google-cloud-storage 0.23.0 → 0.23.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ea4be7f9752b1d98381c5f9eb8109a5a3bee1f5
-  data.tar.gz: b7f3164a319ac37f66badeca1c789b59042ad741
+  metadata.gz: d25ea51c3061bfb14179befa5250f8665e7f9691
+  data.tar.gz: b431f5182d343bb654b7d57cc75db83d6d5470f7
 SHA512:
-  metadata.gz: 26edfa57afbf8251e3463677b3b9c524a789d61a426b5e43459a221717cb1c7a838052e5e6f454944c247ef78c0a24f79b1339805c1ae7bee0ad6be35b532536
-  data.tar.gz: bcedbb48b9d1cef2fccf80c45f28a1f4b384e7805ba50027808d21931c27204a5647d785bdb1d595dda58c073caf77f3bae71bb36402c7221f14d3b4f0189e74
+  metadata.gz: f257e340fb77698aaa60a23ac31d86d42352ad6c70450e59a0a30166f96b3c9b111244033131041c1c567d5a34a0c981d1a74b662af844e1c6276a69b2ad35be
+  data.tar.gz: 419052576260453c9595b6c1a6236e8f325d0104fdd0ffc81f71bde1d17e00d28871eff0f8951ef9e56bba825289c7e00cbabff7bec861459fc32a6c23988a56

data/lib/google/cloud/storage/bucket.rb

@@ -613,6 +613,9 @@ module Google
         # @param [String] content_md5 The MD5 digest value in base64. If you
         #   provide this in the string, the client (usually a browser) must
         #   provide this HTTP header with this same value in its request.
+        # @param [Hash] headers Google extension headers (custom HTTP headers
+        #   that begin with `x-goog-`) that must be included in requests that
+        #   use the signed URL.
         # @param [String] issuer Service Account's Client Email.
         # @param [String] client_email Service Account's Client Email.
         # @param [OpenSSL::PKey::RSA, String] signing_key Service Account's
@@ -649,11 +652,23 @@ module Google
         #                                  issuer: "service-account@gcloud.com",
         #                                  signing_key: key
         #
+        # @example Using the headers option:
+        #   require "google/cloud/storage"
+        #
+        #   storage = Google::Cloud.storage
+        #
+        #   bucket = storage.bucket "my-todo-app"
+        #   shared_url = bucket.signed_url "avatars/heidi/400x400.png",
+        #                                  headers: {
+        #                                    "x-goog-acl" => "private",
+        #                                    "x-goog-meta-foo" => "bar,baz"
+        #                                  }
+        #
         def signed_url path, method: nil, expires: nil, content_type: nil,
-                       content_md5: nil, issuer: nil, client_email: nil,
-                       signing_key: nil, private_key: nil
+                       content_md5: nil, headers: nil, issuer: nil,
+                       client_email: nil, signing_key: nil, private_key: nil
           ensure_service!
-          options = { method: method, expires: expires,
+          options = { method: method, expires: expires, headers: headers,
                       content_type: content_type, content_md5: content_md5,
                       issuer: issuer, client_email: client_email,
                       signing_key: signing_key, private_key: private_key }

data/lib/google/cloud/storage/file.rb

@@ -547,6 +547,9 @@ module Google
         # @param [String] content_md5 The MD5 digest value in base64. If you
         #   provide this in the string, the client (usually a browser) must
         #   provide this HTTP header with this same value in its request.
+        # @param [Hash] headers Google extension headers (custom HTTP headers
+        #   that begin with `x-goog-`) that must be included in requests that
+        #   use the signed URL.
         # @param [String] issuer Service Account's Client Email.
         # @param [String] client_email Service Account's Client Email.
         # @param [OpenSSL::PKey::RSA, String] signing_key Service Account's
@@ -584,11 +587,24 @@ module Google
         #   shared_url = file.signed_url issuer: "service-account@gcloud.com",
         #                                signing_key: key
         #
+        # @example Using the `headers` option:
+        #   require "google/cloud/storage"
+        #
+        #   storage = Google::Cloud::Storage.new
+        #
+        #   bucket = storage.bucket "my-todo-app"
+        #   file = bucket.file "avatars/heidi/400x400.png"
+        #   shared_url = file.signed_url method: "GET",
+        #                                headers: {
+        #                                  "x-goog-acl" => "public-read",
+        #                                  "x-goog-meta-foo" => bar,baz"
+        #                                }
+        #
         def signed_url method: nil, expires: nil, content_type: nil,
-                       content_md5: nil, issuer: nil, client_email: nil,
-                       signing_key: nil, private_key: nil
+                       content_md5: nil, headers: nil, issuer: nil,
+                       client_email: nil, signing_key: nil, private_key: nil
           ensure_service!
-          options = { method: method, expires: expires,
+          options = { method: method, expires: expires, headers: headers,
                       content_type: content_type, content_md5: content_md5,
                       issuer: issuer, client_email: client_email,
                       signing_key: signing_key, private_key: private_key }
@@ -746,7 +762,7 @@ module Google
           def signature_str options
             [options[:method], options[:content_md5],
              options[:content_type], options[:expires],
-             ext_path].join "\n"
+             format_extension_headers(options[:headers]) + ext_path].join "\n"
           end
 
           def determine_signing_key options = {}
@@ -781,8 +797,18 @@ module Google
           def generate_signed_url issuer, signed_string, expires
             signature = Base64.strict_encode64(signed_string).delete("\n")
             "#{ext_url}?GoogleAccessId=#{CGI.escape issuer}" \
-                      "&Expires=#{expires}" \
-                      "&Signature=#{CGI.escape signature}"
+              "&Expires=#{expires}" \
+              "&Signature=#{CGI.escape signature}"
+          end
+
+          def format_extension_headers headers
+            return "" if headers.nil?
+            fail "Headers must be given in a Hash" unless headers.is_a? Hash
+            flatten = headers.map do |key, value|
+              "#{key.to_s.downcase}:#{value.gsub(/\s+/, ' ')}\n"
+            end
+            flatten.reject! { |h| h.start_with? "x-goog-encryption-key" }
+            flatten.sort.join
           end
         end
 

data/lib/google/cloud/storage/version.rb

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module Storage
-      VERSION = "0.23.0"
+      VERSION = "0.23.1"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-storage
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.23.1
 platform: ruby
 authors:
 - Mike Moore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-09 00:00:00.000000000 Z
+date: 2016-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-core