riak-client 1.0.0.beta → 1.0.0

data/spec/riak/robject_spec.rb

@@ -214,6 +214,10 @@ describe Riak::RObject do
       @object.conflict?.should be_false
     end
 
+    it 'should return [self] for siblings' do
+      @object.siblings.should == [@object]
+    end
+
     describe "when there are multiple values in an object" do
       before :each do
         response = @sample_response.dup
@@ -257,7 +261,7 @@ describe Riak::RObject do
   describe "when storing the object normally" do
     before :each do
       @backend = mock("Backend")
-      @client.stub!(:backend).and_return(@backend)
+      @client.stub!(:backend).and_yield(@backend)
       @object = Riak::RObject.new(@bucket)
       @object.content_type = "text/plain"
       @object.data = "This is some text."
@@ -278,7 +282,7 @@ describe Riak::RObject do
   describe "when reloading the object" do
     before :each do
       @backend = mock("Backend")
-      @client.stub!(:backend).and_return(@backend)
+      @client.stub!(:backend).and_yield(@backend)
       @object = Riak::RObject.new(@bucket, "bar")
       @object.vclock = "somereallylongstring"
     end
@@ -318,7 +322,7 @@ describe Riak::RObject do
   describe "walking from the object to linked objects" do
     before :each do
       @http = mock("HTTPBackend")
-      @client.stub!(:http).and_return(@http)
+      @client.stub!(:http).and_yield(@http)
       @client.stub!(:bucket).and_return(@bucket)
       @object = Riak::RObject.new(@bucket, "bar")
     end
@@ -332,7 +336,7 @@ describe Riak::RObject do
   describe "when deleting" do
     before :each do
       @backend = mock("Backend")
-      @client.stub!(:backend).and_return(@backend)
+      @client.stub!(:backend).and_yield(@backend)
       @object = Riak::RObject.new(@bucket, "bar")
     end
 

data/spec/riak/search_spec.rb

@@ -1,11 +1,12 @@
 require 'spec_helper'
+require 'rexml/document'
 
 describe "Search features" do
   describe Riak::Client do
     before :each do
       @client = Riak::Client.new
       @http = mock(Riak::Client::HTTPBackend)
-      @client.stub!(:http).and_return(@http)
+      @client.stub!(:http).and_yield(@http)
     end
 
     describe "searching" do
@@ -28,20 +29,40 @@ describe "Search features" do
     describe "indexing documents" do
       it "should update the default index" do
         doc = {'field' => "value", 'id' => 1}
-        if doc.to_a.first.first == 'field'
-          expect_update_body('<add><doc><field name="field">value</field><field name="id">1</field></doc></add>')
-        else # 1.8.7, I hate you.
-          expect_update_body('<add><doc><field name="id">1</field><field name="field">value</field></doc></add>')
+        expect_update_body do |body|
+          root = REXML::Document.new(body).root
+          root.name.should == 'add'
+          root.elements.should have(1).item
+          root.elements[1].each_element do |el|
+            case el.attributes['name']
+            when 'field'
+              el.text.should == 'value'
+            when 'id'
+              el.text.should == '1'
+            else
+              fail "Spurious element in #{root.elements[1]}! #{el}"
+            end
+          end
         end
         @client.index(doc)
       end
 
       it "should update the specified index" do
         doc = {'field' => "value", 'id' => 1}
-        if doc.to_a.first.first == 'field'
-          expect_update_body('<add><doc><field name="field">value</field><field name="id">1</field></doc></add>', 'foo')
-        else # 1.8.7, I hate you.
-          expect_update_body('<add><doc><field name="id">1</field><field name="field">value</field></doc></add>', 'foo')
+        expect_update_body(nil, "foo") do |body|
+          root = REXML::Document.new(body).root
+          root.name.should == 'add'
+          root.elements.should have(1).item
+          root.elements[1].each_element do |el|
+            case el.attributes['name']
+            when 'field'
+              el.text.should == 'value'
+            when 'id'
+              el.text.should == '1'
+            else
+              fail "Spurious element in #{root.elements[1]}! #{el}"
+            end
+          end
         end
         @client.index("foo", doc)
       end
@@ -54,10 +75,34 @@ describe "Search features" do
 
       it "should include multiple documents in the <add> request" do
         docs = {'field' => "value", 'id' => 1}, {'foo' => "bar", 'id' => 2}
-        if docs.first.to_a.first.first == 'field'
-          expect_update_body('<add><doc><field name="field">value</field><field name="id">1</field></doc><doc><field name="foo">bar</field><field name="id">2</field></doc></add>')
-        else # 1.8.7, I hate you
-          expect_update_body('<add><doc><field name="id">1</field><field name="field">value</field></doc><doc><field name="id">2</field><field name="foo">bar</field></doc></add>')
+        expect_update_body do |body|
+          root = REXML::Document.new(body).root
+          root.name.should == 'add'
+          docs = root.elements
+          docs.each do |d|
+            d.name.should == 'doc'
+            d.elements.size.should == 2
+          end
+          docs[1].each_element do |el|
+            case el.attributes['name']
+            when 'field'
+              el.text.should == 'value'
+            when 'id'
+              el.text.should == '1'
+            else
+              fail "Spurious element in #{docs[0]}! #{el}"
+            end
+          end
+          docs[2].each_element do |el|
+            case el.attributes['name']
+            when 'foo'
+              el.text.should == 'bar'
+            when 'id'
+              el.text.should == '2'
+            else
+              fail "Spurious element in #{docs[1]}! #{el}"
+            end
+          end
         end
         @client.index(*docs)
       end
@@ -93,8 +138,14 @@ describe "Search features" do
       end
     end
 
-    def expect_update_body(body, index=nil)
-      @http.should_receive(:update_search_index).with(index, body)
+    def expect_update_body(body=nil, index=nil)
+      if block_given?
+        @http.should_receive(:update_search_index).with(index, kind_of(String)) do |i, b|
+          yield b
+        end
+      else
+        @http.should_receive(:update_search_index).with(index, body)
+      end
     end
   end
 

data/spec/riak/serializers_spec.rb

@@ -73,7 +73,7 @@ describe Riak::Serializers do
         end
 
         def o.load(string)
-          string.sub!(/^The string is: /, '')
+          string.sub(/^The string is: /, '')
         end
       end
     end
@@ -81,6 +81,7 @@ describe Riak::Serializers do
     it 'can be registered' do
       described_class['application/custom-type-1'] = custom_serializer
       described_class['application/custom-type-1'].should be(custom_serializer)
+      # fail
     end
 
     it_behaves_like "a serializer", "application/custom-type-a", "foo", "The string is: foo" do
@@ -88,6 +89,16 @@ describe Riak::Serializers do
         described_class['application/custom-type-a'] = custom_serializer
       end
     end
+
+    after(:each) do
+      # Make sure to clean up the registered serializer
+      %w{application/custom-type-1 application/custom-type-a}.each do |ctype|
+        described_class.send(:serializers).delete(ctype)
+      end
+    end
   end
+
+  it_behaves_like "a serializer", "application/json; charset=UTF-8", { "a" => 7 }, %q|{"a":7}|
+  it_behaves_like "a serializer", "application/json ;charset=UTF-8", { "a" => 7 }, %q|{"a":7}|
 end
 

data/spec/spec_helper.rb

@@ -10,6 +10,8 @@ require 'fakeweb'
 Riak.disable_list_keys_warnings = true
 
 %w[integration_setup
+   version_filter
+   sometimes
    http_backend_implementation_examples
    unified_backend_examples
    mocks
@@ -20,7 +22,7 @@ Riak.disable_list_keys_warnings = true
 end
 
 RSpec.configure do |config|
-  config.debug = true
+  #config.debug = true
   config.mock_with :rspec
 
   config.before(:all, :integration => true) do
@@ -38,4 +40,10 @@ RSpec.configure do |config|
 
   config.filter_run :focus => true
   config.run_all_when_everything_filtered = true
+
+  if defined?(::Java)
+    config.seed = Time.now.utc
+  else
+    config.order = :random
+  end
 end

data/spec/support/http_backend_implementation_examples.rb

@@ -185,7 +185,11 @@ shared_examples_for "HTTP backend" do
 
   describe "SSL" do
     it "should be supported" do
-      @client.http_port = $mock_server.port + 1 unless @client.http_backend == :NetHTTP
+      unless @client.http_backend == :NetHTTP
+        @client.nodes.each do |node|
+          node.http_port = $mock_server.port + 1
+        end
+      end
       @client.ssl = true
       setup_http_mock(:get, @backend.path("/riak/","ssl").to_s, :body => "Success!")
       response = @backend.get(200,  @backend.path("/riak/","ssl"))
@@ -194,7 +198,7 @@ shared_examples_for "HTTP backend" do
   end
 
   describe "HTTP Basic Authentication", :basic_auth => true do
-    it "should add the http basic auth header" do
+    sometimes "should add the http basic auth header" do
       @client.basic_auth = "ripple:rocks"
       if @client.http_backend == :NetHTTP
         setup_http_mock(:get, "http://ripple:rocks@127.0.0.1:8098/riak/auth", :body => 'Success!')

data/spec/support/sometimes.rb

@@ -0,0 +1,46 @@
+# Emulates the QuickCheck ?SOMETIMES macro.
+
+module Sometimes
+  def run_with_retries(example_to_run, retries)
+    self.example.metadata[:retries] ||= retries
+    retries.times do |t|
+      self.example.metadata[:retried] = t + 1
+      self.example.instance_variable_set(:@exception, nil)
+      example_to_run.run
+      break unless self.example.exception
+    end
+    if e = self.example.exception
+      new_exception = e.exception(e.message + "[Retried #{retries} times]")
+      new_exception.set_backtrace e.backtrace
+      self.example.instance_variable_set(:@exception, new_exception)
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.include Sometimes
+  config.alias_example_to :sometimes, :sometimes => true
+  config.add_setting :sometimes_retry_count, :default => 3
+
+  config.around(:each, :sometimes => true) do |example|
+    retries = example.metadata[:retries] || RSpec.configuration.sometimes_retry_count
+    run_with_retries(example, retries)
+  end
+
+  config.after(:suite) do
+    formatter = RSpec.configuration.formatters.first
+    color = lambda {|tint, msg| formatter.send(tint, msg) }
+    retried_examples = RSpec.world.example_groups.map do |g|
+      g.descendants.map do |d|
+        d.filtered_examples.select {|e| e.metadata[:sometimes] && e.metadata[:retried] > 1 }
+      end
+    end.flatten
+    formatter.message color[retried_examples.empty? ? :green : :yellow, "\n\nRetried examples: #{retried_examples.count}"]
+    unless retried_examples.empty?
+      retried_examples.each do |e|
+        formatter.message "  #{e.full_description}"
+        formatter.message(color[:yellow, "  [#{e.metadata[:retried]}/#{e.metadata[:retries]}] "] + formatter.class.relative_path(e.location))
+      end
+    end
+  end
+end

data/spec/support/test_server.rb

@@ -1,30 +1,61 @@
 require 'riak/test_server'
 
-RSpec.configure do |config|
-  config.before(:each, :integration => true) do
-    begin
-      unless $test_server
-        config = YAML.load_file("spec/support/test_server.yml")
+module TestServerSupport
+  def test_server
+    unless $test_server
+      begin
+        require 'yaml'
+        config = YAML.load_file(File.expand_path("../test_server.yml", __FILE__))
         $test_server = Riak::TestServer.create(:root => config['root'],
-                                               :source => config['source'],
-                                               :min_port => config['min_port'] || 15000)
-        at_exit { $test_server.stop }
-      end
-      if example.metadata[:test_server] == false
-        $test_server.stop
-      else
-        $test_server.create unless $test_server.exist?
-        $test_server.start
+                                         :source => config['source'],
+                                         :min_port => config['min_port'] || 15000)
+      rescue SocketError => e
+        warn "Couldn't connect to Riak TestServer! #{$test_server.inspect}"
+        warn "Skipping remaining integration tests."
+        warn_crash_log
+        $test_server_fatal = e
+      rescue => e
+        warn "Can't run integration specs without the test server. Please create/verify spec/support/test_server.yml."
+        warn "Skipping remaining integration tests."
+        warn e.inspect
+        warn_crash_log
+        $test_server_fatal = e
       end
-    rescue => e
-      warn "Can't run integration specs without the test server. Please create spec/support/test_server.yml."
-      warn e.inspect
+    end
+    $test_server
+  end
+
+  def test_server_fatal
+    $test_server_fatal
+  end
+
+  def warn_crash_log
+    if $test_server && crash_log = $test_server.log + 'crash.log'
+      warn crash_log.read if crash_log.exist?
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.include TestServerSupport, :integration => true
+
+  config.before(:each, :integration => true) do
+    fail "Test server not working: #{test_server_fatal}" if test_server_fatal
+    if example.metadata[:test_server] == false
+      test_server.stop
+    else
+      test_server.create unless test_server.exist?
+      test_server.start
     end
   end
 
   config.after(:each, :integration => true) do
-    if $test_server && example.metadata[:test_server] != false
-      $test_server.drop
+    if test_server && !test_server_fatal && example.metadata[:test_server] != false
+      test_server.drop
     end
   end
+
+  config.after(:suite) do
+    $test_server.stop if $test_server
+  end
 end

data/spec/support/unified_backend_examples.rb

@@ -9,9 +9,9 @@ shared_examples_for "Unified backend API" do
   context "fetching an object" do
     before do
       @robject = Riak::RObject.new(@client.bucket("test"), "fetch")
-      @robject.indexes['test_bin'] << 'pass'
       @robject.content_type = "application/json"
       @robject.data = { "test" => "pass" }
+      @robject.indexes['test_bin'] << 'pass' if test_server.version >= "1.0.0"
       @backend.store_object(@robject)
     end
 
@@ -38,15 +38,14 @@ shared_examples_for "Unified backend API" do
         robj.data.should == { "test" => "pass" }
       end
 
-      it "should accept a PR value of #{q.inspect} for the request" do
+      it "should accept a PR value of #{q.inspect} for the request", :version => "1.0.0" do
         robj = @backend.fetch_object("test", "fetch", :pr => q)
         robj.should be_kind_of(Riak::RObject)
         robj.data.should == { "test" => "pass" }
       end
     end
 
-    it "should marshal indexes properly" do
-      # This really tests both storing and fetching indexes, given the setup
+    sometimes "should marshal indexes properly", :version => "1.0.0", :retries => 5 do
       robj = @backend.fetch_object('test', 'fetch')
       robj.indexes['test_bin'].should be
       robj.indexes['test_bin'].should include('pass')
@@ -74,14 +73,16 @@ shared_examples_for "Unified backend API" do
         @backend.reload_object(@robject, :r => q)
       end
 
-      it "should accept a valid PR value of #{q.inspect} for the request" do
+      it "should accept a valid PR value of #{q.inspect} for the request", :version => "1.0.0" do
         @backend.reload_object(@robject, :pr => q)
       end
     end
 
     after do
-      @robject.vclock.should == @robject2.vclock
-      @robject.data['test'].should == "second"
+      unless example.pending?
+        @robject.vclock.should == @robject2.vclock
+        @robject.data['test'].should == "second"
+      end
     end
   end
 
@@ -112,7 +113,7 @@ shared_examples_for "Unified backend API" do
         @backend.store_object(@robject, :returnbody => false, :w => :all, :dw => q)
       end
 
-      it "should accept a PW value of #{q.inspect} for the request" do
+      it "should accept a PW value of #{q.inspect} for the request", :version => "1.0.0" do
         @backend.store_object(@robject, :returnbody => false, :pw => q)
       end
     end
@@ -206,7 +207,7 @@ shared_examples_for "Unified backend API" do
         @backend.list_keys("test") do |keys|
           keys.each do |key|
             begin
-              @backend.fetch_object("test", key)
+              @client.get_object("test", key)
             rescue => e
               errors << e
             end
@@ -263,7 +264,7 @@ shared_examples_for "Unified backend API" do
           unless result.empty?
             result.each do |v|
               begin
-                @backend.fetch_object("test", v['value'])
+                @client.get_object("test", v['value'])
               rescue => e
                 errors << e
               end