elastic_record 0.12.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a25b326c628b294aff17e44d2465d1b988ca2c3
-  data.tar.gz: f20002ac648ecf9f7df8f524bf639e6b1be55af2
+  metadata.gz: da221f93d4c557456f18f0b3892a5d2552caf4d2
+  data.tar.gz: ee3abb0b5a4c3d22a58f7eba64f7a621af29e973
 SHA512:
-  metadata.gz: c3baffc104e19d488ae910b3265cd8dcb239ac5a1c05492cdbb1a7747bb2156f3e4085bd6de0defed0eea9dbd2b6b3478a17f759eeaf3a751e12d417f7912eef
-  data.tar.gz: 1bdeaefcffd51c750ad47d36ff5d8018d9040557f2f9a63d994715bb9206346c1439b1c2e8abcf09c997f127bf06fa6ccacccceef33798993f50548c4c5069db
+  metadata.gz: 3f02b3fee7e8464da19f7a8dac186572eae381d1cfc042022671ab369487ecfba68d988b8c035d5cf860775469f41a52d3d5c78016267df47fa9ef885929ccea
+  data.tar.gz: f3afe2ea723942ef860a61fafcfb0d99680865e55117b59a2124109f2b1dd73bf55e17a3c783f7be30c63c03faea6eebe1e16f12fadbe8068a29f2bcd116869d

data/.travis.yml

@@ -1,4 +1,4 @@
 services:
   - elasticsearch
 rvm:
-  - 1.9.3
+  - 2.0.0

data/LICENSE

@@ -1,165 +1,176 @@
-                   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.
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS

data/README.rdoc

@@ -12,35 +12,10 @@ The usual Gemfile addition:
 
 Include ElasticRecord into your model:
 
-  class Product < YourFavoriteOrm::Base
+  class Product < ActiveRecord::Base
     include ElasticRecord::Model
   end
 
-== Configuration
-
-While elastic search automatically maps fields, you may wish to override the defaults:
-
-  class Product < YourFavoriteOrm::Base
-    elastic_index.configure do
-      property :status, type: "string", index: "not_analyzed"
-    end
-  end
-
-You can also directly access Product.elastic_index.mapping and Product.elastic_index.settings:
-
-  class Product
-    elastic_index.mapping = {
-      properties: {
-        name: {type: "string", index: "analyzed"}
-        status: {type: "string", index: "not_analyzed"}
-      }
-    }
-  end
-
-Create the index:
-
-  rake index:create
-
 == Searching
 
 ElasticRecord adds the method 'elastic_search' to your models. It works similar to active_record scoping:
@@ -97,7 +72,6 @@ To change the 'size' and 'from' values of a query, use offset and limit:
 
   search.limit(40).offset(80)   # Creates a query with {size: 40, from: 80}
 
-
 === Facets
 
 Since term facets are the most common, they are the easiest to add to a query:
@@ -136,6 +110,31 @@ Class methods can be executed within scopes:
   # Increase the price of all red products by $10.
   Product.filter(color: 'red').increase_prices
 
+== Configuration
+
+While elastic search automatically maps fields, you may wish to override the defaults:
+
+  class Product < ActiveRecord::Base
+    elastic_index.configure do
+      property :status, type: "string", index: "not_analyzed"
+    end
+  end
+
+You can also directly access Product.elastic_index.mapping and Product.elastic_index.settings:
+
+  class Product
+    elastic_index.mapping = {
+      properties: {
+        name: {type: "string", index: "analyzed"}
+        status: {type: "string", index: "not_analyzed"}
+      }
+    }
+  end
+
+Create the index:
+
+  rake index:create
+
 == Index Information
 
 Core and Index APIs can be accessed with Product.elastic_index. Some examples include:

data/elastic_record.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'elastic_record'
-  s.version = '0.12.0'
+  s.version = '1.0.0'
   s.summary = 'Use Elastic Search with your objects'
   s.description = 'Find your records with elastic search'
 
@@ -18,6 +18,6 @@ Gem::Specification.new do |s|
   s.files       = `git ls-files`.split("\n")
   s.test_files  = `git ls-files -- {test}/*`.split("\n")
 
-  s.add_dependency 'arelastic'
+  s.add_dependency 'arelastic', '>= 0.3.0'
   s.add_dependency 'activemodel'
 end

data/lib/elastic_record/callbacks.rb

@@ -16,7 +16,7 @@ module ElasticRecord
       json = {}
       elastic_index.mapping[:properties].each_key do |key|
         next unless respond_to?(key)
-        value = value = send(key)
+        value = send(key)
 
         if value.present? || value == false
           json[key] = value

data/lib/elastic_record/index/deferred.rb

@@ -21,7 +21,7 @@ module ElasticRecord
           if writes_made
             begin
               index.disable_deferring!
-              index.reset
+              index.delete_by_query match_all: {}
             ensure
               index.enable_deferring!
             end

data/lib/elastic_record/index/documents.rb

@@ -15,7 +15,7 @@ module ElasticRecord
           connection.json_put "/#{index_name}/#{type}/#{id}", document
         end
       end
-      
+
       def delete_document(id, index_name = nil)
         index_name ||= alias_name
 
@@ -26,6 +26,10 @@ module ElasticRecord
         end
       end
 
+      def delete_by_query(query)
+        connection.json_delete "/#{alias_name}/#{type}/_query", query
+      end
+
       def record_exists?(id)
         get(id)['exists']
       end

data/lib/elastic_record/index/warmer.rb

@@ -0,0 +1,24 @@
+module ElasticRecord
+  class Index
+    module Warmer
+      def create_warmer(name, elastic_query)
+        connection.json_put "/#{alias_name}/#{type}/_warmer/#{name}", elastic_query
+      end
+
+      def delete_warmer(name)
+        connection.json_delete "/#{alias_name}/#{type}/_warmer/#{name}"
+      end
+
+      def get_warmer(name)
+        connection.json_get("/#{alias_name}/#{type}/_warmer/#{name}").values.first['warmers'][name]
+      end
+
+      def warmer_exists?(name)
+        get_warmer(name)
+        true
+      rescue ElasticRecord::ConnectionError
+        false
+      end
+    end
+  end
+end

data/lib/elastic_record/index.rb

@@ -5,13 +5,19 @@ require 'elastic_record/index/manage'
 require 'elastic_record/index/mapping'
 require 'elastic_record/index/percolator'
 require 'elastic_record/index/settings'
+require 'elastic_record/index/warmer'
 
-require 'active_support/core_ext/hash/deep_dup'
+require 'active_support/version'
+if ActiveSupport::VERSION::STRING < '4'
+  require 'active_support/core_ext/hash/deep_dup'
+else
+  require 'active_support/core_ext/object/deep_dup'
+end
 
 module ElasticRecord
   # ElasticRecord::Index provides access to elastic search's API. It is accessed with
   # <tt>Widget.elastic_index</tt>. The methods provided are:
-  # 
+  #
   # [create]
   #   Create a new index that is not aliased
   # [create_and_deploy]
@@ -29,9 +35,8 @@ module ElasticRecord
   class Index
     include Documents
     include Manage
-    include Mapping
-    include Percolator
-    include Settings
+    include Mapping, Settings
+    include Percolator, Warmer
     include Deferred
 
     attr_accessor :model
@@ -48,11 +53,11 @@ module ElasticRecord
     end
 
     def alias_name
-      @alias_name ||= model.base_class.model_name.collection
+      @alias_name ||= model.base_class.name.demodulize.underscore.pluralize
     end
 
     def type
-      @type ||= model.base_class.model_name.element
+      @type ||= model.base_class.name.demodulize.underscore
     end
 
     def disable!

data/lib/elastic_record/relation/admin.rb

@@ -0,0 +1,13 @@
+module ElasticRecord
+  class Relation
+    module Admin
+      def create_percolator(name)
+        klass.elastic_index.create_percolator(name, as_elastic)
+      end
+
+      def create_warmer(name)
+        klass.elastic_index.create_warmer(name, as_elastic)
+      end
+    end
+  end
+end

data/lib/elastic_record/relation/batches.rb

@@ -1,8 +1,8 @@
 module ElasticRecord
   class Relation
     module Batches
-      def find_each
-        find_in_batches do |records|
+      def find_each(options = {})
+        find_in_batches(options) do |records|
           records.each { |record| yield record }
         end
       end
@@ -20,7 +20,7 @@ module ElasticRecord
           scroll: scroll_keep_alive,
           size: 100,
           search_type: 'scan'
-        }
+        }.update(options)
 
         scroll_id = klass.elastic_index.search(as_elastic, options)['_scroll_id']
 

data/lib/elastic_record/relation/search_methods.rb

@@ -24,7 +24,7 @@ module ElasticRecord
           end                                  # end
         CODE
       end
-    
+
       def query!(value)
         self.query_value = value
         self
@@ -226,24 +226,23 @@ module ElasticRecord
         end
 
         def build_orders(orders)
-          unless orders.empty?
-            orders = reverse_query_order(orders) if reverse_order_value
-            Arelastic::Searches::Sort.new(orders) unless orders.empty?
+          return if orders.empty?
+
+          orders = orders.map do |order|
+            if order.is_a?(Arelastic::Sorts::Sort)
+              order
+            else
+              Arelastic::Sorts::Sort.new(order)
+            end
           end
+
+          orders = reverse_query_order(orders) if reverse_order_value
+          Arelastic::Searches::Sort.new(orders)
         end
 
         def reverse_query_order(orders)
-          orders.reverse.map do |o|
-            case o
-            when String, Symbol
-              {o => :desc}
-            when Hash
-              o.each_with_object({}) do |(field, dir), memo|
-                memo[field] = (dir.to_sym == :asc ? :desc : :asc )
-              end
-            else
-              o
-            end
+          orders.reverse.map do |order|
+            order.reverse
           end
         end
     end

data/lib/elastic_record/relation.rb

@@ -1,4 +1,5 @@
 require 'elastic_record/relation/value_methods'
+require 'elastic_record/relation/admin'
 require 'elastic_record/relation/batches'
 require 'elastic_record/relation/delegation'
 require 'elastic_record/relation/finder_methods'
@@ -8,7 +9,7 @@ require 'elastic_record/relation/search_methods'
 
 module ElasticRecord
   class Relation
-    include Batches, Delegation, FinderMethods, Merging, SearchMethods
+    include Admin, Batches, Delegation, FinderMethods, Merging, SearchMethods
 
     attr_reader :klass, :arelastic, :values
 
@@ -26,10 +27,6 @@ module ElasticRecord
       search_results['facets']
     end
 
-    def create_percolator(name)
-      klass.elastic_index.create_percolator(name, as_elastic)
-    end
-
     def explain(id)
       klass.elastic_index.explain(id, as_elastic)
     end
@@ -69,7 +66,7 @@ module ElasticRecord
       def reset
         @search_results = @records = nil
       end
-    
+
       def search_hits
         search_results['hits']['hits']
       end

data/test/elastic_record/index/documents_test.rb

@@ -28,9 +28,19 @@ class ElasticRecord::Index::DocumentsTest < MiniTest::Spec
     refute index.record_exists?('abc')
   end
 
+  def test_delete_by_query
+    index.index_document('bob', name: 'bob')
+    index.index_document('joe', name: 'joe')
+
+    index.delete_by_query(query_string: {query: 'name.analyzed:bob'})
+
+    refute index.record_exists?('bob')
+    assert index.record_exists?('joe')
+  end
+
   def test_bulk_add
     record = Widget.new(id: 'abc', color: 'red')
-    
+
     index.bulk_add [record]
 
     assert index.record_exists?('abc')

data/test/elastic_record/index/manage_test.rb

@@ -1,59 +1,58 @@
 require 'helper'
 
-# class Cat
-#   include TestModel
-# end
-
 class ElasticRecord::Index::ManageTest < MiniTest::Spec
+  class Felon
+    include TestModel
+  end
+
   def setup
     super
-    index.disable_deferring!
-    index.delete_all
+    Felon.elastic_index.delete_all
   end
 
   def test_create
-    assert !index.exists?('widgets_foo')
+    assert !index.exists?('felons_foo')
 
-    index.create 'widgets_foo'
+    index.create 'felons_foo'
 
-    assert index.exists?('widgets_foo')
+    assert index.exists?('felons_foo')
   end
 
   def test_exists
-    index.create 'widgets_foo'
+    index.create 'felons_foo'
 
-    assert index.exists?('widgets_foo')
-    assert !index.exists?('widgets_bar')
+    assert index.exists?('felons_foo')
+    assert !index.exists?('felons_bar')
   end
 
   def test_type_exists
-    index.create 'widgets_foo'
+    index.create 'felons_foo'
 
-    assert index.type_exists?('widgets_foo')
-    assert !index.type_exists?('widgets_bar')    
+    assert index.type_exists?('felons_foo')
+    assert !index.type_exists?('felons_bar')
   end
 
   def test_deploy
-    index.create 'widgets_foo'
-    
+    index.create 'felons_foo'
+
     assert index.aliased_names.empty?
-    index.deploy 'widgets_foo'
+    index.deploy 'felons_foo'
 
-    assert_equal ['widgets_foo'], index.aliased_names
+    assert_equal ['felons_foo'], index.aliased_names
   end
 
   def test_deploy_when_already_deployed
-    index.create 'widgets_foo'
-    index.deploy 'widgets_foo'
-    
-    index.deploy 'widgets_foo'
+    index.create 'felons_foo'
+    index.deploy 'felons_foo'
+
+    index.deploy 'felons_foo'
 
-    assert_equal ['widgets_foo'], index.aliased_names
+    assert_equal ['felons_foo'], index.aliased_names
   end
 
   private
 
     def index
-      @index ||= Widget.elastic_index
+      @index ||= Felon.elastic_index
     end
 end

data/test/elastic_record/index/percolator_test.rb

@@ -2,6 +2,8 @@ require 'helper'
 
 class ElasticRecord::Index::PercolatorTest < MiniTest::Spec
   def test_create_percolator
+    index.disable_deferring!
+
     index.delete_percolator('green') if index.percolator_exists?('green')
     index.delete_percolator('blue') if index.percolator_exists?('blue')
 
@@ -12,6 +14,8 @@ class ElasticRecord::Index::PercolatorTest < MiniTest::Spec
   end
 
   def test_delete_percolator
+    index.disable_deferring!
+
     index.create_percolator('green', 'color' => 'green')
     assert index.percolator_exists?('green')
 
@@ -23,6 +27,7 @@ class ElasticRecord::Index::PercolatorTest < MiniTest::Spec
   end
 
   private
+
     def index
       Widget.elastic_index
     end

data/test/elastic_record/index/warmer_test.rb

@@ -0,0 +1,20 @@
+require 'helper'
+
+class ElasticRecord::Index::WarmerTest < MiniTest::Spec
+  def test_create_warmer
+    index.delete_warmer('green') if index.warmer_exists?('green')
+    refute index.warmer_exists?('green')
+
+    index.create_warmer('green', 'query' => { "match_all" => {} })
+
+    assert index.warmer_exists?('green')
+    expected = {"types" => ["widget"], "source" => {"query" => {"match_all"=>{}}}}
+    assert_equal expected, index.get_warmer('green')
+  end
+
+  private
+
+    def index
+      Widget.elastic_index
+    end
+end

data/test/elastic_record/relation/admin_test.rb

@@ -0,0 +1,22 @@
+require 'helper'
+
+class ElasticRecord::Relation::AdminTest < MiniTest::Spec
+  def test_create_percolator
+    Widget.elastic_index.reset_percolator
+
+    Widget.elastic_relation.filter(color: 'green').create_percolator('green')
+    Widget.elastic_relation.filter(color: 'blue').create_percolator('blue')
+    widget = Widget.new(color: 'green')
+
+    assert_equal ['green'], Widget.elastic_index.percolate(widget.as_search)
+  end
+
+  def test_create_warmer
+    Widget.elastic_index.delete_warmer('green') if Widget.elastic_index.warmer_exists?('green')
+
+    relation = Widget.elastic_relation.filter('color' => 'green')
+    relation.create_warmer('green')
+
+    assert_equal relation.as_elastic, Widget.elastic_index.get_warmer('green')['source']
+  end
+end

data/test/elastic_record/relation/search_methods_test.rb

@@ -10,7 +10,7 @@ class ElasticRecord::Relation::SearchMethodsTest < MiniTest::Spec
   def test_query_with_multiple_filters
     relation.filter!('foo' => 'bar')
     relation.filter!(Widget.arelastic['faz'].in ['baz', 'fum'])
-    
+
     expected = {
       "constant_score" => {
         "filter" => {
@@ -27,7 +27,7 @@ class ElasticRecord::Relation::SearchMethodsTest < MiniTest::Spec
 
   def test_filter_with_arelastic
     relation.filter!(Widget.arelastic['faz'].in 3..5)
-    
+
     expected = {
       "constant_score" => {
         "filter" => {
@@ -43,7 +43,7 @@ class ElasticRecord::Relation::SearchMethodsTest < MiniTest::Spec
 
   def test_filter_with_hash
     relation.filter!("prefix" => {"name" => "Jo"})
-    
+
     expected = {
       "constant_score" => {
         "filter" => {
@@ -153,7 +153,20 @@ class ElasticRecord::Relation::SearchMethodsTest < MiniTest::Spec
 
     expected = [
       'foo',
-      'bar' => 'desc'
+      {'bar' => 'desc'}
+    ]
+
+    assert_equal expected, relation.as_elastic['sort']
+  end
+
+  def test_reverse_order
+    relation.order! 'foo' => {'missing' => '_last'}
+    relation.order! 'bar' => 'desc'
+    relation.reverse_order!
+
+    expected = [
+      {'bar' => 'asc'},
+      {'foo' => {'order' => 'desc', 'missing' => '_last'}}
     ]
 
     assert_equal expected, relation.as_elastic['sort']

data/test/elastic_record/relation_test.rb

@@ -15,16 +15,6 @@ class ElasticRecord::RelationTest < MiniTest::Spec
     assert_equal 2, facets['popular_colors']['total']
   end
 
-  def test_create_percolator
-    Widget.elastic_index.reset_percolator
-
-    Widget.elastic_relation.filter(color: 'green').create_percolator('green')
-    Widget.elastic_relation.filter(color: 'blue').create_percolator('blue')
-    widget = Widget.new(color: 'green')
-
-    assert_equal ['green'], Widget.elastic_index.percolate(widget.as_search)
-  end
-
   def test_explain
     create_widgets [Widget.new(id: 10, color: 'blue')]
 
@@ -43,7 +33,7 @@ class ElasticRecord::RelationTest < MiniTest::Spec
 
   def test_to_a
     create_widgets [Widget.new(id: 5, color: 'red'), Widget.new(id: 10, color: 'blue')]
-    
+
     array = Widget.elastic_relation.to_a
 
     assert_equal 2, array.size

data/test/elastic_record/searching_test.rb

@@ -2,7 +2,7 @@ require 'helper'
 
 class ElasticRecord::SearchingTest < MiniTest::Spec
   def test_elastic_search
-    
+
   end
 
   def test_elastic_scope

data/test/helper.rb

@@ -7,7 +7,6 @@ require 'support/connect'
 require 'support/models/test_model'
 require 'support/models/warehouse'
 require 'support/models/widget'
-Widget.elastic_index.reset
 
 ElasticRecord::Config.model_names = %w(Warehouse Widget)
 
@@ -19,6 +18,8 @@ module MiniTest
       super
       FakeWeb.clean_registry
 
+      Widget.elastic_index.create_and_deploy if Widget.elastic_index.all_names.empty?
+
       ElasticRecord::Config.models.each do |model|
         model.elastic_index.enable_deferring!
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic_record
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Infogroup
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
+date: 2013-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arelastic
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -65,6 +65,7 @@ files:
 - lib/elastic_record/index/mapping.rb
 - lib/elastic_record/index/percolator.rb
 - lib/elastic_record/index/settings.rb
+- lib/elastic_record/index/warmer.rb
 - lib/elastic_record/log_subscriber.rb
 - lib/elastic_record/lucene.rb
 - lib/elastic_record/model.rb
@@ -72,6 +73,7 @@ files:
 - lib/elastic_record/railtie.rb
 - lib/elastic_record/railties/controller_runtime.rb
 - lib/elastic_record/relation.rb
+- lib/elastic_record/relation/admin.rb
 - lib/elastic_record/relation/batches.rb
 - lib/elastic_record/relation/delegation.rb
 - lib/elastic_record/relation/finder_methods.rb
@@ -96,11 +98,13 @@ files:
 - 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/warmer_test.rb
 - test/elastic_record/index_test.rb
 - test/elastic_record/log_subscriber_test.rb
 - test/elastic_record/lucene_test.rb
 - test/elastic_record/model_test.rb
 - test/elastic_record/railties/controller_runtime_test.rb
+- test/elastic_record/relation/admin_test.rb
 - test/elastic_record/relation/batches_test.rb
 - test/elastic_record/relation/delegation_test.rb
 - test/elastic_record/relation/finder_methods_test.rb
@@ -108,6 +112,7 @@ files:
 - test/elastic_record/relation/none_test.rb
 - test/elastic_record/relation/search_methods_test.rb
 - test/elastic_record/relation_test.rb
+- test/elastic_record/searches_many/association_test.rb
 - test/elastic_record/searches_many/autosave_test.rb
 - test/elastic_record/searches_many/collection_proxy_test.rb
 - test/elastic_record/searches_many/reflection_test.rb