riak-client 2.3.0 → 2.3.1

data/spec/riak/escape_spec.rb

@@ -1,72 +1,72 @@
-
-require 'spec_helper'
-
-describe Riak::Util::Escape do
-  before :each do
-    @object = Object.new
-    @object.extend(Riak::Util::Escape)
-  end
-
-  it "uses URI by default for escaping" do
-    expect(Riak.escaper).to eq(URI)
-  end
-
-  context "when using CGI for escaping" do
-    before { @oldesc, Riak.escaper = Riak.escaper, CGI }
-    after { Riak.escaper = @oldesc }
-
-    it "escapes standard non-safe characters" do
-      expect(@object.escape("some string")).to eq("some%20string")
-      expect(@object.escape("another^one")).to eq("another%5Eone")
-      expect(@object.escape("bracket[one")).to eq("bracket%5Bone")
-    end
-
-    it "escapes slashes" do
-      expect(@object.escape("some/inner/path")).to eq("some%2Finner%2Fpath")
-    end
-
-    it "converts the bucket or key to a string before escaping" do
-      expect(@object.escape(125)).to eq('125')
-    end
-
-    it "unescapes escaped strings" do
-      expect(@object.unescape("some%20string")).to eq("some string")
-      expect(@object.unescape("another%5Eone")).to eq("another^one")
-      expect(@object.unescape("bracket%5Bone")).to eq("bracket[one")
-      expect(@object.unescape("some%2Finner%2Fpath")).to eq("some/inner/path")
-    end
-  end
-
-  context "when using URI for escaping" do
-    before { @oldesc, Riak.escaper = Riak.escaper, URI }
-    after { Riak.escaper = @oldesc }
-
-    it "escapes standard non-safe characters" do
-      expect(@object.escape("some string")).to eq("some%20string")
-      expect(@object.escape("another^one")).to eq("another%5Eone")
-      expect(@object.escape("--one+two--")).to eq("--one%2Btwo--")
-    end
-
-    it "allows URI-safe characters" do
-      expect(@object.escape("bracket[one")).to eq("bracket[one")
-      expect(@object.escape("sean@basho")).to eq("sean@basho")
-    end
-
-    it "escapes slashes" do
-      expect(@object.escape("some/inner/path")).to eq("some%2Finner%2Fpath")
-    end
-
-    it "converts the bucket or key to a string before escaping" do
-      expect(@object.escape(125)).to eq('125')
-    end
-
-    it "unescapes escaped strings" do
-      expect(@object.unescape("some%20string")).to eq("some string")
-      expect(@object.unescape("another%5Eone")).to eq("another^one")
-      expect(@object.unescape("bracket%5Bone")).to eq("bracket[one")
-      expect(@object.unescape("some%2Finner%2Fpath")).to eq("some/inner/path")
-      expect(@object.unescape("--one%2Btwo--")).to eq("--one+two--")
-      expect(@object.unescape("me%40basho.co")).to eq("me@basho.co")
-    end
-  end
-end
+
+require 'spec_helper'
+
+describe Riak::Util::Escape do
+  before :each do
+    @object = Object.new
+    @object.extend(Riak::Util::Escape)
+  end
+
+  it "uses URI by default for escaping" do
+    expect(Riak.escaper).to eq(URI)
+  end
+
+  context "when using CGI for escaping" do
+    before { @oldesc, Riak.escaper = Riak.escaper, CGI }
+    after { Riak.escaper = @oldesc }
+
+    it "escapes standard non-safe characters" do
+      expect(@object.escape("some string")).to eq("some%20string")
+      expect(@object.escape("another^one")).to eq("another%5Eone")
+      expect(@object.escape("bracket[one")).to eq("bracket%5Bone")
+    end
+
+    it "escapes slashes" do
+      expect(@object.escape("some/inner/path")).to eq("some%2Finner%2Fpath")
+    end
+
+    it "converts the bucket or key to a string before escaping" do
+      expect(@object.escape(125)).to eq('125')
+    end
+
+    it "unescapes escaped strings" do
+      expect(@object.unescape("some%20string")).to eq("some string")
+      expect(@object.unescape("another%5Eone")).to eq("another^one")
+      expect(@object.unescape("bracket%5Bone")).to eq("bracket[one")
+      expect(@object.unescape("some%2Finner%2Fpath")).to eq("some/inner/path")
+    end
+  end
+
+  context "when using URI for escaping" do
+    before { @oldesc, Riak.escaper = Riak.escaper, URI }
+    after { Riak.escaper = @oldesc }
+
+    it "escapes standard non-safe characters" do
+      expect(@object.escape("some string")).to eq("some%20string")
+      expect(@object.escape("another^one")).to eq("another%5Eone")
+      expect(@object.escape("--one+two--")).to eq("--one%2Btwo--")
+    end
+
+    it "allows URI-safe characters" do
+      expect(@object.escape("bracket[one")).to eq("bracket[one")
+      expect(@object.escape("sean@basho")).to eq("sean@basho")
+    end
+
+    it "escapes slashes" do
+      expect(@object.escape("some/inner/path")).to eq("some%2Finner%2Fpath")
+    end
+
+    it "converts the bucket or key to a string before escaping" do
+      expect(@object.escape(125)).to eq('125')
+    end
+
+    it "unescapes escaped strings" do
+      expect(@object.unescape("some%20string")).to eq("some string")
+      expect(@object.unescape("another%5Eone")).to eq("another^one")
+      expect(@object.unescape("bracket%5Bone")).to eq("bracket[one")
+      expect(@object.unescape("some%2Finner%2Fpath")).to eq("some/inner/path")
+      expect(@object.unescape("--one%2Btwo--")).to eq("--one+two--")
+      expect(@object.unescape("me%40basho.co")).to eq("me@basho.co")
+    end
+  end
+end

data/spec/riak/feature_detection_spec.rb

@@ -1,77 +1,77 @@
-require 'spec_helper'
-require 'riak/client/feature_detection'
-
-describe Riak::Client::FeatureDetection do
-  let(:klass) {
-    Class.new do
-      include Riak::Client::FeatureDetection
-    end
-  }
-  subject { klass.new }
-
-  context "when the get_server_version is unimplemented" do
-    it "raises a NotImplementedError" do
-      expect { subject.server_version }.to raise_error(NotImplementedError)
-    end
-  end
-
-  context "when the Riak version is 0.14.x" do
-    before { allow(subject).to receive(:get_server_version).and_return("0.14.2") }
-    it { is_expected.not_to be_mapred_phaseless }
-    it { is_expected.not_to be_pb_indexes }
-    it { is_expected.not_to be_pb_search }
-    it { is_expected.not_to be_pb_conditionals }
-    it { is_expected.not_to be_quorum_controls }
-    it { is_expected.not_to be_tombstone_vclocks }
-    it { is_expected.not_to be_pb_head }
-    it { is_expected.not_to be_http_props_clearable }
-  end
-
-  context "when the Riak version is 1.0.x" do
-    before { allow(subject).to receive(:get_server_version).and_return("1.0.3") }
-    it { is_expected.not_to be_mapred_phaseless }
-    it { is_expected.not_to be_pb_indexes }
-    it { is_expected.not_to be_pb_search }
-    it { is_expected.to be_pb_conditionals }
-    it { is_expected.to be_quorum_controls }
-    it { is_expected.to be_tombstone_vclocks }
-    it { is_expected.to be_pb_head }
-    it { is_expected.not_to be_http_props_clearable }
-  end
-
-  context "when the Riak version is 1.1.x" do
-    before { allow(subject).to receive(:get_server_version).and_return("1.1.4") }
-    it { is_expected.to be_mapred_phaseless }
-    it { is_expected.not_to be_pb_indexes }
-    it { is_expected.not_to be_pb_search }
-    it { is_expected.to be_pb_conditionals }
-    it { is_expected.to be_quorum_controls }
-    it { is_expected.to be_tombstone_vclocks }
-    it { is_expected.to be_pb_head }
-    it { is_expected.not_to be_http_props_clearable }
-  end
-
-  context "when the Riak version is 1.2.x" do
-    before { allow(subject).to receive(:get_server_version).and_return("1.2.1") }
-    it { is_expected.to be_mapred_phaseless }
-    it { is_expected.to be_pb_indexes }
-    it { is_expected.to be_pb_search }
-    it { is_expected.to be_pb_conditionals }
-    it { is_expected.to be_quorum_controls }
-    it { is_expected.to be_tombstone_vclocks }
-    it { is_expected.to be_pb_head }
-    it { is_expected.not_to be_http_props_clearable }
-  end
-
-  context "when the Riak version is 1.3.x" do
-    before { allow(subject).to receive(:get_server_version).and_return("1.3.0") }
-    it { is_expected.to be_mapred_phaseless }
-    it { is_expected.to be_pb_indexes }
-    it { is_expected.to be_pb_search }
-    it { is_expected.to be_pb_conditionals }
-    it { is_expected.to be_quorum_controls }
-    it { is_expected.to be_tombstone_vclocks }
-    it { is_expected.to be_pb_head }
-    it { is_expected.to be_http_props_clearable }
-  end
-end
+require 'spec_helper'
+require 'riak/client/feature_detection'
+
+describe Riak::Client::FeatureDetection do
+  let(:klass) {
+    Class.new do
+      include Riak::Client::FeatureDetection
+    end
+  }
+  subject { klass.new }
+
+  context "when the get_server_version is unimplemented" do
+    it "raises a NotImplementedError" do
+      expect { subject.server_version }.to raise_error(NotImplementedError)
+    end
+  end
+
+  context "when the Riak version is 0.14.x" do
+    before { allow(subject).to receive(:get_server_version).and_return("0.14.2") }
+    it { is_expected.not_to be_mapred_phaseless }
+    it { is_expected.not_to be_pb_indexes }
+    it { is_expected.not_to be_pb_search }
+    it { is_expected.not_to be_pb_conditionals }
+    it { is_expected.not_to be_quorum_controls }
+    it { is_expected.not_to be_tombstone_vclocks }
+    it { is_expected.not_to be_pb_head }
+    it { is_expected.not_to be_http_props_clearable }
+  end
+
+  context "when the Riak version is 1.0.x" do
+    before { allow(subject).to receive(:get_server_version).and_return("1.0.3") }
+    it { is_expected.not_to be_mapred_phaseless }
+    it { is_expected.not_to be_pb_indexes }
+    it { is_expected.not_to be_pb_search }
+    it { is_expected.to be_pb_conditionals }
+    it { is_expected.to be_quorum_controls }
+    it { is_expected.to be_tombstone_vclocks }
+    it { is_expected.to be_pb_head }
+    it { is_expected.not_to be_http_props_clearable }
+  end
+
+  context "when the Riak version is 1.1.x" do
+    before { allow(subject).to receive(:get_server_version).and_return("1.1.4") }
+    it { is_expected.to be_mapred_phaseless }
+    it { is_expected.not_to be_pb_indexes }
+    it { is_expected.not_to be_pb_search }
+    it { is_expected.to be_pb_conditionals }
+    it { is_expected.to be_quorum_controls }
+    it { is_expected.to be_tombstone_vclocks }
+    it { is_expected.to be_pb_head }
+    it { is_expected.not_to be_http_props_clearable }
+  end
+
+  context "when the Riak version is 1.2.x" do
+    before { allow(subject).to receive(:get_server_version).and_return("1.2.1") }
+    it { is_expected.to be_mapred_phaseless }
+    it { is_expected.to be_pb_indexes }
+    it { is_expected.to be_pb_search }
+    it { is_expected.to be_pb_conditionals }
+    it { is_expected.to be_quorum_controls }
+    it { is_expected.to be_tombstone_vclocks }
+    it { is_expected.to be_pb_head }
+    it { is_expected.not_to be_http_props_clearable }
+  end
+
+  context "when the Riak version is 1.3.x" do
+    before { allow(subject).to receive(:get_server_version).and_return("1.3.0") }
+    it { is_expected.to be_mapred_phaseless }
+    it { is_expected.to be_pb_indexes }
+    it { is_expected.to be_pb_search }
+    it { is_expected.to be_pb_conditionals }
+    it { is_expected.to be_quorum_controls }
+    it { is_expected.to be_tombstone_vclocks }
+    it { is_expected.to be_pb_head }
+    it { is_expected.to be_http_props_clearable }
+  end
+end

data/spec/riak/index_collection_spec.rb

@@ -1,53 +1,53 @@
-require 'spec_helper'
-
-describe Riak::IndexCollection do
-  describe "json initialization" do
-    it "accepts a list of keys" do
-      @input = {
-        'keys' => %w{first second third}
-      }.to_json
-      expect { @coll = Riak::IndexCollection.new_from_json @input }.not_to raise_error
-      expect(%w{first second third}).to eq(@coll)
-    end
-
-    it "accepts a list of keys and a continuation" do
-      @input = {
-        'keys' => %w{first second third},
-        'continuation' => 'examplecontinuation'
-      }.to_json
-      expect { @coll = Riak::IndexCollection.new_from_json @input }.not_to raise_error
-      expect(%w{first second third}).to eq(@coll)
-      expect(@coll.continuation).to eq('examplecontinuation')
-    end
-
-    it "accepts a list of results hashes" do
-      @input = {
-        'results' => [
-          {'first' => 'first'},
-          {'second' => 'second'},
-          {'second' => 'other'}
-        ]
-      }.to_json
-
-      expect { @coll = Riak::IndexCollection.new_from_json @input }.not_to raise_error
-      expect(%w{first second other}).to eq(@coll)
-      expect({'first' => %w{first}, 'second' => %w{second other}}).to eq(@coll.with_terms)
-    end
-
-    it "accepts a list of results hashes and a continuation" do
-      @input = {
-        'results' => [
-          {'first' => 'first'},
-          {'second' => 'second'},
-          {'second' => 'other'}
-        ],
-        'continuation' => 'examplecontinuation'
-      }.to_json
-
-      expect { @coll = Riak::IndexCollection.new_from_json @input }.not_to raise_error
-      expect(%w{first second other}).to eq(@coll)
-      expect(@coll.continuation).to eq('examplecontinuation')
-      expect({'first' => %w{first}, 'second' => %w{second other}}).to eq(@coll.with_terms)
-    end
-  end
-end
+require 'spec_helper'
+
+describe Riak::IndexCollection do
+  describe "json initialization" do
+    it "accepts a list of keys" do
+      @input = {
+        'keys' => %w{first second third}
+      }.to_json
+      expect { @coll = Riak::IndexCollection.new_from_json @input }.not_to raise_error
+      expect(%w{first second third}).to eq(@coll)
+    end
+
+    it "accepts a list of keys and a continuation" do
+      @input = {
+        'keys' => %w{first second third},
+        'continuation' => 'examplecontinuation'
+      }.to_json
+      expect { @coll = Riak::IndexCollection.new_from_json @input }.not_to raise_error
+      expect(%w{first second third}).to eq(@coll)
+      expect(@coll.continuation).to eq('examplecontinuation')
+    end
+
+    it "accepts a list of results hashes" do
+      @input = {
+        'results' => [
+          {'first' => 'first'},
+          {'second' => 'second'},
+          {'second' => 'other'}
+        ]
+      }.to_json
+
+      expect { @coll = Riak::IndexCollection.new_from_json @input }.not_to raise_error
+      expect(%w{first second other}).to eq(@coll)
+      expect({'first' => %w{first}, 'second' => %w{second other}}).to eq(@coll.with_terms)
+    end
+
+    it "accepts a list of results hashes and a continuation" do
+      @input = {
+        'results' => [
+          {'first' => 'first'},
+          {'second' => 'second'},
+          {'second' => 'other'}
+        ],
+        'continuation' => 'examplecontinuation'
+      }.to_json
+
+      expect { @coll = Riak::IndexCollection.new_from_json @input }.not_to raise_error
+      expect(%w{first second other}).to eq(@coll)
+      expect(@coll.continuation).to eq('examplecontinuation')
+      expect({'first' => %w{first}, 'second' => %w{second other}}).to eq(@coll.with_terms)
+    end
+  end
+end

data/spec/riak/instrumentation_spec.rb

@@ -1,124 +1,124 @@
-require 'spec_helper'
-
-describe Riak::Client do
-
-  before do
-    @client = Riak::Client.new
-    @backend = double("Backend")
-    allow(@client).to receive(:backend).and_yield(@backend)
-    allow(@client).to receive(:http).and_yield(@backend)
-    @bucket = Riak::Bucket.new(@client, "foo")
-
-    @events = []
-    @notifier = ActiveSupport::Notifications.notifier
-    @notifier.subscribe { |*args| (@events ||= []) << event(*args) }
-  end
-
-  describe "instrumentation", instrumentation: true do
-
-    it "should notify on the 'buckets' operation" do
-      expect(@backend).to receive(:list_buckets).and_return(%w{test test2})
-      test_client_event(@client, 'riak.list_buckets') do
-        @client.buckets
-      end
-    end
-
-    it "should notify on the 'list_buckets' operation" do
-      expect(@backend).to receive(:list_buckets).and_return(%w{test test2})
-      test_client_event(@client, 'riak.list_buckets') do
-        @client.list_buckets
-      end
-    end
-
-    it "should notify on the 'list_keys' operation" do
-      expect(@backend).to receive(:list_keys).and_return(%w{test test2})
-      test_client_event(@client, 'riak.list_keys') do
-        @client.list_keys(@bucket)
-      end
-    end
-
-    it "should notify on the 'get_bucket_props' operation" do
-      expect(@backend).to receive(:get_bucket_props).and_return({})
-      test_client_event(@client, 'riak.get_bucket_props') do
-        @client.get_bucket_props(@bucket)
-      end
-    end
-
-    it "should notify on the 'set_bucket_props' operation" do
-      expect(@backend).to receive(:set_bucket_props).and_return({})
-      test_client_event(@client, 'riak.set_bucket_props') do
-        @client.set_bucket_props(@bucket, {})
-      end
-    end
-
-    it "should notify on the 'clear_bucket_props' operation" do
-      expect(@backend).to receive(:reset_bucket_props).and_return({})
-      test_client_event(@client, 'riak.clear_bucket_props') do
-        @client.clear_bucket_props(@bucket)
-      end
-    end
-
-    it "should notify on the 'get_index' operation" do
-      expect(@backend).to receive(:get_index).and_return({})
-      test_client_event(@client, 'riak.get_index') do
-        @client.get_index(@bucket, 'index', 'query', {})
-      end
-    end
-
-    it "should notify on the 'get_object' operation" do
-      expect(@backend).to receive(:fetch_object).and_return(nil)
-      test_client_event(@client, 'riak.get_object') do
-        @client.get_object(@bucket, 'bar')
-      end
-    end
-
-    it "should notify on the 'store_object' operation" do
-      expect(@backend).to receive(:store_object).and_return(nil)
-      test_client_event(@client, 'riak.store_object') do
-        @client.store_object(Object.new)
-      end
-    end
-
-    it "should notify on the 'reload_object' operation" do
-      expect(@backend).to receive(:reload_object).and_return(nil)
-      test_client_event(@client, 'riak.reload_object') do
-        @client.reload_object(Object.new)
-      end
-    end
-
-    it "should notify on the 'delete_object' operation" do
-      expect(@backend).to receive(:delete_object).and_return(nil)
-      test_client_event(@client, 'riak.delete_object') do
-        @client.delete_object(@bucket, 'bar')
-      end
-    end
-
-    it "should notify on the 'mapred' operation" do
-      @mapred = Riak::MapReduce.new(@client).add('test').map("function(){}").map("function(){}")
-      expect(@backend).to receive(:mapred).and_return(nil)
-      test_client_event(@client, 'riak.map_reduce') do
-        @client.mapred(@mapred)
-      end
-    end
-
-    it "should notify on the 'ping' operation" do
-      expect(@backend).to receive(:ping).and_return(nil)
-      test_client_event(@client, 'riak.ping') do
-        @client.ping
-      end
-    end
-  end
-end
-
-def test_client_event(client, event_name, &block)
-  block.call
-  expect(@events.size).to eql(1)
-  event = @events.first
-  expect(event.name).to eql(event_name)
-  expect(event.payload[:client_id]).to eql(client.client_id)
-end
-
-# name, start, finish, id, payload
-def event(*args)
-  ActiveSupport::Notifications::Event.new(*args)
-end
+require 'spec_helper'
+
+describe Riak::Client do
+
+  before do
+    @client = Riak::Client.new
+    @backend = double("Backend")
+    allow(@client).to receive(:backend).and_yield(@backend)
+    allow(@client).to receive(:http).and_yield(@backend)
+    @bucket = Riak::Bucket.new(@client, "foo")
+
+    @events = []
+    @notifier = ActiveSupport::Notifications.notifier
+    @notifier.subscribe { |*args| (@events ||= []) << event(*args) }
+  end
+
+  describe "instrumentation", instrumentation: true do
+
+    it "should notify on the 'buckets' operation" do
+      expect(@backend).to receive(:list_buckets).and_return(%w{test test2})
+      test_client_event(@client, 'riak.list_buckets') do
+        @client.buckets
+      end
+    end
+
+    it "should notify on the 'list_buckets' operation" do
+      expect(@backend).to receive(:list_buckets).and_return(%w{test test2})
+      test_client_event(@client, 'riak.list_buckets') do
+        @client.list_buckets
+      end
+    end
+
+    it "should notify on the 'list_keys' operation" do
+      expect(@backend).to receive(:list_keys).and_return(%w{test test2})
+      test_client_event(@client, 'riak.list_keys') do
+        @client.list_keys(@bucket)
+      end
+    end
+
+    it "should notify on the 'get_bucket_props' operation" do
+      expect(@backend).to receive(:get_bucket_props).and_return({})
+      test_client_event(@client, 'riak.get_bucket_props') do
+        @client.get_bucket_props(@bucket)
+      end
+    end
+
+    it "should notify on the 'set_bucket_props' operation" do
+      expect(@backend).to receive(:set_bucket_props).and_return({})
+      test_client_event(@client, 'riak.set_bucket_props') do
+        @client.set_bucket_props(@bucket, {})
+      end
+    end
+
+    it "should notify on the 'clear_bucket_props' operation" do
+      expect(@backend).to receive(:reset_bucket_props).and_return({})
+      test_client_event(@client, 'riak.clear_bucket_props') do
+        @client.clear_bucket_props(@bucket)
+      end
+    end
+
+    it "should notify on the 'get_index' operation" do
+      expect(@backend).to receive(:get_index).and_return({})
+      test_client_event(@client, 'riak.get_index') do
+        @client.get_index(@bucket, 'index', 'query', {})
+      end
+    end
+
+    it "should notify on the 'get_object' operation" do
+      expect(@backend).to receive(:fetch_object).and_return(nil)
+      test_client_event(@client, 'riak.get_object') do
+        @client.get_object(@bucket, 'bar')
+      end
+    end
+
+    it "should notify on the 'store_object' operation" do
+      expect(@backend).to receive(:store_object).and_return(nil)
+      test_client_event(@client, 'riak.store_object') do
+        @client.store_object(Object.new)
+      end
+    end
+
+    it "should notify on the 'reload_object' operation" do
+      expect(@backend).to receive(:reload_object).and_return(nil)
+      test_client_event(@client, 'riak.reload_object') do
+        @client.reload_object(Object.new)
+      end
+    end
+
+    it "should notify on the 'delete_object' operation" do
+      expect(@backend).to receive(:delete_object).and_return(nil)
+      test_client_event(@client, 'riak.delete_object') do
+        @client.delete_object(@bucket, 'bar')
+      end
+    end
+
+    it "should notify on the 'mapred' operation" do
+      @mapred = Riak::MapReduce.new(@client).add('test').map("function(){}").map("function(){}")
+      expect(@backend).to receive(:mapred).and_return(nil)
+      test_client_event(@client, 'riak.map_reduce') do
+        @client.mapred(@mapred)
+      end
+    end
+
+    it "should notify on the 'ping' operation" do
+      expect(@backend).to receive(:ping).and_return(nil)
+      test_client_event(@client, 'riak.ping') do
+        @client.ping
+      end
+    end
+  end
+end
+
+def test_client_event(client, event_name, &block)
+  block.call
+  expect(@events.size).to eql(1)
+  event = @events.first
+  expect(event.name).to eql(event_name)
+  expect(event.payload[:client_id]).to eql(client.client_id)
+end
+
+# name, start, finish, id, payload
+def event(*args)
+  ActiveSupport::Notifications::Event.new(*args)
+end