From e14d1c9f27c442925dfad4e0f1bc2dc7909139f3 Mon Sep 17 00:00:00 2001 From: Ryan Sonnek Date: Thu, 21 Apr 2011 10:42:21 -0500 Subject: [PATCH] update license --- CONTRIBUTORS.txt | 6 ++++++ LICENSE.txt | 36 +++++++++++++++++++----------------- README.md | 8 +++++++- 3 files changed, 32 insertions(+), 18 deletions(-) create mode 100644 CONTRIBUTORS.txt diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt new file mode 100644 index 0000000..0bfaa1c --- /dev/null +++ b/CONTRIBUTORS.txt @@ -0,0 +1,6 @@ +Ryan Sonnek - Original Author + + +Complete list of contributors: +https://github.com/socialcast/elastic_searchable/contributors + diff --git a/LICENSE.txt b/LICENSE.txt index 5d63dda..c8c2b33 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,20 +1,22 @@ -Copyright (c) 2011 Ryan Sonnek +The MIT License -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: +Copyright (c) 2011 Socialcast, Inc -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/README.md b/README.md index 8fd8984..089bacf 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ Integrate the elasticsearch library into Rails. ## Usage + ```ruby class Blog < ActiveRecord::Base elastic_searchable @@ -19,12 +20,14 @@ results = Blog.search 'foo' * integrates with will_paginate library for easy pagination of search results ## Installation + ```ruby # Bundler Gemfile gem 'elastic_searchable' ``` ## Configuration + ```ruby # config/initializers/elastic_searchable.rb # (optional) customize elasticsearch host @@ -39,7 +42,10 @@ ElasticSearchable.base_uri = 'server:9200' * Add unit tests * Submit pull request on github +See CONTRIBUTORS.txt for list of project contributors + ## Copyright -Copyright (c) 2011 Ryan Sonnek. See LICENSE.txt for further details. +Copyright (c) 2011 Socialcast, Inc. +See LICENSE.txt for further details.