elastic_searchable 1.2.2 → 1.3.0

data/lib/elastic_searchable/index.rb

@@ -111,7 +111,7 @@ module ElasticSearchable
       # see http://www.elasticsearch.org/guide/reference/api/index_.html
       def reindex(lifecycle = nil)
         query = {}
-        query.merge! :percolate => "*" if _percolate_callbacks.any?
+        query[:percolate] = "*" if _percolate_callbacks.any?
         response = ElasticSearchable.request :put, self.class.index_type_path(self.id), :query => query, :json_body => self.as_json_for_index
 
         self.index_lifecycle = lifecycle ? lifecycle.to_sym : nil
@@ -136,8 +136,10 @@ module ElasticSearchable
       # can be done on transient/non-persisted objects!
       # can be done automatically when indexing using :percolate => true config option
       # http://www.elasticsearch.org/blog/2011/02/08/percolator.html
-      def percolate
-        response = ElasticSearchable.request :get, self.class.index_type_path('_percolate'), :json_body => {:doc => self.as_json_for_index}
+      def percolate(percolator_query = nil)
+        body = {:doc => self.as_json_for_index}
+        body[:query] = percolator_query if percolator_query
+        response = ElasticSearchable.request :get, self.class.index_type_path('_percolate'), :json_body => body
         self.percolations = response['matches'] || []
         self.percolations
       end

data/lib/elastic_searchable/version.rb

@@ -1,4 +1,4 @@
 module ElasticSearchable
-  VERSION = '1.2.2'
+  VERSION = '1.3.0'
 end
 

data/test/test_elastic_searchable.rb

@@ -325,11 +325,9 @@ class TestElasticSearchable < Test::Unit::TestCase
       should 'have set mapping' do
         @status = ElasticSearchable.request :get, '/elastic_searchable/users/_mapping'
         expected = {
-          "properties"=> {
-            "name"=> {"type"=>"string", "index"=>"not_analyzed"}
-          }
+          "name"=> {"type"=>"string", "index"=>"not_analyzed"}
         }
-        assert_equal expected, @status['users'], @status.inspect
+        assert_equal expected, @status['users']['properties'], @status.inspect
       end
     end
   end
@@ -417,6 +415,29 @@ class TestElasticSearchable < Test::Unit::TestCase
             assert_equal ['myfilter'], @matches
           end
         end
+        context "with multiple percolators" do
+          setup do
+            ElasticSearchable.request :put, '/_percolator/elastic_searchable/greenfilter', :json_body => { :color => 'green', :query => {:query_string => {:query => 'foo' }}}
+            ElasticSearchable.request :put, '/_percolator/elastic_searchable/bluefilter', :json_body => { :color => 'blue', :query => {:query_string => {:query => 'foo' }}}
+            ElasticSearchable.request :post, '/_percolator/_refresh'
+          end
+          context 'percolating a non-persisted object with no limitation' do
+            setup do
+              @matches = Book.new(:title => 'foo').percolate
+            end
+            should 'return all percolated matches' do
+              assert_equal ['bluefilter','greenfilter','myfilter'], @matches.sort
+            end
+          end
+          context 'percolating a non-persisted object with limitations' do
+            setup do
+              @matches = Book.new(:title => 'foo').percolate( { :term => { :color => 'green' }} )
+            end
+            should 'return limited percolated matches' do
+              assert_equal ['greenfilter'], @matches
+            end
+          end
+        end
       end
     end
   end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 1
-  - 2
-  - 2
-  version: 1.2.2
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Ryan Sonnek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-14 00:00:00 Z
+date: 2011-11-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord