riak-client 0.9.0 → 0.9.1

data/Gemfile

@@ -8,7 +8,7 @@ gem 'rack', '>=1.0'
 gem 'rake'
 gem 'bundler'
 gem 'excon', "~>0.5.7"
-gem 'beefcake', '~>0.2.0'
+gem 'beefcake', '~>0.3.1'
 
 platforms :mri do
   gem 'curb', '>=0.6'

data/Rakefile

@@ -16,7 +16,7 @@ gemspec = Gem::Specification.new do |gem|
   gem.add_development_dependency "excon", "~>0.5.7"
   gem.add_dependency "i18n", ">=0.4.0"
   gem.add_dependency "builder", "~>2.1.2"
-  gem.add_dependency "beefcake", "~>0.2.0"
+  gem.add_dependency "beefcake", "~>0.3.0"
 
   files = FileList["**/*"]
   # Editor and O/S files

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

@@ -17,19 +17,21 @@ module Riak
   class Client
     class BeefcakeProtobuffsBackend
       module ObjectMethods
+        ENCODING = "Riak".respond_to?(:encoding)
+
         # Returns RpbPutReq
         def dump_object(robject)
-          pbuf = RpbPutReq.new(:bucket => robject.bucket.name)
-          pbuf.key = robject.key || generate_key
-          pbuf.vclock = Base64.decode64(robject.vclock) if robject.vclock
-          pbuf.content = RpbContent.new(:value => robject.raw_data,
-                                        :content_type => robject.content_type,
+          pbuf = RpbPutReq.new(:bucket => maybe_encode(robject.bucket.name))
+          pbuf.key = maybe_encode(robject.key ||= generate_key)
+          pbuf.vclock = maybe_encode Base64.decode64(robject.vclock) if robject.vclock
+          pbuf.content = RpbContent.new(:value => maybe_encode(robject.raw_data),
+                                        :content_type => maybe_encode(robject.content_type),
                                         :links => robject.links.map {|l| encode_link(l) }.compact)
 
           pbuf.content.usermeta = robject.meta.map {|k,v| encode_meta(k,v)} if robject.meta.any?
-          pbuf.content.vtag = robject.etag if robject.etag.present?
-          if robject.raw_data.respond_to?(:encoding) # 1.9 support
-            pbuf.content.charset = robject.raw_data.encoding.name
+          pbuf.content.vtag = maybe_encode(robject.etag) if robject.etag.present?
+          if ENCODING # 1.9 support
+            pbuf.content.charset = maybe_encode(robject.raw_data.encoding.name)
           end
           pbuf
         end
@@ -52,7 +54,7 @@ module Riak
 
         private
         def load_content(pbuf, robject)
-          if pbuf.value.respond_to?(:force_encoding) && pbuf.charset.present?
+          if ENCODING && pbuf.charset.present?
             pbuf.value.force_encoding(pbuf.charset) if Encoding.find(pbuf.charset)
           end
           robject.raw_data = pbuf.value
@@ -73,7 +75,9 @@ module Riak
 
         def encode_link(link)
           return nil unless link.key.present?
-          RpbLink.new(:bucket => link.bucket.to_s, :key => link.key.to_s, :tag => link.tag.to_s)
+          RpbLink.new(:bucket => maybe_encode(link.bucket.to_s),
+                      :key => maybe_encode(link.key.to_s),
+                      :tag => maybe_encode(link.tag.to_s))
         end
 
         def decode_meta(pbuf, hash)
@@ -82,7 +86,12 @@ module Riak
 
         def encode_meta(key,value)
           return nil unless value.present?
-          RpbPair.new(:key.to_s, :value => value.to_s)
+          RpbPair.new(:key => maybe_encode(key.to_s),
+                      :value => maybe_encode(value.to_s))
+        end
+
+        def maybe_encode(string)
+          ENCODING ? string.encode('BINARY') : string
         end
       end
 

data/riak-client.gemspec

@@ -6,13 +6,13 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sean Cribbs"]
-  s.date = %q{2011-04-03}
+  s.date = %q{2011-04-07}
   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/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/invalid_response.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.homepage = %q{http://seancribbs.github.com/ripple}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.1}
+  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"]
 
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<excon>, ["~> 0.5.7"])
       s.add_runtime_dependency(%q<i18n>, [">= 0.4.0"])
       s.add_runtime_dependency(%q<builder>, ["~> 2.1.2"])
-      s.add_runtime_dependency(%q<beefcake>, ["~> 0.2.0"])
+      s.add_runtime_dependency(%q<beefcake>, ["~> 0.3.0"])
     else
       s.add_dependency(%q<rspec>, ["~> 2.4.0"])
       s.add_dependency(%q<fakeweb>, [">= 1.2"])
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<excon>, ["~> 0.5.7"])
       s.add_dependency(%q<i18n>, [">= 0.4.0"])
       s.add_dependency(%q<builder>, ["~> 2.1.2"])
-      s.add_dependency(%q<beefcake>, ["~> 0.2.0"])
+      s.add_dependency(%q<beefcake>, ["~> 0.3.0"])
     end
   else
     s.add_dependency(%q<rspec>, ["~> 2.4.0"])
@@ -46,6 +46,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<excon>, ["~> 0.5.7"])
     s.add_dependency(%q<i18n>, [">= 0.4.0"])
     s.add_dependency(%q<builder>, ["~> 2.1.2"])
-    s.add_dependency(%q<beefcake>, ["~> 0.2.0"])
+    s.add_dependency(%q<beefcake>, ["~> 0.3.0"])
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: riak-client
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors: 
 - Sean Cribbs
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-03 00:00:00 -04:00
-default_executable: 
+date: 2011-04-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -98,7 +97,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.2.0
+        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.
@@ -198,7 +197,6 @@ files:
 - spec/support/mocks.rb
 - spec/support/test_server.yml.example
 - spec/support/unified_backend_examples.rb
-has_rdoc: true
 homepage: http://seancribbs.github.com/ripple
 licenses: []
 
@@ -222,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: riak-client is a rich client for Riak, the distributed database by Basho.