5apps/liquor-cabinet
5apps/liquor-cabinet
4
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Activity

Escape the directory name when saving it as an index (fixes #15)

Browse Source
This commit is contained in:
galfert 2012-10-22 12:19:48 +02:00
parent ba979dfe04
commit 544400b138
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/remote_storage/riak.rb
View File

@ -72,7 +72,7 @@ module RemoteStorage
directory_index = directory == "" ? "/" : directory directory_index = directory == "" ? "/" : directory
object.indexes.merge!({:user_id_bin => [user], object.indexes.merge!({:user_id_bin => [user],
:directory_bin => [directory_index]}) :directory_bin => [CGI.escape(directory_index)]})
object.store object.store
object.reload object.reload
@ -215,7 +215,7 @@ module RemoteStorage
directory_object.data = timestamp.to_s directory_object.data = timestamp.to_s
directory_object.indexes.merge!({:user_id_bin => [user]}) directory_object.indexes.merge!({:user_id_bin => [user]})
if parent_directory if parent_directory
directory_object.indexes.merge!({:directory_bin => [parent_directory]}) directory_object.indexes.merge!({:directory_bin => [CGI.escape(parent_directory)]})
end end
directory_object.store directory_object.store
end end

2
spec/directories_spec.rb
View File

@ -196,7 +196,7 @@ describe "Directories" do
put "/jimmy/tasks/home/trash", "take out the trash" put "/jimmy/tasks/home/trash", "take out the trash"
object = directory_bucket.get("jimmy:tasks") object = directory_bucket.get("jimmy:tasks")
object.indexes["directory_bin"].must_include "/" object.indexes["directory_bin"].must_include CGI.escape("/")
object.data.wont_be_nil object.data.wont_be_nil
object = directory_bucket.get("jimmy:") object = directory_bucket.get("jimmy:")