elastic_record 0.10.2 → 0.11.0

data/LICENSE

@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

data/elastic_record.gemspec

@@ -2,7 +2,7 @@
  
 Gem::Specification.new do |s|
   s.name = 'elastic_record'
-  s.version = '0.10.2'
+  s.version = '0.11.0'
   s.summary = 'Use Elastic Search with your objects'
   s.description = 'Find your records with elastic search'
 

data/lib/elastic_record/index/manage.rb

@@ -10,6 +10,7 @@ module ElasticRecord
       def create(index_name = new_index_name)
         connection.json_put "/#{index_name}"
         update_mapping(index_name)
+        update_settings(index_name)
         index_name
       end
 
@@ -53,6 +54,10 @@ module ElasticRecord
         connection.json_put "/#{index_name}/#{type}/_mapping", type => mapping
       end
 
+      def update_settings(index_name = alias_name)
+        connection.json_put "/#{index_name}/_settings", settings
+      end
+
       def refresh(index_name = alias_name)
         connection.json_post "/#{index_name}/_refresh"
       end

data/lib/elastic_record/index/settings.rb

@@ -0,0 +1,13 @@
+module ElasticRecord
+  class Index
+    module Settings
+      def settings=(mapping)
+        settings.deep_merge!(mapping)
+      end
+
+      def settings
+        @settings ||= {}
+      end
+    end
+  end
+end

data/lib/elastic_record/index.rb

@@ -3,6 +3,7 @@ require 'elastic_record/index/documents'
 require 'elastic_record/index/manage'
 require 'elastic_record/index/mapping'
 require 'elastic_record/index/percolator'
+require 'elastic_record/index/settings'
 require 'net/http'
 
 module ElasticRecord
@@ -11,6 +12,7 @@ module ElasticRecord
     include Manage
     include Mapping
     include Percolator
+    include Settings
     include Deferred
 
     attr_accessor :model
@@ -21,6 +23,9 @@ module ElasticRecord
       @disabled = false
     end
 
+    # def initialize_copy(other)
+    # end
+
     def alias_name
       @alias_name ||= model.base_class.model_name.collection
     end

data/lib/elastic_record/model.rb

@@ -9,6 +9,11 @@ module ElasticRecord
     end
 
     module ClassMethods
+      # def inherited(child)
+      #   super
+      #   child.elastic_index = elastic_index.dup
+      # end
+
       def elastic_connection
         @elastic_connection ||= ElasticRecord::Connection.new(ElasticRecord::Config.servers)
       end
@@ -28,6 +33,10 @@ module ElasticRecord
       def elastic_index
         @elastic_index ||= ElasticRecord::Index.new(self)
       end
+
+      def elastic_index=(index)
+        @elastic_index = index
+      end
     end
 
     def arelastic

data/test/elastic_record/index/manage_test.rb

@@ -10,7 +10,7 @@ class ElasticRecord::Index::ManageTest < MiniTest::Spec
     index.disable_deferring!
     index.delete_all
   end
-  
+
   def test_create
     assert !index.exists?('widgets_foo')
 
@@ -45,6 +45,7 @@ class ElasticRecord::Index::ManageTest < MiniTest::Spec
   end
 
   private
+
     def index
       @index ||= Widget.elastic_index
     end

data/test/elastic_record/index/mapping_test.rb

@@ -1,4 +1,15 @@
 require 'helper'
 
 class ElasticRecord::Index::MappingTest < MiniTest::Spec
+  def test_default_mapping
+    mapping = index.mapping
+
+    refute_nil mapping[:_source]
+    refute_nil mapping[:properties]
+  end
+
+  private
+    def index
+      @index ||= ElasticRecord::Index.new(Widget)
+    end
 end

data/test/elastic_record/index/settings_test.rb

@@ -0,0 +1,14 @@
+require 'helper'
+
+class ElasticRecord::Index::SettingsTest < MiniTest::Spec
+  def test_default_settings
+    expected = {}
+    assert_equal expected, ElasticRecord::Index.new(Widget).settings
+  end
+
+  private
+
+    def index
+      @index ||= ElasticRecord::Index.new(Widget)
+    end
+end

data/test/elastic_record/model_test.rb

@@ -1,6 +1,9 @@
 require 'helper'
 
 class ElasticRecord::ModelTest < MiniTest::Spec
+  class InheritedModel < Widget
+  end
+
   # def test_elastic_connection
   #   connection = Widget.elastic_connection
   # 
@@ -20,4 +23,8 @@ class ElasticRecord::ModelTest < MiniTest::Spec
 
     assert_equal Widget, index.model
   end
+
+  # def test_elastic_index_inheritence
+  #   refute_equal Widget.elastic_index.object_id, InheritedModel.elastic_index.object_id
+  # end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic_record
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.11.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-04 00:00:00.000000000 Z
+date: 2012-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arelastic
@@ -53,7 +53,7 @@ files:
 - .gitignore
 - .travis.yml
 - Gemfile
-- MIT-LICENSE
+- LICENSE
 - README.rdoc
 - Rakefile
 - elastic_record.gemspec
@@ -67,6 +67,7 @@ files:
 - lib/elastic_record/index/manage.rb
 - lib/elastic_record/index/mapping.rb
 - lib/elastic_record/index/percolator.rb
+- lib/elastic_record/index/settings.rb
 - lib/elastic_record/log_subscriber.rb
 - lib/elastic_record/lucene.rb
 - lib/elastic_record/model.rb
@@ -96,6 +97,7 @@ files:
 - test/elastic_record/index/manage_test.rb
 - test/elastic_record/index/mapping_test.rb
 - test/elastic_record/index/percolator_test.rb
+- test/elastic_record/index/settings_test.rb
 - test/elastic_record/index_test.rb
 - test/elastic_record/log_subscriber_test.rb
 - test/elastic_record/lucene_test.rb

data/MIT-LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2012 Matthew Higgins
-
-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.