From 73336ed5bc812451cee7c5fbd5e27a8df1ae8ab9 Mon Sep 17 00:00:00 2001
From: Garret Alfert <garret@5apps.com>
Date: Fri, 14 Jun 2013 18:49:26 +0200
Subject: [PATCH] Fix for using Riak with http_url_encoding config enabled

---
 lib/remote_storage/riak.rb | 8 ++++----
 spec/directories_spec.rb   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/remote_storage/riak.rb b/lib/remote_storage/riak.rb
index 958eb05..5fc8bed 100644
--- a/lib/remote_storage/riak.rb
+++ b/lib/remote_storage/riak.rb
@@ -156,7 +156,7 @@ module RemoteStorage
 
       directory_index = directory == "" ? "/" : directory
       object.indexes.merge!({:user_id_bin => [user],
-                             :directory_bin => [CGI.escape(directory_index)]})
+                             :directory_bin => [directory_index]})
 
       object
     end
@@ -236,14 +236,14 @@ module RemoteStorage
       listing = {}
 
       sub_directories(user, directory).each do |entry|
-        directory_name = CGI.unescape(entry["name"]).split("/").last
+        directory_name = entry["name"].split("/").last
         timestamp = entry["timestamp"].to_i
 
         listing.merge!({ "#{directory_name}/" => timestamp })
       end
 
       directory_entries(user, directory).each do |entry|
-        entry_name = CGI.unescape(entry["name"])
+        entry_name = entry["name"]
         timestamp = if entry["timestamp"]
                       entry["timestamp"].to_i
                     else
@@ -339,7 +339,7 @@ module RemoteStorage
       directory_object.data = timestamp.to_s
       directory_object.indexes.merge!({:user_id_bin => [user]})
       if parent_directory
-        directory_object.indexes.merge!({:directory_bin => [CGI.escape(parent_directory)]})
+        directory_object.indexes.merge!({:directory_bin => [parent_directory]})
       end
       directory_object.store
     end
diff --git a/spec/directories_spec.rb b/spec/directories_spec.rb
index 777256d..5b7fbf1 100644
--- a/spec/directories_spec.rb
+++ b/spec/directories_spec.rb
@@ -297,7 +297,7 @@ describe "Directories" do
           put "/jimmy/tasks/home/trash", "take out the trash"
 
           object = directory_bucket.get("jimmy:tasks")
-          object.indexes["directory_bin"].must_include CGI.escape("/")
+          object.indexes["directory_bin"].must_include "/"
           object.data.wont_be_nil
 
           object = directory_bucket.get("jimmy:")