riak-client 1.4.5 → 2.0.0.rc1

data/spec/riak/crdt/shared_examples.rb

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

data/spec/riak/crdt/typed_collection_spec.rb

@@ -0,0 +1,231 @@
+require 'spec_helper'
+
+describe Riak::Crdt::TypedCollection do
+  let(:parent){ double 'parent' }
+  let(:operation){ double 'operation' }
+
+  describe 'initialization' do
+    it "should accept a type, parent, and hash of values" do
+      expect{ described_class.new Riak::Crdt::Counter, parent, {} }.to_not raise_error
+    end
+  end
+
+  describe 'containing' do
+    describe 'registers' do
+      let(:register_class){ Riak::Crdt::InnerRegister }
+      subject do
+        described_class.new register_class, parent, existing: 'existing'
+      end
+      
+      it 'should expose 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
+        expect(subject['existing'].frozen?).to be
+        expect{subject['existing'].gsub!('e', 'a')}.to raise_error
+      end
+
+      describe 'creating and updating' 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
+          expect(register_class).to receive(:update).
+            with(new_value).
+            and_return(operation)
+
+          expect(operation).
+            to receive(:name=).
+            with('existing')
+
+          expect(parent).
+            to receive(:operate).
+            with(operation)
+
+          subject['existing'] = new_value
+        end
+      end
+
+      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
+          expect(register_class).
+            to receive(:delete).
+            and_return(operation)
+
+          expect(operation).
+            to receive(:name=).
+            with('existing')
+
+          expect(parent).
+            to receive(:operate).
+            with(operation)
+
+          subject.delete 'existing'
+        end
+      end
+    end
+    describe 'flags' do
+      let(:flag_class){ Riak::Crdt::InnerFlag }
+      subject do
+        described_class.new flag_class, parent, truthy: true, falsey: false
+      end
+      
+      it 'should expose them as booleans' do
+        expect(subject[:truthy]).to eq true
+        expect(subject['falsey']).to eq false
+      end
+
+      it 'should update them' do
+        expect(flag_class).
+          to receive(:update).
+          with(true).
+          and_return(operation)
+
+        expect(operation).
+          to receive(:name=).
+          with('become_truthy')
+
+        expect(parent).
+          to receive(:operate).
+          with(operation)
+
+        subject['become_truthy'] = true
+      end
+      
+      it 'should delete them' do
+        expect(flag_class).
+          to receive(:delete).
+          and_return(operation)
+
+        expect(operation).
+          to receive(:name=).
+          with('become_deleted')
+
+        expect(parent).
+          to receive(:operate).
+          with(operation)
+
+        subject.delete 'become_deleted'
+      end
+    end
+    describe 'counters' do
+      let(:counter_class){ Riak::Crdt::InnerCounter }
+
+      subject{ described_class.new counter_class, parent, zero: 0, one: 1 }
+      
+      it 'should expose 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
+        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
+        counter_name = 'counter'
+        
+        expect(parent).to receive(:operate) do |op|
+          expect(op.name).to eq counter_name
+          expect(op.type).to eq :counter
+          expect(op.value).to eq 1
+        end
+        subject[counter_name].increment
+
+        expect(parent).to receive(:operate) do |op|
+          expect(op.name).to eq counter_name
+          expect(op.type).to eq :counter
+          expect(op.value).to eq -5
+        end
+        
+        subject[counter_name].decrement 5
+      end
+    end
+    describe 'sets' do
+      let(:set_class){ Riak::Crdt::InnerSet }
+
+      subject{ described_class.new set_class, parent, brewers: %w{aeropress clever v60}}
+      
+      it 'should expose 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
+        expect(subject['filters']).to be_an_instance_of set_class
+        expect(subject['filters']).to be_empty
+      end
+      
+      it 'should allow adding and removing' do
+        set_name = 'brewers'
+
+        expect(parent).to receive(:operate) do |op|
+          expect(op.name).to eq set_name
+          expect(op.type).to eq :set
+          expect(op.value).to eq add: 'frenchpress'
+        end
+        subject[set_name].add 'frenchpress'
+
+        expect(parent).to receive(:operate) do |op|
+          expect(op.name).to eq set_name
+          expect(op.type).to eq :set
+          expect(op.value).to eq remove: 'aeropress'
+        end
+        allow(parent).to receive(:context?).and_return(true)
+
+        subject[set_name].remove 'aeropress'
+      end
+    end
+    
+    describe 'maps' do
+      let(:map_class){ Riak::Crdt::InnerMap }
+
+      let(:contents) do {a: {
+            counters: {},
+            flags: {},
+            maps: {},
+            registers: {'hello' => 'world'},
+            sets: {}
+          }}
+        end
+        
+      let(:inner_map_name){ 'inner map' }
+      
+      subject do
+        described_class.new map_class, parent, contents
+      end
+      
+      it 'should expose 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
+        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
+        expect(operation).
+          to receive(:name=).
+          with(inner_map_name)
+        
+        expect(parent).
+          to receive(:operate).
+          with(operation)
+        
+        subject.operate inner_map_name, operation
+      end
+    end
+  end
+end

data/spec/riak/escape_spec.rb

@@ -7,33 +7,33 @@ describe Riak::Util::Escape do
     @object.extend(Riak::Util::Escape)
   end
 
-  it "uses URI by default for escaping" do
-    Riak.escaper.should == CGI
+  it "should use URI by default for escaping" do
+    expect(Riak.escaper).to eq(URI)
   end
 
   context "when using CGI for escaping" do
     before { @oldesc, Riak.escaper = Riak.escaper, CGI }
     after { Riak.escaper = @oldesc }
 
-    it "escapes standard non-safe characters" do
-      @object.escape("some string").should == "some%20string"
-      @object.escape("another^one").should == "another%5Eone"
-      @object.escape("bracket[one").should == "bracket%5Bone"
+    it "should escape standard non-safe characters" do
+      expect(@object.escape("some string")).to eq("some%20string")
+      expect(@object.escape("another^one")).to eq("another%5Eone")
+      expect(@object.escape("bracket[one")).to eq("bracket%5Bone")
     end
 
-    it "escapes slashes" do
-      @object.escape("some/inner/path").should == "some%2Finner%2Fpath"
+    it "should escape slashes" do
+      expect(@object.escape("some/inner/path")).to eq("some%2Finner%2Fpath")
     end
 
-    it "converts the bucket or key to a string before escaping" do
-      @object.escape(125).should == '125'
+    it "should convert the bucket or key to a string before escaping" do
+      expect(@object.escape(125)).to eq('125')
     end
 
-    it "unescapes escaped strings" do
-      @object.unescape("some%20string").should == "some string"
-      @object.unescape("another%5Eone").should == "another^one"
-      @object.unescape("bracket%5Bone").should == "bracket[one"
-      @object.unescape("some%2Finner%2Fpath").should == "some/inner/path"
+    it "should unescape escaped strings" do
+      expect(@object.unescape("some%20string")).to eq("some string")
+      expect(@object.unescape("another%5Eone")).to eq("another^one")
+      expect(@object.unescape("bracket%5Bone")).to eq("bracket[one")
+      expect(@object.unescape("some%2Finner%2Fpath")).to eq("some/inner/path")
     end
   end
 
@@ -41,36 +41,32 @@ describe Riak::Util::Escape do
     before { @oldesc, Riak.escaper = Riak.escaper, URI }
     after { Riak.escaper = @oldesc }
 
-    it "escapes 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--"
+    it "should escape standard non-safe characters" do
+      expect(@object.escape("some string")).to eq("some%20string")
+      expect(@object.escape("another^one")).to eq("another%5Eone")
+      expect(@object.escape("--one+two--")).to eq("--one%2Btwo--")
     end
 
-    it "allows URI-safe characters" do
-      @object.escape("sean@basho").should == "sean@basho"
+    it "should allow URI-safe characters" do
+      expect(@object.escape("bracket[one")).to eq("bracket[one")
+      expect(@object.escape("sean@basho")).to eq("sean@basho")
     end
 
-    it "escapes slashes" do
-      @object.escape("some/inner/path").should == "some%2Finner%2Fpath"
+    it "should escape slashes" do
+      expect(@object.escape("some/inner/path")).to eq("some%2Finner%2Fpath")
     end
 
-    it "escapes square brackets" do
-      @object.escape("bracket[one").should == "bracket%5Bone"
-      @object.escape("bracket]two").should == "bracket%5Dtwo"
+    it "should convert the bucket or key to a string before escaping" do
+      expect(@object.escape(125)).to eq('125')
     end
 
-    it "converts the bucket or key to a string before escaping" do
-      @object.escape(125).should == '125'
-    end
-
-    it "unescapes escaped strings" do
-      @object.unescape("some%20string").should == "some string"
-      @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"
+    it "should unescape escaped strings" do
+      expect(@object.unescape("some%20string")).to eq("some string")
+      expect(@object.unescape("another%5Eone")).to eq("another^one")
+      expect(@object.unescape("bracket%5Bone")).to eq("bracket[one")
+      expect(@object.unescape("some%2Finner%2Fpath")).to eq("some/inner/path")
+      expect(@object.unescape("--one%2Btwo--")).to eq("--one+two--")
+      expect(@object.unescape("me%40basho.co")).to eq("me@basho.co")
     end
   end
 end

data/spec/riak/feature_detection_spec.rb

@@ -16,62 +16,62 @@ describe Riak::Client::FeatureDetection do
   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 }
-    it { should_not be_http_props_clearable }
+    before { allow(subject).to receive(:get_server_version).and_return("0.14.2") }
+    it { is_expected.not_to be_mapred_phaseless }
+    it { is_expected.not_to be_pb_indexes }
+    it { is_expected.not_to be_pb_search }
+    it { is_expected.not_to be_pb_conditionals }
+    it { is_expected.not_to be_quorum_controls }
+    it { is_expected.not_to be_tombstone_vclocks }
+    it { is_expected.not_to be_pb_head }
+    it { is_expected.not_to be_http_props_clearable }
   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 }
-    it { should_not be_http_props_clearable }
+    before { allow(subject).to receive(:get_server_version).and_return("1.0.3") }
+    it { is_expected.not_to be_mapred_phaseless }
+    it { is_expected.not_to be_pb_indexes }
+    it { is_expected.not_to be_pb_search }
+    it { is_expected.to be_pb_conditionals }
+    it { is_expected.to be_quorum_controls }
+    it { is_expected.to be_tombstone_vclocks }
+    it { is_expected.to be_pb_head }
+    it { is_expected.not_to be_http_props_clearable }
   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 }
-    it { should_not be_http_props_clearable }
+    before { allow(subject).to receive(:get_server_version).and_return("1.1.4") }
+    it { is_expected.to be_mapred_phaseless }
+    it { is_expected.not_to be_pb_indexes }
+    it { is_expected.not_to be_pb_search }
+    it { is_expected.to be_pb_conditionals }
+    it { is_expected.to be_quorum_controls }
+    it { is_expected.to be_tombstone_vclocks }
+    it { is_expected.to be_pb_head }
+    it { is_expected.not_to be_http_props_clearable }
   end
 
   context "when the Riak version is 1.2.x" do
-    before { subject.stub!(:get_server_version).and_return("1.2.1") }
-    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 }
-    it { should_not be_http_props_clearable }
+    before { allow(subject).to receive(:get_server_version).and_return("1.2.1") }
+    it { is_expected.to be_mapred_phaseless }
+    it { is_expected.to be_pb_indexes }
+    it { is_expected.to be_pb_search }
+    it { is_expected.to be_pb_conditionals }
+    it { is_expected.to be_quorum_controls }
+    it { is_expected.to be_tombstone_vclocks }
+    it { is_expected.to be_pb_head }
+    it { is_expected.not_to be_http_props_clearable }
   end
 
   context "when the Riak version is 1.3.x" do
-    before { subject.stub!(:get_server_version).and_return("1.3.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 }
-    it { should be_http_props_clearable }
+    before { allow(subject).to receive(:get_server_version).and_return("1.3.0") }
+    it { is_expected.to be_mapred_phaseless }
+    it { is_expected.to be_pb_indexes }
+    it { is_expected.to be_pb_search }
+    it { is_expected.to be_pb_conditionals }
+    it { is_expected.to be_quorum_controls }
+    it { is_expected.to be_tombstone_vclocks }
+    it { is_expected.to be_pb_head }
+    it { is_expected.to be_http_props_clearable }
   end
 end