riak-client 1.0.5 → 1.1.0

data/spec/integration/riak/cluster_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'riak/cluster'
 
-describe Riak::Cluster, :test_server => false, :slow => true do
+describe Riak::Cluster, :test_server => false, :slow => true, :nodegen => true do
   let(:config) { YAML.load_file("spec/support/test_server.yml").symbolize_keys }
   subject { described_class.new(config) }
 

data/spec/integration/riak/http_backends_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "HTTP" do
   before do
-    @web_port = $test_server.http_port
+    @web_port = test_server.http_port
     @client = Riak::Client.new(:http_port => @web_port)
   end
 
@@ -16,7 +16,28 @@ describe "HTTP" do
 
         it_should_behave_like "Unified backend API"
 
-        describe "using Luwak", :version => "0.14.0".."1.0.3" do
+        describe "searching fulltext indexes (1.1 and earlier)", :version => "< 1.2.0" do
+          include_context "search corpus setup"
+
+          it 'should find indexed documents, returning ids' do
+            results = @backend.search 'search_test', 'fearless elephant rushed', :fl => 'id'
+            results.should have_key 'docs'
+            results.should have_key 'max_score'
+            results.should have_key 'num_found'
+            results['docs'].should include({"id" => "munchausen-605"})
+          end
+
+          it 'should find indexed documents, returning documents' do
+            # For now use '*' until #122 is merged into riak_search
+            results = @backend.search 'search_test', 'fearless elephant rushed', :fl => '*'
+            results.should have_key 'docs'
+            results.should have_key 'max_score'
+            results.should have_key 'num_found'
+            results['docs'].should include({"id" => "munchausen-605", "value" => "Fearless I advanced against the elephant, desirous to take alive the haughty Tippoo Sahib; but he drew a pistol from his belt, and discharged it full in my face as I rushed upon him, which did me no further harm than wound my cheek-bone, which disfigures me somewhat under my left eye. I could not withstand the rage and impulse of that moment, and with one blow of my sword separated his head from his body.\n"})
+          end
+        end
+
+        context "using Luwak", :version => "< 1.1.0" do
           let(:file) { File.open(__FILE__) }
           let(:key) { "spec.rb" }
           let(:string) { file.read }

data/spec/integration/riak/node_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'riak/node'
 require 'yaml'
 
-describe Riak::Node, :test_server => false, :slow => true do
+describe Riak::Node, :test_server => false, :slow => true, :nodegen => true do
   let(:test_server_config){ YAML.load_file("spec/support/test_server.yml") }
   let(:node){ described_class.new(:root => ".ripplenode", :source => test_server_config['source']) }
   subject { node }
@@ -173,7 +173,7 @@ describe Riak::Node, :test_server => false, :slow => true do
       expect {
         console.command "ok."
         console.close
-      }.should_not raise_error
+      }.to_not raise_error
     end
   end
 

data/spec/integration/riak/protobuffs_backends_spec.rb

@@ -2,8 +2,9 @@ require 'spec_helper'
 
 describe "Protocol Buffers" do
   before do
-    @pbc_port ||= $test_server.pb_port
-    @client = Riak::Client.new(:pb_port => @pbc_port, :protocol => "pbc")
+    @pbc_port ||= test_server.pb_port
+    @http_port ||= test_server.http_port
+    @client = Riak::Client.new(:http_port => @http_port, :pb_port => @pbc_port, :protocol => "pbc")
   end
 
   [:BeefcakeProtobuffsBackend].each do |klass|
@@ -15,6 +16,20 @@ describe "Protocol Buffers" do
         end
 
         it_should_behave_like "Unified backend API"
+
+        describe "searching fulltext indexes (1.1 and earlier)", :version => '< 1.2.0' do
+          include_context "search corpus setup"
+
+          it 'should find document IDs via MapReduce' do
+            # Note that the trailing options Hash is ignored when
+            # emulating search with MapReduce
+            results = @backend.search 'search_test', 'fearless elephant rushed'
+            results.should have_key 'docs'
+            results.should have_key 'max_score'
+            results.should have_key 'num_found'
+            results['docs'].should include({"id" => "munchausen-605"})
+          end
+        end
       end
     end
   end

data/spec/integration/riak/test_server_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'riak/test_server'
 
-describe Riak::TestServer do
+describe Riak::TestServer, :nodegen => true do
   subject { test_server }
   let(:app_config) { (subject.etc + 'app.config').read }
 

data/spec/integration/riak/threading_spec.rb

@@ -61,8 +61,8 @@ describe "Multithreaded client", :test_server => true do
   ].each do |opts|
     describe opts.inspect do
       before do
-        @pb_port ||= $test_server.pb_port
-        @http_port ||= $test_server.http_port
+        @pb_port ||= test_server.pb_port
+        @http_port ||= test_server.http_port
         @client = Riak::Client.new({
                                      :pb_port => @pb_port,
                                      :http_port => @http_port
@@ -104,7 +104,7 @@ describe "Multithreaded client", :test_server => true do
       # This is a 1.0+ spec because putting with the same client ID
       # will not create siblings on 0.14 in the same way. This will
       # also likely fail for nodes with vnode_vclocks = false.
-      it 'should put conflicts in parallel', :version => "1.0.0" do
+      it 'should put conflicts in parallel', :version => ">= 1.0.0" do
         @client['test'].allow_mult = true
         @client['test'].allow_mult.should == true
 

data/spec/riak/beefcake_protobuffs_backend_spec.rb

@@ -1,19 +1,17 @@
 require 'spec_helper'
-require 'riak/client/beefcake/messages'
 
 describe Riak::Client::BeefcakeProtobuffsBackend do
-  before :each do
-    @client = Riak::Client.new
-    @node = @client.nodes.first
-    @backend = Riak::Client::BeefcakeProtobuffsBackend.new(@client, @node)
-    @backend.instance_variable_set(:@server_config, {})
-  end
+  before(:all) { described_class.should be_configured }
+  before(:each) { backend.stub(:get_server_version => "1.2.0") }
+  let(:client) { Riak::Client.new }
+  let(:node) { client.nodes.first }
+  let(:backend) { Riak::Client::BeefcakeProtobuffsBackend.new(client, node) }
 
   it "should only write to the socket one time per request" do
     exp_bucket, exp_keys = 'foo', ['bar']
     mock_socket = mock("mock TCP socket")
 
-    @backend.stub!(:socket).and_return(mock_socket)
+    backend.stub!(:socket).and_return(mock_socket)
     mock_socket.should_receive(:write).exactly(1).with do |param|
       len, code = param[0,5].unpack("NC")
       req = Riak::Client::BeefcakeProtobuffsBackend::RpbListKeysReq.decode(param[5..-1])
@@ -36,27 +34,62 @@ describe Riak::Client::BeefcakeProtobuffsBackend do
       mock_socket.should_receive(:read).exactly(1).with(encoded_response.length).and_return(encoded_response)
     end
 
-    @backend.list_keys(exp_bucket).should == exp_keys
+    backend.list_keys(exp_bucket).should == exp_keys
   end
-end
 
-describe Riak::Client::BeefcakeProtobuffsBackend, '#mapred' do
-  before(:each) do
-    @client = Riak::Client.new
-    @node = @client.nodes.first
-    @backend = Riak::Client::BeefcakeProtobuffsBackend.new(@client, @node)
-    @backend.instance_variable_set(:@server_config, {})
+  context "#mapred" do
+    let(:mapred) { Riak::MapReduce.new(client).add('test').map("function(){}").map("function(){}") }
+
+    it "should not return nil for previous phases that don't return anything" do
+      socket = stub(:socket).as_null_object
+      socket.stub(:read).and_return(stub(:socket_header, :unpack => [2, 24]), stub(:socket_message), stub(:socket_header_2, :unpack => [0, 1]))
+      message = stub(:message, :phase => 1, :response => [{}].to_json)
+      message.stub(:done).and_return(false, true)
+      Riak::Client::BeefcakeProtobuffsBackend::RpbMapRedResp.stub(:decode => message)
+      TCPSocket.stub(:new => socket)
+      backend.send(:reset_socket)
+
+      backend.mapred(mapred).should == [{}]
+    end
   end
 
-  it "should not return nil for previous phases that don't return anything" do
-    socket = stub(:socket).as_null_object
-    socket.stub(:read).and_return(stub(:socket_header, :unpack => [2, 24]), stub(:socket_message), stub(:socket_header_2, :unpack => [0, 1]))
-    message = stub(:message, :phase => 1, :response => [{}].to_json)
-    message.stub(:done).and_return(false, true)
-    Riak::Client::BeefcakeProtobuffsBackend::RpbMapRedResp.stub(:decode => message)
-    TCPSocket.stub(:new => socket)
-    @backend.send(:reset_socket)
+  context "preventing stale writes" do
+    before { backend.stub(:decode_response => nil, :get_server_version => "1.0.3") }
 
-    @backend.mapred('').should == [{}]
+    let(:robject) do
+      Riak::RObject.new(client['stale'], 'prevent').tap do |obj|
+        obj.prevent_stale_writes = true
+        obj.raw_data = "stale"
+        obj.content_type = "text/plain"
+      end
+    end
+
+    it "should set the if_none_match field when the object is new" do
+      backend.should_receive(:write_protobuff) do |msg, req|
+        msg.should == :PutReq
+        req.if_none_match.should be_true
+      end
+      backend.store_object(robject)
+    end
+
+    it "should set the if_not_modified field when the object has a vclock" do
+      robject.vclock = Base64.encode64("foo")
+      backend.should_receive(:write_protobuff) do |msg, req|
+        msg.should == :PutReq
+        req.if_not_modified.should be_true
+      end
+      backend.store_object(robject)
+    end
+
+    context "when conditional requests are not supported" do
+      before { backend.stub(:get_server_version => "0.14.2") }
+      let(:other) { robject.dup.tap {|o| o.vclock = 'bar' } }
+
+      it "should fetch the original object and raise if not equivalent" do
+        robject.vclock = Base64.encode64("foo")
+        backend.should_receive(:fetch_object).and_return(other)
+        expect { backend.store_object(robject) }.to raise_error(Riak::FailedRequest)
+      end
+    end
   end
 end

data/spec/riak/escape_spec.rb

@@ -44,6 +44,7 @@ describe Riak::Util::Escape do
     it "should escape standard non-safe characters" do
       @object.escape("some string").should == "some%20string"
       @object.escape("another^one").should == "another%5Eone"
+      @object.escape("--one+two--").should == "--one%2Btwo--"
     end
 
     it "should allow URI-safe characters" do
@@ -64,6 +65,8 @@ describe Riak::Util::Escape do
       @object.unescape("another%5Eone").should == "another^one"
       @object.unescape("bracket%5Bone").should == "bracket[one"
       @object.unescape("some%2Finner%2Fpath").should == "some/inner/path"
+      @object.unescape("--one%2Btwo--").should == "--one+two--"
+      @object.unescape("me%40basho.co").should == "me@basho.co"
     end
   end
 end

data/spec/riak/feature_detection_spec.rb

@@ -0,0 +1,61 @@
+require 'spec_helper'
+require 'riak/client/feature_detection'
+
+describe Riak::Client::FeatureDetection do
+  let(:klass) {
+    Class.new do
+      include Riak::Client::FeatureDetection
+    end
+  }
+  subject { klass.new }
+
+  context "when the get_server_version is unimplemented" do
+    it "should raise a NotImplementedError" do
+      expect { subject.server_version }.to raise_error(NotImplementedError)
+    end
+  end
+
+  context "when the Riak version is 0.14.x" do
+    before { subject.stub!(:get_server_version).and_return("0.14.2") }
+    it { should_not be_mapred_phaseless }
+    it { should_not be_pb_indexes }
+    it { should_not be_pb_search }
+    it { should_not be_pb_conditionals }
+    it { should_not be_quorum_controls }
+    it { should_not be_tombstone_vclocks }
+    it { should_not be_pb_head }
+  end
+
+  context "when the Riak version is 1.0.x" do
+    before { subject.stub!(:get_server_version).and_return("1.0.3") }
+    it { should_not be_mapred_phaseless }
+    it { should_not be_pb_indexes }
+    it { should_not be_pb_search }
+    it { should be_pb_conditionals }
+    it { should be_quorum_controls }
+    it { should be_tombstone_vclocks }
+    it { should be_pb_head }
+  end
+
+  context "when the Riak version is 1.1.x" do
+    before { subject.stub!(:get_server_version).and_return("1.1.4") }
+    it { should be_mapred_phaseless }
+    it { should_not be_pb_indexes }
+    it { should_not be_pb_search }
+    it { should be_pb_conditionals }
+    it { should be_quorum_controls }
+    it { should be_tombstone_vclocks }
+    it { should be_pb_head }
+  end
+
+  context "when the Riak version is 1.2.x" do
+    before { subject.stub!(:get_server_version).and_return("1.2.0") }
+    it { should be_mapred_phaseless }
+    it { should be_pb_indexes }
+    it { should be_pb_search }
+    it { should be_pb_conditionals }
+    it { should be_quorum_controls }
+    it { should be_tombstone_vclocks }
+    it { should be_pb_head }
+  end
+end

data/spec/riak/http_backend/object_methods_spec.rb

@@ -28,14 +28,13 @@ describe Riak::Client::HTTPBackend::ObjectMethods do
     end
 
     it "should deserialize the body data" do
-      @object.should_receive(:deserialize).with("{}").and_return({})
       @backend.load_object(@object, {:headers => {"content-type" => ["application/json"]}, :body => "{}"})
       @object.data.should == {}
     end
 
     it "should leave the object data unchanged if the response body is blank" do
       @object.data = "Original data"
-      @backend.load_object(@object, {:headers => {"content-type" => ["application/json"]}, :body => ""})
+      @backend.load_object(@object, {:headers => {"content-type" => ["application/json"]}, :body => "", :code => 304})
       @object.data.should == "Original data"
     end
 
@@ -84,7 +83,7 @@ describe Riak::Client::HTTPBackend::ObjectMethods do
     end
 
     context "when the response code is 300 and the content-type is multipart/mixed" do
-      let(:http_response) { {:headers => {"content-type" => ["multipart/mixed; boundary=foo"]}, :code => 300 } }
+      let(:http_response) { {:headers => {"content-type" => ["multipart/mixed; boundary=8XZD3w6ttFTHIz6LCmhVxn9Ex0K"]}, :code => 300, :body => File.read("spec/fixtures/multipart-basic-conflict.txt")} }
       let(:other_object) { Riak::RObject.new(@bucket, "bar2") }
 
       it 'marks the object as in conflict' do
@@ -106,22 +105,14 @@ describe Riak::Client::HTTPBackend::ObjectMethods do
 
     describe "extracting siblings" do
       before :each do
-        @backend.load_object(@object, {:headers => {"x-riak-vclock" => ["merged"], "content-type" => ["multipart/mixed; boundary=foo"]}, :code => 300, :body => "\n--foo\nContent-Type: text/plain\n\nbar\n--foo\nContent-Type: text/plain\n\nbaz\n--foo--\n"})
+        @backend.load_object(@object, {:headers => {"x-riak-vclock" => ["merged"], "content-type" => ["multipart/mixed; boundary=8XZD3w6ttFTHIz6LCmhVxn9Ex0K"]}, :code => 300, :body => File.read("spec/fixtures/multipart-basic-conflict.txt")})
       end
 
       it "should extract the siblings" do
         @object.should have(2).siblings
         siblings = @object.siblings
         siblings[0].data.should == "bar"
-        siblings[1].data.should == "baz"
-      end
-
-      it "should set the key on both siblings" do
-        @object.siblings.should be_all {|s| s.key == "bar" }
-      end
-
-      it "should set the vclock on both siblings to the merged vclock" do
-        @object.siblings.should be_all {|s| s.vclock == "merged" }
+        siblings[1].data.should == "foo"
       end
     end
   end

data/spec/riak/http_backend_spec.rb

@@ -183,16 +183,17 @@ describe Riak::Client::HTTPBackend do
     end
 
     it "should issue POST request to the mapred endpoint" do
-      @backend.should_receive(:post).with(200, @backend.mapred_path, @mr.to_json, hash_including("Content-Type" => "application/json")).and_return({:headers => {'content-type' => ["application/json"]}, :body => "[]"})
+      @backend.should_receive(:post).with(200, @backend.mapred_path(:chunked => true), @mr.to_json, hash_including("Content-Type" => "application/json")).and_yield(%Q|--foo\r\nContent-Type: application/json\r\n\r\n{"phase":0,"data":[]}\r\n--foo--\r\n|)
       @backend.mapred(@mr)
     end
 
     it "should vivify JSON responses" do
-      @backend.stub!(:post).and_return(:headers => {'content-type' => ["application/json"]}, :body => '[{"key":"value"}]')
+      @backend.stub!(:post).and_yield(%Q|--foo\r\nContent-Type: application/json\r\n\r\n{"phase":0,"data":[{"key":"value"}]}\r\n--foo--\r\n|)
       @backend.mapred(@mr).should == [{"key" => "value"}]
     end
 
     it "should return the full response hash for non-JSON responses" do
+      pending "It is not clear when Riak would ever return a non-JSON or non-multipart response for mapred."
       response = {:code => 200, :headers => {'content-type' => ["text/plain"]}, :body => 'This is some text.'}
       @backend.stub!(:post).and_return(response)
       @backend.mapred(@mr).should == response
@@ -272,9 +273,9 @@ describe Riak::Client::HTTPBackend do
       @backend.search(nil, 'foo')
     end
 
-    it "should vivify JSON responses" do
-      @backend.should_receive(:get).and_return({:code => 200, :headers => {"content-type"=>["application/json"]}, :body => '{"response":{"docs":["foo"]}}'})
-      @backend.search(nil, "foo").should == {"response" => {"docs" => ["foo"]}}
+    it "should vivify and normalize JSON responses" do
+      @backend.should_receive(:get).and_return({:code => 200, :headers => {"content-type"=>["application/json"]}, :body => '{"response":{"docs":[{"id":"foo","fields":{},"props":{}}],"maxScore":"0.0345","numFound":1}}'})
+      @backend.search(nil, "foo").should == {"docs" => [{"id" => "foo"}], "max_score" => 0.0345, "num_found" => 1}
     end
 
     it "should return non-JSON responses raw" do

data/spec/riak/map_reduce_spec.rb

@@ -330,11 +330,6 @@ describe Riak::MapReduce do
       @mr.map("Riak.mapValues",:keep => true)
     end
 
-    it "should raise an exception when no phases are defined" do
-      @mr.query.clear
-      lambda { @mr.run }.should raise_error(Riak::MapReduceError)
-    end
-
     it "should submit the query to the backend" do
       @backend.should_receive(:mapred).with(@mr).and_return([])
       @mr.run.should == []

data/spec/riak/robject_spec.rb

@@ -50,14 +50,14 @@ describe Riak::RObject do
       @object.content_type = 'text/plain'
       Riak::Serializers.should respond_to(:serialize).with(2).arguments
       Riak::Serializers.should_receive(:serialize).with('text/plain', "foo").and_return("serialized foo")
-      @object.serialize("foo").should == "serialized foo"
+      @object.content.serialize("foo").should == "serialized foo"
     end
 
     it 'delegates #deserialize to the appropriate serializer for the content type' do
       @object.content_type = 'text/plain'
       Riak::Serializers.should respond_to(:deserialize).with(2).arguments
       Riak::Serializers.should_receive(:deserialize).with('text/plain', "foo").and_return("deserialized foo")
-      @object.deserialize("foo").should == "deserialized foo"
+      @object.content.deserialize("foo").should == "deserialized foo"
     end
   end
 
@@ -113,7 +113,7 @@ describe Riak::RObject do
           let(:io_object) { stub(:read => 'the io object') }
 
           it 'reads the object before deserializing it' do
-            @object.should_receive(:deserialize).with('the io object').and_return('deserialized')
+            @object.content.should_receive(:deserialize).with('the io object').and_return('deserialized')
             @object.raw_data = io_object
             @object.data.should == 'deserialized'
           end
@@ -214,8 +214,8 @@ describe Riak::RObject do
       @object.conflict?.should be_false
     end
 
-    it 'should return [self] for siblings' do
-      @object.siblings.should == [@object]
+    it 'should return [RContent] for siblings' do
+      @object.siblings.should == [@object.content]
     end
 
     describe "when there are multiple values in an object" do
@@ -241,13 +241,9 @@ describe Riak::RObject do
       end
 
       it "should be in conflict" do
-        @object.data.should_not be_present
+        expect { @object.data }.to raise_error(Riak::Conflict)
         @object.should be_conflict
       end
-
-      it "should assign the same vclock to all the siblings" do
-        @object.siblings.should be_all {|s| s.vclock == @object.vclock }
-      end
     end
   end
 
@@ -285,6 +281,11 @@ describe Riak::RObject do
       @backend.should_receive(:store_object).with(@object, :returnbody => false, :w => 3, :dw => 2).and_return(true)
       @object.store(:returnbody => false, :w => 3, :dw => 2)
     end
+
+    it "should raise an error if the object is in conflict" do
+      @object.siblings << Riak::RContent.new(@object)
+      expect { @object.store }.to raise_error(Riak::Conflict)
+    end
   end
 
   describe "when reloading the object" do
@@ -419,7 +420,7 @@ describe Riak::RObject do
   end
 
   describe '#attempt_conflict_resolution' do
-    let(:conflicted_robject) { Riak::RObject.new(@bucket, "conflicted") { |r| r.conflict = true } }
+    let(:conflicted_robject) { Riak::RObject.new(@bucket, "conflicted") { |r| r.siblings = [ Riak::RContent.new(r), Riak::RContent.new(r)] } }
     let(:resolved_robject) { Riak::RObject.new(@bucket, "resolved") }
     let(:invoked_resolvers) { [] }
     let(:resolver_1) { lambda { |r| invoked_resolvers << :resolver_1; nil } }