ripple 0.6.0 → 0.6.1

data/RELEASE_NOTES.textile

@@ -1,5 +1,18 @@
 h1. Ripple Release Notes
 
+h2. 0.6.1 Patch Release - 2010-03-17
+
+This is a minor release with fixes for a few issues:
+
+* Riak::Link objects will now be unique when added to RObject#links
+  Set. [John Lynch]
+* Attributes on Ripple::Document classes are no longer clone, which had
+  prevented non-scalar properties from being modified directly (e.g. Array).
+* Buckets, keys, and walk specs are properly escaped in URLs
+  (including slashes).
+* Time-related properties properly convert to string formats in JSON that
+  they will work in the context of MapReduce jobs.
+
 h2. 0.6.0 Feature Release - 2010-03-05
 
 This release contains enhancements and bugfixes in preparation for the

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1

data/lib/riak.rb

@@ -38,6 +38,7 @@ module Riak
   autoload :MapReduceError,  "riak/map_reduce_error"
   
   module Util
+    autoload :Escape,        "riak/util/escape"
     autoload :Headers,       "riak/util/headers"
     autoload :Multipart,     "riak/util/multipart"
     autoload :Translation,   "riak/util/translation"

data/lib/riak/bucket.rb

@@ -18,6 +18,8 @@ module Riak
   # using {Client#bucket}, or create it manually and retrieve its meta-information later.
   class Bucket
     include Util::Translation
+    include Util::Escape
+
     # @return [Riak::Client] the associated client
     attr_reader :client
 
@@ -62,12 +64,12 @@ module Riak
     # @return [Array<String>] Keys in this bucket
     def keys(options={})
       if block_given?
-        @client.http.get(200, @client.prefix, name, {:props => false}, {}) do |chunk|
+        @client.http.get(200, @client.prefix, escape(name), {:props => false}, {}) do |chunk|
           obj = ActiveSupport::JSON.decode(chunk) rescue {}
           yield obj['keys'].map {|k| URI.unescape(k) } if obj['keys']
         end
       elsif @keys.nil? || options[:reload]
-        response = @client.http.get(200, @client.prefix, name, {:props => false}, {})
+        response = @client.http.get(200, @client.prefix, escape(name), {:props => false}, {})
         load(response)
       end
       @keys
@@ -81,7 +83,7 @@ module Riak
     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, name, body, {"Content-Type" => "application/json"})
+      @client.http.put(204, @client.prefix, escape(name), body, {"Content-Type" => "application/json"})
       @props = properties
     end
 
@@ -93,7 +95,7 @@ module Riak
     # @raise [FailedRequest] if the object is not found or some other error occurs
     def get(key, options={})
       code = allow_mult ? [200,300] : 200
-      response = @client.http.get(code, @client.prefix, name, key, options, {})
+      response = @client.http.get(code, @client.prefix, escape(name), escape(key), options, {})
       RObject.new(self, key).load(response)
     end
     alias :[] :get
@@ -126,7 +128,7 @@ module Riak
     def allow_mult
       props['allow_mult']
     end
-    
+
     # Set the allow_mult property.  *NOTE* This will result in a PUT request to Riak.
     # @param [true, false] value whether the bucket should allow siblings
     def allow_mult=(value)
@@ -146,10 +148,10 @@ module Riak
       self.props = props.merge('n_val' => value)
       value
     end
-    
+
     # @return [String] a representation suitable for IRB and debugging output
     def inspect
-      "#<Riak::Bucket #{client.http.path(client.prefix, name).to_s}#{" keys=[#{keys.join(',')}]" if defined?(@keys)}>"
+      "#<Riak::Bucket #{client.http.path(client.prefix, escape(name)).to_s}#{" keys=[#{keys.join(',')}]" if defined?(@keys)}>"
     end
   end
 end

data/lib/riak/client.rb

@@ -17,6 +17,7 @@ module Riak
   # A client connection to Riak.
   class Client
     include Util::Translation
+    include Util::Escape
 
     autoload :HTTPBackend,    "riak/client/http_backend"
     autoload :NetHTTPBackend, "riak/client/net_http_backend"
@@ -116,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, name, options, {})
+      response = http.get(200, prefix, escape(name), options, {})
       Bucket.new(self, name).load(response)
     end
     alias :[] :bucket

data/lib/riak/client/http_backend.rb

@@ -143,7 +143,7 @@ module Riak
       # @return [URI] an absolute URI for the resource
       def path(*segments)
         query = segments.extract_options!.to_param
-        root_uri.merge(URI.escape(segments.join("/").gsub(/\/+/, "/").sub(/^\//, ''))).tap do |uri|
+        root_uri.merge(segments.join("/").gsub(/\/+/, "/").sub(/^\//, '')).tap do |uri|
           uri.query = query if query.present?
         end
       end

data/lib/riak/link.rb

@@ -22,6 +22,8 @@ module Riak
 
     # @return [String] the relationship ("rel") of the other resource to this one
     attr_accessor :rel
+    alias :tag :rel
+    alias :tag= :rel=
 
     # @param [String] header_string the string value of the Link: HTTP header from a Riak response
     # @return [Array<Link>] an array of Riak::Link structs parsed from the header
@@ -37,12 +39,12 @@ module Riak
 
     # @return [String] bucket_name, if the Link url is a known Riak link ("/riak/<bucket>/<key>")
     def bucket
-      $1 if url =~ %r{/riak/([^/]+)/?}
+      URI.unescape($1) if url =~ %r{^/[^/]+/([^/]+)/?}
     end
     
     # @return [String] key, if the Link url is a known Riak link ("/riak/<bucket>/<key>")
     def key
-      $1 if url =~ %r{/riak/[^/]+/([^/]+)/?}
+      URI.unescape($1) if url =~ %r{^/[^/]+/[^/]+/([^/]+)/?}
     end
 
     def inspect; to_s; end
@@ -51,6 +53,14 @@ module Riak
       %Q[<#{@url}>; riaktag="#{@rel}"]
     end
 
+    def hash
+      self.to_s.hash
+    end
+
+    def eql?(other)
+      self == other
+    end
+
     def ==(other)
       other.is_a?(Link) && url == other.url && rel == other.rel
     end

data/lib/riak/robject.rb

@@ -20,6 +20,7 @@ module Riak
   class RObject
     include Util
     include Util::Translation
+    include Util::Escape
 
     # @return [Bucket] the bucket in which this object is contained
     attr_accessor :bucket
@@ -117,7 +118,7 @@ module Riak
     def store(options={})
       raise ArgumentError, t("content_type_undefined") unless @content_type.present?
       params = {:returnbody => true}.merge(options)
-      method, codes, path = @key.present? ? [:put, [200,204], "#{@bucket.name}/#{@key}"] : [:post, 201, @bucket.name]
+      method, codes, path = @key.present? ? [:put, [200,204,300], "#{escape(@bucket.name)}/#{escape(@key)}"] : [:post, 201, escape(@bucket.name)]
       response = @bucket.client.http.send(method, codes, @bucket.client.prefix, path, params, serialize(data), store_headers)
       load(response)
     end
@@ -131,7 +132,7 @@ module Riak
       force = options.delete(:force)
       return self unless @key && (@vclock || force)
       codes = @bucket.allow_mult ? [200,300,304] : [200,304]
-      response = @bucket.client.http.get(codes, @bucket.client.prefix, @bucket.name, @key, options, reload_headers)
+      response = @bucket.client.http.get(codes, @bucket.client.prefix, escape(@bucket.name), escape(@key), options, reload_headers)
       load(response) unless response[:code] == 304
       self
     end
@@ -142,7 +143,7 @@ module Riak
     # exists in the Riak database.
     def delete
       return if key.blank?
-      @bucket.client.http.delete([204,404], @bucket.client.prefix, @bucket.name, key)
+      @bucket.client.http.delete([204,404], @bucket.client.prefix, escape(@bucket.name), escape(@key))
       freeze
     end
 
@@ -215,13 +216,13 @@ module Riak
 
     # @return [String] A representation suitable for IRB and debugging output
     def inspect
-      "#<#{self.class.name} #{@bucket.client.http.path(@bucket.client.prefix, @bucket.name, @key).to_s} [#{@content_type}]:#{@data.inspect}>"
+      "#<#{self.class.name} #{@bucket.client.http.path(@bucket.client.prefix, escape(@bucket.name), escape(@key)).to_s} [#{@content_type}]:#{@data.inspect}>"
     end
 
     # Walks links from this object to other objects in Riak.
     def walk(*params)
       specs = WalkSpec.normalize(*params)
-      response = @bucket.client.http.get(200, @bucket.client.prefix, @bucket.name, @key, specs.join("/"))
+      response = @bucket.client.http.get(200, @bucket.client.prefix, escape(@bucket.name), escape(@key), specs.join("/"))
       if boundary = Multipart.extract_boundary(response[:headers]['content-type'].first)
         Multipart.parse(response[:body], boundary).map do |group|
           map_walk_group(group)
@@ -233,7 +234,7 @@ module Riak
 
     # Converts the object to a link suitable for linking other objects to it
     def to_link(tag=nil)
-      Link.new(@bucket.client.http.path(@bucket.client.prefix, @bucket.name, @key).path, tag)
+      Link.new(@bucket.client.http.path(@bucket.client.prefix, escape(@bucket.name), escape(@key)).path, tag)
     end
 
     private

data/lib/riak/util/escape.rb

@@ -0,0 +1,12 @@
+module Riak
+  module Util
+    module Escape
+      # URI-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).gsub("/", "%2F")
+      end
+    end
+  end
+end

data/lib/riak/walk_spec.rb

@@ -24,6 +24,8 @@ module Riak
   #   Riak::WalkSpec.new({:bucket => 'tracks', :result => true})
   class WalkSpec
     include Util::Translation
+    include Util::Escape
+
     # @return [String] The bucket followed links should be restricted to. "_" represents all buckets.
     attr_accessor :bucket
 
@@ -84,7 +86,9 @@ module Riak
 
     # Converts the walk-spec into the form required by the link-walker resource URL
     def to_s
-      "#{@bucket || '_'},#{@tag || '_'},#{@keep ? '1' : '_'}"
+      b = @bucket && escape(@bucket) || '_'
+      t = @tag && escape(@tag) || '_'
+      "#{b},#{t},#{@keep ? '1' : '_'}"
     end
 
     def ==(other)

data/lib/ripple/core_ext/casting.rb

@@ -94,3 +94,36 @@ class FalseClass
     Boolean.ripple_cast(value)
   end
 end
+
+# @private
+class Time
+  def as_json(options={})
+    self.utc.rfc822
+  end
+
+  def self.ripple_cast(value)
+    value.respond_to?(:to_time) && value.to_time or raise Ripple::PropertyTypeMismatch.new(self, value)
+  end
+end
+
+# @private
+class Date
+  def as_json(options={})
+    self.to_s(:rfc822)
+  end
+
+  def self.ripple_cast(value)
+    value.respond_to?(:to_date) && value.to_date or raise Ripple::PropertyTypeMismatch.new(self, value)
+  end
+end
+
+# @private
+class DateTime
+  def as_json(options={})
+    self.utc.to_s(:rfc822)
+  end
+
+  def self.ripple_cast(value)
+    value.respond_to?(:to_datetime) && value.to_datetime or raise Ripple::PropertyTypeMismatch.new(self, value)
+  end
+end

data/lib/ripple/document/attribute_methods/read.rb

@@ -26,8 +26,7 @@ module Ripple
         private
         def attribute(attr_name)
           if @attributes.include?(attr_name)
-            value = @attributes[attr_name]
-            value.duplicable? ? value.clone : value
+            @attributes[attr_name]
           else
             nil
           end

data/ripple.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ripple}
-  s.version = "0.6.0"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sean Cribbs"]
-  s.date = %q{2010-03-05}
+  s.date = %q{2010-03-17}
   s.description = %q{ripple is a rich Ruby client for Riak, Basho's distributed database.  It includes all the basics of accessing and manipulating Riak buckets and objects, and an object mapper library for building a rich domain on top of Riak.}
   s.email = %q{seancribbs@gmail.com}
   s.extra_rdoc_files = [
@@ -39,6 +39,7 @@ Gem::Specification.new do |s|
      "lib/riak/map_reduce.rb",
      "lib/riak/map_reduce_error.rb",
      "lib/riak/robject.rb",
+     "lib/riak/util/escape.rb",
      "lib/riak/util/fiber1.8.rb",
      "lib/riak/util/headers.rb",
      "lib/riak/util/multipart.rb",
@@ -72,6 +73,7 @@ Gem::Specification.new do |s|
      "spec/riak/bucket_spec.rb",
      "spec/riak/client_spec.rb",
      "spec/riak/curb_backend_spec.rb",
+     "spec/riak/escape_spec.rb",
      "spec/riak/headers_spec.rb",
      "spec/riak/http_backend_spec.rb",
      "spec/riak/link_spec.rb",
@@ -83,6 +85,7 @@ Gem::Specification.new do |s|
      "spec/ripple/attribute_methods_spec.rb",
      "spec/ripple/bucket_access_spec.rb",
      "spec/ripple/callbacks_spec.rb",
+     "spec/ripple/core_ext_spec.rb",
      "spec/ripple/document_spec.rb",
      "spec/ripple/embedded_document_spec.rb",
      "spec/ripple/finders_spec.rb",
@@ -100,12 +103,13 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.requirements = ["`gem install curb` for better HTTP performance"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{ripple is a rich Ruby client for Riak, Basho's distributed database.}
   s.test_files = [
     "spec/riak/bucket_spec.rb",
      "spec/riak/client_spec.rb",
      "spec/riak/curb_backend_spec.rb",
+     "spec/riak/escape_spec.rb",
      "spec/riak/headers_spec.rb",
      "spec/riak/http_backend_spec.rb",
      "spec/riak/link_spec.rb",
@@ -117,6 +121,7 @@ Gem::Specification.new do |s|
      "spec/ripple/attribute_methods_spec.rb",
      "spec/ripple/bucket_access_spec.rb",
      "spec/ripple/callbacks_spec.rb",
+     "spec/ripple/core_ext_spec.rb",
      "spec/ripple/document_spec.rb",
      "spec/ripple/embedded_document_spec.rb",
      "spec/ripple/finders_spec.rb",

data/spec/riak/bucket_spec.rb

@@ -104,6 +104,12 @@ describe Riak::Bucket do
       @http.should_receive(:get).with(200, "/riak/","foo", {:props => false}, {}).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"]}'})
+      @bucket.keys.should == ["bar"]
+    end
   end
 
   describe "setting the bucket properties" do
@@ -120,6 +126,12 @@ describe Riak::Bucket do
     it "should raise an error if an invalid property is given" do
       lambda { @bucket.props = "blah" }.should raise_error(ArgumentError)
     end
+
+    it "should escape the bucket name" do
+      @bucket.instance_variable_set :@name, "foo bar"
+      @http.should_receive(:put).with(204, "/riak/","foo%20bar", '{"props":{"n_val":2}}', {"Content-Type" => "application/json"}).and_return({:body => "", :headers => {}})
+      @bucket.props = {:n_val => 2}
+    end
   end
 
   describe "fetching an object" do
@@ -143,6 +155,12 @@ describe Riak::Bucket do
       @http.should_receive(:get).with([200,300], "/riak/","foo", "db", {}, {}).and_return({:headers => {"content-type" => ["application/json"]}, :body => '{"name":"Riak","company":"Basho"}'})
       @bucket.get('db')
     end
+
+    it "should escape the bucket and key names" do
+      @bucket.instance_variable_set(:@name, "foo ")
+      @http.should_receive(:get).with(200, "/riak/","foo%20", "%20bar", {}, {}).and_return({:headers => {"content-type" => ["application/json"]}, :body => '{"name":"Riak","company":"Basho"}'})
+      @bucket.get(' bar')
+    end
   end
 
   describe "creating a new blank object" do

data/spec/riak/client_spec.rb

@@ -165,5 +165,10 @@ describe Riak::Client do
       @http.should_receive(:get).with(200, "/riak/", "foo", {:keys => false}, {}).and_return(@payload)
       @client.bucket("foo", :keys => false)
     end
+
+    it "should escape bucket names with invalid characters" do
+      @http.should_receive(:get).with(200, "/riak/", "foo%2Fbar%20", {:keys => false}, {}).and_return(@payload)
+      @client.bucket("foo/bar ", :keys => false)
+    end
   end
 end

data/spec/riak/escape_spec.rb

@@ -0,0 +1,17 @@
+require File.expand_path("../../spec_helper", __FILE__)
+
+describe Riak::Util::Escape do
+  before :each do
+    @object = Object.new
+    @object.extend(Riak::Util::Escape)
+  end
+
+  it "should escape standard non-safe characters" do
+    @object.escape("some string").should == "some%20string"
+    @object.escape("another^one").should == "another%5Eone"
+  end
+
+  it "should escape slashes" do
+    @object.escape("some/inner/path").should == "some%2Finner%2Fpath"
+  end
+end

data/spec/riak/http_backend_spec.rb

@@ -45,11 +45,6 @@ describe Riak::Client::HTTPBackend do
     @backend.path("/foo/bar").to_s.should == "http://127.0.0.1:8098/foo/bar"
   end
 
-  it "should escape appropriate characters in a relative resource path" do
-    @backend.path("foo bar").to_s.should == "http://127.0.0.1:8098/foo%20bar"
-    @backend.path("foo", "bar", {"param" => "a string"}).to_s.should == "http://127.0.0.1:8098/foo/bar?param=a+string"
-  end
-
   it "should compute a URI from a relative resource path with a hash of query parameters" do
     @backend.path("baz", :r => 2).to_s.should == "http://127.0.0.1:8098/baz?r=2"
   end

data/spec/riak/link_spec.rb

@@ -65,4 +65,18 @@ describe Riak::Link do
     [one].should include(two)
     [two].should include(one)
   end
+
+  it "should unescape the bucket name" do
+    Riak::Link.new("/riak/bucket%20spaces/key", "foo").bucket.should == "bucket spaces"
+  end
+
+  it "should unescape the key name" do
+    Riak::Link.new("/riak/bucket/key%2Fname", "foo").key.should == "key/name"
+  end
+
+  it "should not rely on the prefix to equal /riak/ when extracting the bucket and key" do
+    link = Riak::Link.new("/raw/bucket/key", "foo")
+    link.bucket.should == "bucket"
+    link.key.should == "key"
+  end
 end

data/spec/riak/object_spec.rb

@@ -30,7 +30,7 @@ describe Riak::RObject do
       @object.key.should == "bar"
     end
 
-    it "should initialize the links to an empty array" do
+    it "should initialize the links to an empty set" do
       @object = Riak::RObject.new(@bucket, "bar")
       @object.links.should == Set.new
     end
@@ -202,6 +202,11 @@ describe Riak::RObject do
       @object.load({:headers => {"content-type" => ["multipart/mixed; boundary=foo"]}, :code => 300 })
       @object.should be_conflict
     end
+
+    it "should unescape the key given in the location header" do
+      @object.load({:headers => {"content-type" => ["application/json"], "location" => ["/riak/foo/baz%20"]}})
+      @object.key.should == "baz "
+    end
   end
 
   describe "extracting siblings" do
@@ -247,7 +252,7 @@ describe Riak::RObject do
 
     describe "when links are defined" do
       before :each do
-        @object.links = [Riak::Link.new("/riak/foo/baz", "next")]
+        @object.links << Riak::Link.new("/riak/foo/baz", "next")
       end
 
       it "should include a Link header with references to other objects" do
@@ -260,10 +265,15 @@ describe Riak::RObject do
         @object.store_headers.should have_key("Link")
         @object.store_headers["Link"].should_not include('riaktag="up"')
       end
+
+      it "should not allow duplicate links" do
+        @object.links << Riak::Link.new("/riak/foo/baz", "next")
+        @object.links.length.should == 1
+      end
     end
 
     it "should exclude the Link header when no links are present" do
-      @object.links = []
+      @object.links = Set.new
       @object.store_headers.should_not have_key("Link")
     end
 
@@ -339,6 +349,12 @@ describe Riak::RObject do
         @http.should_receive(:post).with(201, "/riak/", "foo", {:dw => 2, :returnbody => true}, "This is some text.", @headers).and_return({:headers => {'location' => ["/riak/foo/somereallylongstring"], "x-riak-vclock" => ["areallylonghashvalue"]}, :code => 201})
         @object.store(:dw => 2)
       end
+
+      it "should escape the bucket name" do
+        @bucket.should_receive(:name).and_return("foo ")
+        @http.should_receive(:post).with(201, "/riak/", "foo%20", {:returnbody => true}, "This is some text.", @headers).and_return({:headers => {'location' => ["/riak/foo/somereallylongstring"], "x-riak-vclock" => ["areallylonghashvalue"]}, :code => 201})
+        @object.store
+      end
     end
 
     describe "when the object has a key" do
@@ -347,16 +363,23 @@ describe Riak::RObject do
       end
 
       it "should issue a PUT request to the bucket, and update the object properties (returning the body by default)" do
-        @http.should_receive(:put).with([200,204], "/riak/", "foo/bar", {:returnbody => true}, "This is some text.", @headers).and_return({:headers => {'location' => ["/riak/foo/somereallylongstring"], "x-riak-vclock" => ["areallylonghashvalue"]}, :code => 204})
+        @http.should_receive(:put).with([200,204,300], "/riak/", "foo/bar", {:returnbody => true}, "This is some text.", @headers).and_return({:headers => {'location' => ["/riak/foo/somereallylongstring"], "x-riak-vclock" => ["areallylonghashvalue"]}, :code => 204})
         @object.store
         @object.key.should == "somereallylongstring"
         @object.vclock.should == "areallylonghashvalue"
       end
 
       it "should include persistence-tuning parameters in the query string" do
-        @http.should_receive(:put).with([200,204], "/riak/", "foo/bar", {:dw => 2, :returnbody => true}, "This is some text.", @headers).and_return({:headers => {'location' => ["/riak/foo/somereallylongstring"], "x-riak-vclock" => ["areallylonghashvalue"]}, :code => 204})
+        @http.should_receive(:put).with([200,204,300], "/riak/", "foo/bar", {:dw => 2, :returnbody => true}, "This is some text.", @headers).and_return({:headers => {'location' => ["/riak/foo/somereallylongstring"], "x-riak-vclock" => ["areallylonghashvalue"]}, :code => 204})
         @object.store(:dw => 2)
       end
+
+      it "should escape the bucket and key names" do
+        @http.should_receive(:put).with([200,204,300], "/riak/", "foo%20/bar%2Fbaz", {:returnbody => true}, "This is some text.", @headers).and_return({:headers => {'location' => ["/riak/foo/somereallylongstring"], "x-riak-vclock" => ["areallylonghashvalue"]}, :code => 204})
+        @bucket.instance_variable_set(:@name, "foo ")
+        @object.key = "bar/baz"
+        @object.store
+      end
     end
   end
 
@@ -410,6 +433,13 @@ describe Riak::RObject do
       @http.should_receive(:get).with([200,300,304], "/riak/", "foo", "bar", {}, {}).and_return({:code => 304})
       @object.reload
     end
+
+    it "should escape the bucket and key names" do
+      @bucket.should_receive(:name).and_return("some/deep/path")
+      @object.key = "another/deep/path"
+      @http.should_receive(:get).with([200,304], "/riak/", "some%2Fdeep%2Fpath", "another%2Fdeep%2Fpath", {}, {}).and_return({:code => 304})
+      @object.reload
+    end
   end
 
   describe "walking from the object to linked objects" do
@@ -443,6 +473,13 @@ describe Riak::RObject do
       @client.should_receive(:bucket).with("foo", :keys => false).and_return(@bucket)
       @object.walk(nil,"next",true)
     end
+
+    it "should escape the bucket, key and link specs" do
+      @object.key = "bar/baz"
+      @bucket.should_receive(:name).and_return("quin/quux")
+      @http.should_receive(:get).with(200, "/riak/", "quin%2Fquux", "bar%2Fbaz", "_,next%2F2,1").and_return(:headers => {"content-type" => ["multipart/mixed; boundary=12345"]}, :body => "\n--12345\nContent-Type: multipart/mixed; boundary=09876\n\n--09876--\n\n--12345--\n")
+      @object.walk(:tag => "next/2", :keep => true)
+    end
   end
 
   describe "when deleting" do
@@ -468,6 +505,13 @@ describe Riak::RObject do
       @http.should_receive(:delete).and_raise(Riak::FailedRequest.new(:delete, [204,404], 500, {}, ""))
       lambda { @object.delete }.should raise_error(Riak::FailedRequest)
     end
+
+    it "should escape the bucket and key names" do
+      @object.key = "deep/path"
+      @bucket.should_receive(:name).and_return("bucket spaces")
+      @http.should_receive(:delete).with([204,404], "/riak/", "bucket%20spaces", "deep%2Fpath").and_return({:code => 204, :headers => {}})
+      @object.delete
+    end
   end
 
   it "should convert to a link having the same url and an empty tag" do
@@ -479,4 +523,10 @@ describe Riak::RObject do
     @object = Riak::RObject.new(@bucket, "bar")
     @object.to_link("next").should == Riak::Link.new("/riak/foo/bar", "next")
   end
+
+  it "should escape the bucket and key when converting to a link" do
+    @object = Riak::RObject.new(@bucket, "deep/path")
+    @bucket.should_receive(:name).and_return("bucket spaces")
+    @object.to_link("bar").url.should == "/riak/bucket%20spaces/deep%2Fpath"
+  end
 end

data/spec/ripple/attribute_methods_spec.rb

@@ -60,6 +60,11 @@ describe Ripple::Document::AttributeMethods do
     it "should return the property default if defined and not set" do
       @widget.name.should == "widget"
     end
+
+    it "should expose the property directly" do
+      @widget.name.gsub!("w","f")
+      @widget.name.should == "fidget"
+    end
   end
 
   describe "mutators" do

data/spec/ripple/core_ext_spec.rb

@@ -0,0 +1,23 @@
+require File.expand_path("../../spec_helper", __FILE__)
+
+describe Time do
+  it "serializes to JSON in UTC, RFC 822 format" do
+    Time.utc(2010,3,16,12).as_json.should == "Tue, 16 Mar 2010 12:00:00 -0000"
+  end
+end
+
+describe Date do
+  it "serializes to JSON RFC 822 format" do
+    Date.civil(2010,3,16).as_json.should == "16 Mar 2010"
+  end
+end
+
+describe DateTime do
+  before :each do
+    Time.zone = :utc
+  end
+
+  it "serializes to JSON in UTC, RFC 822 format" do
+    DateTime.civil(2010,3,16,12).as_json.should == "Tue, 16 Mar 2010 12:00:00 +0000"
+  end
+end

data/spec/ripple/properties_spec.rb

@@ -195,5 +195,29 @@ describe Ripple::Document::Property do
         end
       end
     end
+
+    describe "when type is a Time type" do
+      before :each do
+        @prop = Ripple::Document::Property.new(:foo, Time)
+      end
+
+      ["Tue, 16 Mar 2010 12:00:00 -0000","2010/03/16 12:00:00 GMT", Time.utc(2010,03,16,12)].each do |v|
+        it "should cast #{v.inspect} to #{Time.utc(2010,03,16,12).inspect}" do
+          @prop.type_cast(v).should == Time.utc(2010,03,16,12)
+        end
+      end
+    end
+
+    describe "when type is a Date type" do
+      before :each do
+        @prop = Ripple::Document::Property.new(:foo, Date)
+      end
+
+      ["Tue, 16 Mar 2010 00:00:00 -0000", "2010/03/16 12:00:00 GMT", Time.utc(2010,03,16,12), "2010/03/16"].each do |v|
+        it "should cast #{v.inspect} to 2010/03/16" do
+          @prop.type_cast(v).should == Date.civil(2010,3,16)
+        end
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ripple
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  prerelease: false
+  segments: 
+  - 0
+  - 6
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Sean Cribbs
@@ -9,79 +14,105 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-05 00:00:00 -05:00
+date: 2010-03-17 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
         version: "1.3"
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: fakeweb
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
         version: "1.2"
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rack
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
         version: "1.0"
-    version: 
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: yard
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 2
         version: 0.5.2
-    version: 
+  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: curb
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 6
         version: "0.6"
-    version: 
+  type: :development
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 0
+        - beta
         version: 3.0.0.beta
-    version: 
+  type: :runtime
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: activemodel
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 0
+        - beta
         version: 3.0.0.beta
-    version: 
+  type: :runtime
+  version_requirements: *id007
 description: ripple is a rich Ruby client for Riak, Basho's distributed database.  It includes all the basics of accessing and manipulating Riak buckets and objects, and an object mapper library for building a rich domain on top of Riak.
 email: seancribbs@gmail.com
 executables: []
@@ -114,6 +145,7 @@ files:
 - lib/riak/map_reduce.rb
 - lib/riak/map_reduce_error.rb
 - lib/riak/robject.rb
+- lib/riak/util/escape.rb
 - lib/riak/util/fiber1.8.rb
 - lib/riak/util/headers.rb
 - lib/riak/util/multipart.rb
@@ -147,6 +179,7 @@ files:
 - spec/riak/bucket_spec.rb
 - spec/riak/client_spec.rb
 - spec/riak/curb_backend_spec.rb
+- spec/riak/escape_spec.rb
 - spec/riak/headers_spec.rb
 - spec/riak/http_backend_spec.rb
 - spec/riak/link_spec.rb
@@ -158,6 +191,7 @@ files:
 - spec/ripple/attribute_methods_spec.rb
 - spec/ripple/bucket_access_spec.rb
 - spec/ripple/callbacks_spec.rb
+- spec/ripple/core_ext_spec.rb
 - spec/ripple/document_spec.rb
 - spec/ripple/embedded_document_spec.rb
 - spec/ripple/finders_spec.rb
@@ -183,18 +217,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: 
 - `gem install curb` for better HTTP performance
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: ripple is a rich Ruby client for Riak, Basho's distributed database.
@@ -202,6 +238,7 @@ test_files:
 - spec/riak/bucket_spec.rb
 - spec/riak/client_spec.rb
 - spec/riak/curb_backend_spec.rb
+- spec/riak/escape_spec.rb
 - spec/riak/headers_spec.rb
 - spec/riak/http_backend_spec.rb
 - spec/riak/link_spec.rb
@@ -213,6 +250,7 @@ test_files:
 - spec/ripple/attribute_methods_spec.rb
 - spec/ripple/bucket_access_spec.rb
 - spec/ripple/callbacks_spec.rb
+- spec/ripple/core_ext_spec.rb
 - spec/ripple/document_spec.rb
 - spec/ripple/embedded_document_spec.rb
 - spec/ripple/finders_spec.rb