riak-client 2.0.0 → 2.1.0

data/spec/riak/core_ext/to_param_spec.rb

@@ -2,13 +2,13 @@
 describe Riak do
   require 'riak/core_ext/to_param'
 
-  it "should do param conversion correctly" do
+  it "converts params correctly" do
     expect({ :name => 'David', :nationality => 'Danish' }.to_param).to eq("name=David&nationality=Danish")
   end
 
   # Based on the activesupport implementation.
   # https://github.com/rails/rails/blob/master/activesupport/lib/active_support/core_ext/object/to_param.rb
-  it "should do param conversion correctly with a namespace" do
+  it "converts namespaced params correctly" do
     expect({ :name => 'David', :nationality => 'Danish' }.to_param('user')).to eq("user%5Bname%5D=David&user%5Bnationality%5D=Danish")
   end
 

data/spec/riak/counter_spec.rb

@@ -10,13 +10,13 @@ describe Riak::Counter do
       allow(@bucket).to receive('is_a?').and_return(true)
     end
 
-    it "should set the bucket and key" do
+    it "sets the bucket and key" do
       ctr = Riak::Counter.new @bucket, @key
       expect(ctr.bucket).to eq(@bucket)
       expect(ctr.key).to eq(@key)
     end
 
-    it "should require allow_mult" do
+    it "requires allow_mult" do
       @bad_bucket = Riak::Bucket.allocate
       allow(@bad_bucket).to receive(:allow_mult).and_return(false)
       allow(@bad_bucket).to receive(:client).and_return(double('client'))
@@ -44,37 +44,37 @@ describe Riak::Counter do
       @increment_expectation = proc{|n| expect(@backend).to receive(:post_counter).with(@bucket, @key, n, {})}
     end
 
-    it "should increment by 1 by default" do
+    it "increments by 1 by default" do
       @increment_expectation[1]
       @ctr.increment
     end
 
-    it "should support incrementing by positive numbers" do
+    it "increments by positive numbers" do
       @increment_expectation[15]
       @ctr.increment 15
     end
 
-    it "should support incrementing by negative numbers" do
+    it "increments by negative numbers" do
       @increment_expectation[-12]
       @ctr.increment -12
     end
 
-    it "should decrement by 1 by default" do
+    it "decrements by 1 by default" do
       @increment_expectation[-1]
       @ctr.decrement
     end
 
-    it "should support decrementing by positive numbers" do
+    it "decrements by positive numbers" do
       @increment_expectation[-30]
       @ctr.decrement 30
     end
 
-    it "should support decrementing by negative numbers" do
+    it "decrements by negative numbers" do
       @increment_expectation[41]
       @ctr.decrement -41
     end
 
-    it "should forbid incrementing by non-integers" do
+    it "forbids incrementing by non-integers" do
       [1.1, nil, :'1', '1', 2.0/2, [1]].each do |candidate|
         expect do
           @ctr.increment candidate
@@ -109,12 +109,12 @@ describe Riak::Counter do
       @ctr = Riak::Counter.new @bucket, @key
     end
 
-    it "should not retry on timeout" do
+    it "doesn't retry on timeout" do
       @expect_post.once.and_raise('timeout')
       expect(proc { @ctr.increment }).to raise_error
     end
     
-    it "should not retry on quorum failure" do
+    it "doesn't retry on quorum failure" do
       @expect_post.once.and_raise('quorum not satisfied')
       expect(proc { @ctr.increment }).to raise_error
     end

data/spec/riak/crdt/counter_spec.rb

@@ -8,7 +8,7 @@ describe Riak::Crdt::Counter do
       allow(b).to receive(:is_a?).and_return(true)
     end
   end
-  it 'should be initialized with bucket, key, and optional bucket-type' do
+  it 'initializes with bucket, key, and optional bucket-type' do
     expect{ described_class.new bucket, 'key' }.to_not raise_error
     expect{ described_class.new bucket, 'key', 'type' }.to_not raise_error
   end
@@ -18,6 +18,7 @@ describe Riak::Crdt::Counter do
   describe 'with a client' do
     let(:response){ double 'response', key: nil }
     let(:operator){ double 'operator' }
+    let(:loader){ double 'loader', get_loader_for_value: nil }
     let(:backend){ double 'backend' }
     let(:client){ double 'client' }
     
@@ -25,11 +26,12 @@ describe Riak::Crdt::Counter do
       allow(bucket).to receive(:client).and_return(client)
       allow(client).to receive(:backend).and_yield(backend)
       allow(backend).to receive(:crdt_operator).and_return(operator)
+      allow(backend).to receive(:crdt_loader).and_return(loader)
     end
     
     include_examples 'Counter CRDT'
 
-    it 'should batch properly' do
+    it 'batches properly' do
       expect(operator).
         to receive(:operate) { |bucket, key, type, operations|
         expect(bucket).to eq bucket

data/spec/riak/crdt/inner_counter_spec.rb

@@ -12,7 +12,7 @@ describe Riak::Crdt::InnerCounter do
 
   include_examples 'Counter CRDT'
 
-  it 'should send increments to the parent' do
+  it 'sends increments to the parent' do
     expect(parent).to receive(:increment).
       with(counter_name, 1)
 

data/spec/riak/crdt/inner_flag_spec.rb

@@ -5,7 +5,7 @@ describe Riak::Crdt::InnerFlag do
   describe 'a truthy flag' do
     subject { described_class.new parent, true }
 
-    it 'should feel truthy' do
+    it 'feels truthy' do
       expect(subject).to be
     end
   end
@@ -13,7 +13,7 @@ describe Riak::Crdt::InnerFlag do
   describe 'a falsey flag' do
     subject { described_class.new parent, false }
 
-    it 'should feel falsey' do
+    it 'feels falsey' do
       expect(subject).to_not be
     end
   end
@@ -21,7 +21,7 @@ describe Riak::Crdt::InnerFlag do
   describe 'updating' do
     let(:new_value){ false }
     
-    it 'should ask the class for an update operation' do
+    it '\asks the class for an update operation' do
       operation = described_class.update(new_value)
 
       expect(operation.value).to eq new_value
@@ -30,7 +30,7 @@ describe Riak::Crdt::InnerFlag do
   end
 
   describe 'deleting' do
-    it 'should ask the class for a delete operation' do
+    it 'asks the class for a delete operation' do
       operation = described_class.delete
 
       expect(operation.type).to eq :flag

data/spec/riak/crdt/inner_map_spec.rb

@@ -17,13 +17,13 @@ describe Riak::Crdt::InnerMap do
     }
   end
   
-  it 'should be initializable with a nested hash of maps' do
+  it 'is initializable with a nested hash of maps' do
     expect{described_class.new parent, populated_contents}.
       to_not raise_error
   end
 
   describe 'deleting the inner map' do
-    it 'should ask the class for a delete operation' do
+    it 'asks the class for a delete operation' do
       operation = described_class.delete
 
       expect(operation.type).to eq :map
@@ -32,7 +32,7 @@ describe Riak::Crdt::InnerMap do
 
   describe 'receiving an operation' do
     let(:inner_operation){ double 'inner operation' }
-    it 'should wrap the operation in an update operation and pass it to the parent' do
+    it 'wraps the operation in an update operation and pass it to the parent' do
       subject.name = 'name'
       
       expect(parent).to receive(:operate) do |name, op|

data/spec/riak/crdt/inner_register_spec.rb

@@ -4,17 +4,17 @@ describe Riak::Crdt::InnerRegister do
   let(:parent){ double 'parent' }
   subject { described_class.new parent, "espressos" }
 
-  it 'should feel like a string' do
+  it 'feels like a string' do
     expect(subject).to match 'espressos'
     expect{ subject.gsub('s', 'x') }.to_not raise_error
     expect(subject.gsub('s', 'x')).to eq 'exprexxox'
   end
   
   describe 'immutability' do
-    it 'should be frozen' do
+    it 'is frozen' do
       expect(subject.frozen?).to be
     end
-    it "shouldn't be gsub!-able" do
+    it "isn't be gsub!-able" do
       # "gsub!-able" is awful, open to suggestions
       expect{ subject.gsub!('s', 'x') }.to raise_error
     end
@@ -22,7 +22,7 @@ describe Riak::Crdt::InnerRegister do
 
   describe 'updating' do
     let(:new_value){ 'new value' }
-    it "should ask the class for an update operation" do
+    it "asks the class for an update operation" do
       operation = described_class.update(new_value)
 
       expect(operation.value).to eq new_value
@@ -31,7 +31,7 @@ describe Riak::Crdt::InnerRegister do
   end
 
   describe 'deleting' do
-    it 'should ask the class for a delete operation' do
+    it 'asks the class for a delete operation' do
       operation = described_class.delete
 
       expect(operation.type).to eq :register

data/spec/riak/crdt/inner_set_spec.rb

@@ -12,7 +12,7 @@ describe Riak::Crdt::InnerSet do
 
   include_examples 'Set CRDT'
 
-  it 'should send additions to the parent' do
+  it 'sends additions to the parent' do
     expect(parent).to receive(:operate) do |name, op|
       expect(name).to eq set_name
       expect(op.type).to eq :set

data/spec/riak/crdt/map_spec.rb

@@ -28,7 +28,7 @@ describe Riak::Crdt::Map do
   include_examples 'Map CRDT'
 
   describe 'batch mode' do
-    it 'should queue up operations' do
+    it 'queues up operations' do
       expect(operator).
         to receive(:operate) do |bucket, key_arg, type, operations|
 
@@ -51,7 +51,7 @@ describe Riak::Crdt::Map do
   end
 
   describe 'immediate mode' do
-    it 'should submit member operations immediately' do
+    it 'submits member operations immediately' do
       expect(operator).
         to receive(:operate) do |bucket, key_arg, type, operations|
 

data/spec/riak/crdt/set_spec.rb

@@ -9,7 +9,7 @@ describe Riak::Crdt::Set do
     end
   end
 
-  it 'should be initialized with bucket, key, and optional bucket-type' do
+  it 'initializes with bucket, key, and optional bucket-type' do
     expect{described_class.new bucket, 'key', 'optional bucket type'}.
       to_not raise_error
   end
@@ -19,6 +19,7 @@ describe Riak::Crdt::Set do
   describe 'with a client' do
     let(:response){ double 'response', key: nil }
     let(:operator){ double 'operator' }
+    let(:loader){ double 'loader', get_loader_for_value: nil }
     let(:backend){ double 'backend' }
     let(:client){ double 'client' }
 
@@ -26,11 +27,12 @@ describe Riak::Crdt::Set do
       allow(bucket).to receive(:client).and_return(client)
       allow(client).to receive(:backend).and_yield(backend)
       allow(backend).to receive(:crdt_operator).and_return(operator)
+      allow(backend).to receive(:crdt_loader).and_return(loader)
     end
 
     include_examples 'Set CRDT'
 
-    it 'should batch properly' do
+    it 'batches properly' do
       expect(operator).
         to receive(:operate) { |bucket, key, type, operations|
 

data/spec/riak/crdt/shared_examples.rb

@@ -1,74 +1,74 @@
 shared_examples_for "Map CRDT" do
   let(:typed_collection){ Riak::Crdt::TypedCollection }
 
-  it 'should contain counters' do
+  it 'contains counters' do
     expect(subject).to respond_to(:counters)
     expect(subject.counters).to be_an_instance_of typed_collection
   end
   
-  it 'should contain flags' do
+  it 'contains flags' do
     expect(subject).to respond_to(:flags)
     expect(subject.counters).to be_an_instance_of typed_collection
   end
   
-  it 'should contain maps' do
+  it 'contains maps' do
     expect(subject).to respond_to(:maps)
     expect(subject.counters).to be_an_instance_of typed_collection
   end
   
-  it 'should contain registers' do
+  it 'contains registers' do
     expect(subject).to respond_to(:registers)
     expect(subject.counters).to be_an_instance_of typed_collection
   end
   
-  it 'should contain sets' do
+  it 'contains sets' do
     expect(subject).to respond_to(:sets)
     expect(subject.counters).to be_an_instance_of typed_collection
   end
 
-  it 'should accept operations' do
+  it 'accepts operations' do
     expect(subject).to respond_to(:operate)
   end
 end
 
 shared_examples_for "Counter CRDT" do
-  it 'should have a value' do
+  it 'has a value' do
     expect(subject).to respond_to :value
   end
   
-  it 'should have an increment method' do
+  it 'has an increment method' do
     expect(subject).to respond_to :increment
   end
 
-  it 'should have a decrement method' do
+  it 'has a decrement method' do
     expect(subject).to respond_to :decrement
   end
 
-  it 'should have a batch method' do
+  it 'has a batch method' do
     expect(subject).to respond_to :batch
   end
 end
 
 shared_examples_for 'Set CRDT' do
-  it 'should have a value' do
+  it 'has a value' do
     expect(subject).to respond_to :value
     expect(subject).to respond_to :members
     expect(subject).to respond_to :to_a
   end
 
-  it 'should have an include? method' do
+  it 'has an include? method' do
     expect(subject).to respond_to :include?
   end
 
-  it 'should have an empty? method' do
+  it 'has an empty? method' do
     expect(subject).to respond_to :empty?
   end
 
-  it 'should have an add method' do
+  it 'has an add method' do
     expect(subject).to respond_to :add
   end
 
-  it 'should have a remove method' do
+  it 'has a remove method' do
     expect(subject).to respond_to :remove
   end
 end

data/spec/riak/crdt/typed_collection_spec.rb

@@ -5,7 +5,7 @@ describe Riak::Crdt::TypedCollection do
   let(:operation){ double 'operation' }
 
   describe 'initialization' do
-    it "should accept a type, parent, and hash of values" do
+    it "accepts a type, parent, and hash of values" do
       expect{ described_class.new Riak::Crdt::Counter, parent, {} }.to_not raise_error
     end
   end
@@ -17,7 +17,7 @@ describe Riak::Crdt::TypedCollection do
         described_class.new register_class, parent, existing: 'existing'
       end
       
-      it 'should expose them as frozen strings that are really Registers' do
+      it 'exposes them as frozen strings that are really Registers' do
         expect(subject[:existing]).to eq 'existing'
         expect(subject['existing']).to eq 'existing'
         expect(subject[:existing]).to be_an_instance_of register_class
@@ -29,10 +29,7 @@ describe Riak::Crdt::TypedCollection do
 
         let(:new_value){ 'the new value' }
         
-        it <<-EOD.gsub(/\s+/, ' ') do
-          should ask the register class for an operation with the new value,
-          add a name to it, and pass it up to the parent
-          EOD
+        it 'asks the register class for an operation' do
           expect(register_class).to receive(:update).
             with(new_value).
             and_return(operation)
@@ -51,10 +48,7 @@ describe Riak::Crdt::TypedCollection do
 
       describe 'removing' do
 
-        it <<-EOD.gsub(/\s+/, ' ') do
-          should ask the register class for a remove operation, add a name to
-          it, and pass it up to the parent
-          EOD
+        it 'asks the register class for a remove operation' do
           expect(register_class).
             to receive(:delete).
             and_return(operation)
@@ -77,12 +71,12 @@ describe Riak::Crdt::TypedCollection do
         described_class.new flag_class, parent, truthy: true, falsey: false
       end
       
-      it 'should expose them as booleans' do
+      it 'exposes them as booleans' do
         expect(subject[:truthy]).to eq true
         expect(subject['falsey']).to eq false
       end
 
-      it 'should update them' do
+      it 'updates them' do
         expect(flag_class).
           to receive(:update).
           with(true).
@@ -99,7 +93,7 @@ describe Riak::Crdt::TypedCollection do
         subject['become_truthy'] = true
       end
       
-      it 'should delete them' do
+      it 'deletes them' do
         expect(flag_class).
           to receive(:delete).
           and_return(operation)
@@ -120,19 +114,19 @@ describe Riak::Crdt::TypedCollection do
 
       subject{ described_class.new counter_class, parent, zero: 0, one: 1 }
       
-      it 'should expose existing ones as Counter instances' do
+      it 'exposes existing ones as Counter instances' do
         expect(subject['zero']).to be_an_instance_of counter_class
         expect(subject['zero'].to_i).to eq 0
         
         expect(subject['one'].to_i).to eq 1
       end
       
-      it 'should expose new ones as Counter instances' do
+      it 'exposes new ones as Counter instances' do
         expect(subject['new_zero']).to be_an_instance_of counter_class
         expect(subject['new_zero'].to_i).to eq 0
       end
       
-      it 'should allow incrementing and decrementing' do
+      it 'allows incrementing and decrementing' do
         counter_name = 'counter'
         
         expect(parent).to receive(:operate) do |op|
@@ -156,17 +150,17 @@ describe Riak::Crdt::TypedCollection do
 
       subject{ described_class.new set_class, parent, brewers: %w{aeropress clever v60}}
       
-      it 'should expose existing ones as Set instances' do
+      it 'exposes existing ones as Set instances' do
         expect(subject['brewers']).to be_an_instance_of set_class
         expect(subject['brewers']).to include 'aeropress'
       end
       
-      it 'should expose new ones as empty Set instances' do
+      it 'exposes new ones as empty Set instances' do
         expect(subject['filters']).to be_an_instance_of set_class
         expect(subject['filters']).to be_empty
       end
       
-      it 'should allow adding and removing' do
+      it 'allows adding and removing' do
         set_name = 'brewers'
 
         expect(parent).to receive(:operate) do |op|
@@ -205,17 +199,17 @@ describe Riak::Crdt::TypedCollection do
         described_class.new map_class, parent, contents
       end
       
-      it 'should expose existing ones as populated Map instances' do
+      it 'exposes existing ones as populated Map instances' do
         expect(subject['a']).to be_an_instance_of map_class
         expect(subject['a'].registers['hello']).to eq 'world'
       end
       
-      it 'should expose new ones as empty Map instances' do
+      it 'exposes new ones as empty Map instances' do
         expect(subject['b']).to be_an_instance_of map_class
         expect(subject['b'].registers['hello']).to be_nil
       end
       
-      it 'should cascade operations to a parent map' do
+      it 'cascades operations to a parent map' do
         expect(operation).
           to receive(:name=).
           with(inner_map_name)