google-cloud-storage 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef777ddfd6e259d9f116f3a5996d058d852b7d49
-  data.tar.gz: 9e197669439fe3b3dc9a7bc2a6cbdb6ce9a76bc0
+  metadata.gz: 474743d603eb149e305fbbbaf7db863b04806cc0
+  data.tar.gz: f8eb5c36d9816604516c4c0d91c5350ba5152c76
 SHA512:
-  metadata.gz: 44a7f28a56c19e8b9014891eca1a559e8481b25ea2a0f0ed2ea244793f883395f26ddaf1cdc9d996469ed991f478d969d11151bdd2543e09f2b51d667248c400
-  data.tar.gz: e8db734cf23c2a8fc846baaee9779b9212abd3f5150eeb2e9d5d4ef3094c5803e0d608624d1e228542e6bf61cb0f53cf158b68bed267c80ca4dc5b2124dc226f
+  metadata.gz: e75929f212d3cea1b8b7064136ff2a6228571358225e1980ba5f46d982a31dc212d50cda1d59d117356c8429388b89d40502352f7020c7578a40e5361dc4ba82
+  data.tar.gz: ebd0b51233c64e48728850b2eb0a0e5ad4699486e0bc8a12d7be442b34092e7c73419051c857dabd4a23b6693da1a0d3bf9e2e3287e61df2a5bc9d0a523d16d4

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

@@ -733,6 +733,14 @@ module Google
         #   Private Key.
         # @param [OpenSSL::PKey::RSA, String] private_key Service Account's
         #   Private Key.
+        # @param [Hash] query Query string parameters to include in the signed
+        #   URL. The given parameters are not verified by the signature.
+        #
+        #   Parameters such as `response-content-disposition` and
+        #   `response-content-type` can alter the behavior of the response when
+        #   using the URL, but only when the file resource is missing the
+        #   corresponding values. (These values can be permanently set using
+        #   {File#content_disposition=} and {File#content_type=}.)
         #
         # @example
         #   require "google/cloud/storage"
@@ -778,14 +786,16 @@ module Google
         #
         def signed_url path, method: nil, expires: nil, content_type: nil,
                        content_md5: nil, headers: nil, issuer: nil,
-                       client_email: nil, signing_key: nil, private_key: nil
+                       client_email: nil, signing_key: nil, private_key: nil,
+                       query: nil
           ensure_service!
-          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 }
           signer = File::Signer.from_bucket self, path
-          signer.signed_url options
+          signer.signed_url 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,
+                            query: query
         end
 
         ##

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

@@ -731,6 +731,14 @@ module Google
         #   Private Key.
         # @param [OpenSSL::PKey::RSA, String] private_key Service Account's
         #   Private Key.
+        # @param [Hash] query Query string parameters to include in the signed
+        #   URL. The given parameters are not verified by the signature.
+        #
+        #   Parameters such as `response-content-disposition` and
+        #   `response-content-type` can alter the behavior of the response when
+        #   using the URL, but only when the file resource is missing the
+        #   corresponding values. (These values can be permanently set using
+        #   {#content_disposition=} and {#content_type=}.)
         #
         # @example
         #   require "google/cloud/storage"
@@ -778,14 +786,16 @@ module Google
         #
         def signed_url method: nil, expires: nil, content_type: nil,
                        content_md5: nil, headers: nil, issuer: nil,
-                       client_email: nil, signing_key: nil, private_key: nil
+                       client_email: nil, signing_key: nil, private_key: nil,
+                       query: nil
           ensure_service!
           signer = File::Signer.from_file self
           signer.signed_url 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
+                            signing_key: signing_key, private_key: private_key,
+                            query: query
         end
 
         ##

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

@@ -109,7 +109,7 @@ module Google
             fail SignedUrlUnavailable unless i && s
 
             sig = generate_signature s, signature_str(options)
-            generate_signed_url i, sig, options[:expires]
+            generate_signed_url i, sig, options[:expires], options[:query]
           end
 
           def generate_signature signing_key, secret
@@ -120,10 +120,18 @@ module Google
             Base64.strict_encode64(signature).delete("\n")
           end
 
-          def generate_signed_url issuer, signed_string, expires
-            "#{ext_url}?GoogleAccessId=#{CGI.escape issuer}" \
+          def generate_signed_url issuer, signed_string, expires, query
+            url = "#{ext_url}?GoogleAccessId=#{CGI.escape issuer}" \
               "&Expires=#{expires}" \
               "&Signature=#{CGI.escape signed_string}"
+
+            if query
+              query.each do |name, value|
+                url << "&#{CGI.escape name}=#{CGI.escape value}"
+              end
+            end
+
+            url
           end
 
           def format_extension_headers headers

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

@@ -375,6 +375,14 @@ module Google
         #   Private Key.
         # @param [OpenSSL::PKey::RSA, String] private_key Service Account's
         #   Private Key.
+        # @param [Hash] query Query string parameters to include in the signed
+        #   URL. The given parameters are not verified by the signature.
+        #
+        #   Parameters such as `response-content-disposition` and
+        #   `response-content-type` can alter the behavior of the response when
+        #   using the URL, but only when the file resource is missing the
+        #   corresponding values. (These values can be permanently set using
+        #   {File#content_disposition=} and {File#content_type=}.)
         #
         # @example
         #   require "google/cloud/storage"
@@ -426,13 +434,14 @@ module Google
         def signed_url bucket, path, method: nil, expires: nil,
                        content_type: nil, content_md5: nil, headers: nil,
                        issuer: nil, client_email: nil, signing_key: nil,
-                       private_key: nil
+                       private_key: nil, query: nil
           signer = File::Signer.new bucket, path, service
           signer.signed_url 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
+                            signing_key: signing_key, private_key: private_key,
+                            query: query
         end
 
         protected

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

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module Storage
-      VERSION = "1.2.0"
+      VERSION = "1.3.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-storage
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Mike Moore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-27 00:00:00.000000000 Z
+date: 2017-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-core