riak-client 2.2.0.pre1 → 2.2.0

data/spec/integration/riak/preflist_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+require 'riak'
+
+describe 'Preflist', integration: true, test_client: true do
+  let(:bucket){ random_bucket }
+  let(:robject) do
+    bucket.get_or_new(random_key).tap do |robj|
+      robj.data = 'asdf'
+      robj.store
+    end
+  end
+
+  matcher :be_a_preflist do
+    match do |actual|
+      actual.is_a?(Array) &&
+      actual.first.is_a?(Riak::PreflistItem)
+    end
+  end
+
+  it 'is available from RObjects' do
+    expect(robject.preflist).to be_a_preflist
+  end
+
+  it 'is available from Buckets' do
+    expect(bucket.get_preflist robject.key).to be_a_preflist
+  end
+
+  it 'is available from the Client' do
+    expect(test_client.get_preflist bucket.name, robject.key).to be_a_preflist
+  end
+end

data/spec/integration/riak/protobuffs/interrupted_request_spec.rb

@@ -5,7 +5,7 @@ describe 'Protocol Buffers', test_client: true do
   describe 'interrupted requests' do
 
     let(:bucket){ random_bucket 'interrupted_requests' }
-    
+
     before do
       first = bucket.new 'first'
       first.data = 'first'
@@ -28,6 +28,6 @@ describe 'Protocol Buffers', test_client: true do
       end.to raise_error Timeout::Error
 
       expect(bucket.get('second').data).to eq 'second'
-    end    
+    end
   end
 end

data/spec/integration/riak/protobuffs_backends_spec.rb

@@ -21,9 +21,16 @@ describe "Protocol Buffers", test_client: true do
 
           it 'returns documents with UTF-8 fields (GH #75)' do
             utf8 = Encoding.find('UTF-8')
-            results = @backend.search @search_bucket.name, 'fearless elephant rushed', df: 'text'
+            results = @backend.search(
+              @search_bucket.name,
+              'fearless elephant rushed',
+              df: 'text'
+            )
             results['docs'].each do |d|
-              d.each {|(k,v)| expect(k.encoding).to eq(utf8); expect(v.encoding).to eq(utf8) }
+              d.each do |(k, v)|
+                expect(k.encoding).to eq(utf8)
+                expect(v.encoding).to eq(utf8)
+              end
             end
           end
         end

data/spec/integration/riak/search_spec.rb

@@ -17,7 +17,7 @@ describe 'Object-oriented Search API', test_client: true, integration: true, sea
     it 'performs queries' do
       results = nil
       expect{ results = subject.results }.to_not raise_error
-      expect(results.raw).to_not be_empty 
+      expect(results.raw).to_not be_empty
       expect(results).to_not be_empty
     end
 
@@ -34,7 +34,7 @@ describe 'Object-oriented Search API', test_client: true, integration: true, sea
     let(:index){ Riak::Search::Index.new test_client, index_name }
     let(:query){ Riak::Search::Query.new test_client, index, term }
     subject { query.results }
-    
+
     it 'exposes search-result documents' do
       expect(subject).to_not be_empty
 
@@ -50,7 +50,7 @@ describe 'Object-oriented Search API', test_client: true, integration: true, sea
 
     it 'exposes RObjects' do
       expect(subject).to_not be_empty
-      
+
       expect(first = subject.first).to be_a Riak::RObject
       expect(first).to eq subject.docs.first.robject
 

data/spec/integration/riak/secondary_index_spec.rb

@@ -18,7 +18,7 @@ describe 'Secondary indexes', test_client: true, integration: true do
   end
 
   it "finds keys for a range query" do
-    expect(bucket.get_index('index_int', 19..21)).to match_array(["19","20", "21"])
+    expect(bucket.get_index('index_int', 19..21)).to match_array(%w(19 20 21))
   end
 
   it "returns an empty array for a query that does not match any keys" do
@@ -29,7 +29,7 @@ describe 'Secondary indexes', test_client: true, integration: true do
     results = nil
     expect do
       results = bucket.get_index('index_int',
-                                 19..21, 
+                                 19..21,
                                  return_terms: true)
     end.to_not raise_error
 
@@ -41,7 +41,7 @@ describe 'Secondary indexes', test_client: true, integration: true do
     results = nil
     expect do
       results = bucket.get_index('index_bin',
-                                 '19'..'21', 
+                                 '19'..'21',
                                  return_terms: true,
                                  term_regex: '20')
     end.to_not raise_error

data/spec/integration/riak/security_spec.rb

@@ -17,7 +17,7 @@ describe 'Secure Protobuffs', test_client: true, integration: true do
       with_auth_config[:authentication] = { user: 'user', password: 'password' }
 
       secure_client = Riak::Client.new with_auth_config
-      
+
       expect{ secure_client.ping }.to raise_error(Riak::TlsError)
     end
   end
@@ -59,13 +59,13 @@ describe 'Secure Protobuffs', test_client: true, integration: true do
     it "refuses to connect if the server cert is revoked" do
       revoked_auth_config = config.dup
       revoked_auth_config[:authentication] = revoked_auth_config[:authentication].dup
-      
+
       revoked_auth_config[:authentication][:crl_file] =
-        File.expand_path(File.join('..', 
-                                   '..', 
+        File.expand_path(File.join('..',
+                                   '..',
                                    '..',
-                                   'support', 
-                                   'certs', 
+                                   'support',
+                                   'certs',
                                    'server.crl'),
                          __FILE__)
       revoked_auth_config[:authentication][:crl] = true
@@ -81,7 +81,7 @@ describe 'Secure Protobuffs', test_client: true, integration: true do
   describe 'with client certificate security enabled on Riak', yes_security: true do
     it 'connects normally with authentication configured' do
       client_cert_config = config.dup
-      client_cert_config[:authentication] = 
+      client_cert_config[:authentication] =
         client_cert_config[:authentication].dup
 
       client_cert_config[:authentication][:client_ca] = client_cert_config[:authentication]['ca_file']

data/spec/integration/yokozuna/queries_spec.rb

@@ -22,7 +22,7 @@ describe "Yokozuna queries", test_client: true, integration: true do
       end
 
       @o1 = build_json_obj(@bucket, "cat", {"cat_s"=>"Lela"})
-      @o2 = build_json_obj(@bucket, "docs", {"dog_ss"=>["Einstein", "Olive"]})
+      @o2 = build_json_obj(@bucket, "docs", {"dog_ss"=>%w(Einstein Olive)})
       build_json_obj(@bucket, "Z", {"username_s"=>"Z", "name_s"=>"ryan", "age_i"=>30})
       build_json_obj(@bucket, "R", {"username_s"=>"R", "name_s"=>"eric", "age_i"=>34})
       build_json_obj(@bucket, "F", {"username_s"=>"F", "name_s"=>"bryan fink", "age_i"=>32})

data/spec/riak/beefcake_protobuffs_backend/bucket_properties_operator_spec.rb

@@ -4,7 +4,7 @@ Riak::Client::BeefcakeProtobuffsBackend.configured?
 describe Riak::Client::BeefcakeProtobuffsBackend::BucketPropertiesOperator do
   let(:backend_class){ Riak::Client::BeefcakeProtobuffsBackend }
   let(:backend) { instance_double('Riak::Client::BeefcakeProtobuffsBackend') }
-  
+
   let(:protocol) do
     instance_double('Riak::Client::BeefcakeProtobuffsBackend::Protocol').
       tap do |p|
@@ -50,16 +50,16 @@ describe Riak::Client::BeefcakeProtobuffsBackend::BucketPropertiesOperator do
   let(:get_bucket_request) do
     backend_class::RpbGetBucketReq.new bucket: bucket_name
   end
-  
+
   let(:get_bucket_response) do
     backend_class::RpbGetBucketResp.
       new(props: test_props)
   end
 
-  let(:get_bucket_expectation) do    
+  let(:get_bucket_expectation) do
     expect(protocol).to receive(:write).
       with(:GetBucketReq, get_bucket_request)
-    
+
     expect(protocol).to receive(:expect).
       with(:GetBucketResp,
            backend_class::RpbGetBucketResp).
@@ -118,11 +118,11 @@ describe Riak::Client::BeefcakeProtobuffsBackend::BucketPropertiesOperator do
         with(:SetBucketResp)
 
       # support both strings and symbols for quorum names
-      write_props = { 
+      write_props = {
         pr: 'one',
         r: :quorum,
         w: 'all',
-        pw: :default, 
+        pw: :default,
         dw: 0,
         rw: 1
       }
@@ -135,7 +135,7 @@ describe Riak::Client::BeefcakeProtobuffsBackend::BucketPropertiesOperator do
     it 'rubyfies' do
       expect(protocol).to receive(:write).
         with(:GetBucketReq, get_bucket_request)
-      
+
       expect(protocol).to receive(:expect).
         with(:GetBucketResp,
              backend_class::RpbGetBucketResp).
@@ -175,7 +175,7 @@ describe Riak::Client::BeefcakeProtobuffsBackend::BucketPropertiesOperator do
       expect(protocol).to receive(:expect).
         with(:SetBucketResp)
 
-      write_props = { 
+      write_props = {
         precommit: { mod: 'validate_json', fun: 'validate' },
         postcommit: ['piper']
       }
@@ -216,7 +216,7 @@ describe Riak::Client::BeefcakeProtobuffsBackend::BucketPropertiesOperator do
       expect(protocol).to receive(:expect).
         with(:SetBucketResp)
 
-      write_props = { 
+      write_props = {
         linkfun: { mod: 'nachos', fun: 'galacticos' }
       }
 

data/spec/riak/beefcake_protobuffs_backend/crdt_operator_spec.rb

@@ -7,7 +7,7 @@ describe Riak::Client::BeefcakeProtobuffsBackend::CrdtOperator do
   let(:backend){ double 'beefcake protobuffs backend' }
   subject { described_class.new backend }
 
-  
+
   describe 'operating on a counter' do
     let(:increment){ 5 }
     let(:operation) do
@@ -16,10 +16,10 @@ describe Riak::Client::BeefcakeProtobuffsBackend::CrdtOperator do
         op.value = increment
       end
     end
-    
+
     it 'serializes a counter operation into protobuffs' do
       result = subject.serialize operation
-      
+
       expect(result).to be_a backend_class::DtOp
       expect(result.counter_op).to be_a backend_class::CounterOp
       expect(result.counter_op.increment).to eq increment
@@ -29,7 +29,7 @@ describe Riak::Client::BeefcakeProtobuffsBackend::CrdtOperator do
       result = subject.serialize [operation, operation]
 
       expect{result.encode}.to_not raise_error
-      
+
       expect(result).to be_a backend_class::DtOp
       expect(result.counter_op).to be_a backend_class::CounterOp
       expect(result.counter_op.increment).to eq (increment * 2)
@@ -53,7 +53,7 @@ describe Riak::Client::BeefcakeProtobuffsBackend::CrdtOperator do
       result = subject.serialize operation
 
       expect{result.encode}.to_not raise_error
-      
+
       expect(result).to be_a backend_class::DtOp
       expect(result.set_op).to be_a backend_class::SetOp
       expect(result.set_op.adds).to eq [added_element]
@@ -74,7 +74,7 @@ describe Riak::Client::BeefcakeProtobuffsBackend::CrdtOperator do
       end
 
       result = subject.serialize map_op
-      
+
       expect{result.encode}.to_not raise_error
 
       expect(result).to be_a backend_class::DtOp
@@ -84,7 +84,7 @@ describe Riak::Client::BeefcakeProtobuffsBackend::CrdtOperator do
       expect(map_update.counter_op).to be_a backend_class::CounterOp
       expect(map_update.counter_op.increment).to eq 12345
     end
-    
+
     it 'serializes inner flag operations' do
       flag_op = Riak::Crdt::Operation::Update.new.tap do |op|
         op.name = 'inner_flag'
@@ -168,7 +168,7 @@ describe Riak::Client::BeefcakeProtobuffsBackend::CrdtOperator do
       expect(map_delete.name).to eq 'inner_register'
       expect(map_delete.type).to eq backend_class::MapField::MapFieldType::REGISTER
     end
-    
+
     it 'serializes inner set operations' do
       set_op = Riak::Crdt::Operation::Update.new.tap do |op|
         op.name = 'inner_set'
@@ -190,7 +190,7 @@ describe Riak::Client::BeefcakeProtobuffsBackend::CrdtOperator do
       expect(map_update).to be_a backend_class::MapUpdate
       expect(map_update.set_op.adds).to eq 'added_member'
     end
-    
+
     it 'serializes inner map operations' do
       register_op = Riak::Crdt::Operation::Update.new.tap do |op|
         op.name = 'inner_inner_register'

data/spec/riak/beefcake_protobuffs_backend/protocol_spec.rb

@@ -84,7 +84,7 @@ describe Riak::Client::BeefcakeProtobuffsBackend::Protocol do
         and_return(message_str)
 
       code, payload = subject.receive
-      
+
       expect(code).to eq name
       expect(payload).to eq message_str
     end
@@ -111,7 +111,7 @@ describe Riak::Client::BeefcakeProtobuffsBackend::Protocol do
         message_len = message_str.length
         name = :CounterGetResp
         header = [message_len + 1, codes.index(name)].pack 'NC'
-        
+
         expect(socket).to receive(:read).
           ordered.
           with(5).
@@ -120,7 +120,7 @@ describe Riak::Client::BeefcakeProtobuffsBackend::Protocol do
           ordered.
           with(message_len).
           and_return(message_str)
-        
+
         payload = subject.expect name, message.class
 
         expect(payload).to eq message
@@ -149,7 +149,7 @@ describe Riak::Client::BeefcakeProtobuffsBackend::Protocol do
         message_len = message_str.length
         name = :CounterGetResp
         header = [message_len + 1, codes.index(name)].pack 'NC'
-        
+
         expect(socket).to receive(:read).
           ordered.
           with(5).
@@ -171,7 +171,7 @@ describe Riak::Client::BeefcakeProtobuffsBackend::Protocol do
         message_len = message_str.length
         name = :ErrorResp
         header = [message_len + 1, codes.index(name)].pack 'NC'
-        
+
         expect(socket).to receive(:read).
           ordered.
           with(5).

data/spec/riak/beefcake_protobuffs_backend_spec.rb

@@ -28,13 +28,13 @@ describe Riak::Client::BeefcakeProtobuffsBackend do
                           errcode: 0)
                       )
                   )
-      
+
       expect{ backend.get_index 'bucket', 'words', 'asdf' }.to raise_error /Secondary indexes aren't supported/
       # '
     end
-    
+
     context 'when streaming' do
-      it "streams when a block is given" do 
+      it "streams when a block is given" do
         expect(protocol).to receive(:write) do |msg, req|
           expect(msg).to eq(:IndexReq)
           expect(req[:stream]).to eq(true)
@@ -43,15 +43,15 @@ describe Riak::Client::BeefcakeProtobuffsBackend do
           and_return(Riak::Client::BeefcakeProtobuffsBackend::RpbIndexResp.new keys: %w{'asdf'}, done: true)
 
         blk = proc{:asdf}
-        
+
         backend.get_index('bucket', 'words', 'asdf'..'hjkl', &blk)
       end
 
       it "sends batches of results to the block" do
         expect(protocol).to receive(:write)
-        
+
         response_sets = [%w{asdf asdg asdh}, %w{gggg gggh gggi}]
-        response_messages = response_sets.map do |s| 
+        response_messages = response_sets.map do |s|
           Riak::Client::BeefcakeProtobuffsBackend::RpbIndexResp.new keys: s
         end
         response_messages.last.done = true
@@ -61,7 +61,7 @@ describe Riak::Client::BeefcakeProtobuffsBackend do
         block_body = double 'block'
         expect(block_body).to receive(:check).with(response_sets.first).once
         expect(block_body).to receive(:check).with(response_sets.last).once
-        
+
         blk = proc {|m| block_body.check m }
 
         backend.get_index 'bucket', 'words', 'asdf'..'hjkl', &blk
@@ -80,7 +80,7 @@ describe Riak::Client::BeefcakeProtobuffsBackend do
                          )
       expect(protocol).to receive(:expect).
         and_return(response_message)
-      
+
       results = backend.get_index 'bucket', 'words', 'asdf'..'hjkl'
       expect(results).to eq(%w{asdf asdg asdh})
     end

data/spec/riak/bucket_properties_spec.rb

@@ -8,10 +8,12 @@ describe Riak::BucketProperties do
       allow(client).to receive(:backend).and_yield be
     end
   end
-  
+
   let(:props_operator) do
-    instance_double('Riak::Client::BeefcakeProtobuffsBackend::BucketPropertiesOperator').
-      tap do |po|
+    Riak::Client::BeefcakeProtobuffsBackend.configured?
+    instance_double(
+      'Riak::Client::BeefcakeProtobuffsBackend::BucketPropertiesOperator'
+    ).tap do |po|
       allow(backend).to receive(:bucket_properties_operator).
         and_return(po)
     end
@@ -30,6 +32,15 @@ describe Riak::BucketProperties do
     end
   end
 
+  let(:index_name){ 'index_name' }
+
+  let(:index) do
+    instance_double('Riak::Search::Index').tap do |i|
+      allow(i).to receive(:name).and_return(index_name)
+      allow(i).to receive(:is_a?).with(Riak::Search::Index).and_return(true)
+    end
+  end
+
   subject{ described_class.new bucket }
 
   it 'is initialized with a bucket' do
@@ -61,6 +72,16 @@ describe Riak::BucketProperties do
     subject.store
   end
 
+  it 'unwraps index objects into names' do
+    expect(props_operator).to receive(:get).
+      with(bucket).
+      and_return('allow_mult' => true)
+
+    expect{ subject['search_index'] = index }.to_not raise_error
+
+    expect(subject['search_index']).to eq index_name
+  end
+
   it 'merges properties from hashes' do
     expect(props_operator).to receive(:get).
       with(bucket).
@@ -70,7 +91,7 @@ describe Riak::BucketProperties do
 
     property_hash = { 'allow_mult' => false }
     expect{ subject.merge! property_hash }.to_not raise_error
-    
+
     expect(props_operator).to receive(:put).
       with(bucket, hash_including('allow_mult' => false))
 
@@ -89,7 +110,7 @@ describe Riak::BucketProperties do
       instance_variable_set :@cached_props, { 'allow_mult' => false}
 
     expect{ subject.merge! other_props }.to_not raise_error
-    
+
     expect(props_operator).to receive(:put).
       with(bucket, hash_including('allow_mult' => false))
 
@@ -100,7 +121,7 @@ describe Riak::BucketProperties do
     expect(props_operator).to receive(:get).
       with(bucket).
       and_return('allow_mult' => true)
-    
+
     expect(subject['allow_mult']).to be
 
     expect(props_operator).to receive(:get).