riak-client 0.7.0 → 0.7.1

data/lib/riak/client/net_http_backend.rb

@@ -30,17 +30,19 @@ module Riak
           when IO
             request.body_stream = data
           end
-          response = http.request(request)
 
-          if valid_response?(expect, response.code)
-            result = {:headers => response.to_hash, :code => response.code.to_i}
-            response.read_body {|chunk| yield chunk } if block_given?
-            if return_body?(method, response.code, block_given?)
-              result[:body] = response.body
+          {}.tap do |result|
+            http.request(request) do |response|
+              if valid_response?(expect, response.code)
+                result.merge!({:headers => response.to_hash, :code => response.code.to_i})
+                response.read_body {|chunk| yield chunk } if block_given?
+                if return_body?(method, response.code, block_given?)
+                  result[:body] = response.body
+                end
+              else
+                raise FailedRequest.new(method, expect, response.code, response.to_hash, response.body)
+              end
             end
-            result
-          else
-            raise FailedRequest.new(method, expect, response.code, response.to_hash, response.body)
           end
         end
       end

data/lib/riak/map_reduce.rb

@@ -128,8 +128,10 @@ module Riak
     # @param [Fixnum] value the job timeout, in milliseconds
     def timeout(value)
       @timeout = value
+      return self
     end
-
+    alias :timeout= :timeout
+    
     # Convert the job to JSON for submission over the HTTP interface.
     # @return [String] the JSON representation
     def to_json(options={})

data/lib/riak/robject.rb

@@ -233,7 +233,7 @@ module Riak
     end
 
     # Converts the object to a link suitable for linking other objects to it
-    def to_link(tag=nil)
+    def to_link(tag)
       Link.new(@bucket.client.http.path(@bucket.client.prefix, escape(@bucket.name), escape(@key)).path, tag)
     end
 

data/spec/riak/map_reduce_spec.rb

@@ -178,6 +178,10 @@ describe Riak::MapReduce do
       @mr.timeout(50000)
       @mr.to_json.should include('"timeout":50000')
     end
+
+    it "should return self from setting the timeout" do
+      @mr.timeout(5000).should == @mr
+    end
   end
 
   describe "executing the map reduce job" do

data/spec/riak/object_spec.rb

@@ -514,9 +514,9 @@ describe Riak::RObject do
     end
   end
 
-  it "should convert to a link having the same url and an empty tag" do
+  it "should not convert to link without a tag" do
     @object = Riak::RObject.new(@bucket, "bar")
-    @object.to_link.should == Riak::Link.new("/riak/foo/bar", nil)
+    lambda { @object.to_link }.should raise_error
   end
 
   it "should convert to a link having the same url and a supplied tag" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Sean Cribbs
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-06 00:00:00 -05:00
+date: 2010-06-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency