rubberband 0.0.8 → 0.0.9

data/lib/elasticsearch/client/index.rb

@@ -14,6 +14,7 @@ module ElasticSearch
 
         id = options.delete(:id)
         if @batch
+          #TODO add routing, parent
           @batch << { :index => { :_index => index, :_type => type, :_id => id }}
           @batch << document
         else
@@ -43,6 +44,7 @@ module ElasticSearch
         index, type, options = extract_required_scope(options)
 
         if @batch
+          #TODO add routing, parent
           @batch << { :delete => { :_index => index, :_type => type, :_id => id }}
         else
           result = execute(:delete, index, type, id, options)
@@ -71,14 +73,12 @@ module ElasticSearch
 
         options[:fields] = "_id" if options[:ids_only]
 
-        # options that hits take: per_page, page, ids_only
-        hits_options = options.select { |k, v| [:per_page, :page, :ids_only].include?(k) }
-
         # options that elasticsearch doesn't recognize: page, per_page, ids_only, limit, offset
-        options.reject! { |k, v| [:page, :per_page, :ids_only, :limit, :offset].include?(k) }
+        search_options = options.reject { |k, v| [:page, :per_page, :ids_only, :limit, :offset].include?(k) }
+
+        response = execute(:search, index, type, query, search_options)
 
-        response = execute(:search, index, type, query, options)
-        Hits.new(response, hits_options).freeze #ids_only returns array of ids instead of hits
+        Hits.new(response, {:per_page => options[:per_page], :page => options[:page], :ids_only => options[:ids_only]}).freeze #ids_only returns array of ids instead of hits
       end
 
       #ids_only Return ids instead of hits
@@ -99,10 +99,10 @@ module ElasticSearch
 
       # Starts a bulk operation batch and yields self. Index and delete requests will be 
       # queued until the block closes, then sent as a single _bulk call.
-      def bulk
+      def bulk(options={})
         @batch = []
         yield(self)
-        response = execute(:bulk, @batch)
+        response = execute(:bulk, @batch, options)
       ensure
         @batch = nil
       end

data/lib/elasticsearch/transport/base_protocol.rb

@@ -69,9 +69,9 @@ module ElasticSearch
         encoder.decode(response.body) # {"count", "_shards"=>{"failed", "total", "successful"}}
       end
 
-      def bulk(actions)
+      def bulk(actions, options={})
         body = actions.inject("") { |a, s| a << encoder.encode(s) << "\n" }
-        response = request(:post, {:op => '_bulk'}, {}, body)
+        response = request(:post, {:op => '_bulk'}, options, body)
         handle_error(response) unless response.status == 200
         encoder.decode(response.body) # {"items => [ {"delete"/"create" => {"_index", "_type", "_id", "ok"}} ] }
       end

data/rubberband.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rubberband}
-  s.version = "0.0.8"
+  s.version = "0.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["grantr"]
-  s.date = %q{2011-02-22}
+  s.date = %q{2011-02-23}
   s.description = %q{An ElasticSearch client with ThriftClient-like failover handling.}
   s.email = %q{grantr@gmail.com}
   s.extra_rdoc_files = [

data/spec/bulk_spec.rb

@@ -27,4 +27,7 @@ describe "bulk ops" do
     @client.get("3").socks.should == "stripey"
     @client.get("4").socks.should == "argyle"
   end
+
+  it "should take options"
+  # check that url generated has options in query string
 end

data/spec/index_spec.rb

@@ -31,4 +31,13 @@ describe "index ops" do
     @client.search(:query => { :term => { :foo => 'baz' }}).should have(2).items
     @client.count(:term => { :foo => 'baz' }).should == 2
   end
+
+  it 'should return ids when given :ids_only' do
+    @client.index({:socks => "stripey"}, :id => "5")
+    @client.index({:stripey => "stripey too"}, :id => "6")
+    @client.refresh
+
+    results = @client.search({:query => { :field => { :socks => 'stripey' }}}, :ids_only => true)
+    results.should include("5")
+  end
 end

data/spec/type_spec.rb

@@ -1,5 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
+#TODO rewrite this to check the generated url with mocks
 describe "type and index parameters" do
   before(:all) do
     @first_index = 'first-' + Time.now.to_i.to_s

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - grantr
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-22 00:00:00 -08:00
+date: 2011-02-23 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -237,7 +237,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2137179161715678959
+      hash: -2113882144738525775
       segments: 
       - 0
       version: "0"