rubberband 0.1.0 → 0.1.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rubberband (0.0.12)
+    rubberband (0.1.1)
       patron
       yajl-ruby
 

data/lib/elasticsearch/client/admin_index.rb

@@ -69,6 +69,15 @@ module ElasticSearch
           execute(:update_mapping, indices, type, mapping, options)
         end
 
+        def update_settings(settings, options={})
+          index, type, options = extract_scope(options)
+          execute(:update_settings, index, settings, options)
+        end
+
+        def get_settings(index, options={})
+          execute(:get_settings, index, options)
+        end
+
         # list of indices, or :all
         # options: refresh
         # default: default_index if defined, otherwise :all

data/lib/elasticsearch/client/index.rb

@@ -114,13 +114,19 @@ 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(options={})
-        @batch = []
-        yield(self)
-        response = execute(:bulk, @batch, options)
-      ensure
-        @batch = nil
+        # allow nested bulk calls
+        if @batch
+          yield(self)
+        else
+          begin
+            @batch = []
+            yield(self)
+            response = execute(:bulk, @batch, options)
+          ensure
+            @batch = nil
+          end
+        end
       end
-
     end
   end
 end

data/lib/elasticsearch/transport/base_protocol.rb

@@ -114,6 +114,14 @@ module ElasticSearch
         standard_request(:get, {:index => index_list, :op => "_mapping"})
       end
 
+      def update_settings(index, settings, options)
+        standard_request(:put, {:index => index, :op => "_settings"}, options, encoder.encode(settings))
+      end
+
+      def get_settings(index, options)
+        standard_request(:get, {:index => index, :op => "_settings"}, options)
+      end
+
       def flush(index_list, options={})
         standard_request(:post, {:index => index_list, :op => "_flush"}, options, "")
       end

data/lib/elasticsearch/version.rb

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

data/spec/admin_spec.rb

@@ -14,8 +14,12 @@ describe "basic ops" do
   it "should get and update mappings" do
     @client.index({:foo => "bar"}, :id => "1", :refresh => true)
 
-    @client.index_mapping(@first_index).should == {@first_index => {"tweet" => { "properties" => { "foo" => {"type" => "string" }}}}}
     @client.update_mapping({"tweet" => {:properties => {:bar => {:type => "string"}}}})
     @client.index_mapping(@first_index).should == {@first_index => {"tweet" => { "properties" => { "foo" => {"type" => "string" }, "bar" => { "type" => "string"}}}}}
   end
+
+  it "should get and update settings" do
+    @client.update_settings("index" => {"refresh_interval" => 30})
+    @client.get_settings(@first_index)[@first_index]["settings"].should include("index.refresh_interval" => "30")
+  end
 end

data/spec/bulk_spec.rb

@@ -28,6 +28,23 @@ describe "bulk ops" do
     @client.get("4").socks.should == "argyle"
   end
 
+  it "should allow nested bulk calls" do
+    @client.bulk do |c|
+      c.index({:foo => 'bar'}, :id => '11')
+      c.index({:foo => 'baz'}, :id => '12')
+      @client.bulk do
+        @client.index({:socks => 'stripey'}, :id => '13')
+        @client.index({:socks => 'argyle'}, :id => '14')
+      end
+    end
+    @client.refresh
+
+    @client.get("11").foo.should == "bar"
+    @client.get("12").foo.should == "baz"
+    @client.get("13").socks.should == "stripey"
+    @client.get("14").socks.should == "argyle"
+  end
+
   it "should take options" do
     @client.bulk do |c|
       c.index({:foo => 'bar'}, :id => '1', :_routing => '1', :_parent => '1')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubberband
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-14 00:00:00.000000000Z
+date: 2011-06-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: patron
-  requirement: &14303940 !ruby/object:Gem::Requirement
+  requirement: &10698800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14303940
+  version_requirements: *10698800
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &14303100 !ruby/object:Gem::Requirement
+  requirement: &10697360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *14303100
+  version_requirements: *10697360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &14302340 !ruby/object:Gem::Requirement
+  requirement: &10696040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *14302340
+  version_requirements: *10696040
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &14301800 !ruby/object:Gem::Requirement
+  requirement: &10695120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *14301800
+  version_requirements: *10695120
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &14301220 !ruby/object:Gem::Requirement
+  requirement: &10693520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *14301220
+  version_requirements: *10693520
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &14298880 !ruby/object:Gem::Requirement
+  requirement: &10691980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.3.8
   type: :development
   prerelease: false
-  version_requirements: *14298880
+  version_requirements: *10691980
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &14298320 !ruby/object:Gem::Requirement
+  requirement: &10688320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +87,7 @@ dependencies:
         version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *14298320
+  version_requirements: *10688320
 description: An ElasticSearch client with ThriftClient-like failover handling.
 email:
 - grantr@gmail.com