riak-client 0.8.3 → 0.9.0.beta

data/lib/riak/util/escape.rb

@@ -23,6 +23,13 @@ module Riak
       def escape(bucket_or_key)
         CGI.escape(bucket_or_key.to_s).gsub("+", "%20")
       end
+
+      # CGI-unescapes bucket or key names
+      # @param [String] bucket_or_key the bucket or key name
+      # @return [String] the unescaped name
+      def unescape(bucket_or_key)
+        CGI.unescape(bucket_or_key.to_s)
+      end
     end
   end
 end

data/riak-client.gemspec

@@ -2,19 +2,19 @@
 
 Gem::Specification.new do |s|
   s.name = %q{riak-client}
-  s.version = "0.8.3"
+  s.version = "0.9.0.beta"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sean Cribbs"]
-  s.date = %q{2010-12-13}
+  s.date = %q{2010-12-29}
   s.description = %q{riak-client is a rich client for Riak, the distributed database by Basho. It supports the full HTTP interface including storage operations, bucket configuration, link-walking and map-reduce.}
   s.email = %q{sean@basho.com}
-  s.files = ["erl_src/riak_kv_test_backend.beam", "erl_src/riak_kv_test_backend.erl", "Gemfile", "lib/active_support/cache/riak_store.rb", "lib/riak/bucket.rb", "lib/riak/cache_store.rb", "lib/riak/client/curb_backend.rb", "lib/riak/client/excon_backend.rb", "lib/riak/client/http_backend.rb", "lib/riak/client/net_http_backend.rb", "lib/riak/client.rb", "lib/riak/core_ext/blank.rb", "lib/riak/core_ext/extract_options.rb", "lib/riak/core_ext/slice.rb", "lib/riak/core_ext/stringify_keys.rb", "lib/riak/core_ext/symbolize_keys.rb", "lib/riak/core_ext/to_param.rb", "lib/riak/core_ext.rb", "lib/riak/failed_request.rb", "lib/riak/i18n.rb", "lib/riak/invalid_response.rb", "lib/riak/link.rb", "lib/riak/locale/en.yml", "lib/riak/map_reduce.rb", "lib/riak/map_reduce_error.rb", "lib/riak/robject.rb", "lib/riak/search.rb", "lib/riak/test_server.rb", "lib/riak/util/escape.rb", "lib/riak/util/fiber1.8.rb", "lib/riak/util/headers.rb", "lib/riak/util/multipart.rb", "lib/riak/util/tcp_socket_extensions.rb", "lib/riak/util/translation.rb", "lib/riak/walk_spec.rb", "lib/riak.rb", "Rakefile", "riak-client.gemspec", "spec/fixtures/cat.jpg", "spec/fixtures/multipart-blank.txt", "spec/fixtures/multipart-with-body.txt", "spec/integration/riak/cache_store_spec.rb", "spec/integration/riak/test_server_spec.rb", "spec/riak/bucket_spec.rb", "spec/riak/client_spec.rb", "spec/riak/curb_backend_spec.rb", "spec/riak/escape_spec.rb", "spec/riak/excon_backend_spec.rb", "spec/riak/headers_spec.rb", "spec/riak/http_backend_spec.rb", "spec/riak/link_spec.rb", "spec/riak/map_reduce_spec.rb", "spec/riak/multipart_spec.rb", "spec/riak/net_http_backend_spec.rb", "spec/riak/object_spec.rb", "spec/riak/search_spec.rb", "spec/riak/walk_spec_spec.rb", "spec/spec_helper.rb", "spec/support/drb_mock_server.rb", "spec/support/http_backend_implementation_examples.rb", "spec/support/mock_server.rb", "spec/support/mocks.rb", "spec/support/test_server.yml.example"]
+  s.files = ["erl_src/riak_kv_test_backend.beam", "erl_src/riak_kv_test_backend.erl", "Gemfile", "lib/active_support/cache/riak_store.rb", "lib/riak/bucket.rb", "lib/riak/cache_store.rb", "lib/riak/client/curb_backend.rb", "lib/riak/client/excon_backend.rb", "lib/riak/client/http_backend/configuration.rb", "lib/riak/client/http_backend/object_methods.rb", "lib/riak/client/http_backend/request_headers.rb", "lib/riak/client/http_backend/transport_methods.rb", "lib/riak/client/http_backend.rb", "lib/riak/client/net_http_backend.rb", "lib/riak/client.rb", "lib/riak/core_ext/blank.rb", "lib/riak/core_ext/extract_options.rb", "lib/riak/core_ext/slice.rb", "lib/riak/core_ext/stringify_keys.rb", "lib/riak/core_ext/symbolize_keys.rb", "lib/riak/core_ext/to_param.rb", "lib/riak/core_ext.rb", "lib/riak/failed_request.rb", "lib/riak/i18n.rb", "lib/riak/invalid_response.rb", "lib/riak/link.rb", "lib/riak/locale/en.yml", "lib/riak/map_reduce/filter_builder.rb", "lib/riak/map_reduce/phase.rb", "lib/riak/map_reduce.rb", "lib/riak/map_reduce_error.rb", "lib/riak/robject.rb", "lib/riak/search.rb", "lib/riak/test_server.rb", "lib/riak/util/escape.rb", "lib/riak/util/fiber1.8.rb", "lib/riak/util/headers.rb", "lib/riak/util/multipart.rb", "lib/riak/util/tcp_socket_extensions.rb", "lib/riak/util/translation.rb", "lib/riak/walk_spec.rb", "lib/riak.rb", "Rakefile", "riak-client.gemspec", "spec/fixtures/cat.jpg", "spec/fixtures/multipart-blank.txt", "spec/fixtures/multipart-with-body.txt", "spec/integration/riak/cache_store_spec.rb", "spec/integration/riak/test_server_spec.rb", "spec/riak/bucket_spec.rb", "spec/riak/client_spec.rb", "spec/riak/curb_backend_spec.rb", "spec/riak/escape_spec.rb", "spec/riak/excon_backend_spec.rb", "spec/riak/headers_spec.rb", "spec/riak/http_backend/object_methods_spec.rb", "spec/riak/http_backend_spec.rb", "spec/riak/link_spec.rb", "spec/riak/map_reduce_spec.rb", "spec/riak/multipart_spec.rb", "spec/riak/net_http_backend_spec.rb", "spec/riak/object_spec.rb", "spec/riak/search_spec.rb", "spec/riak/walk_spec_spec.rb", "spec/spec_helper.rb", "spec/support/drb_mock_server.rb", "spec/support/http_backend_implementation_examples.rb", "spec/support/mock_server.rb", "spec/support/mocks.rb", "spec/support/test_server.yml.example"]
   s.homepage = %q{http://seancribbs.github.com/ripple}
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{riak-client is a rich client for Riak, the distributed database by Basho.}
-  s.test_files = ["lib/riak/walk_spec.rb", "spec/integration/riak/cache_store_spec.rb", "spec/integration/riak/test_server_spec.rb", "spec/riak/bucket_spec.rb", "spec/riak/client_spec.rb", "spec/riak/curb_backend_spec.rb", "spec/riak/escape_spec.rb", "spec/riak/excon_backend_spec.rb", "spec/riak/headers_spec.rb", "spec/riak/http_backend_spec.rb", "spec/riak/link_spec.rb", "spec/riak/map_reduce_spec.rb", "spec/riak/multipart_spec.rb", "spec/riak/net_http_backend_spec.rb", "spec/riak/object_spec.rb", "spec/riak/search_spec.rb", "spec/riak/walk_spec_spec.rb"]
+  s.test_files = ["lib/riak/walk_spec.rb", "spec/integration/riak/cache_store_spec.rb", "spec/integration/riak/test_server_spec.rb", "spec/riak/bucket_spec.rb", "spec/riak/client_spec.rb", "spec/riak/curb_backend_spec.rb", "spec/riak/escape_spec.rb", "spec/riak/excon_backend_spec.rb", "spec/riak/headers_spec.rb", "spec/riak/http_backend/object_methods_spec.rb", "spec/riak/http_backend_spec.rb", "spec/riak/link_spec.rb", "spec/riak/map_reduce_spec.rb", "spec/riak/multipart_spec.rb", "spec/riak/net_http_backend_spec.rb", "spec/riak/object_spec.rb", "spec/riak/search_spec.rb", "spec/riak/walk_spec_spec.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/spec/riak/bucket_spec.rb

@@ -16,24 +16,11 @@ require File.expand_path("../spec_helper", File.dirname(__FILE__))
 describe Riak::Bucket do
   before :each do
     @client = Riak::Client.new
+    @backend = mock("Backend")
+    @client.stub!(:backend).and_return(@backend)
     @bucket = Riak::Bucket.new(@client, "foo")
   end
 
-  def do_load(overrides={})
-    @bucket.load({
-                   :body => '{"props":{"name":"foo","n_val":3,"allow_mult":false,"last_write_wins":false,"precommit":[],"postcommit":[],"chash_keyfun":{"mod":"riak_core_util","fun":"chash_std_keyfun"},"linkfun":{"mod":"riak_kv_wm_link_walker","fun":"mapreduce_linkfun"},"old_vclock":86400,"young_vclock":20,"big_vclock":50,"small_vclock":10,"r":"quorum","w":"quorum","dw":"quorum","rw":"quorum"},"keys":["bar"]}',
-                   :headers => {
-                     "vary" => ["Accept-Encoding"],
-                     "server" => ["MochiWeb/1.1 WebMachine/1.5.1 (hack the charles gibson)"],
-                     "link" => ['</riak/foo/bar>; riaktag="contained"'],
-                     "date" => ["Tue, 12 Jan 2010 15:30:43 GMT"],
-                     "content-type" => ["application/json"],
-                     "content-length" => ["257"]
-                   }
-                 }.merge(overrides))
-  end
-
-
   describe "when initializing" do
     it "should require a client and a name" do
       lambda { Riak::Bucket.new }.should raise_error
@@ -50,116 +37,69 @@ describe Riak::Bucket do
     end
   end
 
-  describe "when loading data from an HTTP response" do
-    it "should load the bucket properties from the response body" do
-      do_load
-      @bucket.props.should == {"name"=>"foo", "n_val"=>3, "allow_mult"=>false, "last_write_wins"=>false, "precommit"=>[], "postcommit"=>[], "chash_keyfun"=>{"mod"=>"riak_core_util", "fun"=>"chash_std_keyfun"}, "linkfun"=>{"mod"=>"riak_kv_wm_link_walker", "fun"=>"mapreduce_linkfun"}, "old_vclock"=>86400, "young_vclock"=>20, "big_vclock"=>50, "small_vclock"=>10, "r"=>"quorum", "w"=>"quorum", "dw"=>"quorum", "rw"=>"quorum"}
-    end
-
-    it "should load the keys from the response body" do
-      do_load
-      @bucket.keys.should == ["bar"]
-    end
-
-    it "should raise an error for a response that is not JSON" do
-      lambda do
-        do_load(:headers => {"content-type" => ["text/plain"]})
-      end.should raise_error(Riak::InvalidResponse)
-    end
-
-    it "should unescape key names" do
-      do_load(:body => '{"keys":["foo", "bar%20baz"]}')
-      @bucket.keys.should == ["foo", "bar baz"]
-    end
-  end
-
   describe "accessing keys" do
-    before :each do
-      @http = mock("HTTPBackend")
-      @client.stub!(:http).and_return(@http)
-    end
-
     it "should load the keys if not present" do
-      @http.should_receive(:get).with(200, "/riak/", "foo", {:props => false, :keys => true}, {}).and_return({:headers => {"content-type" => ["application/json"]}, :body => '{"keys":["bar"]}'})
+      @backend.should_receive(:list_keys).with(@bucket).and_return(["bar"])
       @bucket.keys.should == ["bar"]
     end
 
     it "should allow reloading of the keys" do
-      @http.should_receive(:get).with(200, "/riak/","foo", {:props => false, :keys => true}, {}).and_return({:headers => {"content-type" => ["application/json"]}, :body => '{"keys":["bar"]}'})
-      do_load # Ensures they're already loaded
+      @backend.should_receive(:list_keys).with(@bucket).and_return(["bar"])
+      @bucket.instance_variable_set(:@keys, ["foo"])
       @bucket.keys(:reload => true).should == ["bar"]
     end
 
     it "should allow streaming keys through block" do
-      # pending "Needs support in the raw_http_resource"
-      @http.should_receive(:get).with(200, "/riak/","foo", {:props => false, :keys => "stream"}, {}).and_yield("{}").and_yield('{"keys":[]}').and_yield('{"keys":["bar"]}').and_yield('{"keys":["baz"]}')
+      @backend.should_receive(:list_keys).with(@bucket).and_yield([]).and_yield(["bar"]).and_yield(["baz"])
       all_keys = []
       @bucket.keys do |list|
         all_keys.concat(list)
       end
       all_keys.should == ["bar", "baz"]
     end
-
-    it "should unescape key names" do
-      @http.should_receive(:get).with(200, "/riak/","foo", {:props => false, :keys => true}, {}).and_return({:headers => {"content-type" => ["application/json"]}, :body => '{"keys":["bar%20baz"]}'})
-      @bucket.keys.should == ["bar baz"]
-    end
-
-    it "should escape the bucket name" do
-      @bucket.instance_variable_set :@name, "unescaped "
-      @http.should_receive(:get).with(200, "/riak/","unescaped%20", {:props => false, :keys => true}, {}).and_return({:headers => {"content-type" => ["application/json"]}, :body => '{"keys":["bar"]}'})
-      @bucket.keys.should == ["bar"]
-    end
   end
 
   describe "setting the bucket properties" do
-    before :each do
-      @http = mock("HTTPBackend")
-      @client.stub!(:http).and_return(@http)
+    it "should prefetch the properties when they are not present" do
+      @backend.stub!(:set_bucket_props)
+      @backend.should_receive(:get_bucket_props).with(@bucket).and_return({"name" => "foo"})
+      @bucket.props = {"precommit" => []}
     end
 
-    it "should PUT the new properties to the bucket" do
-      @http.should_receive(:put).with(204, "/riak/","foo", '{"props":{"name":"foo"}}', {"Content-Type" => "application/json"}).and_return({:body => "", :headers => {}})
+    it "should set the new properties on the bucket" do
+      @bucket.instance_variable_set(:@props, {}) # Pretend they are there
+      @backend.should_receive(:set_bucket_props).with(@bucket, { :name => "foo" })
       @bucket.props = { :name => "foo" }
     end
 
-    it "should raise an error if an invalid property is given" do
+    it "should raise an error if an invalid type is given" do
       lambda { @bucket.props = "blah" }.should raise_error(ArgumentError)
     end
-
-    it "should escape the bucket name" do
-      @bucket.instance_variable_set :@name, "foo bar"
-      @http.should_receive(:put).with(204, "/riak/","foo%20bar", '{"props":{"n_val":2}}', {"Content-Type" => "application/json"}).and_return({:body => "", :headers => {}})
-      @bucket.props = {:n_val => 2}
-    end
   end
 
-  describe "fetching an object" do
-    before :each do
-      @http = mock("HTTPBackend")
-      @client.stub!(:http).and_return(@http)
-    end
-
-    it "should load the object from the server as a Riak::RObject" do
-      @http.should_receive(:get).with(200, "/riak/","foo", "db", {}, {}).and_return({:headers => {"content-type" => ["application/json"]}, :body => '{"name":"Riak","company":"Basho"}'})
-      @bucket.get("db").should be_kind_of(Riak::RObject)
+  describe "fetching the bucket properties" do
+    it "should fetch properties on first access" do
+      @bucket.instance_variable_get(:@props).should be_nil
+      @backend.should_receive(:get_bucket_props).with(@bucket).and_return({"name" => "foo"})
+      @bucket.props.should == {"name" => "foo"}
     end
 
-    it "should use the given query parameters (for R value, etc)" do
-      @http.should_receive(:get).with(200, "/riak/","foo", "db", {:r => 2}, {}).and_return({:headers => {"content-type" => ["application/json"]}, :body => '{"name":"Riak","company":"Basho"}'})
-      @bucket.get("db", :r => 2).should be_kind_of(Riak::RObject)
+    it "should memoize fetched properties" do
+      @backend.should_receive(:get_bucket_props).once.with(@bucket).and_return({"name" => "foo"})
+      @bucket.props.should == {"name" => "foo"}
+      @bucket.props.should == {"name" => "foo"}
     end
+  end
 
-    it "should allow 300 responses if allow_mult is set" do
-      @bucket.instance_variable_set(:@props, {'allow_mult' => true})
-      @http.should_receive(:get).with([200,300], "/riak/","foo", "db", {}, {}).and_return({:headers => {"content-type" => ["application/json"]}, :body => '{"name":"Riak","company":"Basho"}'})
-      @bucket.get('db')
+  describe "fetching an object" do
+    it "should fetch the object via the backend" do
+      @backend.should_receive(:fetch_object).with(@bucket, "db", nil).and_return(nil)
+      @bucket.get("db")
     end
 
-    it "should escape the bucket and key names" do
-      @bucket.instance_variable_set(:@name, "foo ")
-      @http.should_receive(:get).with(200, "/riak/","foo%20", "%20bar", {}, {}).and_return({:headers => {"content-type" => ["application/json"]}, :body => '{"name":"Riak","company":"Basho"}'})
-      @bucket.get(' bar')
+    it "should use the specified R quroum" do
+      @backend.should_receive(:fetch_object).with(@bucket, "db", 2).and_return(nil)
+      @bucket.get("db", :r => 2)
     end
   end
 
@@ -173,34 +113,34 @@ describe Riak::Bucket do
   end
 
   describe "fetching or creating a new object" do
-    before :each do
-      @http = mock("HTTPBackend")
-      @client.stub!(:http).and_return(@http)
-    end
-
     it "should return the existing object if present" do
-      @http.should_receive(:get).with(200, "/riak/","foo", "db", {}, {}).and_return({:headers => {"content-type" => ["application/json"]}, :body => '{"name":"Riak","company":"Basho"}'})
-      obj = @bucket.get_or_new('db')
-      obj.key.should == 'db'
-      obj.data['name'].should == "Riak"
+      @object = mock("RObject")
+      @backend.should_receive(:fetch_object).with(@bucket,"db", nil).and_return(@object)
+      @bucket.get_or_new('db').should == @object
     end
 
     it "should create a new blank object if the key does not exist" do
-      @http.should_receive(:get).and_raise(Riak::FailedRequest.new(:get, 200, 404, {}, "File not found"))
+      @backend.should_receive(:fetch_object).and_raise(Riak::FailedRequest.new(:get, 200, 404, {}, "File not found"))
       obj = @bucket.get_or_new('db')
       obj.key.should == 'db'
       obj.data.should be_blank
     end
 
     it "should bubble up non-ok non-missing errors" do
-      @http.should_receive(:get).and_raise(Riak::FailedRequest.new(:get, 200, 500, {}, "File not found"))
+      @backend.should_receive(:fetch_object).and_raise(Riak::FailedRequest.new(:get, 200, 500, {}, "File not found"))
       lambda { @bucket.get_or_new('db') }.should raise_error(Riak::FailedRequest)
     end
+
+    it "should pass along the given R quorum parameter" do
+      @object = mock("RObject")
+      @backend.should_receive(:fetch_object).with(@bucket,"db", "all").and_return(@object)
+      @bucket.get_or_new('db', :r => "all").should == @object
+    end
   end
 
   describe "get/set allow_mult property" do
     before :each do
-      do_load
+      @backend.stub!(:get_bucket_props).and_return({"allow_mult" => false})
     end
 
     it "should extract the allow_mult property" do
@@ -215,7 +155,7 @@ describe Riak::Bucket do
 
   describe "get/set the N value" do
     before :each do
-      do_load
+      @backend.stub!(:get_bucket_props).and_return({"n_val" => 3})
     end
 
     it "should extract the N value" do
@@ -231,7 +171,7 @@ describe Riak::Bucket do
   [:r, :w, :dw, :rw].each do |q|
     describe "get/set the default #{q} quorum" do
       before :each do
-        do_load
+        @backend.stub!(:get_bucket_props).and_return({"r" => "quorum", "w" => "quorum", "dw" => "quorum", "rw" => "quorum"})
       end
 
       it "should extract the default #{q} quorum" do
@@ -245,21 +185,27 @@ describe Riak::Bucket do
     end
   end
 
-
   describe "checking whether a key exists" do
     it "should return true if the object does exist" do
-      @client.http.should_receive(:head).and_return(:code => 200)
+      @backend.should_receive(:fetch_object).and_return(mock)
       @bucket.exists?("foo").should be_true
     end
 
     it "should return false if the object doesn't exist" do
-      @client.http.should_receive(:head).and_return(:code => 404)
+      @backend.should_receive(:fetch_object).and_raise(Riak::FailedRequest.new(:get, [200,300], 404, {}, "not found"))
       @bucket.exists?("foo").should be_false
     end
   end
 
-  it "should delete a key from within the bucket" do
-    @client.http.should_receive(:delete).with([204,404], @client.prefix, @bucket.name, 'bar',{},{}).and_return(:code => 204)
-    @bucket.delete('bar')
+  describe "deleting an object" do
+    it "should delete a key from within the bucket" do
+      @backend.should_receive(:delete_object).with(@bucket, "bar", nil)
+      @bucket.delete('bar')
+    end
+
+    it "should use the specified RW quorum" do
+      @backend.should_receive(:delete_object).with(@bucket, "bar", "all")
+      @bucket.delete('bar', :rw => "all")
+    end
   end
 end

data/spec/riak/client_spec.rb

@@ -112,7 +112,7 @@ describe Riak::Client do
       end
     end
 
-    it "should allow setting the prefix (although we prefer the raw interface)" do
+    it "should allow setting the prefix" do
       @client.should respond_to(:prefix=)
       @client.prefix = "/another-prefix"
       @client.prefix.should == "/another-prefix"
@@ -165,108 +165,127 @@ describe Riak::Client do
   describe "retrieving a bucket" do
     before :each do
       @client = Riak::Client.new
-      @http = mock(Riak::Client::HTTPBackend)
-      @client.stub!(:http).and_return(@http)
-      @payload = {:headers => {"content-type" => ["application/json"]}, :body => "{}"}
-      @http.stub!(:get).and_return(@payload)
+      @backend = mock("Backend")
+      @client.stub!(:backend).and_return(@backend)
     end
 
-    it "should send a GET request to the bucket name and return a Riak::Bucket" do
-      @http.should_receive(:get).with(200, "/riak/", "foo", {:keys => false}, {}).and_return(@payload)
+    it "should return a bucket object" do
       @client.bucket("foo").should be_kind_of(Riak::Bucket)
     end
 
-    it "should allow requesting bucket properties with the keys" do
-      @http.should_receive(:get).with(200, "/riak/", "foo", {:keys => true}, {}).and_return(@payload)
+    it "should fetch bucket properties if asked" do
+      @backend.should_receive(:get_bucket_props) {|b| b.name.should == "foo"; {} }
+      @client.bucket("foo", :props => true)
+    end
+
+    it "should fetch keys if asked" do
+      @backend.should_receive(:list_keys) {|b| b.name.should == "foo"; ["bar"] }
       @client.bucket("foo", :keys => true)
     end
 
-    it "should escape bucket names with invalid characters" do
-      @http.should_receive(:get).with(200, "/riak/", "foo%2Fbar%20", {:keys => false}, {}).and_return(@payload)
-      @client.bucket("foo/bar ", :keys => false)
+
+    it "should memoize bucket parameters" do
+      @bucket = mock("Bucket")
+      Riak::Bucket.should_receive(:new).with(@client, "baz").once.and_return(@bucket)
+      @client.bucket("baz").should == @bucket
+      @client.bucket("baz").should == @bucket
     end
   end
 
-  describe "storing a file" do
-    before :each do
-      @client = Riak::Client.new
-      @http = mock(Riak::Client::HTTPBackend)
-      @client.stub!(:http).and_return(@http)
-    end
+  it "should list buckets" do
+    @client = Riak::Client.new
+    @backend = mock("Backend")
+    @client.stub!(:backend).and_return(@backend)
+    @backend.should_receive(:list_buckets).and_return(%w{test test2})
+    buckets = @client.buckets
+    buckets.should have(2).items
+    buckets.should be_all {|b| b.is_a?(Riak::Bucket) }
+    buckets[0].name.should == "test"
+    buckets[1].name.should == "test2"
+  end
 
-    it "should store the file in Luwak and return the key/filename when no filename is given" do
-      @http.should_receive(:post).with(201, "/luwak", anything, {"Content-Type" => "text/plain"}).and_return(:code => 201, :headers => {"location" => ["/luwak/123456789"]})
-      @client.store_file("text/plain", "Hello, world").should == "123456789"
+  describe "Luwak (large-files) support" do
+    describe "storing a file" do
+      before :each do
+        @client = Riak::Client.new
+        @http = mock(Riak::Client::HTTPBackend)
+        @client.stub!(:http).and_return(@http)
+      end
+
+      it "should store the file in Luwak and return the key/filename when no filename is given" do
+        @http.should_receive(:post).with(201, "/luwak", anything, {"Content-Type" => "text/plain"}).and_return(:code => 201, :headers => {"location" => ["/luwak/123456789"]})
+        @client.store_file("text/plain", "Hello, world").should == "123456789"
+      end
+
+      it "should store the file in Luwak and return the key/filename when the filename is given" do
+        @http.should_receive(:put).with(204, "/luwak", "greeting.txt", anything, {"Content-Type" => "text/plain"}).and_return(:code => 204, :headers => {})
+        @client.store_file("greeting.txt", "text/plain", "Hello, world").should == "greeting.txt"
+      end
     end
 
-    it "should store the file in Luwak and return the key/filename when the filename is given" do
-      @http.should_receive(:put).with(204, "/luwak", "greeting.txt", anything, {"Content-Type" => "text/plain"}).and_return(:code => 204, :headers => {})
-      @client.store_file("greeting.txt", "text/plain", "Hello, world").should == "greeting.txt"
+    describe "retrieving a file" do
+      before :each do
+        @client = Riak::Client.new
+        @http = mock(Riak::Client::HTTPBackend)
+        @client.stub!(:http).and_return(@http)
+        @http.should_receive(:get).with(200, "/luwak", "greeting.txt").and_yield("Hello,").and_yield(" world!").and_return({:code => 200, :headers => {"content-type" => ["text/plain"]}})
+      end
+
+      it "should stream the data to a temporary file" do
+        file = @client.get_file("greeting.txt")
+        file.open {|f| f.read.should == "Hello, world!" }
+      end
+
+      it "should stream the data through the given block, returning nil" do
+        string = ""
+        result = @client.get_file("greeting.txt"){|chunk| string << chunk }
+        result.should be_nil
+        string.should == "Hello, world!"
+      end
+
+      it "should expose the original key and content-type on the temporary file" do
+        file = @client.get_file("greeting.txt")
+        file.content_type.should == "text/plain"
+        file.original_filename.should == "greeting.txt"
+      end
     end
-  end
 
-  describe "retrieving a file" do
-    before :each do
+    it "should delete a file" do
       @client = Riak::Client.new
       @http = mock(Riak::Client::HTTPBackend)
       @client.stub!(:http).and_return(@http)
-      @http.should_receive(:get).with(200, "/luwak", "greeting.txt").and_yield("Hello,").and_yield(" world!").and_return({:code => 200, :headers => {"content-type" => ["text/plain"]}})
+      @http.should_receive(:delete).with([204,404], "/luwak", "greeting.txt")
+      @client.delete_file("greeting.txt")
     end
 
-    it "should stream the data to a temporary file" do
-      file = @client.get_file("greeting.txt")
-      file.open {|f| f.read.should == "Hello, world!" }
+    it "should return true if the file exists" do
+      @client = Riak::Client.new
+      @client.http.should_receive(:head).and_return(:code => 200)
+      @client.file_exists?("foo").should be_true
     end
 
-    it "should stream the data through the given block, returning nil" do
-      string = ""
-      result = @client.get_file("greeting.txt"){|chunk| string << chunk }
-      result.should be_nil
-      string.should == "Hello, world!"
+    it "should return false if the file doesn't exist" do
+      @client = Riak::Client.new
+      @client.http.should_receive(:head).and_return(:code => 404)
+      @client.file_exists?("foo").should be_false
     end
 
-    it "should expose the original key and content-type on the temporary file" do
-      file = @client.get_file("greeting.txt")
-      file.content_type.should == "text/plain"
-      file.original_filename.should == "greeting.txt"
+    it "should escape the filename when storing, retrieving or deleting files" do
+      @client = Riak::Client.new
+      @http = mock(Riak::Client::HTTPBackend)
+      @client.stub!(:http).and_return(@http)
+      # Delete escapes keys
+      @http.should_receive(:delete).with([204,404], "/luwak", "docs%2FA%20Big%20PDF.pdf")
+      @client.delete_file("docs/A Big PDF.pdf")
+      # Get escapes keys
+      @http.should_receive(:get).with(200, "/luwak", "docs%2FA%20Big%20PDF.pdf").and_yield("foo").and_return(:headers => {"content-type" => ["text/plain"]}, :code => 200)
+      @client.get_file("docs/A Big PDF.pdf")
+      # Streamed get escapes keys
+      @http.should_receive(:get).with(200, "/luwak", "docs%2FA%20Big%20PDF.pdf").and_yield("foo").and_return(:headers => {"content-type" => ["text/plain"]}, :code => 200)
+      @client.get_file("docs/A Big PDF.pdf"){|chunk| chunk }
+      # Put escapes keys
+      @http.should_receive(:put).with(204, "/luwak", "docs%2FA%20Big%20PDF.pdf", "foo", {"Content-Type" => "text/plain"})
+      @client.store_file("docs/A Big PDF.pdf", "text/plain", "foo")
     end
   end
-
-  it "should delete a file" do
-    @client = Riak::Client.new
-    @http = mock(Riak::Client::HTTPBackend)
-    @client.stub!(:http).and_return(@http)
-    @http.should_receive(:delete).with([204,404], "/luwak", "greeting.txt")
-    @client.delete_file("greeting.txt")
-  end
-
-  it "should return true if the file exists" do
-    @client = Riak::Client.new
-    @client.http.should_receive(:head).and_return(:code => 200)
-    @client.file_exists?("foo").should be_true
-  end
-
-  it "should return false if the file doesn't exist" do
-    @client = Riak::Client.new
-    @client.http.should_receive(:head).and_return(:code => 404)
-    @client.file_exists?("foo").should be_false
-  end
-
-  it "should escape the filename when storing, retrieving or deleting files" do
-    @client = Riak::Client.new
-    @http = mock(Riak::Client::HTTPBackend)
-    @client.stub!(:http).and_return(@http)
-    # Delete escapes keys
-    @http.should_receive(:delete).with([204,404], "/luwak", "docs%2FA%20Big%20PDF.pdf")
-    @client.delete_file("docs/A Big PDF.pdf")
-    # Get escapes keys
-    @http.should_receive(:get).with(200, "/luwak", "docs%2FA%20Big%20PDF.pdf").and_yield("foo").and_return(:headers => {"content-type" => ["text/plain"]}, :code => 200)
-    @client.get_file("docs/A Big PDF.pdf")
-    # Streamed get escapes keys
-    @http.should_receive(:get).with(200, "/luwak", "docs%2FA%20Big%20PDF.pdf").and_yield("foo").and_return(:headers => {"content-type" => ["text/plain"]}, :code => 200)
-    @client.get_file("docs/A Big PDF.pdf"){|chunk| chunk }
-    # Put escapes keys
-    @http.should_receive(:put).with(204, "/luwak", "docs%2FA%20Big%20PDF.pdf", "foo", {"Content-Type" => "text/plain"})
-    @client.store_file("docs/A Big PDF.pdf", "text/plain", "foo")
-  end
 end