gcs-signer 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a74dad977177130c33d5b0ba0ca0ead47b5c3a82
-  data.tar.gz: 7926bd9cb2d5d2f48af827afb5f1392555f6e4e9
+  metadata.gz: fcc753e1262301f1f25d2bc0637ad2c03fbe0da7
+  data.tar.gz: f8bf159daf4ac001b8999e563cb87f09c6e44b74
 SHA512:
-  metadata.gz: 5188880d7e0d8abc3a7ae068714256a235f96f659be957866e3938dacfa9e7be20b0b7899b7aa717fdfa4b92566655c40c8eea706c1820bd5f0868e3dd856f8c
-  data.tar.gz: 975ee1df451b55e8a774a9cab6e7ffff22348310be3febca46db623fa5c390230681a86e4230c2b4276ecdde4948d252beaf4d807eec566e72ece403e4d1cd4b
+  metadata.gz: 8dce4c13fe146f462926ab4c8b124f756a5a5b9fa525b7e38ee4c2502990d80bd030e49f42d6b9838199b054cf7deb4acb48cb465bc6342ef045d9995c3a0579
+  data.tar.gz: 8b563b219fdd62a91775b6c4ed2f85b138c433dcffad7f6db3ade618622fe967e06abbf6e1be3646cf1acb9e53e190e166a319dae22242c543dc6505a718958d

data/lib/gcs_signer.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "uri"
 require "openssl"
 require "base64"
@@ -10,7 +11,7 @@ require "json"
 #  signer.sign "your-bucket", "object/name"
 #  # => "https://storage.googleapis.com/your-bucket/object/name?..."
 class GcsSigner
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 
   # gcs-signer requires credential that can access to GCS.
   # [path] the path of the service_account json file.
@@ -37,7 +38,12 @@ class GcsSigner
   # Variable options are available:
   # [expires] Time(stamp in UTC) when the signed url expires.
   # [valid_for] ...or how much seconds is the signed url available.
-  # If you don't set those values, it will set to 300 seconds by default.
+  # [google_access_id] Just in case if you want to change \+GoogleAccessId+
+  # [response_content_disposition] Content-Disposition of the signed URL.
+  # [response_content_type] Content-Type of the signed URL.
+  #
+  # If you set neither \+expires+ nor \+valid_for+,
+  # it will set to 300 seconds by default.
   #
   #  # default is 5 minutes
   #  signer.sign_url("bucket-name", "path/to/file")
@@ -56,15 +62,19 @@ class GcsSigner
   # like \+method+, \+md5+, and \+content_type+. See:
   # https://cloud.google.com/storage/docs/access-control/signed-urls
   #
-  # Just in case if you want to change \+GoogleAccessId+ in the signed url,
-  # You can set \+google_access_id+ as an option.
   def sign_url(bucket, object_name, options = {})
     options = apply_default_options(options)
 
-    url = URI.join @gcs_host,
-                   URI.escape("/#{bucket}/"), URI.escape(object_name)
-    signature = sign string_that_will_be_signed(url, options)
-    url.query = query_for_signed_url(signature, options)
+    url = URI.join(
+      @gcs_host,
+      URI.escape("/#{bucket}/"), URI.escape(object_name)
+    )
+
+    url.query = query_for_signed_url(
+      sign(string_that_will_be_signed(url, options)),
+      options
+    )
+
     url.to_s
   end
 
@@ -114,9 +124,15 @@ class GcsSigner
 
   # Escapes and generates query string for actual result.
   def query_for_signed_url(signature, options)
-    URI.encode_www_form GoogleAccessId: options[:google_access_id],
-                        Expires: options[:expires].to_i,
-                        Signature: Base64.strict_encode64(signature)
+    query = {
+      "GoogleAccessId" => options[:google_access_id],
+      "Expires" => options[:expires].to_i,
+      "Signature" => Base64.strict_encode64(signature),
+      "response-content-disposition" => options[:response_content_disposition],
+      "response-content-type" => options[:response_content_type]
+    }.reject { |_, v| v.nil? }
+
+    URI.encode_www_form(query)
   end
 
   # raised When GcsSigner could not find service_account JSON file.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gcs-signer
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Sangwon Yi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-25 00:00:00.000000000 Z
+date: 2017-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.40.0
+        version: 0.49.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.40.0
+        version: 0.49.1
 description: |2
     Simple signed URL generator for Google Cloud Storage.
     No additional gems and API requests required to generate signed URL.
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Simple signed URL generator for Google Cloud Storage.