riak-client 0.7.1 → 0.8.0.beta

data/Gemfile

@@ -0,0 +1,13 @@
+# A sample Gemfile
+source :gemcutter
+
+gem 'activesupport', '~>2.3.5' # '3.0.0.rc'
+gem 'i18n'
+
+gem 'rspec', "~>2.0.0.beta.18"
+gem 'fakeweb', ">=1.2"
+gem 'rack', '>=1.0'
+gem 'curb', '>=0.6'
+gem 'yajl-ruby'
+gem 'rake'
+gem 'bundler'

data/Gemfile.lock

@@ -0,0 +1,33 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (2.3.8)
+    curb (0.7.8)
+    diff-lcs (1.1.2)
+    fakeweb (1.3.0)
+    i18n (0.4.1)
+    rack (1.2.1)
+    rake (0.8.7)
+    rspec (2.0.0.beta.20)
+      rspec-core (= 2.0.0.beta.20)
+      rspec-expectations (= 2.0.0.beta.20)
+      rspec-mocks (= 2.0.0.beta.20)
+    rspec-core (2.0.0.beta.20)
+    rspec-expectations (2.0.0.beta.20)
+      diff-lcs (>= 1.1.2)
+    rspec-mocks (2.0.0.beta.20)
+    yajl-ruby (0.7.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (~> 2.3.5)
+  bundler
+  curb (>= 0.6)
+  fakeweb (>= 1.2)
+  i18n
+  rack (>= 1.0)
+  rake
+  rspec (~> 2.0.0.beta.18)
+  yajl-ruby

data/Rakefile

@@ -9,11 +9,12 @@ gemspec = Gem::Specification.new do |gem|
   gem.email = "seancribbs@gmail.com"
   gem.homepage = "http://seancribbs.github.com/ripple"
   gem.authors = ["Sean Cribbs"]
-  gem.add_development_dependency "rspec", "~>2.0.0.beta.6"
+  gem.add_development_dependency "rspec", "~>2.0.0.beta.11"
   gem.add_development_dependency "fakeweb", ">=1.2"
   gem.add_development_dependency "rack", ">=1.0"
   gem.add_development_dependency "curb", ">=0.6"
   gem.add_dependency "activesupport", ">= 2.3.5"
+  gem.add_dependency "i18n", "~>0.4.0"
   gem.requirements << "`gem install curb` for better HTTP performance"
 
   files = FileList["**/*"]
@@ -48,7 +49,7 @@ end
 
 desc %{Release the gem to RubyGems.org}
 task :release => :gem do
-  "gem push pkg/#{gemspec.name}-#{gemspec.version}.gem"
+  system "gem push pkg/#{gemspec.name}-#{gemspec.version}.gem"
 end
 
 require 'rspec/core'

data/lib/riak.rb

@@ -15,8 +15,10 @@ $KCODE = "UTF8" if RUBY_VERSION < "1.9"
 
 require 'active_support/all'
 require 'active_support/json'
+require 'active_support/version'
 require 'base64'
 require 'uri'
+require 'cgi'
 require 'net/http'
 require 'yaml'
 require 'riak/i18n'
@@ -32,8 +34,11 @@ module Riak
   autoload :RObject,         "riak/robject"
   autoload :MapReduce,       "riak/map_reduce"
 
-  # Cache store
-  autoload :CacheStore,      "riak/cache_store"
+  # Cache store - only supports Rails 3 style
+  if ActiveSupport::VERSION::STRING >= "3.0.0"
+    autoload :CacheStore,      "riak/cache_store"
+    ::ActiveSupport::Cache.autoload :RiakStore, "riak/cache_store"
+  end
 
   # Exceptions
   autoload :FailedRequest,   "riak/failed_request"

data/lib/riak/bucket.rb

@@ -26,10 +26,6 @@ module Riak
     # @return [String] the bucket name
     attr_reader :name
 
-    # @return [Hash] Internal Riak bucket properties.
-    attr_reader :props
-    alias_attribute :properties, :props
-
     # Create a Riak bucket manually.
     # @param [Client] client the {Riak::Client} for this bucket
     # @param [String] name the name of the bucket
@@ -49,7 +45,7 @@ module Riak
         raise Riak::InvalidResponse.new({"content-type" => ["application/json"]}, response[:headers], t("loading_bucket", :name => name))
       end
       payload = ActiveSupport::JSON.decode(response[:body])
-      @keys = payload['keys'].map {|k| URI.unescape(k) }  if payload['keys']
+      @keys = payload['keys'].map {|k| CGI.unescape(k) }  if payload['keys']
       @props = payload['props'] if payload['props']
       self
     end
@@ -66,26 +62,48 @@ module Riak
       if block_given?
         @client.http.get(200, @client.prefix, escape(name), {:props => false, :keys => 'stream'}, {}) do |chunk|
           obj = ActiveSupport::JSON.decode(chunk) rescue {}
-          yield obj['keys'].map {|k| URI.unescape(k) } if obj['keys']
+          yield obj['keys'].map {|k| CGI.unescape(k) } if obj['keys']
         end
       elsif @keys.nil? || options[:reload]
-        response = @client.http.get(200, @client.prefix, escape(name), {:props => false}, {})
+        response = @client.http.get(200, @client.prefix, escape(name), {:props => false, :keys => true}, {})
         load(response)
       end
       @keys
     end
 
+
     # Sets internal properties on the bucket
     # Note: this results in a request to the Riak server!
     # @param [Hash] properties new properties for the bucket
-    # @return [Hash] the properties that were accepted
-    # @raise [FailedRequest] if the new properties were not accepted by the Riak server
+    # @option properties [Fixnum] :n_val (3) The N value (replication factor)
+    # @option properties [true,false] :allow_mult (false) Whether to permit object siblings
+    # @option properties [true,false] :last_write_wins (false) Whether to ignore vclocks
+    # @option properties [Array<Hash>] :precommit ([]) precommit hooks
+    # @option properties [Array<Hash>] :postcommit ([])postcommit hooks
+    # @option properties [Fixnum,String] :r ("quorum") read quorum (numeric or
+    # symbolic)
+    # @option properties [Fixnum,String] :w ("quorum") write quorum (numeric or
+    # symbolic)
+    # @option properties [Fixnum,String] :dw ("quorum") durable write quorum
+    # (numeric or symbolic)
+    # @option properties [Fixnum,String] :rw ("quorum") delete quorum (numeric or
+    # symbolic)
+    # @return [Hash] the merged bucket properties
+    # @raise [FailedRequest] if the new properties were not accepted by the Riakserver
+    # @see #n_value, #allow_mult, #r, #w, #dw, #rw
     def props=(properties)
       raise ArgumentError, t("hash_type", :hash => properties.inspect) unless Hash === properties
       body = {'props' => properties}.to_json
       @client.http.put(204, @client.prefix, escape(name), body, {"Content-Type" => "application/json"})
-      @props = properties
+      @props.merge!(properties)
+    end
+
+    # @return [Hash] Internal Riak bucket properties.
+    # @see #props=
+    def props
+      @props
     end
+    alias_attribute :properties, :props
 
     # Retrieve an object from within the bucket.
     # @param [String] key the key of the object to retrieve
@@ -168,9 +186,22 @@ module Riak
       value
     end
 
-    # @return [String] a representation suitable for IRB and debugging output
-    def inspect
-      "#<Riak::Bucket #{client.http.path(client.prefix, escape(name)).to_s}#{" keys=[#{keys.join(',')}]" if defined?(@keys)}>"
+    [:r,:w,:dw,:rw].each do |q|
+      class_eval <<-CODE
+        def #{q}
+          props["#{q}"]
+        end
+
+        def #{q}=(value)
+          self.props = {"#{q}" => value}
+          value
+        end
+        CODE
+      end
+
+      # @return [String] a representation suitable for IRB and debugging output
+      def inspect
+        "#<Riak::Bucket #{client.http.path(client.prefix, escape(name)).to_s}#{" keys=[#{keys.join(',')}]" if defined?(@keys)}>"
+      end
     end
   end
-end

data/lib/riak/cache_store.rb

@@ -19,63 +19,61 @@ module Riak
     def initialize(options = {})
       @bucket_name = options.delete(:bucket) || '_cache'
       @n_value = options.delete(:n_value) || 2
-      @r = [options.delete(:r) || 1, @n_value].min
-      @w = [options.delete(:w) || 1, @n_value].min
-      @dw = [options.delete(:dw) || 0, @n_value].min
-      @rw = [options.delete(:rw) || 1, @n_value].min
+      @r = options.delete(:r) || 1
+      @w = options.delete(:w) || 1
+      @dw = options.delete(:dw) || 0
+      @rw = options.delete(:rw) || "quorum"
       @client = Riak::Client.new(options)
+      set_bucket_defaults
     end
 
     def bucket
-      @bucket ||= @client.bucket(@bucket_name, :keys => false).tap do |b|
-        begin
-          b.n_value = @n_value unless b.n_value == @n_value
-        rescue
-        end
-      end
-    end
-    
-    def write(key, value, options={})
-      super do
-        object = bucket.get_or_new(key, :r => @r)
-        object.content_type = 'application/yaml'
-        object.data = value
-        object.store(:r => @r, :w => @w, :dw => @dw)
-      end
+      @bucket ||= @client.bucket(@bucket_name, :keys => false)
     end
 
-    def read(key, options={})
-      super do
-        begin
-          bucket.get(key, :r => @r).data
-        rescue Riak::FailedRequest => fr
-          raise fr unless fr.code == 404
-          nil
+    def delete_matched(matcher, options={})
+      instrument(:delete_matched, matcher) do
+        bucket.keys do |keys|
+          keys.grep(matcher).each do |k|
+            bucket.delete(k)
+          end
         end
       end
     end
 
-    def exist?(key)
-      super do
-        bucket.exists?(key, :r => @r)
+    protected
+    def set_bucket_defaults
+      begin
+        new_values = {}
+        new_values['n_val'] = @n_value unless bucket.n_value == @n_value
+        new_values['r']     = @r       unless bucket.r == @r
+        new_values['w']     = @w       unless bucket.w == @w
+        new_values['dw']    = @dw      unless bucket.dw == @dw
+        new_values['rw']    = @rw      unless bucket.rw == @rw
+        bucket.props = new_values      unless new_values.empty?
+      rescue
       end
     end
 
-    def delete_matched(matcher, options={})
-      super do
-        bucket.keys do |keys|
-          keys.grep(matcher).each do |k|
-            bucket.delete(k, :rw => @rw)
-          end
-        end
-      end
+    def write_entry(key, value, options={})
+      object = bucket.get_or_new(key)
+      object.content_type = 'application/yaml'
+      object.data = value
+      object.store
     end
 
-    def delete(key, options={})
-      super do
-        bucket.delete(key, :rw => @rw)
+    def read_entry(key, options={})
+      begin
+        bucket.get(key).data
+      rescue Riak::FailedRequest => fr
+        raise fr unless fr.code == 404
+        nil
       end
     end
+
+    def delete_entry(key, options={})
+      bucket.delete(key)
+    end
   end
 end
 

data/lib/riak/client.rb

@@ -117,7 +117,7 @@ module Riak
     # @return [Bucket] the requested bucket
     def bucket(name, options={})
       options.assert_valid_keys(:keys, :props)
-      response = http.get(200, prefix, escape(name), options, {})
+      response = http.get(200, prefix, escape(name), {:keys => false}.merge(options), {})
       Bucket.new(self, name).load(response)
     end
     alias :[] :bucket

data/lib/riak/i18n.rb

@@ -11,9 +11,9 @@
 #    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
-begin
+if ActiveSupport::VERSION::STRING >= "3.0"
   require 'active_support/i18n'
-rescue LoadError
+else
   require 'i18n' # support ActiveSupport < 3
 end
 

data/lib/riak/link.rb

@@ -39,12 +39,12 @@ module Riak
 
     # @return [String] bucket_name, if the Link url is a known Riak link ("/riak/<bucket>/<key>")
     def bucket
-      URI.unescape($1) if url =~ %r{^/[^/]+/([^/]+)/?}
+      CGI.unescape($1) if url =~ %r{^/[^/]+/([^/]+)/?}
     end
     
     # @return [String] key, if the Link url is a known Riak link ("/riak/<bucket>/<key>")
     def key
-      URI.unescape($1) if url =~ %r{^/[^/]+/[^/]+/([^/]+)/?}
+      CGI.unescape($1) if url =~ %r{^/[^/]+/[^/]+/([^/]+)/?}
     end
 
     def inspect; to_s; end

data/lib/riak/locale/en.yml

@@ -13,25 +13,25 @@
 #    limitations under the License.
 en:
   riak:
-    client_type: "invalid argument {{client}} is not a Riak::Client"
-    string_type: "invalid_argument {{string}} is not a String"
-    loading_bucket: "while loading bucket '{{name}}'"
-    failed_request: "Expected {{expected}} from Riak but received {{code}}. {{body}}"
-    hash_type: "invalid argument {{hash}} is not a Hash"
-    path_and_body_required: "You must supply both a resource path and a body."
-    request_body_type: "Request body must be a string or IO."
-    resource_path_short: "Resource path too short"
-    missing_host_and_port: "You must specify a host and port, or use the defaults of 127.0.0.1:8098"
-    invalid_client_id: "Invalid client ID, must be a string or between 0 and {{max_id}}"
+    bucket_link_conversion: "Can't convert a bucket link to a walk spec"
+    client_type: "invalid argument %{client} is not a Riak::Client"
+    content_type_undefined: "content_type is not defined!"
+    failed_request: "Expected %{expected} from Riak but received %{code}. %{body}"
+    hash_type: "invalid argument %{hash} is not a Hash"
     hostname_invalid: "host must be a valid hostname"
-    port_invalid: "port must be an integer between 0 and 65535"
     install_curb: "curb library not found! Please `gem install curb` for better performance."
-    bucket_link_conversion: "Can't convert a bucket link to a walk spec"
+    invalid_client_id: "Invalid client ID, must be a string or between 0 and %{max_id}"
+    invalid_function_value: "invalid value for function: %{value}"
     invalid_phase_type: "type must be :map, :reduce, or :link"
+    loading_bucket: "while loading bucket '%{name}'"
+    missing_host_and_port: "You must specify a host and port, or use the defaults of 127.0.0.1:8098"
     module_function_pair_required: "function must have two elements when an array"
+    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"
+    request_body_type: "Request body must be a string or IO."
+    resource_path_short: "Resource path too short"
     stored_function_invalid: "function must have :bucket and :key when a hash"
+    string_type: "invalid_argument %{string} is not a String"
+    too_few_arguments: "too few arguments: %{params}"
     walk_spec_invalid_unless_link: "WalkSpec is only valid for a function when the type is :link"
-    invalid_function_value: "invalid value for function: {{value}}"
-    content_type_undefined: "content_type is not defined!"
-    too_few_arguments: "too few arguments: {{params}}"
-    wrong_argument_count_walk_spec: "wrong number of arguments (one Hash or bucket,tag,keep required)"
+    wrong_argument_count_walk_spec: "wrong number of arguments (one Hash or bucket,tag,keep required)"

data/lib/riak/map_reduce.rb

@@ -17,6 +17,8 @@ module Riak
   # Class for invoking map-reduce jobs using the HTTP interface.
   class MapReduce
     include Util::Translation
+    include Util::Escape
+    
     # @return [Array<[bucket,key]>,String] The bucket/keys for input to the job, or the bucket (all keys).
     # @see #add
     attr_accessor :inputs
@@ -58,16 +60,17 @@ module Riak
         p = params.first
         case p
         when Bucket
-          @inputs = p.name
+          @inputs = escape(p.name)
         when RObject
-          @inputs << [p.bucket.name, p.key]
+          @inputs << [escape(p.bucket.name), escape(p.key)]
         when String
-          @inputs = p
+          @inputs = escape(p)
         end
       when 2..3
         bucket = params.shift
         bucket = bucket.name if Bucket === bucket
-        @inputs << params.unshift(bucket)
+        key = params.shift
+        @inputs << params.unshift(escape(key)).unshift(escape(bucket))
       end
       self
     end

data/lib/riak/robject.rb

@@ -38,7 +38,7 @@ module Riak
     # @return [Object] the data stored in Riak at this object's key. Varies in format by content-type, defaulting to String from the response body.
     attr_accessor :data
 
-    # @return [Set<Link>] an Set of {Riak::Link} objects for relationships between this object and other resources
+    # @return [Set<Link>] a Set of {Riak::Link} objects for relationships between this object and other resources
     attr_accessor :links
 
     # @return [String] the ETag header from the most recent HTTP response, useful for caching and reloading
@@ -50,6 +50,19 @@ module Riak
     # @return [Hash] a hash of any X-Riak-Meta-* headers that were in the HTTP response, keyed on the trailing portion
     attr_accessor :meta
 
+    # Loads a list of RObjects that were emitted from a MapReduce
+    # query.
+    # @param [Client] client A Riak::Client with which the results will be
+    # associated
+    # @param [Array<Hash>] response A list of results a MapReduce job. Each
+    # entry should contain these keys: bucket, key, vclock, values
+    # @return [Array<RObject>] An array of RObject instances
+    def self.load_from_mapreduce(client, response)
+      response.map do |item|
+        RObject.new(client[CGI.unescape(item['bucket'])], CGI.unescape(item['key'])).load_from_mapreduce(item)
+      end
+    end
+
     # Create a new object manually
     # @param [Bucket] bucket the bucket in which the object exists
     # @param [String] key the key at which the object resides. If nil, a key will be assigned when the object is saved.
@@ -81,6 +94,28 @@ module Riak
       self
     end
 
+    # Load object data from a map/reduce response item.
+    # This method is used by RObject::load_from_mapreduce to instantiate the necessary
+    # objects.
+    # @param [Hash] response a response from {Riak::MapReduce}
+    # @return [RObject] self
+    def load_from_mapreduce(response)
+      self.vclock = response['vclock']
+      if response['values'].size == 1
+        value = response['values'].first
+        load_map_reduce_value(value)
+      else
+        @conflict = true
+        @siblings = response['values'].map do |v|
+          RObject.new(self.bucket, self.key) do |robj|
+            robj.vclock = self.vclock
+            robj.load_map_reduce_value(v)
+          end
+        end
+      end
+      self
+    end
+
     # HTTP header hash that will be sent along when storing the object
     # @return [Hash] hash of HTTP Headers
     def store_headers
@@ -141,9 +176,9 @@ module Riak
 
     # Delete the object from Riak and freeze this instance.  Will work whether or not the object actually
     # exists in the Riak database.
-    def delete
+    def delete(options={})
       return if key.blank?
-      @bucket.delete(key)
+      @bucket.delete(key, options)
       freeze
     end
 
@@ -179,12 +214,8 @@ module Riak
         ActiveSupport::JSON.encode(payload)
       when /yaml/
         YAML.dump(payload)
-      when "application/octet-stream"
-        if @meta['ruby-serialization'] == "Marshal"
-          Marshal.dump(payload)
-        else
-          payload.to_s
-        end
+      when "application/x-ruby-marshal"
+        Marshal.dump(payload)
       else
         payload.to_s
       end
@@ -203,12 +234,8 @@ module Riak
         ActiveSupport::JSON.decode(body)
       when /yaml/
         YAML.load(body)
-      when "application/octet-stream"
-        if @meta['ruby-serialization'] == "Marshal"
-          Marshal.load(body)
-        else
-          body
-        end
+      when "application/x-ruby-marshal"
+        Marshal.load(body)
       else
         body
       end
@@ -246,12 +273,37 @@ module Riak
       @bucket.client.http.path(*segments).to_s
     end
 
+    protected
+    def load_map_reduce_value(hash)
+      metadata = hash['metadata']
+      extract_if_present(metadata, 'X-Riak-VTag', :etag)
+      extract_if_present(metadata, 'content-type', :content_type)
+      extract_if_present(metadata, 'X-Riak-Last-Modified', :last_modified) { |v| Time.httpdate( v ) }
+      extract_if_present(metadata, 'Links', :links) do |links|
+        Set.new( links.map { |l| Link.new("#{@bucket.client.prefix}#{l[0]}/#{l[1]}", l[2]) } )
+      end
+      extract_if_present(metadata, 'X-Riak-Meta', :meta) do |meta|
+        Hash[
+             meta.map do |k,v|
+               [k.sub(%r{^x-riak-meta-}i, ''), [v]]
+             end
+            ]
+      end
+      extract_if_present(hash, 'data', :data) { |v| deserialize(v) }
+    end
+
     private
-    def extract_header(response, name, attribute=nil)
-      if response[:headers][name].present?
-        value = response[:headers][name].try(:first)
-        value = yield value if block_given?
-        send("#{attribute}=", value) if attribute
+    def extract_if_present(hash, key, attribute=nil)
+      if hash[key].present?
+        attribute ||= key
+        value = block_given? ? yield(hash[key]) : hash[key]
+        send("#{attribute}=", value)
+      end
+    end
+
+    def extract_header(response, name, attribute=nil, &block)
+      extract_if_present(response[:headers], name, attribute) do |value|
+        block ? block.call(value[0]) : value[0]
       end
     end
 

data/lib/riak/util/escape.rb

@@ -1,11 +1,11 @@
 module Riak
   module Util
     module Escape
-      # URI-escapes bucket or key names that may contain slashes for use in URLs.
+      # CGI-escapes bucket or key names that may contain slashes for use in URLs.
       # @param [String] bucket_or_key the bucket or key name
       # @return [String] the escaped path segment
       def escape(bucket_or_key)
-        URI.escape(bucket_or_key.to_s).gsub("/", "%2F")
+        CGI.escape(bucket_or_key.to_s).gsub("+", "%20")
       end
     end
   end

data/spec/integration/riak/cache_store_spec.rb

@@ -57,6 +57,42 @@ describe Riak::CacheStore do
       @cache = ActiveSupport::Cache.lookup_store(:riak_store, :n_value => 1)
       @cache.bucket.n_value.should == 1
     end
+
+    it "should set the bucket R value to 1 by default" do
+      @cache.bucket.r.should == 1
+    end
+
+    it "should set the bucket R default to the specified value" do
+      @cache = ActiveSupport::Cache.lookup_store(:riak_store, :r => "quorum")
+      @cache.bucket.r.should == "quorum"
+    end
+
+    it "should set the bucket W value to 1 by default" do
+      @cache.bucket.w.should == 1
+    end
+
+    it "should set the bucket W default to the specified value" do
+      @cache = ActiveSupport::Cache.lookup_store(:riak_store, :w => "all")
+      @cache.bucket.w.should == "all"
+    end
+
+    it "should set the bucket DW value to 0 by default" do
+      @cache.bucket.dw.should == 0
+    end
+
+    it "should set the bucket DW default to the specified value" do
+      @cache = ActiveSupport::Cache.lookup_store(:riak_store, :dw => "quorum")
+      @cache.bucket.dw.should == "quorum"
+    end
+
+    it "should set the bucket RW value to quorum by default" do
+      @cache.bucket.rw.should == "quorum"
+    end
+
+    it "should set the bucket RW default to the specified value" do
+      @cache = ActiveSupport::Cache.lookup_store(:riak_store, :rw => "all")
+      @cache.bucket.rw.should == "all"
+    end
   end
 
 
@@ -93,20 +129,6 @@ describe Riak::CacheStore do
     @cache.fetch('foo', :force => true){'bar'}.should == 'bar'
   end
 
-  it "should increment an integer value in the cache" do
-    @cache.write('foo', 1, :raw => true)
-    @cache.read('foo', :raw => true).to_i.should == 1
-    @cache.increment('foo')
-    @cache.read('foo', :raw => true).to_i.should == 2
-  end
-
-  it "should decrement an integer value in the cache" do
-    @cache.write('foo', 1, :raw => true)
-    @cache.read('foo', :raw => true).to_i.should == 1
-    @cache.decrement('foo')
-    @cache.read('foo', :raw => true).to_i.should == 0
-  end
-
   it "should detect if a value exists in the cache" do
     @cache.write('foo', 'bar')
     @cache.exist?('foo').should be_true

data/spec/riak/bucket_spec.rb

@@ -21,7 +21,7 @@ describe Riak::Bucket do
 
   def do_load(overrides={})
     @bucket.load({
-                   :body => '{"props":{"name":"foo","allow_mult":false,"big_vclock":50,"chash_keyfun":{"mod":"riak_util","fun":"chash_std_keyfun"},"linkfun":{"mod":"jiak_object","fun":"mapreduce_linkfun"},"n_val":3,"old_vclock":86400,"small_vclock":10,"young_vclock":20},"keys":["bar"]}',
+                   :body => '{"props":{"name":"foo","n_val":3,"allow_mult":false,"last_write_wins":false,"precommit":[],"postcommit":[],"chash_keyfun":{"mod":"riak_core_util","fun":"chash_std_keyfun"},"linkfun":{"mod":"riak_kv_wm_link_walker","fun":"mapreduce_linkfun"},"old_vclock":86400,"young_vclock":20,"big_vclock":50,"small_vclock":10,"r":"quorum","w":"quorum","dw":"quorum","rw":"quorum"},"keys":["bar"]}',
                    :headers => {
                      "vary" => ["Accept-Encoding"],
                      "server" => ["MochiWeb/1.1 WebMachine/1.5.1 (hack the charles gibson)"],
@@ -53,7 +53,7 @@ describe Riak::Bucket do
   describe "when loading data from an HTTP response" do
     it "should load the bucket properties from the response body" do
       do_load
-      @bucket.props.should == {"name"=>"foo","allow_mult" => false,"big_vclock" => 50,"chash_keyfun" => {"mod" =>"riak_util","fun"=>"chash_std_keyfun"},"linkfun"=>{"mod"=>"jiak_object","fun"=>"mapreduce_linkfun"},"n_val"=>3,"old_vclock"=>86400,"small_vclock"=>10,"young_vclock"=>20}
+      @bucket.props.should == {"name"=>"foo", "n_val"=>3, "allow_mult"=>false, "last_write_wins"=>false, "precommit"=>[], "postcommit"=>[], "chash_keyfun"=>{"mod"=>"riak_core_util", "fun"=>"chash_std_keyfun"}, "linkfun"=>{"mod"=>"riak_kv_wm_link_walker", "fun"=>"mapreduce_linkfun"}, "old_vclock"=>86400, "young_vclock"=>20, "big_vclock"=>50, "small_vclock"=>10, "r"=>"quorum", "w"=>"quorum", "dw"=>"quorum", "rw"=>"quorum"}
     end
 
     it "should load the keys from the response body" do
@@ -80,12 +80,12 @@ describe Riak::Bucket do
     end
 
     it "should load the keys if not present" do
-      @http.should_receive(:get).with(200, "/riak/", "foo", {:props => false}, {}).and_return({:headers => {"content-type" => ["application/json"]}, :body => '{"keys":["bar"]}'})
+      @http.should_receive(:get).with(200, "/riak/", "foo", {:props => false, :keys => true}, {}).and_return({:headers => {"content-type" => ["application/json"]}, :body => '{"keys":["bar"]}'})
       @bucket.keys.should == ["bar"]
     end
 
     it "should allow reloading of the keys" do
-      @http.should_receive(:get).with(200, "/riak/","foo", {:props => false}, {}).and_return({:headers => {"content-type" => ["application/json"]}, :body => '{"keys":["bar"]}'})
+      @http.should_receive(:get).with(200, "/riak/","foo", {:props => false, :keys => true}, {}).and_return({:headers => {"content-type" => ["application/json"]}, :body => '{"keys":["bar"]}'})
       do_load # Ensures they're already loaded
       @bucket.keys(:reload => true).should == ["bar"]
     end
@@ -101,13 +101,13 @@ describe Riak::Bucket do
     end
 
     it "should unescape key names" do
-      @http.should_receive(:get).with(200, "/riak/","foo", {:props => false}, {}).and_return({:headers => {"content-type" => ["application/json"]}, :body => '{"keys":["bar%20baz"]}'})
+      @http.should_receive(:get).with(200, "/riak/","foo", {:props => false, :keys => true}, {}).and_return({:headers => {"content-type" => ["application/json"]}, :body => '{"keys":["bar%20baz"]}'})
       @bucket.keys.should == ["bar baz"]
     end
 
     it "should escape the bucket name" do
       @bucket.instance_variable_set :@name, "unescaped "
-      @http.should_receive(:get).with(200, "/riak/","unescaped%20", {:props => false}, {}).and_return({:headers => {"content-type" => ["application/json"]}, :body => '{"keys":["bar"]}'})
+      @http.should_receive(:get).with(200, "/riak/","unescaped%20", {:props => false, :keys => true}, {}).and_return({:headers => {"content-type" => ["application/json"]}, :body => '{"keys":["bar"]}'})
       @bucket.keys.should == ["bar"]
     end
   end
@@ -228,6 +228,24 @@ describe Riak::Bucket do
     end
   end
 
+  [:r, :w, :dw, :rw].each do |q|
+    describe "get/set the default #{q} quorum" do
+      before :each do
+        do_load
+      end
+
+      it "should extract the default #{q} quorum" do
+        @bucket.send(q).should == "quorum"
+      end
+
+      it "should set the #{q} quorum" do
+        @bucket.should_receive(:props=).with(hash_including("#{q}" => 1))
+        @bucket.send("#{q}=",1)
+      end
+    end
+  end
+
+
   describe "checking whether a key exists" do
     it "should return true if the object does exist" do
       @client.http.should_receive(:head).and_return(:code => 200)

data/spec/riak/client_spec.rb

@@ -1,4 +1,4 @@
-# Copyright 2010 Sean Cribbs, Sonian Inc., and Basho Technologies, Inc.
+60# Copyright 2010 Sean Cribbs, Sonian Inc., and Basho Technologies, Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -157,13 +157,13 @@ describe Riak::Client do
     end
 
     it "should send a GET request to the bucket name and return a Riak::Bucket" do
-      @http.should_receive(:get).with(200, "/riak/", "foo", {}, {}).and_return(@payload)
+      @http.should_receive(:get).with(200, "/riak/", "foo", {:keys => false}, {}).and_return(@payload)
       @client.bucket("foo").should be_kind_of(Riak::Bucket)
     end
 
-    it "should allow requesting bucket properties without the keys" do
-      @http.should_receive(:get).with(200, "/riak/", "foo", {:keys => false}, {}).and_return(@payload)
-      @client.bucket("foo", :keys => false)
+    it "should allow requesting bucket properties with the keys" do
+      @http.should_receive(:get).with(200, "/riak/", "foo", {:keys => true}, {}).and_return(@payload)
+      @client.bucket("foo", :keys => true)
     end
 
     it "should escape bucket names with invalid characters" do

data/spec/riak/escape_spec.rb

@@ -9,6 +9,7 @@ describe Riak::Util::Escape do
   it "should escape standard non-safe characters" do
     @object.escape("some string").should == "some%20string"
     @object.escape("another^one").should == "another%5Eone"
+    @object.escape("bracket[one").should == "bracket%5Bone"
   end
 
   it "should escape slashes" do

data/spec/riak/map_reduce_spec.rb

@@ -49,11 +49,21 @@ describe Riak::MapReduce do
       @mr.inputs.should == [["foo","bar"]]
     end
 
+    it "should add bucket/key pairs to the inputs" do
+      @mr.add("[foo]","(bar)")
+      @mr.inputs.should == [["%5Bfoo%5D","%28bar%29"]]
+    end
+
     it "should add an array containing a bucket/key pair to the inputs" do
       @mr.add(["foo","bar"])
       @mr.inputs.should == [["foo","bar"]]
     end
 
+    it "should add an escaped array containing a bucket/key pair to the inputs" do
+      @mr.add(["[foo]","(bar)"])
+      @mr.inputs.should == [["%5Bfoo%5D","%28bar%29"]]
+    end
+
     it "should add an object to the inputs by its bucket and key" do
       bucket = Riak::Bucket.new(@client, "foo")
       obj = Riak::RObject.new(bucket, "bar")
@@ -61,17 +71,36 @@ describe Riak::MapReduce do
       @mr.inputs.should == [["foo", "bar"]]
     end
 
+    it "should add an object to the inputs by its escaped bucket and key" do
+      bucket = Riak::Bucket.new(@client, "[foo]")
+      obj = Riak::RObject.new(bucket, "(bar)")
+      @mr.add(obj)
+      @mr.inputs.should == [["%5Bfoo%5D", "%28bar%29"]]
+    end
+
     it "should add an array containing a bucket/key/key-data triple to the inputs" do
       @mr.add(["foo","bar",1000])
       @mr.inputs.should == [["foo","bar",1000]]
     end
 
+    it "should add an escaped array containing a bucket/key/key-data triple to the inputs" do
+      @mr.add(["[foo]","(bar)","[]()"])
+      @mr.inputs.should == [["%5Bfoo%5D", "%28bar%29","[]()"]]
+    end
+
     it "should use a bucket name as the single input" do
       @mr.add(Riak::Bucket.new(@client, "foo"))
       @mr.inputs.should == "foo"
       @mr.add("docs")
       @mr.inputs.should == "docs"
     end
+
+    it "should use an escaped bucket name as the single input" do
+      @mr.add(Riak::Bucket.new(@client, "[foo]"))
+      @mr.inputs.should == "%5Bfoo%5D"
+      @mr.add("docs")
+      @mr.inputs.should == "docs"
+    end
   end
 
   [:map, :reduce].each do |type|

data/spec/riak/object_spec.rb

@@ -101,39 +101,19 @@ describe Riak::RObject do
       end
     end
 
-    describe "when the content type is an octet-stream" do
+    describe "when the content type is application/x-ruby-marshal" do
       before :each do
-        @object.content_type = "application/octet-stream"
+        @object.content_type = "application/x-ruby-marshal"
+        @payload = Marshal.dump({"foo" => "bar"})
       end
 
-      describe "if the ruby-serialization meta field is set to Marshal" do
-        before :each do
-          @object.meta['ruby-serialization'] = "Marshal"
-          @payload = Marshal.dump({"foo" => "bar"})
-        end
 
-        it "should dump via Marshal" do
-          @object.serialize({"foo" => "bar"}).should == @payload
-        end
-
-        it "should load from Marshal" do
-          @object.deserialize(@payload).should == {"foo" => "bar"}
-        end
+      it "should dump via Marshal" do
+        @object.serialize({"foo" => "bar"}).should == @payload
       end
 
-      describe "if the ruby-serialization meta field is not set to Marshal" do
-        before :each do
-          @object.meta.delete("ruby-serialization")
-        end
-
-        it "should dump to a string" do
-          @object.serialize(2).should == "2"
-          @object.serialize("foo").should == "foo"
-        end
-
-        it "should load the body unmodified" do
-          @object.deserialize("foo").should == "foo"
-        end
+      it "should load from Marshal" do
+        @object.deserialize(@payload).should == {"foo" => "bar"}
       end
     end
   end
@@ -198,6 +178,11 @@ describe Riak::RObject do
       @object.key.should == "baz"
     end
 
+    it "should parse and escape the location header into the key when present" do
+      @object.load({:headers => {"content-type" => ["application/json"], "location" => ["/riak/foo/%5Bbaz%5D"]}})
+      @object.key.should == "[baz]"
+    end
+
     it "should be in conflict when the response code is 300 and the content-type is multipart/mixed" do
       @object.load({:headers => {"content-type" => ["multipart/mixed; boundary=foo"]}, :code => 300 })
       @object.should be_conflict
@@ -209,6 +194,106 @@ describe Riak::RObject do
     end
   end
 
+  describe "instantiating new object from a map reduce operation" do
+    before :each do
+      @client.stub!(:[]).and_return(@bucket)
+
+      @sample_response = [
+                          {"bucket"=>"users",
+                            "key"=>"A2IbUQ2KEMbe4WGtdL97LoTi1DN%5B%28%5C%2F%29%5D",
+                            "vclock"=> "a85hYGBgzmDKBVIsCfs+fc9gSN9wlA8q/hKosDpIOAsA",
+                            "values"=> [
+                                        {"metadata"=>
+                                          {"Links"=>[["addresses", "A2cbUQ2KEMbeyWGtdz97LoTi1DN", "home_address"]],
+                                            "X-Riak-VTag"=>"5bnavU3rrubcxLI8EvFXhB",
+                                            "content-type"=>"application/json",
+                                            "X-Riak-Last-Modified"=>"Mon, 12 Jul 2010 21:37:43 GMT",
+                                            "X-Riak-Meta"=>{"X-Riak-Meta-King-Of-Robots"=>"I"}},
+                                          "data"=>
+                                          "{\"email\":\"mail@test.com\",\"_type\":\"User\"}"
+                                        }
+                                       ]
+                          }
+                         ]
+      @object = Riak::RObject.load_from_mapreduce(@client,@sample_response).first
+      @object.should be_kind_of(Riak::RObject)
+    end
+
+    it "should load the content type" do
+      @object.content_type.should == "application/json"
+    end
+
+    it "should load the body data" do
+      @object.data.should be_present
+    end
+
+    it "should deserialize the body data" do
+      @object.data.should == {"email" => "mail@test.com", "_type" => "User"}
+    end
+
+    it "should set the vclock" do
+      @object.vclock.should == "a85hYGBgzmDKBVIsCfs+fc9gSN9wlA8q/hKosDpIOAsA"
+    end
+
+    it "should load and parse links" do
+      @object.links.should have(1).item
+      @object.links.first.url.should == "/riak/addresses/A2cbUQ2KEMbeyWGtdz97LoTi1DN"
+      @object.links.first.rel.should == "home_address"
+    end
+
+    it "should set the ETag" do
+      @object.etag.should == "5bnavU3rrubcxLI8EvFXhB"
+    end
+
+    it "should set modified date" do
+      @object.last_modified.to_i.should == Time.httpdate("Mon, 12 Jul 2010 21:37:43 GMT").to_i
+    end
+
+    it "should load meta information" do
+      @object.meta["King-Of-Robots"].should == ["I"]
+    end
+
+    it "should set the key" do
+      @object.key.should == "A2IbUQ2KEMbe4WGtdL97LoTi1DN[(\\/)]"
+    end
+
+    it "should not set conflict when there is none" do
+      @object.conflict?.should be_false
+    end
+
+    describe "when there are multiple values in an object" do
+      before :each do
+        response = @sample_response.dup
+        response[0]['values'] << {
+          "metadata"=> {
+            "Links"=>[],
+            "X-Riak-VTag"=>"7jDZLdu0fIj2iRsjGD8qq8",
+            "content-type"=>"application/json",
+            "X-Riak-Last-Modified"=>"Mon, 14 Jul 2010 19:28:27 GMT",
+            "X-Riak-Meta"=>[]
+          },
+          "data"=> "{\"email\":\"mail@domain.com\",\"_type\":\"User\"}"
+        }
+        @object = Riak::RObject.load_from_mapreduce( @client, response ).first
+      end
+
+      it "should expose siblings" do
+        @object.should have(2).siblings
+        @object.siblings[0].etag.should == "5bnavU3rrubcxLI8EvFXhB"
+        @object.siblings[1].etag.should == "7jDZLdu0fIj2iRsjGD8qq8"
+      end
+
+      it "should be in conflict" do
+        @object.data.should_not be_present
+        @object.should be_conflict
+      end
+
+      it "should assign the same vclock to all the siblings" do
+        @object.siblings.should be_all {|s| s.vclock == @object.vclock }
+      end
+    end
+  end
+
   describe "extracting siblings" do
     before :each do
       @object = Riak::RObject.new(@bucket, "bar").load({:headers => {"x-riak-vclock" => ["merged"], "content-type" => ["multipart/mixed; boundary=foo"]}, :code => 300, :body => "\n--foo\nContent-Type: text/plain\n\nbar\n--foo\nContent-Type: text/plain\n\nbaz\n--foo--\n"})

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: riak-client
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 0
-  - 7
-  - 1
-  version: 0.7.1
+  - 8
+  - 0
+  - beta
+  version: 0.8.0.beta
 platform: ruby
 authors: 
 - Sean Cribbs
@@ -14,13 +15,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-08 00:00:00 -04:00
+date: 2010-08-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -29,14 +31,15 @@ dependencies:
         - 0
         - 0
         - beta
-        - 6
-        version: 2.0.0.beta.6
+        - 11
+        version: 2.0.0.beta.11
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: fakeweb
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -50,6 +53,7 @@ dependencies:
   name: rack
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -63,6 +67,7 @@ dependencies:
   name: curb
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -76,6 +81,7 @@ dependencies:
   name: activesupport
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -86,6 +92,21 @@ dependencies:
         version: 2.3.5
   type: :runtime
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: i18n
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 4
+        - 0
+        version: 0.4.0
+  type: :runtime
+  version_requirements: *id006
 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: seancribbs@gmail.com
 executables: []
@@ -95,6 +116,8 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- Gemfile
+- Gemfile.lock
 - lib/riak/bucket.rb
 - lib/riak/cache_store.rb
 - lib/riak/client/curb_backend.rb
@@ -147,6 +170,7 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -154,16 +178,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: 
 - `gem install curb` for better HTTP performance
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: riak-client is a rich client for Riak, the distributed database by Basho.