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

Merge pull request #646 from autohaus24/master

Browse source 
add query options for s3 to support response headers overwriting
This commit is contained in:
Wesley Beary 2011-12-12 07:43:39 -08:00
commit bf66bc1a0f
5 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -2,6 +2,7 @@
*.gem
*.rbc
*.sw?
.rvmrc
.bundle
.DS_Store
coverage

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

@ -123,9 +123,9 @@ module Fog
true
end
def url(expires)
def url(expires, options = {})
requires :key
collection.get_https_url(key, expires)
collection.get_https_url(key, expires, options)
end
private

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

@ -78,14 +78,14 @@ 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)
def get_https_url(key, expires, options = {})
requires :directory
connection.get_object_https_url(directory.key, key, expires)
connection.get_object_https_url(directory.key, key, expires, options)
end
def head(key, options = {})

5
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

5
lib/fog/aws/requests/storage/get_object_https_url.rb
View file

@ -4,7 +4,7 @@ module Fog
module GetObjectHttpsUrl
def get_object_https_url(bucket_name, object_name, expires)
def get_object_https_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