From ca397eafbc422437c14457ca59ccea63cff0b366 Mon Sep 17 00:00:00 2001
From: Jacob Mattingley <jem@ubalo.com>
Date: Wed, 21 Mar 2012 19:30:34 -0700
Subject: [PATCH] Allow custom headers in Storage#put_object_url

---
 lib/fog/aws/requests/storage/put_object_url.rb    | 8 ++++----
 lib/fog/google/requests/storage/put_object_url.rb | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/fog/aws/requests/storage/put_object_url.rb b/lib/fog/aws/requests/storage/put_object_url.rb
index b152c0de7..2a547f708 100644
--- a/lib/fog/aws/requests/storage/put_object_url.rb
+++ b/lib/fog/aws/requests/storage/put_object_url.rb
@@ -17,7 +17,7 @@ module Fog
         # ==== See Also
         # http://docs.amazonwebservices.com/AmazonS3/latest/dev/S3_QSAuth.html
 
-        def put_object_url(bucket_name, object_name, expires)
+        def put_object_url(bucket_name, object_name, expires, headers = {})
           unless bucket_name
             raise ArgumentError.new('bucket_name is required')
           end
@@ -25,7 +25,7 @@ module Fog
             raise ArgumentError.new('object_name is required')
           end
           url({
-            :headers  => {},
+            :headers  => headers,
             :host     => @host,
             :method   => 'PUT',
             :path     => "#{bucket_name}/#{object_name}"
@@ -36,7 +36,7 @@ module Fog
 
       class Mock # :nodoc:all
 
-        def put_object_url(bucket_name, object_name, expires)
+        def put_object_url(bucket_name, object_name, expires, headers = {})
           unless bucket_name
             raise ArgumentError.new('bucket_name is required')
           end
@@ -44,7 +44,7 @@ module Fog
             raise ArgumentError.new('object_name is required')
           end
           url({
-            :headers  => {},
+            :headers  => headers,
             :host     => @host,
             :method   => 'PUT',
             :path     => "#{bucket_name}/#{object_name}"
diff --git a/lib/fog/google/requests/storage/put_object_url.rb b/lib/fog/google/requests/storage/put_object_url.rb
index db5fa5736..293f7e9cd 100644
--- a/lib/fog/google/requests/storage/put_object_url.rb
+++ b/lib/fog/google/requests/storage/put_object_url.rb
@@ -14,7 +14,7 @@ module Fog
         # * response<~Excon::Response>:
         #   * body<~String> - url for object
         #
-        def put_object_url(bucket_name, object_name, expires)
+        def put_object_url(bucket_name, object_name, expires, headers = {})
           unless bucket_name
             raise ArgumentError.new('bucket_name is required')
           end
@@ -22,7 +22,7 @@ module Fog
             raise ArgumentError.new('object_name is required')
           end
           url({
-            :headers  => {},
+            :headers  => headers,
             :host     => @host,
             :method   => 'PUT',
             :path     => "#{bucket_name}/#{object_name}"
@@ -33,7 +33,7 @@ module Fog
 
       class Mock
 
-        def put_object_url(bucket_name, object_name, expires)
+        def put_object_url(bucket_name, object_name, expires, headers = {})
           unless bucket_name
             raise ArgumentError.new('bucket_name is required')
           end
@@ -41,7 +41,7 @@ module Fog
             raise ArgumentError.new('object_name is required')
           end
           url({
-            :headers  => {},
+            :headers  => headers,
             :host     => @host,
             :method   => 'PUT',
             :path     => "#{bucket_name}/#{object_name}"