google-cloud-storage 1.28.0 → 1.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5141d81168421311ea103c5d466e2f0a1e6a6b6d
-  data.tar.gz: 352c5ac1297c6919c8a71d80bd61a24697692bd2
+SHA256:
+  metadata.gz: c1b17e5256dade278dacc588b1dd5483769f352fa6a44075f8984c9b98e6951b
+  data.tar.gz: 9a17da5e7e0f0da605e290e4a17ad75d6d89c2d2c83549d6a70378f77b86c8c8
 SHA512:
-  metadata.gz: 7bec28a4b4eebf986b43b9d06115955cc44ed03430f657b5f5eb9a2aff1ba26e77adcbbac9f2a57536f1734fda1c795664e65532f3476dcd085703aa8dc167b8
-  data.tar.gz: 894e70a45cf36a63158e07059a84a13e3a668d4730dab612a8acca3fdf532fa97e74e20a06bb86c037343e54c468a53fa16e2eaefbbe25e1cb9c0c198d007e82
+  metadata.gz: 33b1ad115cb14c993607c4c173a8d117b19ebbe1515c7fbbaf6f7f38650dfcef0219b68e404a02a785f1092d6c1b04ffdab273c5546370569134b5fdbf596cc4
+  data.tar.gz: 8f4595aa9df9901462e1a2d522f35fd9b84ab2d96bbaf765e78582b4378c6270324efb3b43b037aa99e38377a5ed410c2dbe63c8ab34daf4b81004c0318a1edf

data/CHANGELOG.md

@@ -1,5 +1,57 @@
 # Release History
 
+### 1.31.0 / 2021-03-10
+
+#### Features
+
+* Drop support for Ruby 2.4 and add support for Ruby 3.0
+
+### 1.30.0 / 2021-01-13
+
+#### Features
+
+* Replace google-api-client with specific client gems
+  * Remove google-api-client
+  * Add google-apis-iamcredentials_v1
+  * Add google-apis-storage_v1
+
+#### Documentation
+
+* Update Bucket#generate_signed_post_policy_v4 documentation
+
+### 1.29.2 / 2020-12-14
+
+#### Bug Fixes
+
+* Fix support for #generate_signed_post_policy_v4 conditions
+
+### 1.29.1 / 2020-10-05
+
+#### Bug Fixes
+
+* Fix encoding of space characters in file names in signed_url v4
+
+#### Documentation
+
+* Update Bucket#default_kms_key= docs
+  * Demonstrate deleting the Cloud KMS encryption key
+* Update customer-supplied encryption key docs and examples ([#7851](https://www.github.com/googleapis/google-cloud-ruby/issues/7851))
+
+### 1.29.0 / 2020-09-22
+
+#### Features
+
+* quota_project can be set via library configuration ([#7656](https://www.github.com/googleapis/google-cloud-ruby/issues/7656))
+
+#### Bug Fixes
+
+* Fix encoding of space characters in #signed_url version: :v4
+  * Fix encoding of space characters to use percent encoding (%20) instead of plus sign (+).
+
+#### Documentation
+
+* Add custom time to file metadata sample
+
 ### 1.28.0 / 2020-08-26
 
 * Add Object Lifecycle Management fields

data/CONTRIBUTING.md

@@ -24,7 +24,7 @@ be able to accept your pull requests.
 In order to use the google-cloud-storage console and run the project's tests,
 there is a small amount of setup:
 
-1. Install Ruby. google-cloud-storage requires Ruby 2.4+. You may choose to
+1. Install Ruby. google-cloud-storage requires Ruby 2.5+. You may choose to
    manage your Ruby and gem installations with [RVM](https://rvm.io/),
    [rbenv](https://github.com/rbenv/rbenv), or
    [chruby](https://github.com/postmodern/chruby).
@@ -45,7 +45,7 @@ there is a small amount of setup:
 
    ```sh
    $ cd google-cloud-storage/
-   $ bundle exec rake bundleupdate
+   $ bundle install
    ```
 
 ## Console

data/lib/google-cloud-storage.rb

@@ -136,6 +136,7 @@ Google::Cloud.configure.add_config! :storage do |config|
                     allow_nil: true
   config.add_alias! :keyfile, :credentials
   config.add_field! :scope, nil, match: [String, Array]
+  config.add_field! :quota_project, nil, match: String
   config.add_field! :retries, nil, match: Integer
   config.add_field! :timeout, nil, match: Integer
   # TODO: Remove once discovery document is updated.

data/lib/google/cloud/storage.rb

@@ -93,7 +93,8 @@ module Google
         Storage::Project.new(
           Storage::Service.new(
             project_id, credentials,
-            retries: retries, timeout: timeout, host: endpoint
+            retries: retries, timeout: timeout, host: endpoint,
+            quota_project: configure.quota_project
           )
         )
       end

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

@@ -309,7 +309,7 @@ module Google
         # @see https://cloud.google.com/storage/docs/access-logs Access Logs
         #
         def logging_bucket
-          @gapi.logging.log_bucket if @gapi.logging
+          @gapi.logging&.log_bucket
         end
 
         ##
@@ -333,7 +333,7 @@ module Google
         # @return [String]
         #
         def logging_prefix
-          @gapi.logging.log_object_prefix if @gapi.logging
+          @gapi.logging&.log_object_prefix
         end
 
         ##
@@ -392,7 +392,7 @@ module Google
         # @return [Boolean]
         #
         def versioning?
-          @gapi.versioning.enabled? unless @gapi.versioning.nil?
+          @gapi.versioning&.enabled?
         end
 
         ##
@@ -422,7 +422,7 @@ module Google
         # @return [String] The main page suffix.
         #
         def website_main
-          @gapi.website.main_page_suffix if @gapi.website
+          @gapi.website&.main_page_suffix
         end
 
         ##
@@ -449,7 +449,7 @@ module Google
         # @return [String]
         #
         def website_404
-          @gapi.website.not_found_page if @gapi.website
+          @gapi.website&.not_found_page
         end
 
         ##
@@ -498,7 +498,7 @@ module Google
         #   the bucket.
         #
         def requester_pays
-          @gapi.billing.requester_pays if @gapi.billing
+          @gapi.billing&.requester_pays
         end
         alias requester_pays? requester_pays
 
@@ -550,14 +550,15 @@ module Google
         #   bucket.default_kms_key #=> kms_key_name
         #
         def default_kms_key
-          @gapi.encryption && @gapi.encryption.default_kms_key_name
+          @gapi.encryption&.default_kms_key_name
         end
 
         ##
         # Set the Cloud KMS encryption key that will be used to protect files.
         # For example: `projects/a/locations/b/keyRings/c/cryptoKeys/d`
         #
-        # @param [String] new_default_kms_key New Cloud KMS key name.
+        # @param [String, nil] new_default_kms_key New Cloud KMS key name, or
+        #   `nil` to delete the Cloud KMS encryption key.
         #
         # @example
         #   require "google/cloud/storage"
@@ -571,6 +572,15 @@ module Google
         #
         #   bucket.default_kms_key = kms_key_name
         #
+        # @example Delete the default Cloud KMS encryption key:
+        #   require "google/cloud/storage"
+        #
+        #   storage = Google::Cloud::Storage.new
+        #
+        #   bucket = storage.bucket "my-bucket"
+        #
+        #   bucket.default_kms_key = nil
+        #
         def default_kms_key= new_default_kms_key
           @gapi.encryption = API::Bucket::Encryption.new \
             default_kms_key_name: new_default_kms_key
@@ -589,7 +599,7 @@ module Google
         #   retention policy exists for the bucket.
         #
         def retention_period
-          @gapi.retention_policy && @gapi.retention_policy.retention_period
+          @gapi.retention_policy&.retention_period
         end
 
         ##
@@ -648,7 +658,7 @@ module Google
         #   policy, if a policy exists.
         #
         def retention_effective_at
-          @gapi.retention_policy && @gapi.retention_policy.effective_time
+          @gapi.retention_policy&.effective_time
         end
 
         ##
@@ -798,7 +808,7 @@ module Google
         #   bucket.uniform_bucket_level_access? # true
         #
         def uniform_bucket_level_access?
-          return false unless @gapi.iam_configuration && @gapi.iam_configuration.uniform_bucket_level_access
+          return false unless @gapi.iam_configuration&.uniform_bucket_level_access
           !@gapi.iam_configuration.uniform_bucket_level_access.enabled.nil? &&
             @gapi.iam_configuration.uniform_bucket_level_access.enabled
         end
@@ -860,7 +870,7 @@ module Google
         #   puts bucket.uniform_bucket_level_access_locked_at
         #
         def uniform_bucket_level_access_locked_at
-          return nil unless @gapi.iam_configuration && @gapi.iam_configuration.uniform_bucket_level_access
+          return nil unless @gapi.iam_configuration&.uniform_bucket_level_access
           @gapi.iam_configuration.uniform_bucket_level_access.locked_time
         end
 
@@ -1637,8 +1647,8 @@ module Google
         end
 
         ##
-        # Generate a PostObject that includes the fields and url to
-        # upload objects via html forms.
+        # Generate a PostObject that includes the fields and URL to
+        # upload objects via HTML forms.
         #
         # Generating a PostObject requires service account credentials,
         # either by connecting with a service account when calling
@@ -1684,7 +1694,7 @@ module Google
         #   Proc should return a signature created using a RPC call to the
         #   [Service Account Credentials signBlob](https://cloud.google.com/iam/docs/reference/credentials/rest/v1/projects.serviceAccounts/signBlob)
         #   method as shown in the example below.
-        # @return [PostObject] An object containing the URL, fields, and values needed to upload files via html forms.
+        # @return [PostObject] An object containing the URL, fields, and values needed to upload files via HTML forms.
         #
         # @raise [SignedUrlUnavailable] If the service account credentials
         #   are missing. Service account credentials are acquired by following the
@@ -1807,10 +1817,14 @@ module Google
         end
 
         ##
-        # Generate a PostObject that includes the fields and url to
-        # upload objects via html forms.
+        # Generate a `PostObject` that includes the fields and URL to
+        # upload objects via HTML forms. The resulting `PostObject` is
+        # based on a policy document created from the method arguments.
+        # This policy provides authorization to ensure that the HTML
+        # form can upload files into the bucket. See [Signatures -
+        # Policy document](https://cloud.google.com/storage/docs/authentication/signatures#policy-document).
         #
-        # Generating a PostObject requires service account credentials,
+        # Generating a `PostObject` requires service account credentials,
         # either by connecting with a service account when calling
         # {Google::Cloud.storage}, or by passing in the service account
         # `issuer` and `signing_key` values. Although the private key can
@@ -1823,6 +1837,8 @@ module Google
         # steps in [Service Account Authentication](
         # https://cloud.google.com/iam/docs/service-accounts).
         #
+        # @see https://cloud.google.com/storage/docs/authentication/signatures#policy-document Signatures -
+        #   Policy document
         # @see https://cloud.google.com/storage/docs/xml-api/post-object
         #
         # @param [String] path Path to the file in Google Cloud Storage.
@@ -1846,9 +1862,14 @@ module Google
         #   method as shown in the example below.
         # @param [Integer] expires The number of seconds until the URL expires.
         #   The default is 604800 (7 days).
-        # @param [Hash] fields User-supplied form fields such as `acl`,
+        # @param [Hash{String => String}] fields User-supplied form fields such as `acl`,
         #   `cache-control`, `success_action_status`, and `success_action_redirect`.
-        # @param [Array<Hash|Array>] conditions User-supplied policy conditions.
+        #   Optional. See [Upload an object with HTML forms - Form
+        #   fields](https://cloud.google.com/storage/docs/xml-api/post-object-forms#form_fields).
+        # @param [Array<Hash{String => String}|Array<String>>] conditions An array of
+        #   policy conditions that every upload must satisfy. For example:
+        #   `[["eq", "$Content-Type", "image/jpeg"]]`. Optional. See [Signatures - Policy
+        #   document](https://cloud.google.com/storage/docs/authentication/signatures#policy-document).
         # @param [String] scheme The URL scheme. The default value is `HTTPS`.
         # @param [Boolean] virtual_hosted_style Whether to use a virtual hosted-style
         #   hostname, which adds the bucket into the host portion of the URI rather
@@ -1861,12 +1882,12 @@ module Google
         #   Cloud Load Balancer which routes to a bucket you own, e.g.
         #   `my-load-balancer-domain.tld`.
         #
-        # @return [PostObject] An object containing the URL, fields, and values needed to upload files via html forms.
+        # @return [PostObject] An object containing the URL, fields, and values needed to
+        #   upload files via HTML forms.
         #
-        # @raise [SignedUrlUnavailable] If the service account credentials
-        #   are missing. Service account credentials are acquired by following the
-        #   steps in [Service Account Authentication](
-        #   https://cloud.google.com/iam/docs/service-accounts).
+        # @raise [SignedUrlUnavailable] If the service account credentials are missing.
+        #   Service account credentials are acquired by following the steps in [Service
+        #   Account Authentication](https://cloud.google.com/iam/docs/service-accounts).
         #
         # @example
         #   require "google/cloud/storage"
@@ -1876,8 +1897,9 @@ module Google
         #   bucket = storage.bucket "my-todo-app"
         #
         #   conditions = [["starts-with", "$acl","public"]]
-        #   post = bucket.generate_signed_post_policy_v4 "avatars/heidi/400x400.png", expires: 10,
-        #                                                                             conditions: conditions
+        #   post = bucket.generate_signed_post_policy_v4 "avatars/heidi/400x400.png",
+        #                                                expires:    10,
+        #                                                conditions: conditions
         #
         #   post.url #=> "https://storage.googleapis.com/my-todo-app/"
         #   post.fields["key"] #=> "my-todo-app/avatars/heidi/400x400.png"
@@ -1918,10 +1940,11 @@ module Google
         #
         #   bucket = storage.bucket "my-todo-app"
         #   conditions = [["starts-with", "$acl","public"]]
-        #   post = bucket.generate_signed_post_policy_v4(
-        #     "avatars/heidi/400x400.png", expires: 10,
-        #     conditions: conditions, issuer: issuer, signer: signer
-        #   )
+        #   post = bucket.generate_signed_post_policy_v4 "avatars/heidi/400x400.png",
+        #                                                expires:    10,
+        #                                                conditions: conditions,
+        #                                                issuer:     issuer,
+        #                                                signer:     signer
         #
         #   post.url #=> "https://storage.googleapis.com/my-todo-app/"
         #   post.fields["key"] #=> "my-todo-app/avatars/heidi/400x400.png"
@@ -2549,9 +2572,11 @@ module Google
         # Yielded to a block to accumulate changes for a patch request.
         class Updater < Bucket
           attr_reader :updates
+
           ##
           # Create an Updater object.
           def initialize gapi
+            super()
             @updates = []
             @gapi = gapi
             @labels = @gapi.labels.to_h.dup

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

@@ -198,7 +198,7 @@ module Google
             gapi = @service.insert_bucket_acl @bucket, entity, "OWNER",
                                               user_project: user_project
             entity = gapi.entity
-            @owners.push entity unless @owners.nil?
+            @owners&.push entity
             entity
           end
 
@@ -243,7 +243,7 @@ module Google
             gapi = @service.insert_bucket_acl @bucket, entity, "WRITER",
                                               user_project: user_project
             entity = gapi.entity
-            @writers.push entity unless @writers.nil?
+            @writers&.push entity
             entity
           end
 
@@ -288,7 +288,7 @@ module Google
             gapi = @service.insert_bucket_acl @bucket, entity, "READER",
                                               user_project: user_project
             entity = gapi.entity
-            @readers.push entity unless @readers.nil?
+            @readers&.push entity
             entity
           end
 
@@ -323,9 +323,9 @@ module Google
           def delete entity
             @service.delete_bucket_acl @bucket, entity,
                                        user_project: user_project
-            @owners.delete entity  unless @owners.nil?
-            @writers.delete entity unless @writers.nil?
-            @readers.delete entity unless @readers.nil?
+            @owners&.delete entity
+            @writers&.delete entity
+            @readers&.delete entity
             true
           end
 
@@ -445,8 +445,7 @@ module Google
 
           def entities_from_acls acls, role
             selected = acls.select { |acl| acl.role == role }
-            entities = selected.map(&:entity)
-            entities
+            selected.map(&:entity)
           end
         end
 
@@ -614,7 +613,7 @@ module Google
             gapi = @service.insert_default_acl @bucket, entity, "OWNER",
                                                user_project: user_project
             entity = gapi.entity
-            @owners.push entity unless @owners.nil?
+            @owners&.push entity
             entity
           end
 
@@ -657,7 +656,7 @@ module Google
             gapi = @service.insert_default_acl @bucket, entity, "READER",
                                                user_project: user_project
             entity = gapi.entity
-            @readers.push entity unless @readers.nil?
+            @readers&.push entity
             entity
           end
 
@@ -690,8 +689,8 @@ module Google
           def delete entity
             @service.delete_default_acl @bucket, entity,
                                         user_project: user_project
-            @owners.delete entity  unless @owners.nil?
-            @readers.delete entity unless @readers.nil?
+            @owners&.delete entity
+            @readers&.delete entity
             true
           end
 
@@ -829,8 +828,7 @@ module Google
 
           def entities_from_acls acls, role
             selected = acls.select { |acl| acl.role == role }
-            entities = selected.map(&:entity)
-            entities
+            selected.map(&:entity)
           end
         end
       end

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

@@ -172,7 +172,10 @@ module Google
           #   rule.max_age #=> 3600
           #
           class Rule
-            attr_accessor :origin, :methods, :headers, :max_age
+            attr_accessor :origin
+            attr_accessor :methods
+            attr_accessor :headers
+            attr_accessor :max_age
 
             # @private
             def initialize origin, methods, headers: nil, max_age: nil

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

@@ -371,17 +371,17 @@ module Google
           #   end
           #
           class Rule
-            attr_accessor :action,
-                          :storage_class,
-                          :age,
-                          :created_before,
-                          :custom_time_before,
-                          :days_since_custom_time,
-                          :days_since_noncurrent_time,
-                          :is_live,
-                          :matches_storage_class,
-                          :noncurrent_time_before,
-                          :num_newer_versions
+            attr_accessor :action
+            attr_accessor :storage_class
+            attr_accessor :age
+            attr_accessor :created_before
+            attr_accessor :custom_time_before
+            attr_accessor :days_since_custom_time
+            attr_accessor :days_since_noncurrent_time
+            attr_accessor :is_live
+            attr_accessor :matches_storage_class
+            attr_accessor :noncurrent_time_before
+            attr_accessor :num_newer_versions
 
             # @private
             def initialize action,

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

@@ -125,17 +125,17 @@ module Google
           #     puts bucket.name
           #   end
           #
-          def all request_limit: nil
+          def all request_limit: nil, &block
             request_limit = request_limit.to_i if request_limit
             unless block_given?
               return enum_for :all, request_limit: request_limit
             end
             results = self
             loop do
-              results.each { |r| yield r }
+              results.each(&block)
               if request_limit
                 request_limit -= 1
-                break if request_limit < 0
+                break if request_limit.negative?
               end
               break unless results.next?
               results = results.next

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

@@ -38,20 +38,22 @@ module Google
       #   storage.project_id #=> "my-project"
       #
       class Credentials < Google::Auth::Credentials
-        SCOPE = \
-          ["https://www.googleapis.com/auth/devstorage.full_control"].freeze
-        PATH_ENV_VARS = %w[STORAGE_CREDENTIALS
-                           STORAGE_KEYFILE
-                           GOOGLE_CLOUD_CREDENTIALS
-                           GOOGLE_CLOUD_KEYFILE
-                           GCLOUD_KEYFILE].freeze
-        JSON_ENV_VARS = %w[STORAGE_CREDENTIALS_JSON
-                           STORAGE_KEYFILE_JSON
-                           GOOGLE_CLOUD_CREDENTIALS_JSON
-                           GOOGLE_CLOUD_KEYFILE_JSON
-                           GCLOUD_KEYFILE_JSON].freeze
-        DEFAULT_PATHS = \
-          ["~/.config/gcloud/application_default_credentials.json"].freeze
+        SCOPE = ["https://www.googleapis.com/auth/devstorage.full_control"].freeze
+        PATH_ENV_VARS = [
+          "STORAGE_CREDENTIALS",
+          "STORAGE_KEYFILE",
+          "GOOGLE_CLOUD_CREDENTIALS",
+          "GOOGLE_CLOUD_KEYFILE",
+          "GCLOUD_KEYFILE"
+        ].freeze
+        JSON_ENV_VARS = [
+          "STORAGE_CREDENTIALS_JSON",
+          "STORAGE_KEYFILE_JSON",
+          "GOOGLE_CLOUD_CREDENTIALS_JSON",
+          "GOOGLE_CLOUD_KEYFILE_JSON",
+          "GCLOUD_KEYFILE_JSON"
+        ].freeze
+        DEFAULT_PATHS = ["~/.config/gcloud/application_default_credentials.json"].freeze
       end
     end
   end

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

@@ -191,7 +191,7 @@ module Google
         # @return [Integer]
         #
         def size
-          @gapi.size.to_i if @gapi.size
+          @gapi.size&.to_i
         end
 
         ##
@@ -412,7 +412,8 @@ module Google
         # You can use this SHA256 hash to uniquely identify the AES-256
         # encryption key required to decrypt this file.
         #
-        # @return [String]
+        # @return [String, nil] The encoded SHA256 hash, or `nil` if there is
+        #   no customer-supplied encryption key for this file.
         #
         def encryption_key_sha256
           return nil unless @gapi.customer_encryption
@@ -1229,7 +1230,7 @@ module Google
         #   cipher.encrypt
         #   new_key = cipher.random_key
         #
-        #   file = bucket.file "path/to/my-file.ext"
+        #   file = bucket.file "path/to/my-file.ext", encryption_key: old_key
         #   file.rewrite "new-destination-bucket",
         #                "path/to/destination/file.ext",
         #                encryption_key: old_key,
@@ -1250,7 +1251,7 @@ module Google
         #   # Old customer-supplied key was stored securely for later use.
         #   old_key = "y\x03\"\x0E\xB6\xD3\x9B\x0E\xAB*\x19\xFAv\xDEY\xBEI..."
         #
-        #   file = bucket.file "path/to/my-file.ext"
+        #   file = bucket.file "path/to/my-file.ext", encryption_key: old_key
         #   file.rewrite "new-destination-bucket",
         #                "path/to/destination/file.ext",
         #                encryption_key: old_key,
@@ -1872,7 +1873,7 @@ module Google
 
           ensure_service!
 
-          rewrite_attrs = %i[storage_class kms_key_name]
+          rewrite_attrs = [:storage_class, :kms_key_name]
           @gapi = if attributes.any? { |a| rewrite_attrs.include? a }
                     rewrite_gapi \
                       bucket, name, update_gapi, user_project: user_project
@@ -1971,6 +1972,7 @@ module Google
           ##
           # @private Create an Updater object.
           def initialize gapi
+            super()
             @updates = []
             @gapi = gapi
             @metadata ||= @gapi.metadata.to_h.dup

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

@@ -190,7 +190,7 @@ module Google
                                             generation: generation,
                                             user_project: user_project
             entity = gapi.entity
-            @owners.push entity unless @owners.nil?
+            @owners&.push entity
             entity
           end
 
@@ -241,7 +241,7 @@ module Google
                                             generation: generation,
                                             user_project: user_project
             entity = gapi.entity
-            @readers.push entity unless @readers.nil?
+            @readers&.push entity
             entity
           end
 
@@ -281,8 +281,8 @@ module Google
             @service.delete_file_acl \
               @bucket, @file, entity,
               generation: generation, user_project: user_project
-            @owners.delete entity  unless @owners.nil?
-            @readers.delete entity unless @readers.nil?
+            @owners&.delete entity
+            @readers&.delete entity
             true
           end
 
@@ -428,8 +428,7 @@ module Google
 
           def entities_from_acls acls, role
             selected = acls.select { |acl| acl.role == role }
-            entities = selected.map(&:entity)
-            entities
+            selected.map(&:entity)
           end
         end
       end

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

@@ -141,17 +141,17 @@ module Google
           #     puts file.name
           #   end
           #
-          def all request_limit: nil
+          def all request_limit: nil, &block
             request_limit = request_limit.to_i if request_limit
             unless block_given?
               return enum_for :all, request_limit: request_limit
             end
             results = self
             loop do
-              results.each { |r| yield r }
+              results.each(&block)
               if request_limit
                 request_limit -= 1
-                break if request_limit < 0
+                break if request_limit.negative?
               end
               break unless results.next?
               results = results.next

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

@@ -147,10 +147,8 @@ module Google
               "&Expires=#{expires}" \
               "&Signature=#{url_escape signed_string}"
 
-            if query
-              query.each do |name, value|
-                url << "&#{url_escape name}=#{url_escape value}"
-              end
+            query&.each do |name, value|
+              url << "&#{url_escape name}=#{url_escape value}"
             end
 
             url

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

@@ -60,7 +60,7 @@ module Google
 
             p = {}
             p["conditions"] = policy_conditions base_fields, conditions, fields
-            expires ||= 60*60*24
+            expires ||= 60 * 60 * 24
             p["expiration"] = (now + expires).strftime "%Y-%m-%dT%H:%M:%SZ"
 
             policy_str = escape_characters p.to_json
@@ -100,7 +100,7 @@ module Google
 
             algorithm = "GOOG4-RSA-SHA256"
             expires = determine_expires expires
-            credential = issuer + "/" + scope
+            credential = "#{issuer}/#{scope}"
             canonical_query_str = canonical_query query, algorithm, credential, goog_date, expires, signed_headers_str
 
             # From AWS: You don't include a payload hash in the Canonical
@@ -131,9 +131,7 @@ module Google
           # methods below are public visibility only for unit testing
           def escape_characters str
             str.split("").map do |s|
-              if !s.ascii_only?
-                escape_special_unicode s
-              else
+              if s.ascii_only?
                 case s
                 when "\\"
                   '\\'
@@ -152,12 +150,14 @@ module Google
                 else
                   s
                 end
+              else
+                escape_special_unicode s
               end
             end.join
           end
 
           def escape_special_unicode str
-            str.unpack("U*").map { |i| '\u' + i.to_s(16).rjust(4, "0") }.join
+            str.unpack("U*").map { |i| "\\u#{i.to_s(16).rjust(4, '0')}" }.join
           end
 
           protected
@@ -177,7 +177,7 @@ module Google
             # Add the bucket to the head of the base_fields. This is not returned in the PostObject fields.
             conditions.unshift "bucket" => @bucket_name
             # Add user-provided conditions to the head of the conditions array.
-            conditions.unshift user_conditions if user_conditions && !user_conditions.empty?
+            conditions = user_conditions + conditions if user_conditions
             if user_fields
               # Convert each pair in fields hash to a single-entry hash and add it to the head of the conditions array.
               user_fields.to_a.reverse.each { |f| conditions.unshift Hash[*f] }
@@ -212,14 +212,14 @@ module Google
             if signer.is_a? Proc
               lambda do |string_to_sign|
                 sig = signer.call string_to_sign
-                sig.unpack("H*").first
+                sig.unpack1 "H*"
               end
             else
               signer = OpenSSL::PKey::RSA.new signer unless signer.respond_to? :sign
               # Sign string to sign
               lambda do |string_to_sign|
                 sig = signer.sign OpenSSL::Digest::SHA256.new, string_to_sign
-                sig.unpack("H*").first
+                sig.unpack1 "H*"
               end
             end
           end
@@ -273,7 +273,7 @@ module Google
           # Only the characters in the regex set [A-Za-z0-9.~_-] must be left un-escaped; all others must be
           # percent-encoded using %XX UTF-8 style.
           def escape_query_param str
-            CGI.escape(str.to_s).gsub("%7E", "~")
+            CGI.escape(str.to_s).gsub("%7E", "~").gsub "+", "%20"
           end
 
           def host_name virtual_hosted_style, bucket_bound_hostname
@@ -287,7 +287,7 @@ module Google
             path = []
             path << "/#{@bucket_name}" if path_style
             path << "/#{String(@file_name)}" if @file_name && !@file_name.empty?
-            CGI.escape(path.join).gsub "%2F", "/"
+            CGI.escape(path.join).gsub("%2F", "/").gsub "+", "%20"
           end
 
           ##
@@ -359,7 +359,7 @@ module Google
               end
               packed_signature = signing_key.sign OpenSSL::Digest::SHA256.new, data
             end
-            packed_signature.unpack("H*").first.force_encoding "utf-8"
+            packed_signature.unpack1("H*").force_encoding "utf-8"
           end
         end
       end

data/lib/google/cloud/storage/hmac_key/list.rb

@@ -131,17 +131,17 @@ module Google
           #     puts key.access_id
           #   end
           #
-          def all request_limit: nil
+          def all request_limit: nil, &block
             request_limit = request_limit.to_i if request_limit
             unless block_given?
               return enum_for :all, request_limit: request_limit
             end
             results = self
             loop do
-              results.each { |r| yield r }
+              results.each(&block)
               if request_limit
                 request_limit -= 1
-                break if request_limit < 0
+                break if request_limit.negative?
               end
               break unless results.next?
               results = results.next

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

@@ -212,8 +212,8 @@ module Google
         def deep_dup
           warn "DEPRECATED: Storage::PolicyV1#deep_dup"
           dup.tap do |p|
-            roles_dup = p.roles.each_with_object({}) do |(k, v), memo|
-              memo[k] = v.dup rescue value
+            roles_dup = p.roles.transform_values do |v|
+              v.dup rescue value
             end
             p.instance_variable_set :@roles, roles_dup
           end

data/lib/google/cloud/storage/policy/binding.rb

@@ -89,7 +89,9 @@ module Google
         #   end
         #
         class Binding
-          attr_reader :role, :members, :condition
+          attr_reader :role
+          attr_reader :members
+          attr_reader :condition
 
           ##
           # Creates a Binding object.
@@ -128,8 +130,8 @@ module Google
             raise ArgumentError, "members is empty, must be provided" if @members.empty?
 
             condition = Condition.new(**condition) if condition.is_a? Hash
-            if condition
-              raise ArgumentError, "expected Condition, not #{condition.inspect}" unless condition.is_a? Condition
+            if condition && !(condition.is_a? Condition)
+              raise ArgumentError, "expected Condition, not #{condition.inspect}"
             end
             @condition = condition
           end

data/lib/google/cloud/storage/policy/bindings.rb

@@ -168,10 +168,10 @@ module Google
           #     puts binding.role
           #   end
           #
-          def each
+          def each &block
             return enum_for :each unless block_given?
 
-            @bindings.each { |binding| yield binding }
+            @bindings.each(&block)
           end
 
           ##

data/lib/google/cloud/storage/policy/condition.rb

@@ -70,7 +70,9 @@ module Google
         #   end
         #
         class Condition
-          attr_reader :title, :description, :expression
+          attr_reader :title
+          attr_reader :description
+          attr_reader :expression
 
           ##
           # Creates a Condition object.
@@ -83,7 +85,7 @@ module Google
           #   one attributes, and statements are combined using logic operators,
           #   following CEL language specification. Required.
           #
-          def initialize title:, description: nil, expression:
+          def initialize title:, expression:, description: nil
             @title = String title
             @description = String description
             @expression = String expression

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

@@ -59,7 +59,8 @@ module Google
       #   post.fields["x-goog-signature"] #=> "4893a0e...cd82"
       #
       class PostObject
-        attr_reader :url, :fields
+        attr_reader :url
+        attr_reader :fields
 
         # @private
         def initialize url, fields

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

@@ -39,7 +39,7 @@ module Google
         ##
         # Creates a new Service instance.
         def initialize project, credentials,
-                       retries: nil, timeout: nil, host: nil
+                       retries: nil, timeout: nil, host: nil, quota_project: nil
           @project = project
           @credentials = credentials
           @service = API::StorageService.new
@@ -55,6 +55,7 @@ module Google
           @service.request_options.header["x-goog-api-client"] = \
             "gl-ruby/#{RUBY_VERSION} gccl/#{Google::Cloud::Storage::VERSION}"
           @service.request_options.header["Accept-Encoding"] = "gzip"
+          @service.request_options.quota_project = quota_project if quota_project
           @service.authorization = @credentials.client if @credentials
           @service.root_url = host if host
         end

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

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module Storage
-      VERSION = "1.28.0".freeze
+      VERSION = "1.31.0".freeze
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-storage
 version: !ruby/object:Gem::Version
-  version: 1.28.0
+  version: 1.31.0
 platform: ruby
 authors:
 - Mike Moore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-26 00:00:00.000000000 Z
+date: 2021-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-core
@@ -26,19 +26,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: google-api-client
+  name: google-apis-iamcredentials_v1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.33'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.33'
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: google-apis-storage_v1
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: googleauth
   requirement: !ruby/object:Gem::Requirement
@@ -101,14 +115,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.24.0
+        version: 1.25.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.24.0
+        version: 1.25.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -291,15 +305,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.4
+rubygems_version: 3.2.13
 signing_key: 
 specification_version: 4
 summary: API Client library for Google Cloud Storage