elasticsearch-ruby 0.0.2 → 0.0.3

data/lib/elastic_search/index.rb

@@ -13,7 +13,7 @@ module ElasticSearch
     end
     alias :[] :get_type
 
-    def search(body, parameters)
+    def search(body, parameters = {})
       request = build_request(method: :get, action: :search, parameters: parameters, body: body || {})
       response = execute(request)
       ElasticSearch::Search::Results.new(response)

data/lib/elastic_search/request.rb

@@ -20,7 +20,7 @@ module ElasticSearch
     end
 
     def body
-      @encoded_body ||= @body.to_json
+      @encoded_body ||= @body.is_a?(String) ? @body : @body.to_json
     end
 
     def path

data/lib/elastic_search/version.rb

@@ -1,3 +1,3 @@
 module ElasticSearch
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/elasticsearch/client_spec.rb

@@ -48,6 +48,17 @@ describe ElasticSearch::Client do
           client.has_index?(TEST_INDEX).must_equal true
         end
       end
+
+      describe :bulk do
+        it "should bulk insert documents" do
+          client.create_index(TEST_INDEX).refresh
+          objects = (1..2).collect do |i|
+            ["{ \"index\" : { \"_index\" : \"#{TEST_INDEX}\", \"_type\" : \"#{TEST_TYPE}\", \"_id\" : \"#{i}\" } }", "{ \"foo\" : \"bar\"}"]
+          end
+          client.bulk(objects)
+        end
+      end
+
     end
   end
 end

data/spec/elasticsearch/index_spec.rb

@@ -45,6 +45,13 @@ describe ElasticSearch::Index do
           results = index.search(nil, q: '*')
           results[0].type.must_equal 'type_1'
         end
+
+        it "should search using the body" do
+          index[TEST_TYPE].put(1, { foo: 'bar' })
+          index.refresh
+          results = index.search({ query: { query_string: { query: '*' } } })
+          results.count.must_equal 1
+        end
       end
 
       describe :refresh do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-17 00:00:00.000000000 Z
+date: 2012-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thrift
-  requirement: &70256836637740 !ruby/object:Gem::Requirement
+  requirement: &70153279330420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70256836637740
+  version_requirements: *70153279330420
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70256836637220 !ruby/object:Gem::Requirement
+  requirement: &70153279329780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70256836637220
+  version_requirements: *70153279329780
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70256836636740 !ruby/object:Gem::Requirement
+  requirement: &70153279329160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70256836636740
+  version_requirements: *70153279329160
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70256836636060 !ruby/object:Gem::Requirement
+  requirement: &70153279328580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70256836636060
+  version_requirements: *70153279328580
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70256836635620 !ruby/object:Gem::Requirement
+  requirement: &70153279328040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70256836635620
+  version_requirements: *70153279328040
 description: Ruby Driver for Elastic Search
 email:
 - edmund@edmundatwork.com