Merge pull request #646 from autohaus24/master

add query options for s3 to support response headers overwriting

.gitignore

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

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

@@ -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

lib/fog/aws/models/storage/files.rb

@@ -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 = {})

lib/fog/aws/requests/storage/get_object_http_url.rb

@@ -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
 

lib/fog/aws/requests/storage/get_object_https_url.rb

@@ -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