rubberband 0.0.12 → 0.1.0

data/CONTRIBUTORS

@@ -4,6 +4,7 @@ Maintainer:
 Contributors:
   Edmund Salvacion
   Ernie Makris
+  Frederic De Jaeger
   jeroig
   mootpointer
   Ryan Sonnek

data/Gemfile.lock

@@ -30,8 +30,8 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.0.0)
-  mocha (~> 0.9.11)
-  rspec (~> 2)
+  mocha (~> 0.9.0)
+  rspec (~> 2.0)
   rubberband!
   simplecov (>= 0.3.8)
   yard (~> 0.6.0)

data/lib/elasticsearch/client/index.rb

@@ -15,7 +15,7 @@ module ElasticSearch
         id = options.delete(:id)
         if @batch
           #TODO add routing, parent
-          @batch << { :index => { :_index => index, :_type => type, :_id => id }}
+          @batch << { :index => { :_index => index, :_type => type, :_id => id }.merge(options)}
           @batch << document
         else
           result = execute(:index, index, type, id, document, options)
@@ -51,6 +51,11 @@ module ElasticSearch
           result["ok"]
         end
       end
+      
+      def delete_by_query(query, options = {})
+        index, type, options = extract_required_scope(options)
+        execute(:delete_by_query, index, type, query, options)
+      end
 
       #df	 The default field to use when no field prefix is defined within the query.
       #analyzer	 The analyzer name to be used when analyzing the query string.
@@ -58,7 +63,7 @@ module ElasticSearch
       #explain	 For each hit, contain an explanation of how to scoring of the hits was computed.
       #fields	 The selective fields of the document to return for each hit (fields must be stored), comma delimited. Defaults to the internal _source field.
       #field	 Same as fields above, but each parameter contains a single field name to load. There can be several field parameters.
-      #sort	 Sorting to perform. Can either be in the form of fieldName, or fieldName:reverse (for reverse sorting). The fieldName can either be an actual field within the document, or the special score name to indicate sorting based on scores. There can be several sort parameters (order is important).
+      #sort	 Sorting to perform. Can either be in the form of fieldName, or fieldName:desc (for reverse sorting). The fieldName can either be an actual field within the document, or the special score name to indicate sorting based on scores. There can be several sort parameters (order is important).
       #from	 The starting from index of the hits to return. Defaults to 0.
       #size	 The number of hits to return. Defaults to 10.
       #search_type	 The type of the search operation to perform. Can be dfs_query_then_fetch, dfs_query_and_fetch, query_then_fetch, query_and_fetch. Defaults to query_then_fetch.

data/lib/elasticsearch/transport/base_protocol.rb

@@ -28,6 +28,17 @@ module ElasticSearch
         handle_error(response) unless response.status == 200 # ElasticSearch always returns 200 on delete, even if the object doesn't exist
         encoder.decode(response.body)
       end
+      
+      def delete_by_query(index, type, query, options={})
+        # pass the query through the parameters in all the cases, since
+        # DELETE with a body are ambiguously supported
+        if query.is_a?(Hash)
+          params = options.merge(:source => encoder.encode(query))
+        else
+          params = options.merge(:q => query)
+        end
+        request(:delete, {:index => index, :type => type, :op => "_query"}, params)
+      end      
 
       def search(index, type, query, options={})
         if query.is_a?(Hash)

data/lib/elasticsearch/version.rb

@@ -1,3 +1,3 @@
 module ElasticSearch
-  VERSION = "0.0.12"
+  VERSION = "0.1.0"
 end

data/rubberband.gemspec

@@ -28,10 +28,10 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency("patron", [">= 0"])
   s.add_runtime_dependency("yajl-ruby", [">= 0"])
-  s.add_development_dependency("rspec", ["~> 2"])
-  s.add_development_dependency("yard", ["~> 0.6"])
-  s.add_development_dependency("bundler", ["~> 1"])
+  s.add_development_dependency("rspec", ["~> 2.0"])
+  s.add_development_dependency("yard", ["~> 0.6.0"])
+  s.add_development_dependency("bundler", ["~> 1.0.0"])
   s.add_development_dependency("simplecov", [">= 0.3.8"])
-  s.add_development_dependency("mocha", ["~> 0.9"])
+  s.add_development_dependency("mocha", ["~> 0.9.0"])
 
 end

data/spec/bulk_spec.rb

@@ -28,6 +28,13 @@ describe "bulk ops" do
     @client.get("4").socks.should == "argyle"
   end
 
-  it "should take options"
-  # check that url generated has options in query string
+  it "should take options" do
+    @client.bulk do |c|
+      c.index({:foo => 'bar'}, :id => '1', :_routing => '1', :_parent => '1')
+      #TODO better way to test this?
+      meta = c.instance_variable_get('@batch').detect { |b| b.has_key?(:index) }
+      meta[:index].should include(:_routing => '1')
+      meta[:index].should include(:_parent => '1')
+    end
+  end
 end

data/spec/index_spec.rb

@@ -40,4 +40,15 @@ describe "index ops" do
     results = @client.search({:query => { :field => { :socks => 'stripey' }}}, :ids_only => true)
     results.should include("5")
   end
+
+  it 'should delete by query' do
+    @client.index({:deleted => "bar"}, :id => "d1")
+    @client.index({:deleted => "bar"}, :id => "d2")
+    @client.refresh
+
+    @client.count(:term => { :deleted => 'bar'}).should == 2
+    @client.delete_by_query(:term => { :deleted => 'bar' })
+    @client.refresh
+    @client.count(:term => { :deleted => 'bar'}).should == 0
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubberband
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-04-28 00:00:00.000000000Z
+date: 2011-06-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: patron
-  requirement: &20994820 !ruby/object:Gem::Requirement
+  requirement: &14303940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20994820
+  version_requirements: *14303940
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &20994280 !ruby/object:Gem::Requirement
+  requirement: &14303100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,43 +32,43 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20994280
+  version_requirements: *14303100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &20993760 !ruby/object:Gem::Requirement
+  requirement: &14302340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *20993760
+  version_requirements: *14302340
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &20993280 !ruby/object:Gem::Requirement
+  requirement: &14301800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *20993280
+  version_requirements: *14301800
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &20992760 !ruby/object:Gem::Requirement
+  requirement: &14301220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *20992760
+  version_requirements: *14301220
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &20992240 !ruby/object:Gem::Requirement
+  requirement: &14298880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,18 +76,18 @@ dependencies:
         version: 0.3.8
   type: :development
   prerelease: false
-  version_requirements: *20992240
+  version_requirements: *14298880
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &20991720 !ruby/object:Gem::Requirement
+  requirement: &14298320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *20991720
+  version_requirements: *14298320
 description: An ElasticSearch client with ThriftClient-like failover handling.
 email:
 - grantr@gmail.com
@@ -161,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rubberband
-rubygems_version: 1.7.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: An ElasticSearch client with ThriftClient-like failover handling.
@@ -173,4 +173,3 @@ test_files:
 - spec/index_spec.rb
 - spec/spec_helper.rb
 - spec/type_spec.rb
-has_rdoc: