kotovalexarian-likes-github/fog--fog
1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00
Code Releases Activity

[local|storage] CGI.escape file names

Browse source
This commit is contained in:
geemus 2010-11-23 13:45:37 -08:00
parent a063173ba9
commit 21cd346b4d
2 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/fog/local/models/storage/file.rb
View file

@ -65,7 +65,7 @@ module Fog
end end
def path def path
connection.path_to(::File.join(directory.key, key)) connection.path_to(::File.join(directory.key, CGI.escape(key)))
end end
end end

18
lib/fog/local/models/storage/files.rb
View file

@ -20,7 +20,7 @@ module Fog
path = file_path(key) path = file_path(key)
{ {
:content_length => ::File.size(path), :content_length => ::File.size(path),
:key => key, :key => CGI.unescape(key),
:last_modified => ::File.mtime(path) :last_modified => ::File.mtime(path)
} }
end end
@ -32,7 +32,7 @@ module Fog
def get(key, &block) def get(key, &block)
requires :directory requires :directory
path = file_path(key) path = file_path(CGI.escape(key))
if ::File.exists?(path) if ::File.exists?(path)
data = { data = {
:content_length => ::File.size(path), :content_length => ::File.size(path),
@ -53,6 +53,20 @@ module Fog
end end
end end
def head(key)
requires :directory
path = file_path(CGI.escape(key))
if ::File.exists?(path)
new({
:content_length => ::File.size(path),
:key => key,
:last_modified => ::File.mtime(path)
})
else
nil
end
end
def new(attributes = {}) def new(attributes = {})
requires :directory requires :directory
super({ :directory => directory }.merge!(attributes)) super({ :directory => directory }.merge!(attributes))