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

add query param to get_object_http_url for consistency

Browse source
This commit is contained in:
Mateusz Juraszek 2011-12-09 20:38:27 +01:00
parent f026d3533e
commit 491ec8fb74
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/fog/aws/models/storage/files.rb
View file

@ -78,9 +78,9 @@ module Fog
end
end
def get_http_url(key, expires)
def get_http_url(key, expires, options = {})
requires :directory
connection.get_object_http_url(directory.key, key, expires)
connection.get_object_http_url(directory.key, key, expires, options)
end
def get_https_url(key, expires, options = {})

7
lib/fog/aws/requests/storage/get_object_http_url.rb
View file

@ -4,7 +4,7 @@ module Fog
module GetObjectHttpUrl
def get_object_http_url(bucket_name, object_name, expires)
def get_object_http_url(bucket_name, object_name, expires, options = {})
unless bucket_name
raise ArgumentError.new('bucket_name is required')
end
@ -15,7 +15,8 @@ module Fog
:headers => {},
:host => @host,
:method => 'GET',
:path => "#{bucket_name}/#{object_name}"
:path => "#{bucket_name}/#{object_name}",
:query => options[:query]
}, expires)
end
@ -48,4 +49,4 @@ module Fog
end
end
end
end
end