riak-client 2.0.0 → 2.1.0

data/spec/riak/search_spec.rb

@@ -10,17 +10,17 @@ describe "Search features" do
     end
 
     describe "searching" do
-      it "should search the default index" do
+      it "searches the default index" do
         expect(@pb).to receive(:search).with(nil, "foo", {}).and_return({})
         @client.search("foo")
       end
 
-      it "should search the default index with additional options" do
+      it "searches the default index with additional options" do
         expect(@pb).to receive(:search).with(nil, 'foo', 'rows' => 30).and_return({})
         @client.search("foo", 'rows' => 30)
       end
 
-      it "should search the specified index" do
+      it "searches the specified index" do
         expect(@pb).to receive(:search).with('search', 'foo', {}).and_return({})
         @client.search("search", "foo")
       end
@@ -41,7 +41,7 @@ describe "Search features" do
       @bucket.instance_variable_set(:@props, {"precommit" => [{"mod" => "riak_search_kv_hook", "fun" => "precommit"}], "search" => true})
     end
 
-    it "should detect whether the indexing hook is installed" do
+    it "detects whether the indexing hook is installed" do
       load_without_index_hook
       expect(@bucket.is_indexed?).to be_falsey
 
@@ -50,13 +50,13 @@ describe "Search features" do
     end
 
     describe "enabling indexing" do
-      it "should add the index hook when not present" do
+      it "adds the index hook when not present" do
         load_without_index_hook
         expect(@bucket).to receive(:props=).with({"precommit" => [Riak::Bucket::SEARCH_PRECOMMIT_HOOK], "search" => true})
         @bucket.enable_index!
       end
 
-      it "should not modify the precommit when the hook is present" do
+      it "doesn't modify the precommit when the hook is present" do
         load_with_index_hook
         expect(@bucket).not_to receive(:props=)
         @bucket.enable_index!
@@ -64,13 +64,13 @@ describe "Search features" do
     end
 
     describe "disabling indexing" do
-      it "should remove the index hook when present" do
+      it "removes the index hook when present" do
         load_with_index_hook
         expect(@bucket).to receive(:props=).with({"precommit" => [], "search" => false})
         @bucket.disable_index!
       end
 
-      it "should not modify the precommit when the hook is missing" do
+      it "doesn't modify the precommit when the hook is missing" do
         load_without_index_hook
         expect(@bucket).not_to receive(:props=)
         @bucket.disable_index!
@@ -85,17 +85,17 @@ describe "Search features" do
     end
 
     describe "using a search query as inputs" do
-      it "should accept a bucket name and query" do
+      it "accepts a bucket name and query" do
         @mr.search("foo", "bar OR baz")
         expect(@mr.inputs).to eq({:module => "riak_search", :function => "mapred_search", :arg => ["foo", "bar OR baz"]})
       end
 
-      it "should accept a Riak::Bucket and query" do
+      it "accepts a Riak::Bucket and query" do
         @mr.search(Riak::Bucket.new(@client, "foo"), "bar OR baz")
         expect(@mr.inputs).to eq({:module => "riak_search", :function => "mapred_search", :arg => ["foo", "bar OR baz"]})
       end
 
-      it "should emit the Erlang function and arguments" do
+      it "emits the Erlang function and arguments" do
         @mr.search("foo", "bar OR baz")
         expect(@mr.to_json).to include('"inputs":{')
         expect(@mr.to_json).to include('"module":"riak_search"')

data/spec/riak/secondary_index_spec.rb

@@ -7,12 +7,12 @@ describe Riak::SecondaryIndex do
   end
 
   describe "initialization" do
-    it "should accept a bucket, index name, and scalar" do
+    it "accepts a bucket, index name, and scalar" do
       expect { Riak::SecondaryIndex.new @bucket, 'asdf', 'aaaa' }.not_to raise_error
       expect { Riak::SecondaryIndex.new @bucket, 'asdf', 12345 }.not_to raise_error
     end
 
-    it "should accept a bucket, index name, and a range" do
+    it "accepts a bucket, index name, and a range" do
       expect { Riak::SecondaryIndex.new @bucket, 'asdf', 'aaaa'..'zzzz' }.not_to raise_error
       expect { Riak::SecondaryIndex.new @bucket, 'asdf', 1..5 }.not_to raise_error
     end
@@ -28,12 +28,12 @@ describe Riak::SecondaryIndex do
       expect(@backend).to receive(:get_index).with(*@args).and_return(%w{abcd efgh})
     end
 
-    it "should return an array of keys" do
+    it "returns an array of keys" do
       @results = @index.keys
       expect(@results).to be_a Array
       expect(@results.first).to be_a String
     end
-    it "should return an array of values" do
+    it "returns an array of values" do
       expect(@backend).to receive(:fetch_object).with(@bucket, 'abcd', {}).and_return('abcd')
       expect(@backend).to receive(:fetch_object).with(@bucket, 'efgh', {}).and_return('efgh')
 
@@ -44,7 +44,7 @@ describe Riak::SecondaryIndex do
   end
 
   describe "streaming" do
-    it "should stream keys into a block" do
+    it "streams keys into a block" do
       @backend = double 'Backend'
       allow(@client).to receive(:backend).and_yield(@backend)
       @args = [@bucket, 'asdf', 'aaaa'..'zzzz', {stream: true}]
@@ -57,7 +57,7 @@ describe Riak::SecondaryIndex do
   end
 
   describe "pagination" do
-    it "should support max_results" do
+    it "supports max_results" do
       @max_results = 5
 
       @expected_collection = Riak::IndexCollection.new_from_json({
@@ -92,7 +92,7 @@ describe Riak::SecondaryIndex do
       expect(@results.length).to eq(@max_results)
     end
 
-    it "should support continuations" do
+    it "supports continuations" do
       @max_results = 5
 
       @expected_collection = Riak::IndexCollection.new_from_json({
@@ -127,7 +127,7 @@ describe Riak::SecondaryIndex do
       expect(@results).to eq(@expected_collection)
     end
 
-    it "should support a next_page method" do
+    it "supports a next_page method" do
       @max_results = 5
 
       @expected_collection = Riak::IndexCollection.new_from_json({
@@ -182,7 +182,7 @@ describe Riak::SecondaryIndex do
   end
 
   describe "return_terms" do
-    it "should optionally give the index value" do
+    it "optionally gives the index value" do
       @expected_collection = Riak::IndexCollection.new_from_json({
         'results' => [
           {'aaaa' => 'aaaa'},

data/spec/riak/stamp_spec.rb

@@ -3,7 +3,7 @@ require 'riak/stamp'
 
 describe Riak::Stamp, test_client: true do
   subject { described_class.new test_client }
-  it "should generate always increasing integer identifiers" do
+  it "generates always increasing integer identifiers" do
     1000.times do
       one = subject.next
       two = subject.next
@@ -12,7 +12,7 @@ describe Riak::Stamp, test_client: true do
     end
   end
 
-  it "should delay until the next millisecond when the sequence overflows" do
+  it "delays until the next millisecond when the sequence overflows" do
     old = subject.instance_variable_get(:@timestamp) + 0
     subject.instance_variable_set(:@sequence, described_class::SEQUENCE_MASK)
     count = 0
@@ -28,7 +28,7 @@ describe Riak::Stamp, test_client: true do
     expect((subject.next >> described_class::TIMESTAMP_SHIFT) & described_class::TIMESTAMP_MASK).to eq(old + 1)
   end
 
-  it "should raise an exception when the system clock moves backwards" do
+  it "raises an exception when the system clock moves backwards" do
     old = subject.instance_variable_get(:@timestamp)
     expect(subject).to receive(:time_gen).and_return(old - 10)
     expect {
@@ -39,7 +39,7 @@ describe Riak::Stamp, test_client: true do
   # The client/worker ID should be used for disambiguation, not for
   # primary ordering.  This breaks from the Snowflake model where the
   # worker ID is in more significant bits.
-  it "should use the client ID as the bottom component of the identifier" do
+  it "uses the client ID as the bottom component of the identifier" do
     expect(subject.next & described_class::CLIENT_ID_MASK).to eq(subject.client.client_id.hash & described_class::CLIENT_ID_MASK)
   end
 
@@ -47,7 +47,7 @@ describe Riak::Stamp, test_client: true do
     subject { described_class.new(Riak::Client.new(:client_id => "ripple")) }
     let(:hash) { "ripple".hash }
 
-    it "should use the hash of the client ID as the bottom component of the identifier" do
+    it "uses the hash of the client ID as the bottom component of the identifier" do
       expect(subject.next & described_class::CLIENT_ID_MASK).to eq(subject.client.client_id.hash & described_class::CLIENT_ID_MASK)
     end
   end

data/spec/riak/walk_spec_spec.rb

@@ -3,28 +3,28 @@ require 'spec_helper'
 describe Riak::WalkSpec do
   describe "initializing" do
     describe "with a hash" do
-      it "should be empty by default" do
+      it "is empty by default" do
         spec = Riak::WalkSpec.new({})
         expect(spec.bucket).to eq("_")
         expect(spec.tag).to eq("_")
         expect(spec.keep).to be_falsey
       end
 
-      it "should extract the bucket" do
+      it "extracts the bucket" do
         spec = Riak::WalkSpec.new({:bucket => "foo"})
         expect(spec.bucket).to eq("foo")
         expect(spec.tag).to eq("_")
         expect(spec.keep).to be_falsey
       end
 
-      it "should extract the tag" do
+      it "extracts the tag" do
         spec = Riak::WalkSpec.new({:tag => "foo"})
         expect(spec.bucket).to eq("_")
         expect(spec.tag).to eq("foo")
         expect(spec.keep).to be_falsey
       end
 
-      it "should extract the keep" do
+      it "extracts the keep" do
         spec = Riak::WalkSpec.new({:keep => true})
         expect(spec.bucket).to eq("_")
         expect(spec.tag).to eq("_")
@@ -33,28 +33,28 @@ describe Riak::WalkSpec do
     end
 
     describe "with three arguments for bucket, tag, and keep" do
-      it "should assign the bucket, tag, and keep" do
+      it "assigns the bucket, tag, and keep" do
         spec = Riak::WalkSpec.new("foo", "next", false)
         expect(spec.bucket).to eq("foo")
         expect(spec.tag).to eq("next")
         expect(spec.keep).to be_falsey
       end
 
-      it "should make the bucket '_' when false or nil" do
+      it "specifies the '_' bucket when false or nil" do
         spec = Riak::WalkSpec.new(nil, "next", false)
         expect(spec.bucket).to eq("_")
         spec = Riak::WalkSpec.new(false, "next", false)
         expect(spec.bucket).to eq("_")
       end
 
-      it "should make the tag '_' when false or nil" do
+      it "specifies the '_' tag when false or nil" do
         spec = Riak::WalkSpec.new("foo", nil, false)
         expect(spec.tag).to eq("_")
         spec = Riak::WalkSpec.new("foo", false, false)
         expect(spec.tag).to eq("_")
       end
 
-      it "should make the keep false when false or nil" do
+      it "make the keep falsey when false or nil" do
         spec = Riak::WalkSpec.new(nil, nil, nil)
         expect(spec.keep).to be_falsey
         spec = Riak::WalkSpec.new(nil, nil, false)
@@ -62,7 +62,7 @@ describe Riak::WalkSpec do
       end
     end
 
-    it "should raise an ArgumentError for invalid arguments" do
+    it "raises an ArgumentError for invalid arguments" do
       expect { Riak::WalkSpec.new }.to raise_error(ArgumentError)
       expect { Riak::WalkSpec.new("foo") }.to raise_error(ArgumentError)
       expect { Riak::WalkSpec.new("foo","bar") }.to raise_error(ArgumentError)
@@ -74,35 +74,35 @@ describe Riak::WalkSpec do
       @spec = Riak::WalkSpec.new({})
     end
 
-    it "should be the empty spec by default" do
+    it "converts to the empty spec by default" do
       expect(@spec.to_s).to eq("_,_,_")
     end
 
-    it "should include the bucket when set" do
+    it "includes the bucket when set" do
       @spec.bucket = "foo"
       expect(@spec.to_s).to eq("foo,_,_")
     end
 
-    it "should include the tag when set" do
+    it "includes the tag when set" do
       @spec.tag = "next"
       expect(@spec.to_s).to eq("_,next,_")
     end
 
-    it "should include the keep when true" do
+    it "includes the keep when true" do
       @spec.keep = true
       expect(@spec.to_s).to eq("_,_,1")
     end
   end
 
   describe "creating from a list of parameters" do
-    it "should detect hashes and WalkSpecs interleaved with other parameters" do
+    it "detects hashes and WalkSpecs interleaved with other parameters" do
       specs = Riak::WalkSpec.normalize(nil,"next",nil,{:bucket => "foo"},Riak::WalkSpec.new({:tag => "child", :keep => true}))
       expect(specs.size).to eq(3)
       expect(specs).to be_all {|s| s.kind_of?(Riak::WalkSpec) }
       expect(specs.join("/")).to eq("_,next,_/foo,_,_/_,child,1")
     end
 
-    it "should raise an error when given invalid number of parameters" do
+    it "raises an error when given invalid number of parameters" do
       expect { Riak::WalkSpec.normalize("foo") }.to raise_error(ArgumentError)
     end
   end
@@ -112,7 +112,7 @@ describe Riak::WalkSpec do
       @spec = Riak::WalkSpec.new({})
     end
 
-    it "should not match objects that aren't links or walk specs" do
+    it "doesn't match objects that aren't links or walk specs" do
       expect(@spec).not_to be === "foo"
     end
 
@@ -121,31 +121,31 @@ describe Riak::WalkSpec do
         @link = Riak::Link.new("/riak/foo/bar", "next")
       end
 
-      it "should match a link when the bucket and tag are not specified" do
+      it "matches a link when the bucket and tag are not specified" do
         expect(@spec).to be === @link
       end
 
-      it "should match a link when the bucket is the same" do
+      it "matches a link when the bucket is the same" do
         @spec.bucket = "foo"
         expect(@spec).to be === @link
       end
 
-      it "should not match a link when the bucket is different" do
+      it "doesn't match a link when the bucket is different" do
         @spec.bucket = "bar"
         expect(@spec).not_to be === @link
       end
 
-      it "should match a link when the tag is the same" do
+      it "matches a link when the tag is the same" do
         @spec.tag = "next"
         expect(@spec).to be === @link
       end
 
-      it "should not match a link when the tag is different" do
+      it "doesn't match a link when the tag is different" do
         @spec.tag = "previous"
         expect(@spec).not_to be === @link
       end
 
-      it "should match a link when the bucket and tag are the same" do
+      it "matches a link when the bucket and tag are the same" do
         @spec.bucket = "foo"
         expect(@spec).to be === @link
       end
@@ -156,41 +156,41 @@ describe Riak::WalkSpec do
         @other = Riak::WalkSpec.new({})
       end
 
-      it "should match a walk spec that is equivalent" do
+      it "matches a walk spec that is equivalent" do
         expect(@spec).to be === @other
       end
 
-      it "should not match a walk spec that has a different keep value" do
+      it "matches a walk spec that has a different keep value" do
         @other.keep = true
         expect(@spec).not_to be === @other
       end
 
-      it "should match a walk spec with a more specific bucket" do
+      it "matches a walk spec with a more specific bucket" do
         @other.bucket = "foo"
         expect(@spec).to be === @other
       end
 
-      it "should match a walk spec with the same bucket" do
+      it "matches a walk spec with the same bucket" do
         @other.bucket = "foo"; @spec.bucket = "foo"
         expect(@spec).to be === @other
       end
 
-      it "should not match a walk spec with a different bucket" do
+      it "doesn't match a walk spec with a different bucket" do
         @other.bucket = "foo"; @spec.bucket = "bar"
         expect(@spec).not_to be === @other
       end
 
-      it "should match a walk spec with a more specific tag" do
+      it "doesn't match a walk spec with a more specific tag" do
         @other.tag = "next"
         expect(@spec).to be === @other
       end
 
-      it "should match a walk spec with the same tag" do
+      it "matches a walk spec with the same tag" do
         @other.tag = "next"; @spec.tag = "next"
         expect(@spec).to be === @other
       end
 
-      it "should not match a walk spec with a different tag" do
+      it "doesn't match a walk spec with a different tag" do
         @other.tag = "next"; @spec.tag = "previous"
         expect(@spec).not_to be === @other
       end

data/spec/spec_helper.rb

@@ -47,4 +47,10 @@ RSpec.configure do |config|
   end
 
   config.raise_errors_for_deprecations!
+
+  begin
+    require 'instrumentable'
+  rescue LoadError => e
+    config.filter_run_excluding instrumentation: true
+  end
 end

data/spec/support/certs/ca.crt

@@ -1,22 +1,21 @@
 -----BEGIN CERTIFICATE-----
-MIIDnjCCAoYCCQCfWsYVjCNEnTANBgkqhkiG9w0BAQUFADCBkDELMAkGA1UEBhMC
-VVMxEzARBgNVBAgMCldhc2hpbmd0b24xEDAOBgNVBAcMB1NlYXR0bGUxDjAMBgNV
-BAoMBUJhc2hvMRswGQYDVQQLDBJSaWFrIFB5dGhvbiBDbGllbnQxCzAJBgNVBAMM
-AkNBMSAwHgYJKoZIhvcNAQkBFhFjbGllbnRzQGJhc2hvLmNvbTAeFw0xNDA1Mjcx
-OTQyNDhaFw0yNDA1MjQxOTQyNDhaMIGQMQswCQYDVQQGEwJVUzETMBEGA1UECAwK
-V2FzaGluZ3RvbjEQMA4GA1UEBwwHU2VhdHRsZTEOMAwGA1UECgwFQmFzaG8xGzAZ
-BgNVBAsMElJpYWsgUHl0aG9uIENsaWVudDELMAkGA1UEAwwCQ0ExIDAeBgkqhkiG
-9w0BCQEWEWNsaWVudHNAYmFzaG8uY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAyb+RlRZKQc5RkUK1CIeiWizz52uy98CJzpEdgZfLJuWv2wCqWZLD
-j3BWpa0uSQCT7F7EdXBpjFOCYx48nTTbNekL2osYm5lH/9QP3tZp+oomSxeZTc7C
-DsnW2/7KPmgE+B8Zs7Q1v2VXj2NyaUmozDWbp80VPMA332B61TTOGXKthQeD/n6W
-/mkH044oG5PMOvMMlNaYx0dsRy73m49DwIG/iZs0ri/sFuOKapOM+Jyi31GF7f50
-hDLNhpOZi2wvAoEdE5c0BfwILqR5rJBsfZzjUnTdYnLE9C1xR0ntE+MgCrxMdvM7
-VtJR0GNSQuW9LUxA6MeYimqHkfjtgDyX8wIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQB9IRE9eir6w2VkVHZanzOrbJVI0xO4o9+y0EXXl575C4uUs3+T7VBo8RQt2Pkn
-JULRVkff37XdblNLEQc5qNoSVu0vXLOjqybletXLD6ysaCn/4EkVrDrM9T5xO01H
-TDUnzBap+Z/YQc6iGaeFUaxPNYBqBypSHxqU2rbtIiok3xNXxgv65ijpdWSL/zzO
-g0P1cGECnsLRgui3AGVa5LioYUvy2eUj+xoasFpArZ3Cn5OTeAFHnnYFbKgdNQWm
-z98RktSlUMDE6EFnmzSBj/3l/CyEzZ2XTz//N3hPZs3LnEccGWUzadqQyO5pgExV
-VEcFwFceAhIM4PsZteI4m9nG
+MIIDjDCCAnQCCQDCaCbuH5N1HjANBgkqhkiG9w0BAQUFADCBhzELMAkGA1UEBhMC
+VVMxEDAOBgNVBAgMB0Zsb3JpZGExDjAMBgNVBAcMBU1pYW1pMQ4wDAYDVQQKDAVC
+YXNobzEZMBcGA1UECwwQUmlhayBSdWJ5IENsaWVudDELMAkGA1UEAwwCQ0ExHjAc
+BgkqhkiG9w0BCQEWD2JyeWNlQGJhc2hvLmNvbTAeFw0xNDA5MTgyMjU4MDJaFw0y
+NDA5MTUyMjU4MDJaMIGHMQswCQYDVQQGEwJVUzEQMA4GA1UECAwHRmxvcmlkYTEO
+MAwGA1UEBwwFTWlhbWkxDjAMBgNVBAoMBUJhc2hvMRkwFwYDVQQLDBBSaWFrIFJ1
+YnkgQ2xpZW50MQswCQYDVQQDDAJDQTEeMBwGCSqGSIb3DQEJARYPYnJ5Y2VAYmFz
+aG8uY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApLREjyW0bsMQ
+2xZuZfXrTqndZdtmJrUaUdwLcTYXo/BLJq8mw/UoKBajzDJS1OsVutOT3l1mQZNk
+pE15lJbPo301RtkGOeYlTx6ptawutrvlMlACnWtYyuL9U8qqnMJAsdBEjTU3Xxao
+/vJTECBVaKtL9D5vEu2fOn4ZWvSuYG14ZXhltBPgon95SrJX+erXgHs0IH6l1ftW
+xZL9Uw/Tj/s8XEMK8n6FB+CYuj33fZMjswvdXABzhEAW8bCupJT42V/S9Zj4B0Z8
+iv6wgurc1yuU6yl0VDGZ6Ee++7ter3GZZrV4YC5A8UjW0+8sADUYKiZNYWTO6S+N
+Pu/sLRdykwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBzcs/VIHHeyUWlS+Rx/s/m
+m54RK332r2+8Mywtwdz57kA6rsbYBrrlKVmEzjtgCIcpF/3hhEChYcSA4w0Aa+zd
+Zd6eNtUyicPFfm/8GycaLM3Ptj3duq4jHha2IzhomfACm8pkBj8IU8Y5q/YBV+3L
+hJxderphbz6lqrH6USkt/aaFzu+1onYlxzGZDyiFPOxUbRPXN12y3XCeFSfuHBej
+ifFRSHGR8HU++g4VYnOi/1YXSDFh7yRvA2qBlz+kYprBS2GggXIrfCgT+FnMALlg
+6TrfsWQiI3pyGKUsNjdaQckdLMWr8jvutb7vPZ1WdMdgKxbE0Swo1HBbkCAe5JjG
 -----END CERTIFICATE-----