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

refactors create_temp_url method to use the options hash for schemes instead of a parameter

Browse source
This commit is contained in:
Julian Weber 2013-10-02 16:22:15 +02:00
parent 2e0be6bd17
commit 0e89acdcc8
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -75,7 +75,7 @@ module Fog
#
def url(expires, options = {})
requires :directory, :key
self.service.create_temp_url_with_service_scheme(self.directory.key, self.key, expires, "GET", options = {})
self.service.create_temp_url(directory.key, key, expires, "GET", options)
end
def public_url

12
lib/fog/openstack/requests/storage/get_object_https_url.rb
View file

@ -15,7 +15,7 @@ module Fog
# * response<~Excon::Response>:
# * body<~String> - url for object
def get_object_https_url(container, object, expires, options = {})
create_temp_url(container, object, expires, "GET", "https", options)
create_temp_url(container, object, expires, "GET", options.merge(:scheme => "https"))
end
# Get an expiring object http url
@ -29,7 +29,7 @@ module Fog
# * response<~Excon::Response>:
# * body<~String> - url for object
def get_object_http_url(container, object, expires, options = {})
create_temp_url(container, object, expires, "GET", "http", options)
create_temp_url(container, object, expires, "GET", options.merge(:scheme => "http"))
end
# creates a temporary url
@ -48,10 +48,11 @@ module Fog
#
# ==== See Also
# http://docs.rackspace.com/files/api/v1/cf-devguide/content/Create_TempURL-d1a444.html
def create_temp_url(container, object, expires, method, scheme, options = {})
def create_temp_url(container, object, expires, method, options = {})
raise ArgumentError, "Insufficient parameters specified." unless (container && object && expires && method)
raise ArgumentError, "Storage must my instantiated with the :openstack_temp_url_key option" if @openstack_temp_url_key.nil?
scheme = options[:scheme] || @scheme
# POST not allowed
allowed_methods = %w{GET PUT HEAD}
@ -71,11 +72,6 @@ module Fog
"#{scheme}://#{@host}#{object_path_escaped}?temp_url_sig=#{sig}&temp_url_expires=#{expires}"
end
# Creates a temporary url using the scheme specified in the service configuration
def create_temp_url_with_service_scheme(container, object, expires, method, options = {})
create_temp_url(container, object, expires, method, @scheme, options)
end
private
def sig_to_hex(str)