Merge branch 'master' into rs_spec_02

Conflicts:
	lib/remote_storage/riak.rb
	spec/directories_spec.rb

spec/directories_spec.rb

@@ -57,6 +57,7 @@ describe "Directories" do
     before do
       put "/jimmy/tasks/foo", "do the laundry"
       put "/jimmy/tasks/http%3A%2F%2F5apps.com", "prettify design"
+      put "/jimmy/tasks/%3A/foo%3Abar%40foo.org", "hello world"
     end
 
     it "lists the objects with version, length and content-type" do
@@ -69,6 +70,7 @@ describe "Directories" do
 
       content = JSON.parse(last_response.body)
       content["items"]["http://5apps.com"].wont_be_nil
+      content["items"][":/"].wont_be_nil
       content["items"]["foo"].wont_be_nil
       content["items"]["foo"]["ETag"].must_equal foo.etag.gsub(/"/, "")
       content["items"]["foo"]["Content-Type"].must_equal "text/plain"
@@ -104,6 +106,16 @@ describe "Directories" do
       last_response.headers["Expires"].must_equal "0"
     end
 
+    it "doesn't choke on colons in the directory name" do
+      get "/jimmy/tasks/%3A/"
+
+      last_response.status.must_equal 200
+      last_response.content_type.must_equal "application/json"
+
+      content = JSON.parse(last_response.body)
+      content["items"]["foo:bar@foo.org"].wont_be_nil
+    end
+
     context "when If-None-Match header is set" do
       before do
         get "/jimmy/tasks/"

spec/riak_spec.rb

@@ -543,17 +543,36 @@ describe "App with Riak backend" do
 
       context "with escaped key" do
         before do
-          put "/jimmy/documents/http%3A%2F%2F5apps.com", "super website"
+          put "/jimmy/documents/bar%3Abaz/http%3A%2F%2F5apps.com", "super website"
         end
 
         it "delivers the data correctly" do
           header "Authorization", "Bearer 123"
-          get "/jimmy/documents/http%3A%2F%2F5apps.com"
+          get "/jimmy/documents/bar%3Abaz/http%3A%2F%2F5apps.com"
 
           last_response.body.must_equal 'super website'
         end
       end
 
+      context "with unescaped key" do
+        before do
+          put "/jimmy/documents/bar:baz/john@doe.com", "John Doe"
+        end
+
+        it "lists the document in the directory" do
+          get "/jimmy/documents/bar:baz/"
+
+          content = JSON.parse(last_response.body)
+          content["items"]["john@doe.com"].wont_be_nil
+        end
+
+        it "delivers the data correctly" do
+          get "/jimmy/documents/bar:baz/john@doe.com"
+
+          last_response.body.must_equal "John Doe"
+        end
+      end
+
       context "escaped square brackets in key" do
         before do
           put "/jimmy/documents/gracehopper%5B1%5D.jpg", "super image"