rubberband 0.1.3 → 0.1.4

data/.gitignore

@@ -17,3 +17,6 @@ cuke_*.log
 
 # ctags generated
 tags
+
+# Gemfile.lock should not be checked in for gems
+Gemfile.lock

data/lib/elasticsearch/transport/base_protocol.rb

@@ -89,10 +89,13 @@ module ElasticSearch
       end
       
       # Uses a post request so we can send ids in content
-      def multi_get(index, type, ids, options={})
+      def multi_get(index, type, query, options={})
         # { "docs" = [ {...}, {...}, ...]}
+        if query.is_a?(Array)
+          query = { "ids" => query }
+        end
         results = standard_request(:post, { :index => index, :type => type, :op => "_mget"}, 
-                                   options, encoder.encode({"ids" => ids}))['docs']
+                                   options, encoder.encode(query))['docs']
         results.each do |hit|
           unescape_id!(hit)
           set_encoding!(hit)

data/lib/elasticsearch/version.rb

@@ -1,3 +1,3 @@
 module ElasticSearch
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/index_spec.rb

@@ -52,7 +52,7 @@ describe "index ops" do
     @client.count(:term => { :deleted => 'bar'}).should == 0
   end
   
-  it 'should perform a successful multi get' do
+  it 'should perform a successful multi get with an array' do
     @client.index({:foo => "bar"}, :id => "1")
     @client.index({:foo => "baz"}, :id => "2")
     @client.index({:foo => "bazbar"}, :id => "3")
@@ -60,4 +60,25 @@ describe "index ops" do
     results = @client.multi_get(ids).inject([]) { |r,e| r << e.id }
     results.should == ids
   end
+ 
+  it 'should perform a successful multi get' do
+    @client.index({:foo => "bar", :bar => "boo1"}, :id => "1")
+    @client.index({:foo => "baz", :bar => "boo2"}, :id => "2")
+    @client.index({:foo => "bazbar", :bar => "boo3"}, :id => "3")
+    query = {
+      "docs" => [
+        { "_id" => "1", "fields" => [] },
+        { "_id" => "2" },
+        { "_id" => "3", "fields" => ["foo"] },
+      ]
+    }
+    results = @client.multi_get(query).inject([]) do
+      |r,e| r << { "id" => e.id, "fields" => e.fields, "_source" => e._source }
+    end
+    results.should == [
+      { "id" => "1", "fields" => nil, "_source" => nil },
+      { "id" => "2", "fields" => nil, "_source" => { "foo" => "baz", "bar" => "boo2" } },
+      { "id" => "3", "fields" => { "foo" => "bazbar" }, "_source" => nil },
+    ]
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubberband
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Grant Rodgers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-22 00:00:00 Z
+date: 2011-10-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: patron
@@ -223,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rubberband
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: An ElasticSearch client with ThriftClient-like failover handling.
@@ -236,3 +236,4 @@ test_files:
 - spec/index_spec.rb
 - spec/spec_helper.rb
 - spec/type_spec.rb
+has_rdoc: