riak-client 0.9.4 → 0.9.5

data/bin/autospec

@@ -0,0 +1,16 @@
+#!/usr/bin/env jruby
+#
+# This file was generated by Bundler.
+#
+# The application 'autospec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rspec-core', 'autospec')

data/bin/htmldiff

@@ -0,0 +1,16 @@
+#!/usr/bin/env jruby
+#
+# This file was generated by Bundler.
+#
+# The application 'htmldiff' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('diff-lcs', 'htmldiff')

data/bin/ldiff

@@ -0,0 +1,16 @@
+#!/usr/bin/env jruby
+#
+# This file was generated by Bundler.
+#
+# The application 'ldiff' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('diff-lcs', 'ldiff')

data/bin/protoc-gen-beefcake

@@ -0,0 +1,16 @@
+#!/usr/bin/env jruby
+#
+# This file was generated by Bundler.
+#
+# The application 'protoc-gen-beefcake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('beefcake', 'protoc-gen-beefcake')

data/bin/rackup

@@ -0,0 +1,16 @@
+#!/usr/bin/env jruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rackup' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rack', 'rackup')

data/bin/rake

@@ -0,0 +1,16 @@
+#!/usr/bin/env jruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rake', 'rake')

data/bin/rspec

@@ -0,0 +1,16 @@
+#!/usr/bin/env jruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rspec-core', 'rspec')

data/lib/riak/bucket.rb

@@ -51,6 +51,7 @@ module Riak
     def keys(options={}, &block)
       if block_given?
         @client.backend.list_keys(self, &block)
+        @keys = nil
       elsif @keys.nil? || options[:reload]
         @keys = @client.backend.list_keys(self)
       end

data/lib/riak/client.rb

@@ -312,7 +312,7 @@ module Riak
     end
     alias :list_buckets :buckets
 
-    # Stores a large file/IO object in Riak via the "Luwak" interface.
+    # Stores a large file/IO-like object in Riak via the "Luwak" interface.
     # @overload store_file(filename, content_type, data)
     #   Stores the file at the given key/filename
     #   @param [String] filename the key/filename for the object
@@ -321,7 +321,7 @@ module Riak
     # @overload store_file(content_type, data)
     #   Stores the file with a server-determined key/filename
     #   @param [String] content_type the MIME Content-Type for the data
-    #   @param [IO, String] data the contents of the file
+    #   @param [String, #read] data the contents of the file
     # @return [String] the key/filename where the object was stored
     def store_file(*args)
       data, content_type, filename = args.reverse

data/lib/riak/client/beefcake_protobuffs_backend.rb

@@ -128,7 +128,7 @@ module Riak
             results[msg.phase] += JSON.parse(msg.response)
           end
         end
-        block_given? || results.size == 1 ? results.first : results
+        block_given? || results.compact.size == 1 ? results.last : results
       end
 
       private

data/lib/riak/client/http_backend/transport_methods.rb

@@ -128,7 +128,7 @@ module Riak
         # @param [URI] uri the HTTP URI to request
         # @param [Hash] headers headers to send along with the request
         # @param [Fixnum, Array] expect the expected response code(s)
-        # @param [String, IO] body the PUT or POST request body
+        # @param [String, #read] body the PUT or POST request body
         # @return [Hash] response data, containing :headers, :code and :body keys. Only :headers and :code should be present when the body is streamed or the method is :head.
         # @yield [chunk] if the method is not :head, successive chunks of the response body will be yielded as strings
         # @raise [NotImplementedError] if a subclass does not implement this method
@@ -186,7 +186,7 @@ module Riak
             raise ArgumentError, t("path_and_body_required")
           end
 
-          raise ArgumentError, t("request_body_type") unless String === body || IO === body
+          raise ArgumentError, t("request_body_type") unless String === body || body.respond_to?(:read)
           [args, body]
         end
 

data/lib/riak/client/net_http_backend.rb

@@ -39,7 +39,15 @@ module Riak
         case data
         when String
           request.body = data
-        when IO
+        when data.respond_to?(:read)
+          case
+          when data.respond_to?(:stat) # IO#stat
+            request.content_length = data.stat.size
+          when data.respond_to?(:size) # Some IO-like objects
+            request.content_length = data.size
+          else
+            request['Transfer-Encoding'] = 'chunked'
+          end
           request.body_stream = data
         end
 

data/lib/riak/core_ext/to_param.rb

@@ -22,9 +22,9 @@ unless Object.new.respond_to? :to_query and Object.new.respond_to? :to_param
   end
 
   class Hash
-    def to_param
-      map do |key, value|
-        value.to_query(key)
+    def to_param(namespace = nil)
+      collect do |key, value|
+        value.to_query(namespace ? "#{namespace}[#{key}]" : key)
       end.sort * '&'
     end
   end

data/lib/riak/locale/en.yml

@@ -42,7 +42,7 @@ en:
     path_and_body_required: "You must supply both a resource path and a body."
     port_invalid: "port must be an integer between 0 and 65535"
     protobuffs_failed_request: "Expected success from Riak but received %{code}. %{body}"
-    request_body_type: "Request body must be a String or IO."
+    request_body_type: "Request body must be a String or respond to :read."
     resource_path_short: "Resource path too short"
     search_docs_require_id: "Search index documents must include the 'id' field."
     search_remove_requires_id_or_query: "Search index documents to be removed must have 'id' or 'query' keys."

data/lib/riak/robject.rb

@@ -125,7 +125,7 @@ module Riak
       @raw_data
     end
 
-    # @param [String, IO] the raw data to be stored in riak at this key, will not be marshaled or manipulated prior to storage. Overrides any data stored by {#data=}
+    # @param [String, IO-like] the raw data to be stored in riak at this key, will not be marshaled or manipulated prior to storage. Overrides any data stored by {#data=}
     # @return [String] the data stored
     def raw_data=(new_raw_data)
       @data = nil
@@ -196,7 +196,7 @@ module Riak
     # be done.
     # @param [Object] payload the data to serialize
     def serialize(payload)
-      return payload if IO === payload
+      return payload if payload.respond_to?(:read)
       case @content_type
       when /json/
         payload.to_json(Riak.json_options)

data/pkg/httpvpbuf.rb

@@ -0,0 +1,48 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+require 'bundler/setup'
+$: << File.expand_path("../../lib", __FILE__)
+require 'riak'
+require 'benchmark'
+
+http = Riak::Client.new(:http_backend => :Excon)
+pbc = Riak::Client.new(:protocol => "pbc")
+
+ops = {
+  :list_buckets => [5],
+  :list_keys => [20,"riakjs_http"],
+  :ping => [100],
+  :get_bucket_props => [1000,"riakjs_airlines"],
+  :set_bucket_props => [100,"foo", {:n_val => 2}]
+}
+
+def textobj(c,key=nil)
+  obj = c['bench'].new(key)
+  obj.content_type = "text/plain"
+  obj.raw_data = "This is a message to all out there who like to benchmark."
+  obj  
+end
+
+KEYS = 1000
+
+OPERATIONS = [
+              [:ping,       lambda {|client| 100.times { client.ping }}],
+              [:buckets,    lambda {|client| 10.times { client.buckets } }],
+              [:get_bucket, lambda {|client| 1000.times { client.backend.get_bucket_props('foo') }}],
+              [:set_bucket, lambda {|client| 100.times { client['foo'].props = {"n_val" => 2}}}],
+              [:store_new,  lambda {|client| KEYS.times { textobj(client).store }}],
+              [:store_key,  lambda {|client| KEYS.times {|i| textobj(client, "#{client.protocol}#{i}").store }}],
+              [:fetch_key,  lambda {|client| KEYS.times {|i| client['bench'].get("#{client.protocol}#{i}") } }],
+              [:keys,       lambda {|client| 5.times { client.backend.list_keys('bench') }}],
+              [:key_stream, lambda {|client| 5.times { client['bench'].keys {|ks| "." }}}]
+             ]
+
+Benchmark.bmbm(25) do |x|
+  OPERATIONS.each do |op|
+    [http, pbc].each do |c|
+      x.report("#{c.protocol.ljust(6)}#{op[0]}") do
+        op[1][c]
+      end
+    end
+  end
+end

data/pkg/lk.rb

@@ -0,0 +1,21 @@
+require 'riak'
+
+riak = Riak::Client.new( :http_backend => :Excon )
+
+bucket_names = ["foobar"]
+bucket_names.each do |bucket_name|
+  bucket = riak.bucket(bucket_name)
+  10.times do
+    new_one = Riak::RObject.new(bucket, "#{rand}")
+    new_one.content_type = "application/javascript" # You must set the content type.
+    new_one.data = "Hello, World!')"
+    new_one.store
+  end
+
+  bucket.keys do |keys|
+    keys.each do |key|
+      puts key
+      bucket.delete(key)
+    end
+  end
+end

data/pkg/ts.rb

@@ -0,0 +1,35 @@
+require 'bundler/setup'
+require 'riak'
+require 'riak/test_server'
+
+OUTER = 100
+INNER = 1000
+
+ts = Riak::TestServer.new(:bin_dir => "/usr/local/bin",
+                          :temp_dir => "./rel")
+$expect_verbose = true
+ts.prepare!
+ts.start
+
+c = Riak::Client.new(:port => 9000, :http_backend => :Excon)
+
+OUTER.times do
+  warn "NOT STARTED, WTF?" unless ts.started?
+  INNER.times do    
+    unless rand > 0.8
+      c['test'].new.tap do |o|
+        o.data = "Some test data" * rand(10)
+        o.content_type = "text/plain"
+        o.store
+      end
+      print "."
+    end
+  end
+  puts
+
+  ts.recycle
+end
+
+ts.stop
+ts.cleanup
+$expect_verbose = false

data/riak-client.gemspec

@@ -2,19 +2,19 @@
 
 Gem::Specification.new do |s|
   s.name = %q{riak-client}
-  s.version = "0.9.4"
+  s.version = "0.9.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Sean Cribbs"]
-  s.date = %q{2011-05-10}
+  s.authors = [%q{Sean Cribbs}]
+  s.date = %q{2011-06-14}
   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/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.files = [%q{erl_src/riak_kv_test_backend.beam}, %q{erl_src/riak_kv_test_backend.erl}, %q{Gemfile}, %q{lib/active_support/cache/riak_store.rb}, %q{lib/riak/bucket.rb}, %q{lib/riak/cache_store.rb}, %q{lib/riak/client/beefcake/messages.rb}, %q{lib/riak/client/beefcake/object_methods.rb}, %q{lib/riak/client/beefcake_protobuffs_backend.rb}, %q{lib/riak/client/curb_backend.rb}, %q{lib/riak/client/excon_backend.rb}, %q{lib/riak/client/http_backend/configuration.rb}, %q{lib/riak/client/http_backend/key_streamer.rb}, %q{lib/riak/client/http_backend/object_methods.rb}, %q{lib/riak/client/http_backend/request_headers.rb}, %q{lib/riak/client/http_backend/transport_methods.rb}, %q{lib/riak/client/http_backend.rb}, %q{lib/riak/client/net_http_backend.rb}, %q{lib/riak/client/protobuffs_backend.rb}, %q{lib/riak/client/pump.rb}, %q{lib/riak/client.rb}, %q{lib/riak/core_ext/blank.rb}, %q{lib/riak/core_ext/extract_options.rb}, %q{lib/riak/core_ext/slice.rb}, %q{lib/riak/core_ext/stringify_keys.rb}, %q{lib/riak/core_ext/symbolize_keys.rb}, %q{lib/riak/core_ext/to_param.rb}, %q{lib/riak/core_ext.rb}, %q{lib/riak/failed_request.rb}, %q{lib/riak/i18n.rb}, %q{lib/riak/json.rb}, %q{lib/riak/link.rb}, %q{lib/riak/locale/en.yml}, %q{lib/riak/map_reduce/filter_builder.rb}, %q{lib/riak/map_reduce/phase.rb}, %q{lib/riak/map_reduce.rb}, %q{lib/riak/map_reduce_error.rb}, %q{lib/riak/robject.rb}, %q{lib/riak/search.rb}, %q{lib/riak/test_server.rb}, %q{lib/riak/util/escape.rb}, %q{lib/riak/util/fiber1.8.rb}, %q{lib/riak/util/headers.rb}, %q{lib/riak/util/multipart/stream_parser.rb}, %q{lib/riak/util/multipart.rb}, %q{lib/riak/util/tcp_socket_extensions.rb}, %q{lib/riak/util/translation.rb}, %q{lib/riak/walk_spec.rb}, %q{lib/riak.rb}, %q{pkg/httpvpbuf.rb}, %q{pkg/lk.rb}, %q{pkg/riak-client-0.9.4.gem}, %q{pkg/ts.rb}, %q{Rakefile}, %q{riak-client.gemspec}, %q{spec/fixtures/cat.jpg}, %q{spec/fixtures/multipart-blank.txt}, %q{spec/fixtures/multipart-mapreduce.txt}, %q{spec/fixtures/multipart-with-body.txt}, %q{spec/fixtures/server.cert.crt}, %q{spec/fixtures/server.cert.key}, %q{spec/fixtures/test.pem}, %q{spec/integration/riak/cache_store_spec.rb}, %q{spec/integration/riak/http_backends_spec.rb}, %q{spec/integration/riak/protobuffs_backends_spec.rb}, %q{spec/integration/riak/test_server_spec.rb}, %q{spec/riak/beefcake_protobuffs_backend_spec.rb}, %q{spec/riak/bucket_spec.rb}, %q{spec/riak/client_spec.rb}, %q{spec/riak/core_ext/to_param_spec.rb}, %q{spec/riak/curb_backend_spec.rb}, %q{spec/riak/escape_spec.rb}, %q{spec/riak/excon_backend_spec.rb}, %q{spec/riak/headers_spec.rb}, %q{spec/riak/http_backend/configuration_spec.rb}, %q{spec/riak/http_backend/object_methods_spec.rb}, %q{spec/riak/http_backend/transport_methods_spec.rb}, %q{spec/riak/http_backend_spec.rb}, %q{spec/riak/link_spec.rb}, %q{spec/riak/map_reduce/filter_builder_spec.rb}, %q{spec/riak/map_reduce/phase_spec.rb}, %q{spec/riak/map_reduce_spec.rb}, %q{spec/riak/multipart_spec.rb}, %q{spec/riak/net_http_backend_spec.rb}, %q{spec/riak/robject_spec.rb}, %q{spec/riak/search_spec.rb}, %q{spec/riak/stream_parser_spec.rb}, %q{spec/riak/walk_spec_spec.rb}, %q{spec/spec_helper.rb}, %q{spec/support/drb_mock_server.rb}, %q{spec/support/http_backend_implementation_examples.rb}, %q{spec/support/mock_server.rb}, %q{spec/support/mocks.rb}, %q{spec/support/test_server.yml.example}, %q{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.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.5}
   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/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"]
+  s.test_files = [%q{lib/riak/walk_spec.rb}, %q{spec/integration/riak/cache_store_spec.rb}, %q{spec/integration/riak/http_backends_spec.rb}, %q{spec/integration/riak/protobuffs_backends_spec.rb}, %q{spec/integration/riak/test_server_spec.rb}, %q{spec/riak/beefcake_protobuffs_backend_spec.rb}, %q{spec/riak/bucket_spec.rb}, %q{spec/riak/client_spec.rb}, %q{spec/riak/core_ext/to_param_spec.rb}, %q{spec/riak/curb_backend_spec.rb}, %q{spec/riak/escape_spec.rb}, %q{spec/riak/excon_backend_spec.rb}, %q{spec/riak/headers_spec.rb}, %q{spec/riak/http_backend/configuration_spec.rb}, %q{spec/riak/http_backend/object_methods_spec.rb}, %q{spec/riak/http_backend/transport_methods_spec.rb}, %q{spec/riak/http_backend_spec.rb}, %q{spec/riak/link_spec.rb}, %q{spec/riak/map_reduce/filter_builder_spec.rb}, %q{spec/riak/map_reduce/phase_spec.rb}, %q{spec/riak/map_reduce_spec.rb}, %q{spec/riak/multipart_spec.rb}, %q{spec/riak/net_http_backend_spec.rb}, %q{spec/riak/robject_spec.rb}, %q{spec/riak/search_spec.rb}, %q{spec/riak/stream_parser_spec.rb}, %q{spec/riak/walk_spec_spec.rb}]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/spec/integration/riak/http_backends_spec.rb

@@ -42,4 +42,30 @@ describe "HTTP" do
       end
     end
   end
+
+  class Reader < Array
+    def read(*args)
+      shift
+    end
+
+    def size
+      join.size
+    end
+  end
+
+  class SizelessReader < Reader
+    undef :size
+  end
+
+  describe 'NetHTTPBackend' do
+    subject { Riak::Client::NetHTTPBackend.new(@client) }
+    let(:file) { File.open(__FILE__) }
+    let(:sized) { Reader.new(["foo", "bar", "baz"]) }
+    let(:sizeless) { SizelessReader.new(["foo", "bar", "baz"]) }
+    it "should set the content-length or transfer-encoding properly on IO uploads" do
+      lambda { subject.put(204, "/riak/nethttp", "test-file", file, {"Content-Type" => "text/plain"}) }.should_not raise_error
+      lambda { subject.put(204, "/riak/nethttp", "test-sized", sized, {"Content-Type" => "text/plain"}) }.should_not raise_error
+      lambda { subject.put(204, "/riak/nethttp", "test-file", sizeless, {"Content-Type" => "text/plain"}) }.should_not raise_error
+    end
+  end
 end

data/spec/riak/beefcake_protobuffs_backend_spec.rb

@@ -38,3 +38,22 @@ describe Riak::Client::BeefcakeProtobuffsBackend do
     @backend.list_keys(exp_bucket).should == exp_keys
   end
 end
+
+describe Riak::Client::BeefcakeProtobuffsBackend, '#mapred' do
+  before(:each) do
+    @client = Riak::Client.new
+    @backend = Riak::Client::BeefcakeProtobuffsBackend.new(@client)
+    @backend.instance_variable_set(:@server_config, {})
+  end
+  
+  it "should not return nil for previous phases that don't return anything" do
+    socket = stub(:socket).as_null_object
+    socket.stub(:read).and_return(stub(:socket_header, :unpack => [2, 24]), stub(:socket_message), stub(:socket_header_2, :unpack => [0, 1]))
+    message = stub(:message, :phase => 1, :response => [{}].to_json)
+    message.stub(:done).and_return(false, true)
+    Riak::Client::BeefcakeProtobuffsBackend::RpbMapRedResp.stub(:decode => message)
+    TCPSocket.stub(:new => socket)
+    
+    @backend.mapred('').should == [{}]
+  end
+end

data/spec/riak/bucket_spec.rb

@@ -57,6 +57,17 @@ describe Riak::Bucket do
       end
       all_keys.should == ["bar", "baz"]
     end
+
+    it "should invalidate the key cache when streaming" do
+      @backend.should_receive(:list_keys).once.and_return(['a'])
+      @backend.should_receive(:list_keys).once.and_yield(['b'])
+      @backend.should_receive(:list_keys).once.and_return(['c'])
+      @bucket.keys.should == ['a']
+      keys = []
+      @bucket.keys {|kl| keys.concat(kl) }
+      keys.should == ['b']
+      @bucket.keys.should == ['c']
+    end
   end
 
   describe "setting the bucket properties" do

data/spec/riak/core_ext/to_param_spec.rb

@@ -0,0 +1,15 @@
+
+describe Riak do
+  require 'riak/core_ext/to_param'
+
+  it "should do param conversion correctly" do
+    { :name => 'David', :nationality => 'Danish' }.to_param.should == "name=David&nationality=Danish"
+  end
+
+  # Based on the activesupport implementation.
+  # https://github.com/rails/rails/blob/master/activesupport/lib/active_support/core_ext/object/to_param.rb
+  it "should do param conversion correctly with a namespace" do
+    { :name => 'David', :nationality => 'Danish' }.to_param('user').should == "user%5Bname%5D=David&user%5Bnationality%5D=Danish"
+  end
+
+end

data/spec/riak/http_backend/transport_methods_spec.rb

@@ -54,9 +54,10 @@ describe Riak::Client::HTTPBackend::TransportMethods do
       data.should == "This is the body."
     end
 
-    it "should raise an error if the body is not a string or IO" do
+    it "should raise an error if the body is not a string or IO or IO-like (responds to :read)" do
       lambda { @backend.verify_path_and_body!(["/riak/", "foo", nil]) }.should raise_error(ArgumentError)
       lambda { @backend.verify_path_and_body!(["/riak/", "foo", File.open("spec/fixtures/cat.jpg")]) }.should_not raise_error(ArgumentError)
+      lambda { @backend.verify_path_and_body!(["/riak/", "foo", Tempfile.new('riak-spec')]) }.should_not raise_error(ArgumentError)
     end
 
     it "should raise an error if a body is not given" do

metadata

@@ -1,114 +1,119 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: riak-client
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.9.5
   prerelease: 
-  version: 0.9.4
 platform: ruby
-authors: 
+authors:
 - Sean Cribbs
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-10 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-06-15 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2151933920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.4.0
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: fakeweb
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2151933920
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: &2151932640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "1.2"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.2'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rack
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2151932640
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: &2151931000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "1.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: curb
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2151931000
+- !ruby/object:Gem::Dependency
+  name: curb
+  requirement: &2151929760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0.6"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.6'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: excon
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2151929760
+- !ruby/object:Gem::Dependency
+  name: excon
+  requirement: &2151928760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.5.7
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: i18n
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2151928760
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &2151927680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: builder
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2151927680
+- !ruby/object:Gem::Dependency
+  name: builder
+  requirement: &2151926600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.1.2
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: beefcake
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *2151926600
+- !ruby/object:Gem::Dependency
+  name: beefcake
+  requirement: &2151924800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
-  version_requirements: *id008
-description: 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.
+  prerelease: false
+  version_requirements: *2151924800
+description: 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.
 email: sean@basho.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- bin/autospec
+- bin/htmldiff
+- bin/ldiff
+- bin/protoc-gen-beefcake
+- bin/rackup
+- bin/rake
+- bin/rspec
 - erl_src/riak_kv_test_backend.beam
 - erl_src/riak_kv_test_backend.erl
 - Gemfile
@@ -158,6 +163,10 @@ files:
 - lib/riak/util/translation.rb
 - lib/riak/walk_spec.rb
 - lib/riak.rb
+- pkg/httpvpbuf.rb
+- pkg/lk.rb
+- pkg/riak-client-0.9.4.gem
+- pkg/ts.rb
 - Rakefile
 - riak-client.gemspec
 - spec/fixtures/cat.jpg
@@ -174,6 +183,7 @@ files:
 - spec/riak/beefcake_protobuffs_backend_spec.rb
 - spec/riak/bucket_spec.rb
 - spec/riak/client_spec.rb
+- spec/riak/core_ext/to_param_spec.rb
 - spec/riak/curb_backend_spec.rb
 - spec/riak/escape_spec.rb
 - spec/riak/excon_backend_spec.rb
@@ -201,32 +211,29 @@ files:
 - spec/support/unified_backend_examples.rb
 homepage: http://seancribbs.github.com/ripple
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: riak-client is a rich client for Riak, the distributed database by Basho.
-test_files: 
+test_files:
 - lib/riak/walk_spec.rb
 - spec/integration/riak/cache_store_spec.rb
 - spec/integration/riak/http_backends_spec.rb
@@ -235,6 +242,7 @@ test_files:
 - spec/riak/beefcake_protobuffs_backend_spec.rb
 - spec/riak/bucket_spec.rb
 - spec/riak/client_spec.rb
+- spec/riak/core_ext/to_param_spec.rb
 - spec/riak/curb_backend_spec.rb
 - spec/riak/escape_spec.rb
 - spec/riak/excon_backend_spec.rb