riak-client 2.2.0.pre1 → 2.2.0

data/riak-client.gemspec

@@ -7,9 +7,9 @@ Gem::Specification.new do |gem|
   gem.version = Riak::VERSION
   gem.summary = %Q{riak-client is a rich client for Riak, the distributed database by Basho.}
   gem.description = %Q{riak-client is a rich client for Riak, the distributed database by Basho. It supports the full HTTP and Protocol Buffers interfaces including storage operations, bucket configuration, link-walking, secondary indexes and map-reduce.}
-  gem.email = ["sean@basho.com", 'bryce@basho.com']
+  gem.email = ['bryce@basho.com']
   gem.homepage = "http://github.com/basho/riak-ruby-client"
-  gem.authors = ["Sean Cribbs", 'Bryce Kerley']
+  gem.authors = ['Bryce Kerley']
   gem.license = 'Apache 2.0'
 
   gem.required_ruby_version = '>= 1.9.3'
@@ -19,11 +19,12 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rake', '~> 10.1.1'
   gem.add_development_dependency 'yard', '~> 0.8.7'
   gem.add_development_dependency 'kramdown', '~> 1.4'
-  gem.add_development_dependency 'simplecov', '~> 0.8.2'
+  gem.add_development_dependency 'simplecov', '~> 0.10.0'
   gem.add_development_dependency "instrumentable", "~> 1.1.0"
+  gem.add_development_dependency "rubocop", "~> 0.28.0"
 
   gem.add_runtime_dependency "i18n", ">=0.4.0"
-  gem.add_runtime_dependency "beefcake", "~> 1.0"
+  gem.add_runtime_dependency "beefcake", "~> 1.1"
   gem.add_runtime_dependency "multi_json", "~>1.0"
   gem.add_runtime_dependency "innertube", "~>1.0.2"
   gem.add_runtime_dependency 'cert_validator', '~> 0.0.1'

data/spec/integration/riak/bucket_types_spec.rb

@@ -41,6 +41,31 @@ describe 'Bucket Types', test_client: true, integration: true do
         expect(bucket.exists?('lawnmower')).to be
       end
 
+      describe 'loading and modifying a RObject' do
+        it "doesn't modify objects in other buckets" do
+          expect(o = bucket.get(object.key)).to be
+          o.data = 'updated'
+          o.store
+          o.reload
+
+          expect(o.data).to eq 'updated'
+
+          expect{ untyped_bucket.get(object.key)}.to raise_error(/not found/)
+
+          expect(o3 = bucket.get(object.key)).to be
+          expect(o3.data).to eq o.data
+        end
+
+        it "doesn't delete objects in other buckets'" do
+          expect{ untyped_object.reload }.to_not raise_error
+
+          expect(o = bucket.get(object.key)).to be
+          o.delete
+
+          expect{ untyped_object.reload }.to_not raise_error
+        end
+      end
+
       it 'only retrieves with a bucket type' do
         expect(bucket.get(object.key).data).to eq object.data
         expect{ untyped_bucket.get object.key }.to raise_error /not_found/
@@ -59,10 +84,15 @@ describe 'Bucket Types', test_client: true, integration: true do
         expect(bucket.keys).to include object.key
       end
 
+      it 'keeps the bucket type attached to value objects' do
+        expect(bucket.get(object.key).bucket).to eq bucket
+        expect(bucket.get(object.key).bucket.type).to eq bucket_type
+      end
+
       describe 'deletion' do
         it 'self-deletes with a bucket type' do
           expect(untyped_object).to be # ensure existence
-          
+
           expect(object.delete).to be
           expect{ object.reload }.to raise_error /not_found/
           expect(untyped_object).to be
@@ -116,7 +146,7 @@ describe 'Bucket Types', test_client: true, integration: true do
         it 'map-reduces correctly with a robject in a typed bucket' do
           expect(object).to be
           expect(untyped_object).to be
-          
+
           mapred.add object
           result = mapred.run
 
@@ -130,11 +160,11 @@ describe 'Bucket Types', test_client: true, integration: true do
       let(:bucket_type){ test_client.bucket_type 'yokozuna' }
       let(:bucket){ bucket_type.bucket random_key }
       let(:untyped_bucket){ test_client.bucket bucket.name }
-      
+
       it 'allows reading and writing bucket properties' do
         expect(test_client.get_bucket_props(bucket, type: 'yokozuna')['last_write_wins']).to_not be
         expect(test_client.get_bucket_props(untyped_bucket)['last_write_wins']).to_not be
-        
+
         # test setting
         expect{ bucket.props = {'last_write_wins' => true} }.to_not raise_error
 
@@ -152,7 +182,7 @@ describe 'Bucket Types', test_client: true, integration: true do
         # test clearing
         expect{ bucket.clear_props }.to_not raise_error
 
-        # make sure clearing doesn't leak to canary setting on untyped bucket 
+        # make sure clearing doesn't leak to canary setting on untyped bucket
         expect(test_client.get_bucket_props(bucket, type: 'yokozuna')['last_write_wins']).to_not be
         expect(test_client.get_bucket_props(untyped_bucket)['n_val']).to eq 1
       end

data/spec/integration/riak/conflict_resolution_spec.rb

@@ -57,7 +57,7 @@ describe 'Conflict resolution', integration: true, test_client: true do
 
       subject.attempt_conflict_resolution
       subject.reload
-      
+
       expect(subject).to_not be_conflict
       expect(subject.data).to eq 100
 

data/spec/integration/riak/counters_spec.rb

@@ -23,7 +23,7 @@ describe Riak::Counter, test_client: true, integration: true do
 
     5.times do
       amt = rand(10_000)
-      
+
       @counter.increment amt
       expect(@counter.value).to eq(initial + amt)
 

data/spec/integration/riak/crdt/configuration_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+require 'riak'
+
+describe "CRDT configuration", integration: true, test_client: true do
+  let(:bucket) { random_bucket }
+
+  it "allows default bucket-types to be configured for each data type" do
+    expect(Riak::Crdt::Set.new(bucket, 'set').bucket_type).to eq 'sets'
+
+    Riak::Crdt::DEFAULT_BUCKET_TYPES[:set] = 'new_set_default'
+    expect(Riak::Crdt::Set.new(bucket, 'set').bucket_type).to eq 'new_set_default'
+
+    Riak::Crdt::DEFAULT_BUCKET_TYPES[:set] = 'sets'
+    expect(Riak::Crdt::Set.new(bucket, 'set').bucket_type).to eq 'sets'
+  end
+
+  describe 'overriding bucket-types' do
+    let(:name){ 'other_counters' }
+    let(:type){ test_client.bucket_type name }
+    let(:typed_bucket){ type.bucket bucket.name }
+
+    it "overrides with a string" do
+      ctr = Riak::Crdt::Counter.new(bucket, 'ctr', name)
+      expect(ctr.bucket_type).to eq name
+    end
+
+    it "overrides with a typed bucket" do
+      ctr = Riak::Crdt::Counter.new(typed_bucket, 'ctr')
+      expect(ctr.bucket_type).to eq name
+    end
+
+    it "overrides with a bucket type object" do
+      ctr = Riak::Crdt::Counter.new(bucket, 'ctr', type)
+      expect(ctr.bucket_type).to eq name
+    end
+  end
+end

data/spec/integration/riak/crdt_search_spec.rb

@@ -0,0 +1,176 @@
+require 'spec_helper'
+require 'riak/search'
+
+describe 'CRDT Search API', crdt_search_config: true do
+  describe 'querying maps' do
+    let(:query) { index.query 'arroz_register:frijoles' }
+
+    before(:all) do
+      expect(first_map).to be
+    end
+
+    subject{ query.results }
+
+    it 'finds maps' do
+      expect(subject.length).to be > 0
+    end
+
+    it 'provides access to maps through the #map accessor' do
+      expect(subject.maps.first).to eq first_map
+      expect(subject.docs.first.map).to eq first_map
+    end
+
+    it 'provides access to maps through the #crdt accessor' do
+      expect(subject.crdts.first).to eq first_map
+      expect(subject.docs.first.crdt).to eq first_map
+    end
+
+    it 'provides access to maps through the #object accessor' do
+      expect(subject.first).to eq first_map
+      expect(subject.docs.first.object).to eq first_map
+    end
+
+    it 'raises errors on the set, counter, and robject accessors' do
+      expect{ subject.docs.first.robject }.
+        to raise_error Riak::SearchError::UnexpectedResultError
+      expect{ subject.docs.first.counter }.
+        to raise_error Riak::CrdtError::UnexpectedDataType
+      expect{ subject.docs.first.set }.
+        to raise_error Riak::CrdtError::UnexpectedDataType
+    end
+  end
+
+  describe 'querying sets' do
+    let(:query) { index.query 'set:frijoles' }
+
+    before(:all) do
+      expect(first_set).to be
+    end
+
+    subject{ query.results }
+
+    it 'finds sets' do
+      expect(subject.length).to be > 0
+    end
+
+    it 'provides access to sets through the #set accessor' do
+      expect(subject.sets.first).to eq first_set
+      expect(subject.docs.first.set).to eq first_set
+    end
+
+    it 'provides access to sets through the #object accessor' do
+      expect(subject.first).to eq first_set
+      expect(subject.docs.first.object).to eq first_set
+    end
+
+    it 'raises errors on the counter, map, and robject accessors' do
+      expect{ subject.docs.first.robject }.
+        to raise_error Riak::SearchError::UnexpectedResultError
+      expect{ subject.docs.first.counter }.
+        to raise_error Riak::CrdtError::UnexpectedDataType
+      expect{ subject.docs.first.map }.
+        to raise_error Riak::CrdtError::UnexpectedDataType
+    end
+  end
+
+  describe 'querying counters' do
+    let(:query) { index.query 'counter:83475' }
+
+    before(:all) do
+      expect(first_counter).to be
+    end
+
+    subject{ query.results }
+
+    it 'finds counters' do
+      expect(subject.length).to be > 0
+    end
+
+    it 'provides access to counters through the #counter accessor' do
+      expect(subject.counters.first).to eq first_counter
+      expect(subject.docs.first.counter).to eq first_counter
+    end
+
+    it 'provides access to counters through the #object accessor' do
+      expect(subject.first).to eq first_counter
+      expect(subject.docs.first.object).to eq first_counter
+    end
+
+    it 'raises errors on the counter, map, and robject accessors' do
+      expect{ subject.docs.first.robject }.
+        to raise_error Riak::SearchError::UnexpectedResultError
+      expect{ subject.docs.first.set }.
+        to raise_error Riak::CrdtError::UnexpectedDataType
+      expect{ subject.docs.first.map }.
+        to raise_error Riak::CrdtError::UnexpectedDataType
+    end
+  end
+
+  describe 'querying multiple kinds of CRDT' do
+    let(:query) do
+      index.query 'arroz_register:frijoles OR set:frijoles OR counter:83475'
+    end
+    subject{ query.results }
+
+    before(:all) do
+      expect(first_counter).to be
+      expect(first_map).to be
+      expect(first_set).to be
+    end
+
+    it 'finds CRDTs' do
+      expect(subject.length).to be >= 3
+    end
+
+    it 'provides access through appropriate accessors' do
+      expect(subject.counters.first).to eq first_counter
+      expect(subject.maps.first).to eq first_map
+      expect(subject.sets.first).to eq first_set
+      expect(subject.crdts).to include first_counter
+      expect(subject.crdts).to include first_map
+      expect(subject.crdts).to include first_set
+    end
+
+    it 'allows looping through each object' do
+      # I worry that this may be order-dependent and occasionally fail
+      expect{ |b| subject.crdts.each &b }.
+        to yield_successive_args(first_counter, first_map, first_set)
+    end
+
+    it 'allows looping through each kind of object' do
+      expect{ |b| subject.counters.each &b }.to yield_with_args(first_counter)
+      expect{ |b| subject.maps.each &b }.to yield_with_args(first_map)
+      expect{ |b| subject.sets.each &b }.to yield_with_args(first_set)
+    end
+  end
+
+  describe 'querying both CRDTs and RObjects' do
+    let(:query) do
+      index.query 'arroz_register:frijoles OR set:frijoles OR counter:83475 OR "bitcask"'
+    end
+    subject{ query.results }
+
+    before(:all) do
+      load_corpus
+      expect(first_counter).to be
+      expect(first_map).to be
+      expect(first_set).to be
+    end
+
+    let(:first_robject){ subject.robjects.first }
+
+    it 'finds CRDTs and RObjects' do
+      expect(subject.objects).to include first_counter
+      expect(subject.objects).to include first_map
+      expect(subject.objects).to include first_set
+      expect(subject.objects).to include first_robject
+    end
+
+    it 'provides access through appropriate accessors' do
+      expect(subject.crdts).to_not include first_robject
+      expect(subject.robjects).to_not include first_counter
+      expect(subject.robjects).to_not include first_map
+      expect(subject.robjects).to_not include first_set
+    end
+  end
+end

data/spec/integration/riak/crdt_spec.rb

@@ -4,39 +4,6 @@ require 'riak'
 describe "CRDTs", integration: true, test_client: true do
   let(:bucket) { random_bucket }
 
-  describe 'configuration' do
-    it "allows default bucket-types to be configured for each data type" do
-      expect(Riak::Crdt::Set.new(bucket, 'set').bucket_type).to eq 'sets'
-
-      Riak::Crdt::DEFAULT_BUCKET_TYPES[:set] = 'new_set_default'
-      expect(Riak::Crdt::Set.new(bucket, 'set').bucket_type).to eq 'new_set_default'
-
-      Riak::Crdt::DEFAULT_BUCKET_TYPES[:set] = 'sets'
-      expect(Riak::Crdt::Set.new(bucket, 'set').bucket_type).to eq 'sets'
-    end
-
-    describe 'overriding bucket-types' do
-      let(:name){ 'other_counters' }
-      let(:type){ test_client.bucket_type name }
-      let(:typed_bucket){ type.bucket bucket.name }
-
-      it "overrides with a string" do
-        ctr = Riak::Crdt::Counter.new(bucket, 'ctr', name)
-        expect(ctr.bucket_type).to eq name
-      end
-
-      it "overrides with a typed bucket" do
-        ctr = Riak::Crdt::Counter.new(typed_bucket, 'ctr')
-        expect(ctr.bucket_type).to eq name
-      end
-
-      it "overrides with a bucket type object" do
-        ctr = Riak::Crdt::Counter.new(bucket, 'ctr', type)
-        expect(ctr.bucket_type).to eq name
-      end
-    end
-  end
-
   describe 'Riak-assigned names' do
     describe 'an anonymous counter' do
       subject { Riak::Crdt::Counter.new bucket, nil }
@@ -105,6 +72,15 @@ describe "CRDTs", integration: true, test_client: true do
       expect(subject.dirty?).to_not be
       expect(subject.value).to eq(start + 10 + 1)
     end
+
+    describe 'equality' do
+      let(:same){ Riak::Crdt::Counter.new subject.bucket, subject.key }
+      let(:same_bucket){ Riak::Bucket.new test_client, bucket.name }
+      let(:similar){ Riak::Crdt::Counter.new same_bucket, subject.key }
+      it { is_expected.to eq subject }
+      it { is_expected.to eq same }
+      it { is_expected.to eq similar }
+    end
   end
   describe 'sets' do
 

data/spec/integration/riak/crdt_validation/map_spec.rb

@@ -22,7 +22,7 @@ describe 'CRDT map validation', integration: true, test_client: true do
     end.to_not raise_error
 
     map2 = Riak::Crdt::Map.new bucket, map.key
-    
+
     expect(map2.sets['set'].members).to eq ::Set.new(['Z'])
   end
 
@@ -30,7 +30,7 @@ describe 'CRDT map validation', integration: true, test_client: true do
     map.counters['counter'].increment 5
 
     map.reload
-    
+
     expect(map.counters['counter'].value).to eq 5
 
     map.batch do |m|
@@ -50,13 +50,13 @@ describe 'CRDT map validation', integration: true, test_client: true do
     end
 
     map.reload
-    expect(map.maps['map'].sets['set'].members).to eq ::Set.new(['X', 'Y'])
+    expect(map.maps['map'].sets['set'].members).to eq ::Set.new(%w(X Y))
 
     map.batch do |m|
       m.maps.delete 'map'
       m.maps['map'].sets['set'].add "Z"
     end
-    
+
     map2 = Riak::Crdt::Map.new bucket, map.key
     expect(map2.maps['map'].sets['set'].members).to eq ::Set.new(['Z'])
   end

data/spec/integration/riak/crdt_validation/set_spec.rb

@@ -4,7 +4,7 @@ require 'riak'
 describe 'CRDT set validation', integration: true, test_client: true do
   let(:bucket){ random_bucket 'crdt_validation' }
   let(:set){ Riak::Crdt::Set.new bucket, random_key }
-  
+
   it 'removes recently-added set entries during batch mode' do
     expect do
       set.batch do |s|
@@ -15,17 +15,17 @@ describe 'CRDT set validation', integration: true, test_client: true do
       end
     end.to raise_error Riak::CrdtError::SetRemovalWithoutContextError
   end
-  
+
   it 'removes non-members with context' do
     set.batch do |s|
       s.add 'X'
       s.add 'Y'
     end
-    
+
     set.reload
-    
+
     expect{ set.remove 'bogus' }.to_not raise_error
-    
+
     set2 = Riak::Crdt::Set.new bucket, set.key
     expect(set2.members).to eq ::Set.new(%w{X Y})
   end
@@ -35,9 +35,9 @@ describe 'CRDT set validation', integration: true, test_client: true do
       s.add 'X'
       s.add 'Y'
     end
-    
+
     set.reload
-    
+
     expect{ set.add 'X' }.to_not raise_error
 
     set2 = Riak::Crdt::Set.new bucket, set.key
@@ -90,14 +90,14 @@ describe 'CRDT set validation', integration: true, test_client: true do
         s.add 'X'
         s.add 'Y'
       end
-      
+
       set_parallel = Riak::Crdt::Set.new bucket, set.key
       set_parallel.add 'Z'
-      
+
       set.reload
-      
+
       expect{ set.remove 'Z' }.to_not raise_error
-      
+
       set2 = Riak::Crdt::Set.new bucket, set.key
       expect(set2.members).to eq ::Set.new(%w{X Y})
     end
@@ -107,9 +107,9 @@ describe 'CRDT set validation', integration: true, test_client: true do
         s.add 'X'
         s.add 'Y'
       end
-      
+
       set.reload
-      
+
       set_parallel = Riak::Crdt::Set.new bucket, set.key
       set_parallel.add 'Z'