riak-client 2.2.0.pre1 → 2.2.0

data/spec/riak/bucket_spec.rb

@@ -38,7 +38,7 @@ describe Riak::Bucket do
       @bucket.keys do |list|
         all_keys.concat(list)
       end
-      expect(all_keys).to eq(["bar", "baz"])
+      expect(all_keys).to eq(%w(bar baz))
     end
 
     it "fetches a fresh list of keys" do
@@ -66,7 +66,7 @@ describe Riak::Bucket do
   describe "accessing a counter" do
     it "returns a counter object" do
       expect(Riak::Counter).to receive(:new).with(@bucket, 'asdf').and_return('example counter')
-      
+
       new_counter = @bucket.counter 'asdf'
 
       expect(new_counter).to eq('example counter')
@@ -146,7 +146,7 @@ describe Riak::Bucket do
 
     it "returns the existing object if present" do
       @object = double("RObject")
-      expect(@backend).to receive(:fetch_object).with(@bucket,"db", {}).and_return(@object)
+      expect(@backend).to receive(:fetch_object).with(@bucket, "db", {}).and_return(@object)
       expect(@bucket.get_or_new('db')).to eq(@object)
     end
 
@@ -164,7 +164,7 @@ describe Riak::Bucket do
 
     it "passes the given R quorum parameter to the backend" do
       @object = double("RObject")
-      expect(@backend).to receive(:fetch_object).with(@bucket,"db", {:r => "all"}).and_return(@object)
+      expect(@backend).to receive(:fetch_object).with(@bucket, "db", {:r => "all"}).and_return(@object)
       expect(@bucket.get_or_new('db', :r => "all")).to eq(@object)
     end
   end
@@ -243,7 +243,7 @@ describe Riak::Bucket do
 
       it "sets the #{q} quorum" do
         expect(@bucket).to receive(:props=).with(hash_including("#{q}" => 1))
-        @bucket.send("#{q}=",1)
+        @bucket.send("#{q}=", 1)
       end
     end
   end

data/spec/riak/bucket_type_spec.rb

@@ -24,11 +24,27 @@ describe Riak::BucketType do
     expect(typed_bucket.type).to eq subject
   end
 
-  let(:sample_props){ { allow_mult: true } }
+  describe 'equality' do
+    let(:same){ described_class.new client, name }
+    let(:different_client){ described_class.new Riak::Client.allocate, name }
+    let(:different_name){ described_class.new client, 'different name' }
+    it { is_expected.to eq same }
+    it { is_expected.to_not eq different_client }
+    it { is_expected.to_not eq different_name }
+  end
+
+  describe 'properties' do
+    let(:props_expectation){ expect(backend).to receive(:get_bucket_type_props).with(name) }
 
-  it 'has properties' do
-    expect(backend).to receive(:get_bucket_type_props).with(name).and_return(sample_props)
-    expect(props = subject.properties).to be_a Hash
-    expect(props[:allow_mult]).to be
+    it 'is queryable' do
+      props_expectation.and_return(allow_mult: true)
+      expect(props = subject.properties).to be_a Hash
+      expect(props[:allow_mult]).to be
+    end
+
+    it 'asks for data type' do
+      props_expectation.and_return(datatype: 'set')
+      expect(subject.data_type_class).to eq Riak::Crdt::Set
+    end
   end
 end

data/spec/riak/bucket_typed/bucket_spec.rb

@@ -0,0 +1,62 @@
+require 'spec_helper'
+require 'riak/bucket_typed/bucket'
+
+describe Riak::BucketTyped::Bucket do
+  let(:client){ Riak::Client.allocate }
+  let(:type){ client.bucket_type 'type' }
+  let(:name){ 'bucket_typed_bucket_spec' }
+
+  subject{ described_class.new client, name, type }
+
+  it 'initializes a typed RObject' do
+    typed_robject = subject.new 'panther'
+    expect(typed_robject).to be_a Riak::RObject
+    expect(typed_robject.key).to eq 'panther'
+    expect(typed_robject.bucket.type).to eq type
+  end
+
+  it 'has a bucket type' do
+    expect(subject.type).to eq type
+    expect(subject.type.name).to eq 'type'
+  end
+
+  describe 'equality' do
+    let(:same){ described_class.new client, name, type }
+    let(:different){ described_class.new client, 'other', type }
+    let(:untyped){ Riak::Bucket.new client, name }
+    it { is_expected.to eq subject }
+    it { is_expected.to eq same }
+    it { is_expected.to_not eq untyped }
+    it { is_expected.to_not eq different }
+  end
+
+  describe 'bucket properties' do
+    it 'returns properties scoped by bucket and type' do
+      expect(client).to receive(:get_bucket_props).
+                         with(subject, { type: subject.type.name }).
+                         and_return('allow_mult' => true)
+
+      expect(props = subject.props).to be_a Hash
+      expect(props['allow_mult']).to be
+    end
+
+    it 'clears properties scoped by bucket and type' do
+      expect(client).to receive(:clear_bucket_props).
+                         with(subject, { type: subject.type.name })
+
+      expect{ subject.clear_props }.to_not raise_error
+    end
+
+    it 'sets properties scoped by bucket and type' do
+      expect(client).to receive(:get_bucket_props).
+                         with(subject, { type: subject.type.name }).
+                         and_return('allow_mult' => false)
+      expect(client).to receive(:set_bucket_props).
+                         with(subject,
+                              { 'allow_mult' => true },
+                              subject.type.name)
+
+     expect{ subject.props = { 'allow_mult' => true } }.to_not raise_error
+    end
+  end
+end

data/spec/riak/client_spec.rb

@@ -26,15 +26,16 @@ describe Riak::Client, test_client: true do
     end
 
     it "creates a client ID if not specified" do
-      expect(Riak::Client.new(pb_port: test_client.nodes.first.pb_port).client_id).not_to be_nil
+      expect(Riak::Client.new(pb_port: test_client.nodes.first.pb_port).
+              client_id).to_not be_nil
     end
 
     it "accepts multiple nodes" do
-      client = Riak::Client.new :nodes => [
-                                           {:host => 'riak1.basho.com'},
-                                           {:host => 'riak2.basho.com', :pb_port => 1234},
-                                           {:host => 'riak3.basho.com', :pb_port => 5678}
-                                          ]
+      client = Riak::Client.new nodes: [
+                                  {host: 'riak1.basho.com'},
+                                  {host: 'riak2.basho.com', pb_port: 1234},
+                                  {host: 'riak3.basho.com', pb_port: 5678}
+                                ]
       expect(client.nodes.size).to eq(3)
       expect(client.nodes.first.host).to eq("riak1.basho.com")
     end
@@ -64,11 +65,15 @@ describe Riak::Client, test_client: true do
       end
 
       it "rejects an integer equal to the maximum client id" do
-        expect { @client.client_id = Riak::Client::MAX_CLIENT_ID }.to raise_error(ArgumentError)
+        expect do
+          @client.client_id = Riak::Client::MAX_CLIENT_ID
+          end.to raise_error(ArgumentError)
       end
 
       it "rejects an integer larger than the maximum client id" do
-        expect { @client.client_id = Riak::Client::MAX_CLIENT_ID + 1 }.to raise_error(ArgumentError)
+        expect do
+          @client.client_id = Riak::Client::MAX_CLIENT_ID + 1
+        end.to raise_error(ArgumentError)
       end
     end
   end
@@ -91,8 +96,11 @@ describe Riak::Client, test_client: true do
     end
 
     it "raises an error when the chosen backend is not valid" do
-      expect(Riak::Client::BeefcakeProtobuffsBackend).to receive(:configured?).and_return(false)
-      expect { @client.protobuffs { |x| } }.to raise_error Riak::BackendCreationError
+      expect(Riak::Client::BeefcakeProtobuffsBackend).to receive(:configured?).
+                                                          and_return(false)
+      expect do
+        @client.protobuffs { |x| }
+      end.to raise_error Riak::BackendCreationError
     end
   end
 
@@ -112,8 +120,12 @@ describe Riak::Client, test_client: true do
     before :each do
       @client = Riak::Client.new
       @bucket = @client.bucket('foo')
-      expect(@bucket).to receive(:[]).with('value1').and_return(double('robject'))
-      expect(@bucket).to receive(:[]).with('value2').and_return(double('robject'))
+      expect(@bucket).to receive(:[]).
+                          with('value1').
+                          and_return(double('robject'))
+      expect(@bucket).to receive(:[]).
+                          with('value2').
+                          and_return(double('robject'))
       @pairs = [
                 [@bucket, 'value1'],
                 [@bucket, 'value2']
@@ -143,13 +155,19 @@ describe Riak::Client, test_client: true do
     end
 
     it "fetches bucket properties if asked" do
-      expect(@backend).to receive(:get_bucket_props) {|b| expect(b.name).to eq("foo"); {} }
+      expect(@backend).to receive(:get_bucket_props) do |b|
+        expect(b.name).to eq("foo")
+        {}
+      end
       @client.bucket("foo", :props => true)
     end
 
     it "memoizes bucket parameters" do
       @bucket = double("Bucket")
-      expect(Riak::Bucket).to receive(:new).with(@client, "baz").once.and_return(@bucket)
+      expect(Riak::Bucket).to receive(:new).
+                               with(@client, "baz").
+                               once.
+                               and_return(@bucket)
       expect(@client.bucket("baz")).to eq(@bucket)
       expect(@client.bucket("baz")).to eq(@bucket)
     end
@@ -194,14 +212,14 @@ describe Riak::Client, test_client: true do
 
   describe "when receiving errors from the backend" do
     before do
-      @client = Riak::Client.new 
+      @client = Riak::Client.new
     end
 
     it "retries on recoverable errors" do
       call_count = 0
-      
+
       begin
-        @client.backend do |b| 
+        @client.backend do |b|
           call_count += 1
           raise Riak::ProtobuffsFailedHeader
         end
@@ -214,7 +232,7 @@ describe Riak::Client, test_client: true do
     it "throws a RuntimeError if it runs out of retries" do
       error = nil
       begin
-        @client.backend do |b| 
+        @client.backend do |b|
           raise Riak::ProtobuffsFailedHeader
         end
       rescue RuntimeError => e

data/spec/riak/counter_spec.rb

@@ -22,10 +22,10 @@ describe Riak::Counter do
       allow(@bad_bucket).to receive(:client).and_return(double('client'))
 
       expect{ctr = Riak::Counter.new @bad_bucket, @key}.to raise_error(ArgumentError)
-      
+
     end
   end
-  
+
   describe "incrementing and decrementing" do
     before :each do
       @backend = double 'backend'
@@ -92,7 +92,7 @@ describe Riak::Counter do
 
       @fake_pool = double 'pool'
       @backend = double 'backend'
-        
+
       @client = Riak::Client.new nodes: @nodes
       @client.instance_variable_set :@protobuffs_pool, @fake_pool
 
@@ -113,7 +113,7 @@ describe Riak::Counter do
       @expect_post.once.and_raise('timeout')
       expect(proc { @ctr.increment }).to raise_error
     end
-    
+
     it "doesn't retry on quorum failure" do
       @expect_post.once.and_raise('quorum not satisfied')
       expect(proc { @ctr.increment }).to raise_error

data/spec/riak/crdt/counter_spec.rb

@@ -22,14 +22,14 @@ describe Riak::Crdt::Counter do
     let(:loader){ double 'loader', get_loader_for_value: nil }
     let(:backend){ double 'backend' }
     let(:client){ double 'client' }
-    
+
     before(:each) 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 'batches properly' do

data/spec/riak/crdt/inner_flag_spec.rb

@@ -9,7 +9,7 @@ describe Riak::Crdt::InnerFlag do
       expect(subject).to be
     end
   end
-  
+
   describe 'a falsey flag' do
     subject { described_class.new parent, false }
 
@@ -20,7 +20,7 @@ describe Riak::Crdt::InnerFlag do
 
   describe 'updating' do
     let(:new_value){ false }
-    
+
     it '\asks the class for an update operation' do
       operation = described_class.update(new_value)
 

data/spec/riak/crdt/inner_map_spec.rb

@@ -13,10 +13,10 @@ describe Riak::Crdt::InnerMap do
       flags: {bravo: true},
       maps: {},
       registers: {delta: 'the expendables' },
-      sets: {echo: %w{stallone statham li lundgren}}      
+      sets: {echo: %w{stallone statham li lundgren}}
     }
   end
-  
+
   it 'is initializable with a nested hash of maps' do
     expect{described_class.new parent, populated_contents}.
       to_not raise_error
@@ -34,13 +34,13 @@ describe Riak::Crdt::InnerMap do
     let(:inner_operation){ double 'inner operation' }
     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|
         expect(name).to eq 'name'
         expect(op.type).to eq :map
         expect(op.value).to eq inner_operation
       end
-      
+
       subject.operate inner_operation
     end
   end

data/spec/riak/crdt/inner_register_spec.rb

@@ -9,7 +9,7 @@ describe Riak::Crdt::InnerRegister do
     expect{ subject.gsub('s', 'x') }.to_not raise_error
     expect(subject.gsub('s', 'x')).to eq 'exprexxox'
   end
-  
+
   describe 'immutability' do
     it 'is frozen' do
       expect(subject.frozen?).to be

data/spec/riak/crdt/map_spec.rb

@@ -15,7 +15,7 @@ describe Riak::Crdt::Map do
   let(:backend){ double 'backend' }
   let(:client){ double 'client' }
   let(:key){ 'map' }
-  
+
   before(:each) do
     allow(client).to receive(:backend).and_yield(backend)
     allow(backend).to receive(:crdt_operator).and_return(operator)
@@ -23,9 +23,9 @@ describe Riak::Crdt::Map do
     allow(loader).to receive(:load).and_return({})
     allow(loader).to receive(:context).and_return('context')
   end
-  
+
   subject{ described_class.new bucket, key }
-  
+
   include_examples 'Map CRDT'
 
   describe 'batch mode' do
@@ -38,7 +38,7 @@ describe Riak::Crdt::Map do
         expect(type).to eq subject.bucket_type
 
         expect(operations.length).to eq 2
-        
+
         expect(operations.first).to be_a Riak::Crdt::Operation::Update
 
         expect(operations.first.value).to be_a Riak::Crdt::Operation::Update

data/spec/riak/crdt/shared_examples.rb

@@ -5,22 +5,22 @@ shared_examples_for "Map CRDT" do
     expect(subject).to respond_to(:counters)
     expect(subject.counters).to be_an_instance_of typed_collection
   end
-  
+
   it 'contains flags' do
     expect(subject).to respond_to(:flags)
     expect(subject.counters).to be_an_instance_of typed_collection
   end
-  
+
   it 'contains maps' do
     expect(subject).to respond_to(:maps)
     expect(subject.counters).to be_an_instance_of typed_collection
   end
-  
+
   it 'contains registers' do
     expect(subject).to respond_to(:registers)
     expect(subject.counters).to be_an_instance_of typed_collection
   end
-  
+
   it 'contains sets' do
     expect(subject).to respond_to(:sets)
     expect(subject.counters).to be_an_instance_of typed_collection
@@ -35,7 +35,7 @@ shared_examples_for "Counter CRDT" do
   it 'has a value' do
     expect(subject).to respond_to :value
   end
-  
+
   it 'has an increment method' do
     expect(subject).to respond_to :increment
   end

data/spec/riak/crdt/typed_collection_spec.rb

@@ -16,7 +16,7 @@ describe Riak::Crdt::TypedCollection do
       subject do
         described_class.new register_class, parent, existing: 'existing'
       end
-      
+
       it 'exposes them as frozen strings that are really Registers' do
         expect(subject[:existing]).to eq 'existing'
         expect(subject['existing']).to eq 'existing'
@@ -28,7 +28,7 @@ describe Riak::Crdt::TypedCollection do
       describe 'creating and updating' do
 
         let(:new_value){ 'the new value' }
-        
+
         it 'asks the register class for an operation' do
           expect(register_class).to receive(:update).
             with(new_value).
@@ -70,7 +70,7 @@ describe Riak::Crdt::TypedCollection do
       subject do
         described_class.new flag_class, parent, truthy: true, falsey: false
       end
-      
+
       it 'exposes them as booleans' do
         expect(subject[:truthy]).to eq true
         expect(subject['falsey']).to eq false
@@ -92,7 +92,7 @@ describe Riak::Crdt::TypedCollection do
 
         subject['become_truthy'] = true
       end
-      
+
       it 'deletes them' do
         expect(flag_class).
           to receive(:delete).
@@ -113,22 +113,22 @@ describe Riak::Crdt::TypedCollection do
       let(:counter_class){ Riak::Crdt::InnerCounter }
 
       subject{ described_class.new counter_class, parent, zero: 0, one: 1 }
-      
+
       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 '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 'allows 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
@@ -141,7 +141,7 @@ describe Riak::Crdt::TypedCollection do
           expect(op.type).to eq :counter
           expect(op.value).to eq -5
         end
-        
+
         subject[counter_name].decrement 5
       end
     end
@@ -149,17 +149,17 @@ describe Riak::Crdt::TypedCollection do
       let(:set_class){ Riak::Crdt::InnerSet }
 
       subject{ described_class.new set_class, parent, brewers: %w{aeropress clever v60}}
-      
+
       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 '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 'allows adding and removing' do
         set_name = 'brewers'
 
@@ -180,7 +180,7 @@ describe Riak::Crdt::TypedCollection do
         subject[set_name].remove 'aeropress'
       end
     end
-    
+
     describe 'maps' do
       let(:map_class){ Riak::Crdt::InnerMap }
 
@@ -192,32 +192,32 @@ describe Riak::Crdt::TypedCollection do
             sets: {}
           }}
         end
-        
+
       let(:inner_map_name){ 'inner map' }
-      
+
       subject do
         described_class.new map_class, parent, contents
       end
-      
+
       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 '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 'cascades 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