riak-client 0.9.3 → 0.9.4

data/lib/riak/client/beefcake_protobuffs_backend.rb

@@ -134,8 +134,8 @@ module Riak
       private
       def write_protobuff(code, message)
         encoded = message.encode
-        socket.write([encoded.length+1, MESSAGE_CODES.index(code)].pack("NC"))
-        socket.write(encoded)
+        header = [encoded.length+1, MESSAGE_CODES.index(code)].pack("NC")
+        socket.write(header + encoded)
       end
 
       def decode_response(*args)

data/lib/riak/client/net_http_backend.rb

@@ -62,7 +62,7 @@ module Riak
         http.use_ssl = true
         http.verify_mode = OpenSSL::SSL.const_get("VERIFY_#{@client.ssl_options[:verify_mode].upcase}")
         if @client.ssl_options[:pem]
-          http.cert = OpenSSL::X510::Certificate.new(@client.ssl_options[:pem])
+          http.cert = OpenSSL::X509::Certificate.new(@client.ssl_options[:pem])
           http.key  = OpenSSL::PKey::RSA.new(@client.ssl_options[:pem], @client.ssl_options[:pem_password])
         end
         http.ca_file = @client.ssl_options[:ca_file] if @client.ssl_options[:ca_file]

data/lib/riak/client/protobuffs_backend.rb

@@ -75,7 +75,13 @@ module Riak
       end
 
       def socket
-        Thread.current[:riakpbc_socket] ||= TCPSocket.new(@client.host, @client.pb_port)
+        Thread.current[:riakpbc_socket] ||= new_socket
+      end
+
+      def new_socket
+        socket = TCPSocket.new(@client.host, @client.pb_port)
+        socket.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, true)
+        socket
       end
 
       def reset_socket

data/lib/riak/json.rb

@@ -1,4 +1,3 @@
-
 # Load JSON
 unless defined? JSON
   begin
@@ -7,3 +6,12 @@ unless defined? JSON
     require 'json'
   end
 end
+
+module Riak
+  class << self
+    # Options that will be passed to the JSON parser and encoder.
+    # Defaults to {:max_nesting => 20}
+    attr_accessor :json_options
+  end
+  self.json_options = {:max_nesting => 20}
+end

data/lib/riak/robject.rb

@@ -199,7 +199,7 @@ module Riak
       return payload if IO === payload
       case @content_type
       when /json/
-        payload.to_json
+        payload.to_json(Riak.json_options)
       when /yaml/
         YAML.dump(payload)
       when "application/x-ruby-marshal"
@@ -219,7 +219,7 @@ module Riak
     def deserialize(body)
       case @content_type
       when /json/
-        JSON.parse(body)
+        JSON.parse(body, Riak.json_options)
       when /yaml/
         YAML.load(body)
       when "application/x-ruby-marshal"

data/riak-client.gemspec

@@ -2,19 +2,19 @@
 
 Gem::Specification.new do |s|
   s.name = %q{riak-client}
-  s.version = "0.9.3"
+  s.version = "0.9.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sean Cribbs"]
-  s.date = %q{2011-04-18}
+  s.date = %q{2011-05-10}
   s.description = %q{riak-client is a rich client for Riak, the distributed database by Basho. It supports the full HTTP interface including storage operations, bucket configuration, link-walking and map-reduce.}
   s.email = %q{sean@basho.com}
-  s.files = ["erl_src/riak_kv_test_backend.beam", "erl_src/riak_kv_test_backend.erl", "Gemfile", "lib/active_support/cache/riak_store.rb", "lib/riak/bucket.rb", "lib/riak/cache_store.rb", "lib/riak/client/beefcake/messages.rb", "lib/riak/client/beefcake/object_methods.rb", "lib/riak/client/beefcake_protobuffs_backend.rb", "lib/riak/client/curb_backend.rb", "lib/riak/client/excon_backend.rb", "lib/riak/client/http_backend/configuration.rb", "lib/riak/client/http_backend/key_streamer.rb", "lib/riak/client/http_backend/object_methods.rb", "lib/riak/client/http_backend/request_headers.rb", "lib/riak/client/http_backend/transport_methods.rb", "lib/riak/client/http_backend.rb", "lib/riak/client/net_http_backend.rb", "lib/riak/client/protobuffs_backend.rb", "lib/riak/client/pump.rb", "lib/riak/client.rb", "lib/riak/core_ext/blank.rb", "lib/riak/core_ext/extract_options.rb", "lib/riak/core_ext/slice.rb", "lib/riak/core_ext/stringify_keys.rb", "lib/riak/core_ext/symbolize_keys.rb", "lib/riak/core_ext/to_param.rb", "lib/riak/core_ext.rb", "lib/riak/failed_request.rb", "lib/riak/i18n.rb", "lib/riak/json.rb", "lib/riak/link.rb", "lib/riak/locale/en.yml", "lib/riak/map_reduce/filter_builder.rb", "lib/riak/map_reduce/phase.rb", "lib/riak/map_reduce.rb", "lib/riak/map_reduce_error.rb", "lib/riak/robject.rb", "lib/riak/search.rb", "lib/riak/test_server.rb", "lib/riak/util/escape.rb", "lib/riak/util/fiber1.8.rb", "lib/riak/util/headers.rb", "lib/riak/util/multipart/stream_parser.rb", "lib/riak/util/multipart.rb", "lib/riak/util/tcp_socket_extensions.rb", "lib/riak/util/translation.rb", "lib/riak/walk_spec.rb", "lib/riak.rb", "Rakefile", "riak-client.gemspec", "spec/fixtures/cat.jpg", "spec/fixtures/multipart-blank.txt", "spec/fixtures/multipart-mapreduce.txt", "spec/fixtures/multipart-with-body.txt", "spec/fixtures/server.cert.crt", "spec/fixtures/server.cert.key", "spec/fixtures/test.pem", "spec/integration/riak/cache_store_spec.rb", "spec/integration/riak/http_backends_spec.rb", "spec/integration/riak/protobuffs_backends_spec.rb", "spec/integration/riak/test_server_spec.rb", "spec/riak/bucket_spec.rb", "spec/riak/client_spec.rb", "spec/riak/curb_backend_spec.rb", "spec/riak/escape_spec.rb", "spec/riak/excon_backend_spec.rb", "spec/riak/headers_spec.rb", "spec/riak/http_backend/configuration_spec.rb", "spec/riak/http_backend/object_methods_spec.rb", "spec/riak/http_backend/transport_methods_spec.rb", "spec/riak/http_backend_spec.rb", "spec/riak/link_spec.rb", "spec/riak/map_reduce/filter_builder_spec.rb", "spec/riak/map_reduce/phase_spec.rb", "spec/riak/map_reduce_spec.rb", "spec/riak/multipart_spec.rb", "spec/riak/net_http_backend_spec.rb", "spec/riak/robject_spec.rb", "spec/riak/search_spec.rb", "spec/riak/stream_parser_spec.rb", "spec/riak/walk_spec_spec.rb", "spec/spec_helper.rb", "spec/support/drb_mock_server.rb", "spec/support/http_backend_implementation_examples.rb", "spec/support/mock_server.rb", "spec/support/mocks.rb", "spec/support/test_server.yml.example", "spec/support/unified_backend_examples.rb"]
+  s.files = ["erl_src/riak_kv_test_backend.beam", "erl_src/riak_kv_test_backend.erl", "Gemfile", "lib/active_support/cache/riak_store.rb", "lib/riak/bucket.rb", "lib/riak/cache_store.rb", "lib/riak/client/beefcake/messages.rb", "lib/riak/client/beefcake/object_methods.rb", "lib/riak/client/beefcake_protobuffs_backend.rb", "lib/riak/client/curb_backend.rb", "lib/riak/client/excon_backend.rb", "lib/riak/client/http_backend/configuration.rb", "lib/riak/client/http_backend/key_streamer.rb", "lib/riak/client/http_backend/object_methods.rb", "lib/riak/client/http_backend/request_headers.rb", "lib/riak/client/http_backend/transport_methods.rb", "lib/riak/client/http_backend.rb", "lib/riak/client/net_http_backend.rb", "lib/riak/client/protobuffs_backend.rb", "lib/riak/client/pump.rb", "lib/riak/client.rb", "lib/riak/core_ext/blank.rb", "lib/riak/core_ext/extract_options.rb", "lib/riak/core_ext/slice.rb", "lib/riak/core_ext/stringify_keys.rb", "lib/riak/core_ext/symbolize_keys.rb", "lib/riak/core_ext/to_param.rb", "lib/riak/core_ext.rb", "lib/riak/failed_request.rb", "lib/riak/i18n.rb", "lib/riak/json.rb", "lib/riak/link.rb", "lib/riak/locale/en.yml", "lib/riak/map_reduce/filter_builder.rb", "lib/riak/map_reduce/phase.rb", "lib/riak/map_reduce.rb", "lib/riak/map_reduce_error.rb", "lib/riak/robject.rb", "lib/riak/search.rb", "lib/riak/test_server.rb", "lib/riak/util/escape.rb", "lib/riak/util/fiber1.8.rb", "lib/riak/util/headers.rb", "lib/riak/util/multipart/stream_parser.rb", "lib/riak/util/multipart.rb", "lib/riak/util/tcp_socket_extensions.rb", "lib/riak/util/translation.rb", "lib/riak/walk_spec.rb", "lib/riak.rb", "Rakefile", "riak-client.gemspec", "spec/fixtures/cat.jpg", "spec/fixtures/multipart-blank.txt", "spec/fixtures/multipart-mapreduce.txt", "spec/fixtures/multipart-with-body.txt", "spec/fixtures/server.cert.crt", "spec/fixtures/server.cert.key", "spec/fixtures/test.pem", "spec/integration/riak/cache_store_spec.rb", "spec/integration/riak/http_backends_spec.rb", "spec/integration/riak/protobuffs_backends_spec.rb", "spec/integration/riak/test_server_spec.rb", "spec/riak/beefcake_protobuffs_backend_spec.rb", "spec/riak/bucket_spec.rb", "spec/riak/client_spec.rb", "spec/riak/curb_backend_spec.rb", "spec/riak/escape_spec.rb", "spec/riak/excon_backend_spec.rb", "spec/riak/headers_spec.rb", "spec/riak/http_backend/configuration_spec.rb", "spec/riak/http_backend/object_methods_spec.rb", "spec/riak/http_backend/transport_methods_spec.rb", "spec/riak/http_backend_spec.rb", "spec/riak/link_spec.rb", "spec/riak/map_reduce/filter_builder_spec.rb", "spec/riak/map_reduce/phase_spec.rb", "spec/riak/map_reduce_spec.rb", "spec/riak/multipart_spec.rb", "spec/riak/net_http_backend_spec.rb", "spec/riak/robject_spec.rb", "spec/riak/search_spec.rb", "spec/riak/stream_parser_spec.rb", "spec/riak/walk_spec_spec.rb", "spec/spec_helper.rb", "spec/support/drb_mock_server.rb", "spec/support/http_backend_implementation_examples.rb", "spec/support/mock_server.rb", "spec/support/mocks.rb", "spec/support/test_server.yml.example", "spec/support/unified_backend_examples.rb"]
   s.homepage = %q{http://seancribbs.github.com/ripple}
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.7.2}
   s.summary = %q{riak-client is a rich client for Riak, the distributed database by Basho.}
-  s.test_files = ["lib/riak/walk_spec.rb", "spec/integration/riak/cache_store_spec.rb", "spec/integration/riak/http_backends_spec.rb", "spec/integration/riak/protobuffs_backends_spec.rb", "spec/integration/riak/test_server_spec.rb", "spec/riak/bucket_spec.rb", "spec/riak/client_spec.rb", "spec/riak/curb_backend_spec.rb", "spec/riak/escape_spec.rb", "spec/riak/excon_backend_spec.rb", "spec/riak/headers_spec.rb", "spec/riak/http_backend/configuration_spec.rb", "spec/riak/http_backend/object_methods_spec.rb", "spec/riak/http_backend/transport_methods_spec.rb", "spec/riak/http_backend_spec.rb", "spec/riak/link_spec.rb", "spec/riak/map_reduce/filter_builder_spec.rb", "spec/riak/map_reduce/phase_spec.rb", "spec/riak/map_reduce_spec.rb", "spec/riak/multipart_spec.rb", "spec/riak/net_http_backend_spec.rb", "spec/riak/robject_spec.rb", "spec/riak/search_spec.rb", "spec/riak/stream_parser_spec.rb", "spec/riak/walk_spec_spec.rb"]
+  s.test_files = ["lib/riak/walk_spec.rb", "spec/integration/riak/cache_store_spec.rb", "spec/integration/riak/http_backends_spec.rb", "spec/integration/riak/protobuffs_backends_spec.rb", "spec/integration/riak/test_server_spec.rb", "spec/riak/beefcake_protobuffs_backend_spec.rb", "spec/riak/bucket_spec.rb", "spec/riak/client_spec.rb", "spec/riak/curb_backend_spec.rb", "spec/riak/escape_spec.rb", "spec/riak/excon_backend_spec.rb", "spec/riak/headers_spec.rb", "spec/riak/http_backend/configuration_spec.rb", "spec/riak/http_backend/object_methods_spec.rb", "spec/riak/http_backend/transport_methods_spec.rb", "spec/riak/http_backend_spec.rb", "spec/riak/link_spec.rb", "spec/riak/map_reduce/filter_builder_spec.rb", "spec/riak/map_reduce/phase_spec.rb", "spec/riak/map_reduce_spec.rb", "spec/riak/multipart_spec.rb", "spec/riak/net_http_backend_spec.rb", "spec/riak/robject_spec.rb", "spec/riak/search_spec.rb", "spec/riak/stream_parser_spec.rb", "spec/riak/walk_spec_spec.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/spec/riak/beefcake_protobuffs_backend_spec.rb

@@ -0,0 +1,40 @@
+require File.expand_path("../spec_helper", File.dirname(__FILE__))
+require 'riak/client/beefcake/messages'
+
+describe Riak::Client::BeefcakeProtobuffsBackend do
+  before :each do
+    @client = Riak::Client.new
+    @backend = Riak::Client::BeefcakeProtobuffsBackend.new(@client)
+    @backend.instance_variable_set(:@server_config, {})
+  end
+
+  it "should only write to the socket one time per request" do
+    exp_bucket, exp_keys = 'foo', ['bar']
+    mock_socket = mock("mock TCP socket")
+
+    @backend.stub!(:socket).and_return(mock_socket)
+    mock_socket.should_receive(:write).exactly(1).with do |param|
+      len, code = param[0,5].unpack("NC")
+      req = Riak::Client::BeefcakeProtobuffsBackend::RpbListKeysReq.decode(param[5..-1])
+      code == 17 && req.bucket == exp_bucket
+    end
+
+    responses = Array.new(2) do |index|
+      resp = Riak::Client::BeefcakeProtobuffsBackend::RpbListKeysResp.new
+      if index == 0
+        resp.keys = exp_keys
+      else
+        resp.done = true
+      end
+      resp
+    end
+
+    responses.each do |response|
+      encoded_response = response.encode
+      mock_socket.should_receive(:read).exactly(1).with(5).and_return([1 + encoded_response.length, 18].pack("NC"))
+      mock_socket.should_receive(:read).exactly(1).with(encoded_response.length).and_return(encoded_response)
+    end
+
+    @backend.list_keys(exp_bucket).should == exp_keys
+  end
+end

data/spec/riak/robject_spec.rb

@@ -95,6 +95,22 @@ describe Riak::RObject do
         @object.deserialize('{"foo":"bar"}').should == {"foo" => "bar"}
         @object.deserialize('[1,2,3]').should == [1,2,3]
       end
+
+      it "should respect the max nesting option" do
+        # Sadly, this spec will not fail for me when using yajl-ruby
+        # on Ruby 1.9, even when passing the options to #to_json is
+        # not implemented.
+        Riak.json_options = {:max_nesting => 51}
+        h = {}
+        p = h
+        (1..50).each do |i|
+          p['a'] = {}
+          p = p['a']
+        end
+        s = h.to_json(Riak.json_options)
+        lambda { @object.serialize(h) }.should_not raise_error
+        lambda { @object.deserialize(s) }.should_not raise_error
+      end
     end
 
     describe "when the content type is application/x-ruby-marshal" do

data/spec/spec_helper.rb

@@ -40,4 +40,7 @@ RSpec.configure do |config|
   config.before(:each) do
     FakeWeb.clean_registry
   end
+
+  config.filter_run :focus => true
+  config.run_all_when_everything_filtered = true
 end

metadata

@@ -2,7 +2,7 @@
 name: riak-client
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors: 
 - Sean Cribbs
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-18 00:00:00 Z
+date: 2011-05-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -171,6 +171,7 @@ files:
 - spec/integration/riak/http_backends_spec.rb
 - spec/integration/riak/protobuffs_backends_spec.rb
 - spec/integration/riak/test_server_spec.rb
+- spec/riak/beefcake_protobuffs_backend_spec.rb
 - spec/riak/bucket_spec.rb
 - spec/riak/client_spec.rb
 - spec/riak/curb_backend_spec.rb
@@ -231,6 +232,7 @@ test_files:
 - spec/integration/riak/http_backends_spec.rb
 - spec/integration/riak/protobuffs_backends_spec.rb
 - spec/integration/riak/test_server_spec.rb
+- spec/riak/beefcake_protobuffs_backend_spec.rb
 - spec/riak/bucket_spec.rb
 - spec/riak/client_spec.rb
 - spec/riak/curb_backend_spec.rb