google-cloud-storage 0.21.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94a9b4984ad82c331f96b286defb5fe25cebce12
-  data.tar.gz: 7ed68558c6cb0db8cd0b431657607219482aa056
+  metadata.gz: 6ea4be7f9752b1d98381c5f9eb8109a5a3bee1f5
+  data.tar.gz: b7f3164a319ac37f66badeca1c789b59042ad741
 SHA512:
-  metadata.gz: 4361659e81aebc49a2c29e3ac77339835a1e893b0e4ea9029a08b3aa88f9a9313b2e75eadb54c4d6bca6ec2a68dafe99b967d89d7c99361768f48e45d187aad9
-  data.tar.gz: be19d2b6af46f535269f98d7aee9ca3145fd2b7a61d1a8e65529e758aebbb09231a2931b04c2a68f19737cef7171f19b207324543f9add28342827880b76052c
+  metadata.gz: 26edfa57afbf8251e3463677b3b9c524a789d61a426b5e43459a221717cb1c7a838052e5e6f454944c247ef78c0a24f79b1339805c1ae7bee0ad6be35b532536
+  data.tar.gz: bcedbb48b9d1cef2fccf80c45f28a1f4b384e7805ba50027808d21931c27204a5647d785bdb1d595dda58c073caf77f3bae71bb36402c7221f14d3b4f0189e74

data/.yardopts

@@ -0,0 +1,7 @@
+--no-private
+--title=Google Cloud Storage
+--markup markdown
+
+./lib/**/*.rb
+-
+README.md

data/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/README.md

@@ -0,0 +1,68 @@
+# google-cloud-storage
+
+[Google Cloud Storage](https://cloud.google.com/storage/) ([docs](https://cloud.google.com/storage/docs/json_api/)) allows you to store data on Google infrastructure with very high reliability, performance and availability, and can be used to distribute large data objects to users via direct download.
+
+- [google-cloud-storage API documentation](http://googlecloudplatform.github.io/google-cloud-ruby/#/docs/google-cloud-storage/master/google/cloud/storage)
+- [google-cloud-storage on RubyGems](https://rubygems.org/gems/google-cloud-storage)
+- [Google Cloud Storage documentation](https://cloud.google.com/storage/docs)
+
+## Quick Start
+
+```sh
+$ gem install google-cloud-storage
+```
+
+## Authentication
+
+This library uses Service Account credentials to connect to Google Cloud services. When running on Compute Engine the credentials will be discovered automatically. When running on other environments the Service Account credentials can be specified by providing the path to the JSON file, or the JSON itself, in environment variables.
+
+Instructions and configuration options are covered in the [Authentication Guide](https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/google-cloud-storage/guides/authentication).
+
+## Example
+
+```ruby
+require "google/cloud/storage"
+
+storage = Google::Cloud::Storage.new(
+  project: "my-todo-project",
+  keyfile: "/path/to/keyfile.json"
+)
+
+bucket = storage.bucket "task-attachments"
+
+file = bucket.file "path/to/my-file.ext"
+
+# Download the file to the local file system
+file.download "/tasks/attachments/#{file.name}"
+
+# Copy the file to a backup bucket
+backup = storage.bucket "task-attachment-backups"
+file.copy backup, file.name
+```
+
+## Supported Ruby Versions
+
+This library is supported on Ruby 2.0+.
+
+## Versioning
+
+This library follows [Semantic Versioning](http://semver.org/).
+
+It is currently in major version zero (0.y.z), which means that anything may change at any time and the public API should not be considered stable.
+
+## Contributing
+
+Contributions to this library are always welcome and highly encouraged.
+
+See the [Contributing Guide](https://googlecloudplatform.github.io/google-cloud-ruby/#/docs/guides/contributing) for more information on how to get started.
+
+Please note that this project is released with a Contributor Code of Conduct. By participating in this project you agree to abide by its terms. See [Code of Conduct](../CODE_OF_CONDUCT.md) for more information.
+
+## License
+
+This library is licensed under Apache 2.0. Full license text is available in [LICENSE](LICENSE).
+
+## Support
+
+Please [report bugs at the project on Github](https://github.com/GoogleCloudPlatform/google-cloud-ruby/issues).
+Don't hesitate to [ask questions](http://stackoverflow.com/questions/tagged/google-cloud-platform+ruby) about the client or APIs on [StackOverflow](http://stackoverflow.com).

data/lib/google/cloud/storage.rb

@@ -199,14 +199,14 @@ module Google
     # By default, Google Cloud Storage manages server-side encryption keys on
     # your behalf. However, a [customer-supplied encryption
     # key](https://cloud.google.com/storage/docs/encryption#customer-supplied)
-    # can be provided with the `encryption_key` and `encryption_key_sha256`
-    # options. If given, the same key and SHA256 hash also must be provided to
-    # subsequently download or copy the file. If you use customer-supplied
-    # encryption keys, you must securely manage your keys and ensure that they
-    # are not lost. Also, please note that file metadata is not encrypted, with
-    # the exception of the CRC32C checksum and MD5 hash. The names of files and
-    # buckets are also not encrypted, and you can read or update the metadata of
-    # an encrypted file without providing the encryption key.
+    # can be provided with the `encryption_key` option. If given, the same key
+    # must be provided to subsequently download or copy the file. If you use
+    # customer-supplied encryption keys, you must securely manage your keys and
+    # ensure that they are not lost. Also, please note that file metadata is not
+    # encrypted, with the exception of the CRC32C checksum and MD5 hash. The
+    # names of files and buckets are also not encrypted, and you can read or
+    # update the metadata of an encrypted file without providing the encryption
+    # key.
     #
     # ```ruby
     # require "google/cloud/storage"
@@ -219,17 +219,14 @@ module Google
     # cipher = OpenSSL::Cipher.new "aes-256-cfb"
     # cipher.encrypt
     # key = cipher.random_key
-    # key_hash = Digest::SHA256.digest key
     #
     # bucket.create_file "/var/todo-app/avatars/heidi/400x400.png",
     #                    "avatars/heidi/400x400.png",
-    #                    encryption_key: key,
-    #                    encryption_key_sha256: key_hash
+    #                    encryption_key: key
     #
     # # Store your key and hash securely for later use.
     # file = bucket.file "avatars/heidi/400x400.png",
-    #                    encryption_key: key,
-    #                    encryption_key_sha256: key_hash
+    #                    encryption_key: key
     # ```
     #
     # ## Downloading a File

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

@@ -105,10 +105,12 @@ module Google
         #   storage = Google::Cloud::Storage.new
         #
         #   bucket = storage.bucket "my-todo-app"
-        #   bucket.cors #=> [{"origin"=>["http://example.org"],
-        #               #     "method"=>["GET","POST","DELETE"],
-        #               #     "responseHeader"=>["X-My-Custom-Header"],
-        #               #     "maxAgeSeconds"=>3600}]
+        #   bucket.cors.size #=> 2
+        #   rule = bucket.cors.first
+        #   rule.origin #=> ["http://example.org"]
+        #   rule.methods #=> ["GET","POST","DELETE"]
+        #   rule.headers #=> ["X-My-Custom-Header"]
+        #   rule.max_age #=> 3600
         #
         # @example Updating the bucket's CORS rules inside a block.
         #   require "google/cloud/storage"
@@ -120,7 +122,7 @@ module Google
         #     b.cors do |c|
         #       c.add_rule ["http://example.org", "https://example.org"],
         #                  "*",
-        #                  response_headers: ["X-My-Custom-Header"],
+        #                  headers: ["X-My-Custom-Header"],
         #                  max_age: 3600
         #     end
         #   end
@@ -289,12 +291,12 @@ module Google
         #
         #   storage = Google::Cloud::Storage.new
         #
-        #   bucket = storage.bucket "my-bucket"
+        #   bucket = storage.bucket "my-todo-app"
         #   bucket.update do |b|
         #     b.website_main = "index.html"
         #     b.website_404 = "not_found.html"
-        #     b.cors[0]["method"] = ["GET","POST","DELETE"]
-        #     b.cors[1]["responseHeader"] << "X-Another-Custom-Header"
+        #     b.cors[0].methods = ["GET","POST","DELETE"]
+        #     b.cors[1].headers << "X-Another-Custom-Header"
         #   end
         #
         # @example New CORS rules can also be added in a nested block:
@@ -307,7 +309,7 @@ module Google
         #     b.cors do |c|
         #       c.add_rule ["http://example.org", "https://example.org"],
         #                  "*",
-        #                  response_headers: ["X-My-Custom-Header"],
+        #                  headers: ["X-My-Custom-Header"],
         #                  max_age: 300
         #     end
         #   end
@@ -411,21 +413,16 @@ module Google
         #
         # If a [customer-supplied encryption
         # key](https://cloud.google.com/storage/docs/encryption#customer-supplied)
-        # was used with {#create_file}, the `encryption_key` and
-        # `encryption_key_sha256` options must be provided or else the file's
-        # CRC32C checksum and MD5 hash will not be returned.
+        # was used with {#create_file}, the `encryption_key` option must be
+        # provided or else the file's CRC32C checksum and MD5 hash will not be
+        # returned.
         #
         # @param [String] path Name (path) of the file.
         # @param [Integer] generation When present, selects a specific revision
         #   of this object. Default is the latest version.
         # @param [String] encryption_key Optional. The customer-supplied,
         #   AES-256 encryption key used to encrypt the file, if one was provided
-        #   to {#create_file}. Must be provided if `encryption_key_sha256` is
-        #   provided.
-        # @param [String] encryption_key_sha256 Optional. The SHA256 hash of the
-        #   customer-supplied, AES-256 encryption key used to encrypt the file,
-        #   if one was provided to {#create_file}. Must be provided if
-        #   `encryption_key` is provided.
+        #   to {#create_file}.
         #
         # @return [Google::Cloud::Storage::File, nil] Returns nil if file does
         #   not exist
@@ -440,11 +437,9 @@ module Google
         #   file = bucket.file "path/to/my-file.ext"
         #   puts file.name
         #
-        def file path, generation: nil, encryption_key: nil,
-                 encryption_key_sha256: nil
+        def file path, generation: nil, encryption_key: nil
           ensure_service!
-          options = { generation: generation, key: encryption_key,
-                      key_sha256: encryption_key_sha256 }
+          options = { generation: generation, key: encryption_key }
           gapi = service.get_file name, path, options
           File.from_gapi gapi, service
         rescue Google::Cloud::NotFoundError
@@ -459,13 +454,11 @@ module Google
         # #### Customer-supplied encryption keys
         #
         # By default, Google Cloud Storage manages server-side encryption keys
-        # on your behalf. However, a [customer-supplied encryption
-        # key](https://cloud.google.com/storage/docs/encryption#customer-supplied)
-        # can be provided with the `encryption_key` and `encryption_key_sha256`
-        # options. If given, the same key and SHA256 hash also must be provided
-        # to subsequently download or copy the file. If you use
-        # customer-supplied encryption keys, you must securely manage your keys
-        # and ensure that they are not lost. Also, please note that file
+        # on your behalf. However, a [customer-supplied encryption key](https://cloud.google.com/storage/docs/encryption#customer-supplied)
+        # can be provided with the `encryption_key` option. If given, the same
+        # key must be provided to subsequently download or copy the file. If you
+        # use customer-supplied encryption keys, you must securely manage your
+        # keys and ensure that they are not lost. Also, please note that file
         # metadata is not encrypted, with the exception of the CRC32C checksum
         # and MD5 hash. The names of files and buckets are also not encrypted,
         # and you can read or update the metadata of an encrypted file without
@@ -522,11 +515,7 @@ module Google
         #   and arbitrary string values that will returned with requests for the
         #   file as "x-goog-meta-" response headers.
         # @param [String] encryption_key Optional. A customer-supplied, AES-256
-        #   encryption key that will be used to encrypt the file. Must be
-        #   provided if `encryption_key_sha256` is provided.
-        # @param [String] encryption_key_sha256 Optional. The SHA256 hash of the
-        #   customer-supplied, AES-256 encryption key that will be used to
-        #   encrypt the file. Must be provided if `encryption_key` is provided.
+        #   encryption key that will be used to encrypt the file.
         #
         # @return [Google::Cloud::Storage::File]
         #
@@ -560,30 +549,27 @@ module Google
         #   cipher = OpenSSL::Cipher.new "aes-256-cfb"
         #   cipher.encrypt
         #   key = cipher.random_key
-        #   key_hash = Digest::SHA256.digest key
         #
         #   bucket.create_file "path/to/local.file.ext",
         #                      "destination/path/file.ext",
-        #                      encryption_key: key,
-        #                      encryption_key_sha256: key_hash
+        #                      encryption_key: key
         #
         #   # Store your key and hash securely for later use.
         #   file = bucket.file "destination/path/file.ext",
-        #                      encryption_key: key,
-        #                      encryption_key_sha256: key_hash
+        #                      encryption_key: key
         #
         def create_file file, path = nil, acl: nil, cache_control: nil,
                         content_disposition: nil, content_encoding: nil,
                         content_language: nil, content_type: nil,
                         crc32c: nil, md5: nil, metadata: nil,
-                        encryption_key: nil, encryption_key_sha256: nil
+                        encryption_key: nil
           ensure_service!
           options = { acl: File::Acl.predefined_rule_for(acl), md5: md5,
                       cache_control: cache_control, content_type: content_type,
                       content_disposition: content_disposition, crc32c: crc32c,
                       content_encoding: content_encoding,
                       content_language: content_language, metadata: metadata,
-                      key: encryption_key, key_sha256: encryption_key_sha256 }
+                      key: encryption_key }
           ensure_file_exists! file
           # TODO: Handle file as an IO and path is missing more gracefully
           path ||= Pathname(file).to_path
@@ -640,7 +626,7 @@ module Google
         #   storage = Google::Cloud::Storage.new
         #
         #   bucket = storage.bucket "my-todo-app"
-        #   shared_url = bucket.signed_url "avatars/heidi/400x400.png",
+        #   shared_url = bucket.signed_url "avatars/heidi/400x400.png"
         #
         # @example Any of the option parameters may be specified:
         #   require "google/cloud/storage"
@@ -652,7 +638,7 @@ module Google
         #                                  method: "PUT",
         #                                  expires: 300 # 5 minutes from now
         #
-        # @example Using the `issuer` and `signing_key` options:
+        # @example Using the issuer and signing_key options:
         #   require "google/cloud/storage"
         #
         #   storage = Google::Cloud.storage

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

@@ -656,7 +656,7 @@ module Google
           #
           #   bucket = storage.bucket "my-bucket"
           #
-          #   bucket.acl.auth!
+          #   bucket.default_acl.auth!
           #
           def auth!
             update_predefined_default_acl! "authenticatedRead"
@@ -677,7 +677,7 @@ module Google
           #
           #   bucket = storage.bucket "my-bucket"
           #
-          #   bucket.acl.owner_full!
+          #   bucket.default_acl.owner_full!
           #
           def owner_full!
             update_predefined_default_acl! "bucketOwnerFullControl"
@@ -695,7 +695,7 @@ module Google
           #
           #   bucket = storage.bucket "my-bucket"
           #
-          #   bucket.acl.owner_read!
+          #   bucket.default_acl.owner_read!
           #
           def owner_read!
             update_predefined_default_acl! "bucketOwnerRead"
@@ -713,7 +713,7 @@ module Google
           #
           #   bucket = storage.bucket "my-bucket"
           #
-          #   bucket.acl.private!
+          #   bucket.default_acl.private!
           #
           def private!
             update_predefined_default_acl! "private"
@@ -730,7 +730,7 @@ module Google
           #
           #   bucket = storage.bucket "my-bucket"
           #
-          #   bucket.acl.project_private!
+          #   bucket.default_acl.project_private!
           #
           def project_private!
             update_predefined_default_acl! "projectPrivate"
@@ -748,7 +748,7 @@ module Google
           #
           #   bucket = storage.bucket "my-bucket"
           #
-          #   bucket.acl.public!
+          #   bucket.default_acl.public!
           #
           def public!
             update_predefined_default_acl! "publicRead"

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

@@ -32,9 +32,9 @@ module Google
         #   require "google/cloud/storage"
         #
         #   storage = Google::Cloud::Storage.new
-        #   bucket = storage.bucket "my-todo-app"
         #
         #   bucket = storage.bucket "my-bucket"
+        #
         #   bucket.cors do |c|
         #     # Remove the last CORS rule from the array
         #     c.pop
@@ -42,7 +42,7 @@ module Google
         #     c.delete_if { |r| r.origin.include? "http://example.com" }
         #     c.add_rule ["http://example.org", "https://example.org"],
         #                ["GET", "POST", "DELETE"],
-        #                response_headers: ["X-My-Custom-Header"],
+        #                headers: ["X-My-Custom-Header"],
         #                max_age: 3600
         #   end
         #
@@ -90,11 +90,11 @@ module Google
           #
           #   storage = Google::Cloud::Storage.new
           #
-          #   bucket = storage.create_bucket "my-bucket" do |c|
-          #     c.add_rule ["http://example.org", "https://example.org"],
-          #                "*",
-          #                response_headers: ["X-My-Custom-Header"],
-          #                max_age: 300
+          #   bucket = storage.create_bucket "my-bucket" do |b|
+          #     b.cors.add_rule ["http://example.org", "https://example.org"],
+          #                     "*",
+          #                     headers: ["X-My-Custom-Header"],
+          #                     max_age: 300
           #   end
           #
           def add_rule origin, methods, headers: nil, max_age: nil

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

@@ -307,8 +307,8 @@ module Google
         #
         # If a [customer-supplied encryption
         # key](https://cloud.google.com/storage/docs/encryption#customer-supplied)
-        # was used with {Bucket#create_file}, the `encryption_key` and
-        # `encryption_key_sha256` options must be provided.
+        # was used with {Bucket#create_file}, the `encryption_key` option must
+        # be provided.
         #
         # @param [String] path The path on the local file system to write the
         #   data to. The path provided must be writable.
@@ -324,12 +324,7 @@ module Google
         #
         # @param [String] encryption_key Optional. The customer-supplied,
         #   AES-256 encryption key used to encrypt the file, if one was provided
-        #   to {Bucket#create_file}. Must be provided if `encryption_key_sha256`
-        #   is provided.
-        # @param [String] encryption_key_sha256 Optional. The SHA256 hash of the
-        #   customer-supplied, AES-256 encryption key used to encrypt the file,
-        #   if one was provided to {Bucket#create_file}. Must be provided if
-        #   `encryption_key` is provided.
+        #   to {Bucket#create_file}.
         #
         # @return [File] Returns a `::File` object on the local file system
         #
@@ -373,12 +368,11 @@ module Google
         #   file = bucket.file "path/to/my-file.ext"
         #   file.download "path/to/downloaded/file.ext", verify: :none
         #
-        def download path, verify: :md5, encryption_key: nil,
-                     encryption_key_sha256: nil
+        def download path, verify: :md5, encryption_key: nil
           ensure_service!
           service.download_file \
             bucket, name, path,
-            key: encryption_key, key_sha256: encryption_key_sha256
+            key: encryption_key
           verify_file! ::File.new(path), verify
         end
 
@@ -387,8 +381,8 @@ module Google
         #
         # If a [customer-supplied encryption
         # key](https://cloud.google.com/storage/docs/encryption#customer-supplied)
-        # was used with {Bucket#create_file}, the `encryption_key` and
-        # `encryption_key_sha256` options must be provided.
+        # was used with {Bucket#create_file}, the `encryption_key` option must
+        # be provided.
         #
         # @param [String] dest_bucket_or_path Either the bucket to copy the file
         #   to, or the path to copy the file to in the current bucket.
@@ -417,12 +411,7 @@ module Google
         #   copy. The default is the latest version.
         # @param [String] encryption_key Optional. The customer-supplied,
         #   AES-256 encryption key used to encrypt the file, if one was provided
-        #   to {Bucket#create_file}. Must be provided if `encryption_key_sha256`
-        #   is provided.
-        # @param [String] encryption_key_sha256 Optional. The SHA256 hash of the
-        #   customer-supplied, AES-256 encryption key used to encrypt the file,
-        #   if one was provided to {Bucket#create_file}. Must be provided if
-        #   `encryption_key` is provided.
+        #   to {Bucket#create_file}.
         #
         # @return [Google::Cloud::Storage::File]
         #
@@ -448,15 +437,21 @@ module Google
         #             "path/to/destination/file.ext"
         #
         # @example The file can also be copied by specifying a generation:
+        #   require "google/cloud/storage"
+        #
+        #   storage = Google::Cloud::Storage.new
+        #
+        #   bucket = storage.bucket "my-bucket"
+        #
+        #   file = bucket.file "path/to/my-file.ext"
         #   file.copy "copy/of/previous/generation/file.ext",
         #             generation: 123456
         #
         def copy dest_bucket_or_path, dest_path = nil, acl: nil,
-                 generation: nil, encryption_key: nil,
-                 encryption_key_sha256: nil
+                 generation: nil, encryption_key: nil
           ensure_service!
           options = { acl: acl, generation: generation,
-                      key: encryption_key, key_sha256: encryption_key_sha256 }
+                      key: encryption_key }
           dest_bucket, dest_path, options = fix_copy_args dest_bucket_or_path,
                                                           dest_path, options
 

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

@@ -272,7 +272,7 @@ module Google
         #     b.website_404 = "not_found.html"
         #     b.cors.add_rule ["http://example.org", "https://example.org"],
         #                      "*",
-        #                      response_headers: ["X-My-Custom-Header"],
+        #                      headers: ["X-My-Custom-Header"],
         #                      max_age: 300
         #   end
         #

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

@@ -171,7 +171,7 @@ module Google
                         cache_control: nil, content_disposition: nil,
                         content_encoding: nil, content_language: nil,
                         content_type: nil, crc32c: nil, md5: nil, metadata: nil,
-                        key: nil, key_sha256: nil
+                        key: nil
           file_obj = Google::Apis::StorageV1::Object.new \
             cache_control: cache_control, content_type: content_type,
             content_disposition: content_disposition, md5_hash: md5,
@@ -183,19 +183,18 @@ module Google
               bucket_name, file_obj,
               name: path, predefined_acl: acl, upload_source: source,
               content_encoding: content_encoding, content_type: content_type,
-              options: key_options(key: key, key_sha256: key_sha256)
+              options: key_options(key)
           end
         end
 
         ##
         # Retrieves an object or its metadata.
-        def get_file bucket_name, file_path, generation: nil, key: nil,
-                     key_sha256: nil
+        def get_file bucket_name, file_path, generation: nil, key: nil
           execute do
             service.get_object \
               bucket_name, file_path,
               generation: generation,
-              options: key_options(key: key, key_sha256: key_sha256)
+              options: key_options(key)
           end
         end
 
@@ -210,20 +209,19 @@ module Google
               destination_bucket_name, destination_file_path,
               destination_predefined_acl: options[:acl],
               source_generation: options[:generation],
-              options: key_options(key: options[:key],
-                                   key_sha256: options[:key_sha256])
+              options: key_options(options[:key])
           end
         end
 
         ##
         # Download contents of a file.
         def download_file bucket_name, file_path, target_path, generation: nil,
-                          key: nil, key_sha256: nil
+                          key: nil
           execute do
             service.get_object \
               bucket_name, file_path,
               download_dest: target_path, generation: generation,
-              options: key_options(key: key, key_sha256: key_sha256)
+              options: key_options(key)
           end
         end
 
@@ -285,13 +283,13 @@ module Google
 
         protected
 
-        def key_options key: nil, key_sha256: nil
+        def key_options key
           options = {}
           if key
+            key_sha256 = Digest::SHA256.digest key
             headers = {}
             headers["x-goog-encryption-algorithm"] = "AES256"
             headers["x-goog-encryption-key"] = Base64.strict_encode64 key
-            key_sha256 ||= Digest::SHA256.digest key
             headers["x-goog-encryption-key-sha256"] = \
               Base64.strict_encode64 key_sha256
             options[:header] = headers

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-storage
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.23.0
 platform: ruby
 authors:
 - Mike Moore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-20 00:00:00.000000000 Z
+date: 2016-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-core
@@ -171,14 +171,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 0.1.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 0.1.8
 description: google-cloud-storage is the official library for Google Cloud Storage.
 email:
 - mike@blowmage.com
@@ -187,6 +187,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".yardopts"
+- LICENSE
+- README.md
 - lib/google-cloud-storage.rb
 - lib/google/cloud/storage.rb
 - lib/google/cloud/storage/bucket.rb
@@ -222,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: API Client library for Google Cloud Storage