riak-client 2.3.0 → 2.3.1

data/spec/riak/link_spec.rb

@@ -1,85 +1,85 @@
-require 'spec_helper'
-
-describe Riak::Link do
-  describe "parsing a link header" do
-    it "creates Link objects from the data" do
-      result = Riak::Link.parse('</riak/foo/bar>; rel="tag", </riak/foo>; rel="up"')
-      expect(result).to be_kind_of(Array)
-      expect(result).to be_all {|i| Riak::Link === i }
-    end
-
-    it "sets the bucket, key, url and rel parameters properly" do
-      result = Riak::Link.parse('</riak/foo/bar>; riaktag="tag", </riak/foo>; rel="up"')
-      expect(result[0].url).to eq("/riak/foo/bar")
-      expect(result[0].bucket).to eq("foo")
-      expect(result[0].key).to eq("bar")
-      expect(result[0].rel).to eq("tag")
-      expect(result[1].url).to eq("/riak/foo")
-      expect(result[1].bucket).to eq("foo")
-      expect(result[1].key).to eq(nil)
-      expect(result[1].rel).to eq("up")
-    end
-
-    it "keeps the url intact if it does not point to a bucket or bucket/key" do
-      result = Riak::Link.parse('</mapred>; rel="riak_kv_wm_mapred"')
-      expect(result[0].url).to eq("/mapred")
-      expect(result[0].bucket).to be_nil
-      expect(result[0].key).to be_nil
-    end
-
-    it "parses the Riak 1.0 URL scheme" do
-      result = Riak::Link.parse('</buckets/b/keys/k>; riaktag="tag"').first
-      expect(result.bucket).to eq('b')
-      expect(result.key).to eq('k')
-      expect(result.tag).to eq('tag')
-    end
-  end
-
-  context "converting to a string" do
-    it "to a string appropriate for use in the Link header" do
-      expect(Riak::Link.new("/riak/foo", "up").to_s).to eq('</riak/foo>; riaktag="up"')
-      expect(Riak::Link.new("/riak/foo/bar", "next").to_s).to eq('</riak/foo/bar>; riaktag="next"')
-      expect(Riak::Link.new("/riak", "riak_kv_wm_raw").to_s).to eq('</riak>; riaktag="riak_kv_wm_raw"')
-    end
-
-    it "converts to a string using the new URL scheme" do
-      expect(Riak::Link.new("bucket", "key", "tag").to_s(true)).to eq('</buckets/bucket/keys/key>; riaktag="tag"')
-      expect(Riak::Link.parse('</riak/bucket/key>; riaktag="tag"').first.to_s(true)).to eq('</buckets/bucket/keys/key>; riaktag="tag"')
-    end
-  end
-
-  it "converts to a walk spec when pointing to an object" do
-    expect(Riak::Link.new("/riak/foo/bar", "next").to_walk_spec.to_s).to eq("foo,next,_")
-    expect { Riak::Link.new("/riak/foo", "up").to_walk_spec }.to raise_error
-  end
-
-  it "is equivalent to a link with the same url and rel" do
-    one = Riak::Link.new("/riak/foo/bar", "next")
-    two = Riak::Link.new("/riak/foo/bar", "next")
-    expect(one).to eq(two)
-    expect([one]).to include(two)
-    expect([two]).to include(one)
-  end
-
-  it "unescapes the bucket name" do
-    expect(Riak::Link.new("/riak/bucket%20spaces/key", "foo").bucket).to eq("bucket spaces")
-  end
-
-  it "unescapes the key name" do
-    expect(Riak::Link.new("/riak/bucket/key%2Fname", "foo").key).to eq("key/name")
-  end
-
-  it "doesn't rely on the prefix to equal /riak/ when extracting the bucket and key" do
-    link = Riak::Link.new("/raw/bucket/key", "foo")
-    expect(link.bucket).to eq("bucket")
-    expect(link.key).to eq("key")
-  end
-
-  it "constructs from bucket, key and tag" do
-    link = Riak::Link.new("bucket", "key", "tag")
-    expect(link.bucket).to eq("bucket")
-    expect(link.key).to eq("key")
-    expect(link.tag).to eq("tag")
-    expect(link.url).to eq("/riak/bucket/key")
-  end
-end
+require 'spec_helper'
+
+describe Riak::Link do
+  describe "parsing a link header" do
+    it "creates Link objects from the data" do
+      result = Riak::Link.parse('</riak/foo/bar>; rel="tag", </riak/foo>; rel="up"')
+      expect(result).to be_kind_of(Array)
+      expect(result).to be_all {|i| Riak::Link === i }
+    end
+
+    it "sets the bucket, key, url and rel parameters properly" do
+      result = Riak::Link.parse('</riak/foo/bar>; riaktag="tag", </riak/foo>; rel="up"')
+      expect(result[0].url).to eq("/riak/foo/bar")
+      expect(result[0].bucket).to eq("foo")
+      expect(result[0].key).to eq("bar")
+      expect(result[0].rel).to eq("tag")
+      expect(result[1].url).to eq("/riak/foo")
+      expect(result[1].bucket).to eq("foo")
+      expect(result[1].key).to eq(nil)
+      expect(result[1].rel).to eq("up")
+    end
+
+    it "keeps the url intact if it does not point to a bucket or bucket/key" do
+      result = Riak::Link.parse('</mapred>; rel="riak_kv_wm_mapred"')
+      expect(result[0].url).to eq("/mapred")
+      expect(result[0].bucket).to be_nil
+      expect(result[0].key).to be_nil
+    end
+
+    it "parses the Riak 1.0 URL scheme" do
+      result = Riak::Link.parse('</buckets/b/keys/k>; riaktag="tag"').first
+      expect(result.bucket).to eq('b')
+      expect(result.key).to eq('k')
+      expect(result.tag).to eq('tag')
+    end
+  end
+
+  context "converting to a string" do
+    it "to a string appropriate for use in the Link header" do
+      expect(Riak::Link.new("/riak/foo", "up").to_s).to eq('</riak/foo>; riaktag="up"')
+      expect(Riak::Link.new("/riak/foo/bar", "next").to_s).to eq('</riak/foo/bar>; riaktag="next"')
+      expect(Riak::Link.new("/riak", "riak_kv_wm_raw").to_s).to eq('</riak>; riaktag="riak_kv_wm_raw"')
+    end
+
+    it "converts to a string using the new URL scheme" do
+      expect(Riak::Link.new("bucket", "key", "tag").to_s(true)).to eq('</buckets/bucket/keys/key>; riaktag="tag"')
+      expect(Riak::Link.parse('</riak/bucket/key>; riaktag="tag"').first.to_s(true)).to eq('</buckets/bucket/keys/key>; riaktag="tag"')
+    end
+  end
+
+  it "converts to a walk spec when pointing to an object" do
+    expect(Riak::Link.new("/riak/foo/bar", "next").to_walk_spec.to_s).to eq("foo,next,_")
+    expect { Riak::Link.new("/riak/foo", "up").to_walk_spec }.to raise_error
+  end
+
+  it "is equivalent to a link with the same url and rel" do
+    one = Riak::Link.new("/riak/foo/bar", "next")
+    two = Riak::Link.new("/riak/foo/bar", "next")
+    expect(one).to eq(two)
+    expect([one]).to include(two)
+    expect([two]).to include(one)
+  end
+
+  it "unescapes the bucket name" do
+    expect(Riak::Link.new("/riak/bucket%20spaces/key", "foo").bucket).to eq("bucket spaces")
+  end
+
+  it "unescapes the key name" do
+    expect(Riak::Link.new("/riak/bucket/key%2Fname", "foo").key).to eq("key/name")
+  end
+
+  it "doesn't rely on the prefix to equal /riak/ when extracting the bucket and key" do
+    link = Riak::Link.new("/raw/bucket/key", "foo")
+    expect(link.bucket).to eq("bucket")
+    expect(link.key).to eq("key")
+  end
+
+  it "constructs from bucket, key and tag" do
+    link = Riak::Link.new("bucket", "key", "tag")
+    expect(link.bucket).to eq("bucket")
+    expect(link.key).to eq("key")
+    expect(link.tag).to eq("tag")
+    expect(link.url).to eq("/riak/bucket/key")
+  end
+end

data/spec/riak/list_buckets_spec.rb

@@ -1,41 +1,41 @@
-require 'spec_helper'
-
-describe Riak::ListBuckets do
-  before :each do
-    @client = Riak::Client.new
-    @backend = double 'backend'
-    @fake_pool = double 'connection pool'
-    allow(@fake_pool).to receive(:take).and_yield(@backend)
-
-    @expect_list = expect(@backend).to receive(:list_buckets)
-
-    @client.instance_variable_set :@protobuffs_pool, @fake_pool
-  end
-
-  describe "non-streaming" do
-    it 'calls the backend without a block' do
-      @expect_list.with({}).and_return(%w{a b c d})
-
-      @client.list_buckets
-    end
-  end
-
-  describe "streaming" do
-    it 'calls the backend with a block' do
-      @expect_list.
-        and_yield(%w{abc abd abe}).
-        and_yield(%w{bbb ccc ddd})
-
-      @yielded = []
-
-      @client.list_buckets do |bucket|
-        @yielded << bucket
-      end
-
-      @yielded.each do |b|
-        expect(b).to be_a Riak::Bucket
-      end
-      expect(@yielded.map(&:name)).to eq(%w{abc abd abe bbb ccc ddd})
-    end
-  end
-end
+require 'spec_helper'
+
+describe Riak::ListBuckets do
+  before :each do
+    @client = Riak::Client.new
+    @backend = double 'backend'
+    @fake_pool = double 'connection pool'
+    allow(@fake_pool).to receive(:take).and_yield(@backend)
+
+    @expect_list = expect(@backend).to receive(:list_buckets)
+
+    @client.instance_variable_set :@protobuffs_pool, @fake_pool
+  end
+
+  describe "non-streaming" do
+    it 'calls the backend without a block' do
+      @expect_list.with({}).and_return(%w{a b c d})
+
+      @client.list_buckets
+    end
+  end
+
+  describe "streaming" do
+    it 'calls the backend with a block' do
+      @expect_list.
+        and_yield(%w{abc abd abe}).
+        and_yield(%w{bbb ccc ddd})
+
+      @yielded = []
+
+      @client.list_buckets do |bucket|
+        @yielded << bucket
+      end
+
+      @yielded.each do |b|
+        expect(b).to be_a Riak::Bucket
+      end
+      expect(@yielded.map(&:name)).to eq(%w{abc abd abe bbb ccc ddd})
+    end
+  end
+end

data/spec/riak/node_spec.rb

@@ -1,26 +1,26 @@
-require 'spec_helper'
-
-describe Riak::Client::Node do
-  before :each do
-    @client = Riak::Client.new
-    @node = Riak::Client::Node.new @client
-  end
-
-  describe 'when initializing' do
-    it 'defaults to the local interface on port 8087' do
-      node = Riak::Client::Node.new @client
-      expect(node.host).to eq('127.0.0.1')
-      expect(node.pb_port).to eq(8087)
-    end
-
-    it 'accepts a host' do
-      node = Riak::Client::Node.new(@client, :host => 'riak.basho.com')
-      expect(node.host).to eq("riak.basho.com")
-    end
-
-    it 'accepts a Protobuffs port' do
-      node = Riak::Client::Node.new @client, :pb_port => 9000
-      expect(node.pb_port).to eq(9000)
-    end
-  end
-end
+require 'spec_helper'
+
+describe Riak::Client::Node do
+  before :each do
+    @client = Riak::Client.new
+    @node = Riak::Client::Node.new @client
+  end
+
+  describe 'when initializing' do
+    it 'defaults to the local interface on port 8087' do
+      node = Riak::Client::Node.new @client
+      expect(node.host).to eq('127.0.0.1')
+      expect(node.pb_port).to eq(8087)
+    end
+
+    it 'accepts a host' do
+      node = Riak::Client::Node.new(@client, :host => 'riak.basho.com')
+      expect(node.host).to eq("riak.basho.com")
+    end
+
+    it 'accepts a Protobuffs port' do
+      node = Riak::Client::Node.new @client, :pb_port => 9000
+      expect(node.pb_port).to eq(9000)
+    end
+  end
+end

data/spec/riak/stamp_spec.rb

@@ -1,54 +1,54 @@
-require 'spec_helper'
-require 'riak/stamp'
-
-describe Riak::Stamp, test_client: true do
-  subject { described_class.new test_client }
-  it "generates always increasing integer identifiers" do
-    1000.times do
-      one = subject.next
-      two = subject.next
-      expect([one, two]).to be_all {|i| Integer === i }
-      expect(two).to be > one
-    end
-  end
-
-  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
-    # Simulate the time_gen method returning the same thing multiple times
-    allow(subject).to receive(:time_gen) do
-      count += 1
-      if count < 10
-        old
-      else
-        old + 1
-      end
-    end
-    expect((subject.next >> described_class::TIMESTAMP_SHIFT) & described_class::TIMESTAMP_MASK).to eq(old + 1)
-  end
-
-  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 {
-      subject.next
-    }.to raise_error(Riak::BackwardsClockError)
-  end
-
-  # 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 "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
-
-  context "using a non-integer client ID" do
-    subject { described_class.new(Riak::Client.new(:client_id => "ripple")) }
-    let(:hash) { "ripple".hash }
-
-    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
-end
+require 'spec_helper'
+require 'riak/stamp'
+
+describe Riak::Stamp, test_client: true do
+  subject { described_class.new test_client }
+  it "generates always increasing integer identifiers" do
+    1000.times do
+      one = subject.next
+      two = subject.next
+      expect([one, two]).to be_all {|i| Integer === i }
+      expect(two).to be > one
+    end
+  end
+
+  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
+    # Simulate the time_gen method returning the same thing multiple times
+    allow(subject).to receive(:time_gen) do
+      count += 1
+      if count < 10
+        old
+      else
+        old + 1
+      end
+    end
+    expect((subject.next >> described_class::TIMESTAMP_SHIFT) & described_class::TIMESTAMP_MASK).to eq(old + 1)
+  end
+
+  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 {
+      subject.next
+    }.to raise_error(Riak::BackwardsClockError)
+  end
+
+  # 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 "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
+
+  context "using a non-integer client ID" do
+    subject { described_class.new(Riak::Client.new(:client_id => "ripple")) }
+    let(:hash) { "ripple".hash }
+
+    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
+end

data/spec/support/certs/README.md

@@ -1,13 +1,13 @@
-**DO NOT USE THESE IN PRODUCTION**
-
-This directory has certificates and a key for testing Riak authentication.
-
-* server.key - a private key for a Riak server
-* server.crt - the certificate for server.key
-* ca.crt - a certificate for the CA that issued server.crt
-* empty_ca.crt - a certificate for a CA that has and cannot ever issue a 
-  certificate (I deleted its private key)
-
-**DO NOT USE THESE IN PRODUCTION**
-
+**DO NOT USE THESE IN PRODUCTION**
+
+This directory has certificates and a key for testing Riak authentication.
+
+* server.key - a private key for a Riak server
+* server.crt - the certificate for server.key
+* ca.crt - a certificate for the CA that issued server.crt
+* empty_ca.crt - a certificate for a CA that has and cannot ever issue a 
+  certificate (I deleted its private key)
+
+**DO NOT USE THESE IN PRODUCTION**
+
 These were generated using https://github.com/basho-labs/riak-ruby-ca .

data/spec/support/certs/ca.crt

@@ -1,21 +1,21 @@
------BEGIN CERTIFICATE-----
-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-----
+-----BEGIN CERTIFICATE-----
+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-----