elastic_searchable 0.7.2 → 0.7.3

data/lib/elastic_searchable.rb

@@ -33,7 +33,7 @@ module ElasticSearchable
     # ElasticSearchable.debug_output outputs all http traffic to console
     def request(method, url, options = {})
       options.merge! :headers => {'Content-Type' => 'application/json'}
-      options.merge! :body => ElasticSearchable.encode_json(options[:body]) if options[:body]
+      options.merge! :body => ElasticSearchable.encode_json(options[:json_body]) if options[:json_body]
 
       response = self.send(method, url, options)
       logger.debug "elasticsearch request: #{method} #{url} #{"took #{response['took']}ms" if response['took']}"

data/lib/elastic_searchable/index.rb

@@ -13,7 +13,7 @@ module ElasticSearchable
       # http://www.elasticsearch.com/docs/elasticsearch/rest_api/admin/indices/put_mapping/
       def update_index_mapping
         if mapping = self.elastic_options[:mapping]
-          ElasticSearchable.request :put, index_type_path('_mapping'), :body => {index_type => mapping}
+          ElasticSearchable.request :put, index_type_path('_mapping'), :json_body => {index_type => mapping}
         end
       end
 
@@ -23,7 +23,7 @@ module ElasticSearchable
         options = {}
         options.merge! :settings => self.elastic_options[:index_options] if self.elastic_options[:index_options]
         options.merge! :mappings => {index_type => self.elastic_options[:mapping]} if self.elastic_options[:mapping]
-        ElasticSearchable.request :put, index_path, :body => options
+        ElasticSearchable.request :put, index_path, :json_body => options
       end
 
       # explicitly refresh the index, making all operations performed since the last refresh
@@ -112,7 +112,7 @@ module ElasticSearchable
       def reindex(lifecycle = nil)
         query = {}
         query.merge! :percolate => "*" if self.class.elastic_options[:percolate]
-        response = ElasticSearchable.request :put, self.class.index_type_path(self.id), :query => query, :body => self.as_json_for_index
+        response = ElasticSearchable.request :put, self.class.index_type_path(self.id), :query => query, :json_body => self.as_json_for_index
 
         self.run_callbacks("after_index_on_#{lifecycle}".to_sym) if lifecycle
         self.run_callbacks(:after_index)
@@ -135,7 +135,7 @@ module ElasticSearchable
       # 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'), :body => {:doc => self.as_json_for_index}
+        response = ElasticSearchable.request :get, self.class.index_type_path('_percolate'), :json_body => {:doc => self.as_json_for_index}
         response['matches']
       end
 

data/lib/elastic_searchable/queries.rb

@@ -33,7 +33,7 @@ module ElasticSearchable
         query[:sort] = sort
       end
 
-      response = ElasticSearchable.request :get, index_type_path('_search'), :query => query, :body => options
+      response = ElasticSearchable.request :get, index_type_path('_search'), :query => query, :json_body => options
       hits = response['hits']
       ids = hits['hits'].collect {|h| h['_id'].to_i }
       results = self.find(ids).sort_by {|result| ids.index(result.id) }

data/lib/elastic_searchable/version.rb

@@ -1,4 +1,4 @@
 module ElasticSearchable
-  VERSION = '0.7.2'
+  VERSION = '0.7.3'
 end
 

data/test/test_elastic_searchable.rb

@@ -362,7 +362,7 @@ class TestElasticSearchable < Test::Unit::TestCase
       end
       context "when index has configured percolation" do
         setup do
-          ElasticSearchable.request :put, '/_percolator/elastic_searchable/myfilter', :body => {:query => {:query_string => {:query => 'foo' }}}
+          ElasticSearchable.request :put, '/_percolator/elastic_searchable/myfilter', :json_body => {:query => {:query_string => {:query => 'foo' }}}
           ElasticSearchable.request :post, '/_percolator/_refresh'
         end
         context 'creating an object that matches the percolation' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: elastic_searchable
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 7
-  - 2
-  version: 0.7.2
+  - 3
+  version: 0.7.3
 platform: ruby
 authors: 
 - Ryan Sonnek