rubberband 0.9.7 → 0.9.8

data/lib/elasticsearch/client/admin_index.rb

@@ -4,6 +4,16 @@ module ElasticSearch
       module Index
         PSEUDO_INDICES = [:all]
 
+        def index_exists?(index)
+          !!index_status(index)
+        rescue RequestError => e
+          if e.status == 404
+            false
+          else
+            raise e
+          end
+        end
+
         def index_status(*args)
           indices, options = extract_indices_and_options(args)
           execute(:index_status, indices, options)

data/lib/elasticsearch/client/index.rb

@@ -53,8 +53,8 @@ module ElasticSearch
       end
       
       def delete_by_query(query, options = {})
-        index, type, options = extract_required_scope(options)
-        execute(:delete_by_query, index, type, query, options)
+        index, type, options = extract_scope(options)
+        execute(:delete_by_query, index || '_all', type, query, options)
       end
 
       #df	 The default field to use when no field prefix is defined within the query.

data/lib/elasticsearch/transport.rb

@@ -5,7 +5,14 @@ module ElasticSearch
   class ConnectionFailed < FatalError; end
   class HostResolutionError < RetryableError; end
   class TimeoutError < RetryableError; end
-  class RequestError < FatalError; end
+
+  class RequestError < FatalError
+    attr_accessor :status
+
+    def initialize(status)
+      @status = status
+    end
+  end
 
   module Transport
     autoload :HTTP, 'transport/http'

data/lib/elasticsearch/transport/base_protocol.rb

@@ -218,7 +218,7 @@ module ElasticSearch
       end
 
       def handle_error(response)
-        raise RequestError, "(#{response.status}) #{response.body}"
+        raise RequestError.new(response.status), "(#{response.status}) #{response.body}"
       end
 
       # :index - one or many index names

data/lib/elasticsearch/version.rb

@@ -1,3 +1,3 @@
 module ElasticSearch
-  VERSION = "0.9.7"
+  VERSION = "0.9.8"
 end

data/spec/admin_spec.rb

@@ -48,4 +48,9 @@ describe "basic ops" do
     result = @client.get_aliases(second_index)
     result[second_index]["aliases"].keys.should include("#{second_index}-alias")
   end
+
+  it 'should provide a shortcut for index existence' do
+    @client.index_exists?(@first_index).should be_true
+    @client.index_exists?(@first_index + "abc").should_not be_true
+  end
 end

data/spec/index_spec.rb

@@ -3,11 +3,13 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe "index ops" do
   before(:all) do
     @first_index = 'first-' + Time.now.to_i.to_s
+    @second_index = 'second-' + Time.now.to_i.to_s
     @client = ElasticSearch.new('http://127.0.0.1:9200', :index => @first_index, :type => "tweet")
   end
 
   after(:all) do
     @client.delete_index(@first_index)
+    @client.delete_index(@second_index)
     sleep(1)
   end
 
@@ -46,14 +48,37 @@ describe "index ops" do
   it 'should delete by query' do
     @client.index({:deleted => "bar"}, :id => "d1")
     @client.index({:deleted => "bar"}, :id => "d2")
-    @client.refresh
+
+    @client.index({:deleted => "bar"}, :id => "d3", :index => @second_index)
+    @client.refresh(:all)
 
     @client.count(:term => { :deleted => 'bar'}).should == 2
+    @client.count({:term => { :deleted => 'bar'}}, :index => @second_index).should == 1
     @client.delete_by_query(:term => { :deleted => 'bar' })
-    @client.refresh
+    @client.refresh(:all)
     @client.count(:term => { :deleted => 'bar'}).should == 0
+    @client.count({:term => { :deleted => 'bar'}}, :index => @second_index).should == 1
+  end
+
+  it 'should delete by query across indices and types' do
+    @client.index({:deleted => "baz"}, :id => "d1")
+    @client.index({:deleted => "baz"}, :id => "d2")
+
+    @client.index({:deleted => "baz"}, :id => "d3", :index => @second_index)
+    @client.refresh(:all)
+
+    @client.count(:term => { :deleted => 'baz'}).should == 2
+    @client.count({:term => { :deleted => 'baz'}}, :index => @second_index).should == 1
+
+    # create a non-scoped client
+    @client2 = ElasticSearch.new('http://127.0.0.1:9200')
+    @client2.delete_by_query(:term => { :deleted => 'baz' })
+
+    @client.refresh(:all)
+    @client.count(:term => { :deleted => 'baz'}).should == 0
+    @client.count({:term => { :deleted => 'baz'}}, :index => @second_index).should == 0
   end
-  
+
   it 'should perform a successful multi get with an array' do
     @client.index({:foo => "bar"}, :id => "1")
     @client.index({:foo => "baz"}, :id => "2")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubberband
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-09 00:00:00.000000000 Z
+date: 2013-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -179,12 +179,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3502483329274426315
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3502483329274426315
 requirements: []
 rubyforge_project: rubberband
 rubygems_version: 1.8.23