riak-client 2.0.0.rc1 → 2.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc9b9f7497052c55bb844b4d367c34845e57ec5a
-  data.tar.gz: a40f43dc918e9f24a8cdfa52eee55eac6abe6cc7
+  metadata.gz: 6c5f3295a8250149c86f2b932a13f015621d42e5
+  data.tar.gz: 22dca3a33f295d67ada447302bcff4aed5bce2bf
 SHA512:
-  metadata.gz: 3d38360e5a71d50a8038fd18117c1e1bd4b525869d8e6f1215b85aa9ba7c22e3069ff795cbfac2bac6156f348feb48cd7951e32e1a0718511e40aa0d809dfd89
-  data.tar.gz: b0c5415b028c0d009cdca47c9c4ee620130ff60d4b320240a4a5593c343b232488c576f20b3602aff9b8dcf5256884de039d9dda8939ded6071b8d9a87c1dfea
+  metadata.gz: d4299561b7b0bd8ee05ee6e1f776e2ca9039d36e09761de4ae0e8dab16ad13633ef2392f2254232dbb9aad5225b0b5f81fc6d49518f63aa2285c1188147e9e37
+  data.tar.gz: 597699ef5a0f67ad7267d2cbce4524ca525639ebecc7475ed927b1f40b338d39857f1cf279362ff579cefe8ac09fbfdcd2643daddb3541c1b132ebda5e096185

data/Gemfile

@@ -12,10 +12,6 @@ platforms :mri do
   gem 'yajl-ruby'
 end
 
-platforms :jruby do
-  gem 'jruby-openssl'
-end
-
 platforms :jruby, :rbx do
   gem 'json'
 end

data/README.markdown

@@ -1,4 +1,4 @@
-# Riak Ruby Client (riak-client) [![Build Status](https://secure.travis-ci.org/basho/riak-ruby-client.png)](http://travis-ci.org/basho/riak-ruby-client)
+# Riak Ruby Client (riak-client)
 
 `riak-client` is a rich Ruby client/toolkit for Riak, Basho's
 distributed database that contains a basic wrapper around typical
@@ -10,6 +10,15 @@ and map-reduce.
 Ruby 1.9.3, 2.0, and 2.1 are supported. JRuby in 1.9 and 2.0 modes are
 also supported. `riak-client` is not compatible with Ruby 1.8.
 
+In JRuby 1.7.13, OCSP validation is absent, and CRL validation always
+fails. [This issue is being tracked][1] and this document will be updated when
+it is fixed. Additionally, client certificate authentication doesn't work in
+JRuby. [This issue is also being tracked][2], and this document will be updated
+when it works.
+
+[1]: https://github.com/jruby/jruby-openssl/issues/5
+[2]: https://github.com/basho/riak_api/issues/65
+
 `riak-client` requires i18n, builder, beefcake, and multi_json. The
 cache store implementation requires ActiveSupport 3 or later.
 

data/Rakefile

@@ -15,7 +15,7 @@ end
 
 YARD::Rake::YardocTask.new :doc do |doc|
   doc.options = ["--markup markdown",
-                 "--markup-provider=redcarpet",
+                 "--markup-provider=kramdown",
                  "--charset utf-8",
                  '-',
                  'lib/**/*.rb',

data/lib/riak/client/beefcake/socket.rb

@@ -1,5 +1,5 @@
 require 'openssl'
-require 'r509/cert/validator'
+require 'cert_validator'
 require 'riak/client/beefcake/messages'
 require 'riak/errors/connection_error'
 
@@ -62,7 +62,11 @@ module Riak
 
             private
             def riak_cert
-              @riak_cert ||= R509::Cert.new cert: @tls.peer_cert
+              @riak_cert ||= @tls.peer_cert
+            end
+
+            def ca_cert
+              @ca_cert ||= @tls.peer_cert_chain[1]
             end
 
             # Set up an SSL context with appropriate defaults for Riak TLS
@@ -70,8 +74,8 @@ module Riak
               @context = OpenSSL::SSL::SSLContext.new
 
               # Replace insecure defaults
-              @context.ssl_version = @auth[:ssl_version] || :TLSv1_2_client
-              @context.verify_mode = @auth[:verify_mode] || OpenSSL::SSL::VERIFY_PEER
+              @context.ssl_version = (@auth[:ssl_version] || default_ssl_version).to_sym
+              @context.verify_mode = (@auth[:verify_mode] || OpenSSL::SSL::VERIFY_PEER).to_i
 
               cert_ify
               key_ify
@@ -82,6 +86,18 @@ module Riak
               end
             end
 
+            # Choose the most secure SSL version available
+            def default_ssl_version
+              available = OpenSSL::SSL::SSLContext::METHODS
+              selected = %w{TLSv1_2_client TLSv1_1_client TLSv1.1 TLSv1_client TLS}.detect do |v|
+                available.include? v.to_sym
+              end
+
+              raise TlsError::SslVersionConfigurationError.new unless selected
+
+              return selected
+            end
+
             # Convert cert and client_ca fields to X509 Certs
             def cert_ify
               %w{ cert client_ca }.each do |k|
@@ -150,23 +166,24 @@ module Riak
             # Validate the TLS session
             def validate_session
               if @auth[:verify_hostname] &&
-                  !OpenSSL::SSL::verify_certificate_identity(riak_cert.cert, @host)
+                  !OpenSSL::SSL::verify_certificate_identity(riak_cert, @host)
                 raise TlsError::CertHostMismatchError.new
               end
 
-              unless riak_cert.valid?
+              unless (riak_cert.not_before..riak_cert.not_after).cover? Time.now
                 raise TlsError::CertNotValidError.new
               end
 
-              validator = R509::Cert::Validator.new riak_cert
+              validator = CertValidator.new riak_cert, ca_cert
 
-              validator_options = {}
-              validator_options[:ocsp] = !!@auth[:ocsp]
-              validator_options[:crl] = !!@auth[:crl]
-              validator_options[:crl_file] = @auth[:crl_file]
+              validator.crl = try_load @auth[:crl_file] if @auth[:crl_file]
+
+              if @auth[:crl]
+                raise TlsError::CertRevokedError.new unless validator.crl_valid?
+              end
 
-              unless validator.validate(validator_options)
-                raise TlsError::CertRevokedError.new
+              if @auth[:ocsp]
+                raise TlsError::CertRevokedError.new unless validator.ocsp_valid?
               end
             end
 

data/lib/riak/client/beefcake_protobuffs_backend.rb

@@ -25,7 +25,16 @@ module Riak
 
       def protocol
         p = Protocol.new socket
-        yield p
+        in_request = false
+        result = nil
+        begin
+          in_request = true
+          result = yield p
+          in_request = false
+        ensure
+          reset_socket if in_request
+        end
+        return result
       end
 
       def new_socket

data/lib/riak/client.rb

@@ -5,6 +5,7 @@ require 'riak'
 require 'riak/util/translation'
 require 'riak/util/escape'
 require 'riak/errors/failed_request'
+require 'riak/errors/protobuffs_error'
 require 'riak/client/decaying'
 require 'riak/client/node'
 require 'riak/client/search'
@@ -43,6 +44,7 @@ module Riak
       Errno::ENETUNREACH,
       SocketError,
       SystemCallError,
+      Riak::ProtobuffsFailedHeader,
     ]
 
     Pool = ::Innertube::Pool

data/lib/riak/crdt/base.rb

@@ -52,6 +52,30 @@ module Riak
       def context?
         !!@context
       end
+
+      def pretty_print(pp)
+        pp.object_group self do
+          pp.breakable
+          pp.text "bucket_type=#{@bucket_type}"
+          pp.comma_breakable
+          pp.text "bucket=#{@bucket.name}"
+          pp.comma_breakable
+          pp.text "key=#{@key}"
+
+          yield
+        end
+      end
+
+      def pretty_print_cycle(pp)
+        pp.object_group self do
+          pp.breakable
+          pp.text "#{@bucket_type}/#{@bucket.name}/#{@key}"
+        end
+      end
+
+      def inspect_name
+        "#<#{self.class.name} bucket=#{@bucket.name} key=#{@key} type=#{@bucket_type}>"
+      end
       
       private
       def client

data/lib/riak/crdt/counter.rb

@@ -54,6 +54,13 @@ module Riak
       def decrement(amount=1)
         increment -amount
       end
+
+      def pretty_print(pp)
+        super pp do
+          pp.comma_breakable
+          pp.text "value=#{value}"
+        end
+      end
       
       private
       def vivify(value)

data/lib/riak/crdt/inner_counter.rb

@@ -55,6 +55,13 @@ module Riak
         increment batcher.accumulator
       end
       
+      def pretty_print(pp)
+        pp.object_group self do
+          pp.breakable
+          pp.pp value
+        end
+      end
+
       # @api private
       def self.update(increment)
         Operation::Update.new.tap do |op|

data/lib/riak/crdt/inner_map.rb

@@ -29,6 +29,28 @@ module Riak
         @parent.operate(name, wrapped_operation)
       end
 
+      def pretty_print(pp)
+        pp.object_group self do
+          %w{counters flags maps registers sets}.each do |h|
+            pp.comma_breakable
+            pp.text "#{h}="
+            pp.pp send h
+          end
+        end
+      end
+
+      def pretty_print_cycle(pp)
+        pp.text "InnerMap"
+      end
+
+      def to_value_h
+        %w{counters flags maps registers sets}.map do |k|
+          [k, send(k).to_value_h]
+        end.to_h
+      end
+
+      alias :value :to_value_h
+
       # @api private
       def self.delete
         Operation::Delete.new.tap do |op|

data/lib/riak/crdt/inner_set.rb

@@ -76,6 +76,13 @@ module Riak
         @parent.context?
       end
 
+      def pretty_print(pp)
+        pp.object_group self do
+          pp.breakable
+          pp.pp to_a
+        end
+      end
+
       # @api private
       def update(changes)
         Operation::Update.new.tap do |op|

data/lib/riak/crdt/map.rb

@@ -32,7 +32,11 @@ module Riak
       def initialize(bucket, key, bucket_type=nil, options={})
         super(bucket, key, bucket_type || DEFAULT_BUCKET_TYPES[:map], options)
 
-        initialize_collections
+        if key
+          initialize_collections 
+        else
+          initialize_blank_collections
+        end
       end
 
       # Maps are frequently updated in batches. Use this method to get a 
@@ -57,6 +61,24 @@ module Riak
           m.operate operation
         end
       end
+
+      def pretty_print(pp)
+        super pp do
+          %w{counters flags maps registers sets}.each do |h|
+            pp.comma_breakable
+            pp.text "#{h}="
+            pp.pp send h
+          end
+        end
+      end
+
+      def to_value_h
+        %w{counters flags maps registers sets}.map do |k|
+          [k, send(k).to_value_h]
+        end.to_h
+      end
+
+      alias :value :to_value_h
       
       private
       def vivify(data)
@@ -71,8 +93,12 @@ module Riak
         reload if dirty?
       end
 
+      def initialize_blank_collections
+        vivify counters: {}, flags: {}, maps: {}, registers: {}, sets: {}
+      end
+
       def write_operations(operations, *args)
-        operator do |op|
+        result = operator do |op|
           op.operate(bucket.name,
                      key,
                      bucket_type,
@@ -80,6 +106,9 @@ module Riak
                      *args
                      )
         end
+
+        @key ||= result.key
+
         # collections break dirty tracking
         reload
       end

data/lib/riak/crdt/set.rb

@@ -92,6 +92,13 @@ module Riak
 
       alias :delete :remove
       
+      def pretty_print(pp)
+        super pp do
+          pp.comma_breakable
+          pp.pp to_a
+        end
+      end
+
       private
       def vivify(value)
         @members = value

data/lib/riak/crdt/typed_collection.rb

@@ -26,6 +26,45 @@ module Riak
         end
       end
 
+      def pretty_print(pp)
+        pp.object_group self do
+          pp.breakable
+          pp.text inspect_name
+          pp.comma_breakable
+          pp.text "parent="
+          @parent.pretty_print_cycle(pp)
+          pp.comma_breakable
+          pp.text "contents="
+          pp.pp @contents
+        end
+        # buf = []
+        # buf << inspect_name
+        # buf << 
+        # buf << "contents={#{inspect_contents}}"
+        # "#<#{self.class.name} #{buf.join ' '}>"
+      end
+
+      def pretty_print_cycle(pp)
+        pp.object_group self do
+          pp.breakable
+          @parent.pretty_print_cycle(pp)
+        end
+      end
+
+      def inspect_name
+        "contains=#{content_name}"
+      end
+
+      def pretty_print_contents(pp)
+        @contents.map do |k,v|
+          "#{k}=>#{v.inspect}"
+        end.join ', '
+      end
+
+      def content_name
+        @type.name
+      end
+
       # @api private
       def reparent(new_parent)
         reparented = self.class.new(@type,
@@ -114,6 +153,14 @@ module Riak
         !!@parent.context?
       end
       
+      def to_value_h
+        return @contents unless NEEDS_NAME.include? @type
+
+        @contents.map do |k, v|
+          [k, v.value]
+        end.to_h
+      end
+
       private
       def normalize_key(unnormalized_key)
         unnormalized_key.to_s

data/lib/riak/errors/connection_error.rb

@@ -5,6 +5,12 @@ module Riak
   end
 
   class TlsError < ConnectionError
+    class SslVersionConfigurationError < TlsError
+      def initialize
+        super t('ssl.version_configuration_error')
+      end
+    end
+
     class CertHostMismatchError < TlsError
       def initialize
         super t('ssl.cert_host_mismatch')

data/lib/riak/locale/en.yml

@@ -59,6 +59,7 @@ en:
     pbc:
       failed_header: "Failed to receive a header from Riak."
       unexpected_eof: "Unexpected EOF on PBC socket"
+      unexpected_response: "Expected PBC %{expected}, got %{actual}."
       user_not_username: "Authentication hash expects :user, not :username."
       wanted_index_resp: "Expected IndexResp during secondary index query"
       wanted_dt_fetch_resp: "Expected PBC DtFetchResp during CRDT fetch"
@@ -80,6 +81,7 @@ en:
       read_data_error: "Tried to read cert or key from %{candidate}, caught error %{actual}."
       unexpected_during_init: "Expected %{expected}, got %{actual} with body %{body} during SSL/TLS initialization."
       unknown_key_type: "Can't figure out what the client key is. Expected it to be some kind of OpenSSL::PKey::PKey subclass, a filename string, or string data representing the key itself."
+      version_configuration_error: "Couldn't find a supported default ssl_version. Configure one that works with your version of Ruby."
     stale_write_prevented: "Stale write prevented by client."
     stored_function_invalid: "function must have :bucket and :key when a hash"
     streaming_bucket_list_without_block: "Streaming bucket list was requested but no block was given."

data/lib/riak/version.rb

@@ -1,3 +1,3 @@
 module Riak
-  VERSION = "2.0.0.rc1"
+  VERSION = "2.0.0.rc2"
 end

data/riak-client.gemspec

@@ -18,14 +18,14 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rspec", "~> 3.0.0"
   gem.add_development_dependency 'rake', '~> 10.1.1'
   gem.add_development_dependency 'yard', '~> 0.8.7'
-  gem.add_development_dependency 'redcarpet', '~> 3.0.0'
+  gem.add_development_dependency 'kramdown', '~> 1.4'
   gem.add_development_dependency 'simplecov', '~> 0.8.2'
   
   gem.add_runtime_dependency "i18n", ">=0.4.0"
   gem.add_runtime_dependency "beefcake", ">= 1.0.0.pre1"
   gem.add_runtime_dependency "multi_json", "~>1.0"
   gem.add_runtime_dependency "innertube", "~>1.0.2"
-  gem.add_runtime_dependency 'r509-cert-validator', '~> 0.0.4'
+  gem.add_runtime_dependency 'cert_validator', '~> 0.0.1'
 
   # Files
 

data/spec/integration/riak/crdt_spec.rb

@@ -20,12 +20,32 @@ describe "CRDTs", integration: true, test_client: true do
     end
   end
 
-  describe 'an anonymous counter' do
-    subject { Riak::Crdt::Counter.new bucket, nil }
-    it 'accepts a Riak-assigned name' do
-      subject.increment
-      expect(subject.key).to be
-      expect(subject.value).to eq 1
+  describe 'Riak-assigned names' do
+    describe 'an anonymous counter' do
+      subject { Riak::Crdt::Counter.new bucket, nil }
+      it 'accepts a Riak-assigned name' do
+        subject.increment
+        expect(subject.key).to be
+        expect(subject.value).to eq 1
+      end
+    end
+
+    describe 'an anonymous set' do
+      subject { Riak::Crdt::Set.new bucket, nil }
+      it 'accepts a Riak-assigned name' do
+        subject.add 'sandwich'
+        expect(subject.key).to be
+        expect(subject).to include 'sandwich'
+      end
+    end
+
+    describe 'an anonymous map' do
+      subject { Riak::Crdt::Map.new bucket, nil }
+      it 'accepts a Riak-assigned name' do
+        subject.registers['coat_pattern'] = 'tabby'
+        expect(subject.key).to be
+        expect(subject.registers['coat_pattern']).to eq 'tabby'
+      end
     end
   end
   

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

@@ -0,0 +1,33 @@
+require 'spec_helper'
+require 'timeout'
+
+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'
+      first.content_type = 'text/plain'
+      first.store
+
+      second = bucket.new 'second'
+      second.data = 'second'
+      second.content_type = 'text/plain'
+      second.store
+    end
+
+    it 'fails out when a request is interrupted, and never returns the wrong payload' do
+      expect do
+        Timeout.timeout 1 do
+          loop do
+            expect(bucket.get('first').data).to eq 'first'
+          end
+        end
+      end.to raise_error Timeout::Error
+
+      expect(bucket.get('second').data).to eq 'second'
+    end    
+  end
+end

data/spec/integration/riak/secondary_index_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+describe 'Secondary indexes', test_client: true, integration: true do
+  let(:bucket){ random_bucket '2i-integration' }
+  before do
+    50.times do |i|
+      bucket.new(i.to_s).tap do |obj|
+        obj.indexes["index_int"] << i
+        obj.indexes["index_bin"] << i.to_s
+        obj.data = [i]
+        obj.store
+      end
+    end
+  end
+
+  it "finds keys for an equality query" do
+    expect(bucket.get_index('index_int', 20)).to eq(["20"])
+  end
+
+  it "finds keys for a range query" do
+    expect(bucket.get_index('index_int', 19..21)).to match_array(["19","20", "21"])
+  end
+
+  it "returns an empty array for a query that does not match any keys" do
+    expect(bucket.get_index('index_int', 10000)).to eq([])
+  end
+
+  it "returns terms" do
+    results = nil
+    expect do
+      results = bucket.get_index('index_int',
+                                 19..21, 
+                                 return_terms: true)
+    end.to_not raise_error
+
+    expect(results).to be_a Array
+    expect(results.with_terms).to be_a Hash
+  end
+
+  it "returns terms matching a term_regex" do
+    results = nil
+    expect do
+      results = bucket.get_index('index_bin',
+                                 '19'..'21', 
+                                 return_terms: true,
+                                 term_regex: '20')
+    end.to_not raise_error
+
+    terms = results.with_terms
+
+    expect(terms['20']).to be
+    expect(terms['19']).to be_empty
+  end
+end

data/spec/integration/riak/security_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'riak'
 require 'riak/errors/connection_error'
-require 'r509/cert/validator/errors'
+require 'cert_validator/errors'
 
 describe 'Secure Protobuffs', test_client: true, integration: true do
   let(:config){ test_client_configuration.dup }
@@ -59,9 +59,15 @@ 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(__dir__, '..', '..', 'support', 'certs', 'server.crl'))
+        File.expand_path(File.join('..', 
+                                   '..', 
+                                   '..',
+                                   'support', 
+                                   'certs', 
+                                   'server.crl'),
+                         __FILE__)
       revoked_auth_config[:authentication][:crl] = true
 
       revoked_auth_client = Riak::Client.new revoked_auth_config

data/spec/riak/client_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'riak/errors/protobuffs_error'
 
 describe Riak::Client, test_client: true do
   describe "when initializing" do
@@ -27,6 +28,16 @@ describe Riak::Client, test_client: true do
     it "should create a client ID if not specified" do
       expect(Riak::Client.new(pb_port: test_client.nodes.first.pb_port).client_id).not_to be_nil
     end
+
+    it "should accept multiple nodes" do
+      client = Riak::Client.new :nodes => [
+        {:host => 'riak1.basho.com'},
+        {:host => 'riak2.basho.com', :pb_port => 1234},
+        {:host => 'riak3.basho.com', :pb_port => 5678}
+      ]
+      expect(client.nodes.size).to eq(3)
+      expect(client.nodes.first.host).to eq("riak1.basho.com")
+    end
   end
 
   it "should expose a Stamp object" do
@@ -173,4 +184,38 @@ describe Riak::Client, test_client: true do
       expect(buckets.size).to eq(2)
     end
   end
+
+  describe "when receiving errors from the backend"
+    before do
+      @client = Riak::Client.new 
+    end
+
+    it "should retry on recoverable errors" do
+      call_count = 0
+      
+      begin
+        @client.backend do |b| 
+          call_count += 1
+          raise Riak::ProtobuffsFailedHeader
+        end
+      rescue RuntimeError
+      end
+
+      expect(call_count).to eq(3)
+    end
+
+    it "should throw a RuntimeError if it runs out of retries" do
+      error = nil
+      begin
+        @client.backend do |b| 
+          raise Riak::ProtobuffsFailedHeader
+        end
+      rescue RuntimeError => e
+        error = e
+      end
+
+      expect(error).not_to be_nil
+      expect(error).to be_instance_of(RuntimeError)
+    end
+
 end

data/spec/support/test_client.yml

@@ -1,7 +1,10 @@
-# protip: don't run more than one node, tests are sensitive to quorums
-nodes:
-  - {host: 'localhost', pb_port: 17017}
-# authentication: 
-#   user: 'user'
-#   password: 'password'
-#   ca_file: /Users/bkerley/Documents/riak-ruby-client/spec/support/certs/ca.crt
+# This file is used for configuring test_client used by
+# many of the integration tests.
+#
+# Simply set the arguments you'd normally pass to
+# Riak::Client.new in the file.
+#
+# Don't run multiple nodes, integration tests include
+# quorum checks that may result in race conditions.
+
+pb_port: 17017

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riak-client
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
+  version: 2.0.0.rc2
 platform: ruby
 authors:
 - Sean Cribbs
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-23 00:00:00.000000000 Z
+date: 2014-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -54,19 +54,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.8.7
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -138,19 +138,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.2
 - !ruby/object:Gem::Dependency
-  name: r509-cert-validator
+  name: cert_validator
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.1
 description: 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.
@@ -262,7 +262,9 @@ files:
 - spec/integration/riak/crdt_spec.rb
 - spec/integration/riak/crdt_validation/map_spec.rb
 - spec/integration/riak/crdt_validation/set_spec.rb
+- spec/integration/riak/protobuffs/interrupted_request_spec.rb
 - spec/integration/riak/protobuffs_backends_spec.rb
+- spec/integration/riak/secondary_index_spec.rb
 - spec/integration/riak/security_spec.rb
 - spec/integration/riak/threading_spec.rb
 - spec/integration/yokozuna/index_spec.rb
@@ -271,7 +273,6 @@ files:
 - spec/riak/beefcake_protobuffs_backend/crdt_operator_spec.rb
 - spec/riak/beefcake_protobuffs_backend/object_methods_spec.rb
 - spec/riak/beefcake_protobuffs_backend/protocol_spec.rb
-- spec/riak/beefcake_protobuffs_backend/socket_spec.rb
 - spec/riak/beefcake_protobuffs_backend_spec.rb
 - spec/riak/bucket_spec.rb
 - spec/riak/client_spec.rb
@@ -340,7 +341,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: riak-client is a rich client for Riak, the distributed database by Basho.
@@ -362,7 +363,9 @@ test_files:
 - spec/integration/riak/crdt_spec.rb
 - spec/integration/riak/crdt_validation/map_spec.rb
 - spec/integration/riak/crdt_validation/set_spec.rb
+- spec/integration/riak/protobuffs/interrupted_request_spec.rb
 - spec/integration/riak/protobuffs_backends_spec.rb
+- spec/integration/riak/secondary_index_spec.rb
 - spec/integration/riak/security_spec.rb
 - spec/integration/riak/threading_spec.rb
 - spec/integration/yokozuna/index_spec.rb
@@ -371,7 +374,6 @@ test_files:
 - spec/riak/beefcake_protobuffs_backend/crdt_operator_spec.rb
 - spec/riak/beefcake_protobuffs_backend/object_methods_spec.rb
 - spec/riak/beefcake_protobuffs_backend/protocol_spec.rb
-- spec/riak/beefcake_protobuffs_backend/socket_spec.rb
 - spec/riak/beefcake_protobuffs_backend_spec.rb
 - spec/riak/bucket_spec.rb
 - spec/riak/client_spec.rb

data/spec/riak/beefcake_protobuffs_backend/socket_spec.rb

@@ -1,151 +0,0 @@
-require 'spec_helper'
-require 'riak/client/beefcake/socket'
-
-describe Riak::Client::BeefcakeProtobuffsBackend::BeefcakeSocket do
-  let(:host){ 'host' }
-  let(:pb_port){ 8087 }
-  let(:tcp_socket_instance){ double 'TCPSocket' }
-
-  let(:ssl){ OpenSSL::SSL }
-
-  describe 'without authentication configured' do
-    let(:options){ Hash.new }
-    it 'should start a tcp connection and not start a tls connection' do
-      expect(TCPSocket).to receive(:new).
-        with(host, pb_port).
-        and_return(tcp_socket_instance)
-
-      expect(tcp_socket_instance).to receive(:setsockopt).
-        with(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, true)
-
-      expect(ssl::SSLSocket).not_to receive(:new)
-
-      described_class.new host, pb_port
-    end
-  end
-
-  describe 'with authentication configured' do
-    let(:user){ 'user' }
-    let(:password){ 'password' }
-    let(:options) do
-      {
-        authentication: { 
-          user: user,
-          password: password
-        } 
-      }
-    end
-    let(:ssl_socket_instance){ double 'SSLSocket' }
-    let(:ssl_peer_cert){ double 'Peer Certificate' }
-    let(:r509_cert){ double 'R509::Cert' }
-    let(:rcv_instance){ double 'R509::Cert::Validator instance' }
-
-    it 'should start a tcp and a tls connection, and send authentication info' do
-      expect(TCPSocket).to receive(:new).
-        with(host, pb_port).
-        and_return(tcp_socket_instance)
-
-      expect(tcp_socket_instance).to receive(:setsockopt).
-        with(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, true)
-
-      allow(tcp_socket_instance).to receive(:write)
-
-      # StartTls
-      expect(tcp_socket_instance).to receive(:read).
-        with(5).
-        and_return([1, 255].pack 'NC')
-
-      expect(ssl::SSLSocket).to receive(:new).
-        with(tcp_socket_instance, kind_of(OpenSSL::SSL::SSLContext)).
-        and_return(ssl_socket_instance)
-
-      expect(ssl_socket_instance).to receive(:connect)
-
-      allow(ssl_socket_instance).to receive(:write)
-
-      expect(ssl_socket_instance).to receive(:peer_cert).
-        and_return(ssl_peer_cert)
-      expect(R509::Cert).to receive(:new).
-        with(cert: ssl_peer_cert).
-        and_return(r509_cert)
-      allow(r509_cert).to receive(:valid?).and_return(true)
-      expect(R509::Cert::Validator).to receive(:new).
-        with(r509_cert).
-        and_return(rcv_instance)
-
-      expect(rcv_instance).to receive(:validate).
-        with(ocsp: false, crl: false, crl_file: nil).
-        and_return(true)
-
-      # AuthResp
-      expect(ssl_socket_instance).to receive(:read).
-        with(5).
-        and_return([1, 254].pack 'NC')
-
-      # PingResp
-      expect(ssl_socket_instance).to receive(:read).
-        with(5).
-        and_return([1, 2].pack 'NC')
-
-      described_class.new host, pb_port, options
-    end
-
-    it 'should pass pass TLS options through to OpenSSL' do
-      options[:authentication][:ca_file] = 'spec/support/certs/ca.crt'
-      options[:authentication][:key] = 'spec/support/certs/client.key'
-
-      expect(TCPSocket).to receive(:new).
-        with(host, pb_port).
-        and_return(tcp_socket_instance)
-
-      expect(tcp_socket_instance).to receive(:setsockopt).
-        with(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, true)
-
-      allow(tcp_socket_instance).to receive(:write)
-
-      # StartTls
-      expect(tcp_socket_instance).to receive(:read).
-        with(5).
-        and_return([1, 255].pack 'NC')
-
-      expect(ssl::SSLSocket).to receive(:new) do |sock, ctx|
-        expect(sock).to eq tcp_socket_instance
-        expect(ctx).to be_a OpenSSL::SSL::SSLContext
-        expect(ctx.key).to be_a OpenSSL::PKey::PKey
-        expect(ctx.ca_file).to eq 'spec/support/certs/ca.crt'
-        
-        ssl_socket_instance
-      end
-
-      expect(ssl_socket_instance).to receive(:connect)
-
-      allow(ssl_socket_instance).to receive(:write)
-
-      expect(ssl_socket_instance).to receive(:peer_cert).
-        and_return(ssl_peer_cert)
-      expect(R509::Cert).to receive(:new).
-        with(cert: ssl_peer_cert).
-        and_return(r509_cert)
-      allow(r509_cert).to receive(:valid?).and_return(true)
-      expect(R509::Cert::Validator).to receive(:new).
-        with(r509_cert).
-        and_return(rcv_instance)
-
-      expect(rcv_instance).to receive(:validate).
-        with(ocsp: false, crl: false, crl_file: nil).
-        and_return(true)
-
-      # AuthResp
-      expect(ssl_socket_instance).to receive(:read).
-        with(5).
-        and_return([1, 254].pack 'NC')
-
-      # PingResp
-      expect(ssl_socket_instance).to receive(:read).
-        with(5).
-        and_return([1, 2].pack 'NC')
-
-      described_class.new host, pb_port, options
-    end
-  end
-end