google-cloud-storage 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e44e7736db1ba058142ad9933e6f70c772271040
-  data.tar.gz: a0c1b589a1b27c357c96764767fcb99ce2c52bf2
+  metadata.gz: aedabfdd29823eedcac9c139bd352c3361ba5d0d
+  data.tar.gz: be5105b8c9183e3294a6bb7116f45007747c49a2
 SHA512:
-  metadata.gz: fceeaf2cf0932e5d65cb104ca34d72c994d3571c7c39e20c1493d40cb758ac81806f349b77f6833133bf9a131d8b7292e9b61434530f83018c416ecd9c8247a9
-  data.tar.gz: 67d37d87e36555c2f7fb7193d717dedb499447bf014d1b6f34c96b5a4b554ed85c227e3baa4b14ba469346991ddd93df2e700d7f18be49b21a5818f38fb647ff
+  metadata.gz: 5b5160e32c88c4a8b4c20c04cd08ebd3081c94807f2489f1d45852519d12da64d596b38aa7d90a736f409a5f5193e8044b0941f0fa092733cb519cd65418f4d0
+  data.tar.gz: ad3994f964a5f67b324cd6c475b5d59eae0ccec407a6c37018be2f3198985b9031d3faf3746f67865c9c946bd055e5043a5420af8507fb4401b3801632f59b31

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

@@ -264,6 +264,22 @@ module Google
           @gapi.website.not_found_page if @gapi.website
         end
 
+        ##
+        # A hash of user-provided labels. The hash is frozen and changes are not
+        # allowed.
+        def labels
+          m = @gapi.labels
+          m = m.to_h if m.respond_to? :to_h
+          m.dup.freeze
+        end
+
+        ##
+        # Updates the hash of user-provided labels.
+        def labels= labels
+          @gapi.labels = labels
+          patch_gapi! :labels
+        end
+
         ##
         # Updates the page returned from a static website served from the bucket
         # when a site visitor requests a resource that does not exist.
@@ -320,6 +336,7 @@ module Google
           updater = Updater.new @gapi
           yield updater
           # Add check for mutable cors
+          updater.check_for_changed_labels!
           updater.check_for_mutable_cors!
           patch_gapi! updater.updates unless updater.updates.empty?
         end
@@ -898,9 +915,9 @@ module Google
         # @see https://cloud.google.com/storage/docs/json_api/v1/buckets/setIamPolicy
         #   Buckets: setIamPolicy
         #
-        # @param [Boolean] force Force load the latest policy when `true`.
-        #   Otherwise the policy will be memoized to reduce the number of API
-        #   calls made. The default is `false`.
+        # @param [Boolean] force [Deprecated] Force the latest policy to be
+        #   retrieved from the Storage service when `true`. Deprecated because
+        #   the latest policy is now always retrieved. The default is `nil`.
         #
         # @yield [policy] A block for updating the policy. The latest policy
         #   will be read from the service and passed to the block. After the
@@ -910,27 +927,16 @@ module Google
         #
         # @return [Policy] the current Cloud IAM Policy for this bucket
         #
-        # @example Policy values are memoized to reduce the number of API calls:
-        #   require "google/cloud/storage"
-        #
-        #   storage = Google::Cloud::Storage.new
-        #
-        #   bucket = storage.bucket "my-todo-app"
-        #
-        #   policy = bucket.policy # API call
-        #   policy_2 = bucket.policy # No API call
-        #
-        # @example Use `force` to retrieve the latest policy from the service:
+        # @example
         #   require "google/cloud/storage"
         #
         #   storage = Google::Cloud::Storage.new
         #
         #   bucket = storage.bucket "my-todo-app"
         #
-        #   policy = bucket.policy force: true # API call
-        #   policy_2 = bucket.policy force: true # API call
+        #   policy = bucket.policy
         #
-        # @example Update the policy by passing a block:
+        # @example Retrieve the latest policy and update it in a block:
         #   require "google/cloud/storage"
         #
         #   storage = Google::Cloud::Storage.new
@@ -939,19 +945,16 @@ module Google
         #
         #   bucket.policy do |p|
         #     p.add "roles/owner", "user:owner@example.com"
-        #   end # 2 API calls
-        #
-        def policy force: false
-          @policy = nil if force || block_given?
-          @policy ||= begin
-            ensure_service!
-            gapi = service.get_bucket_policy name
-            Policy.from_gapi gapi
-          end
-          return @policy unless block_given?
-          p = @policy.deep_dup
-          yield p
-          self.policy = p
+        #   end
+        #
+        def policy force: nil
+          warn "DEPRECATED: 'force' in Bucket#policy" unless force.nil?
+          ensure_service!
+          gapi = service.get_bucket_policy name
+          policy = Policy.from_gapi gapi
+          return policy unless block_given?
+          yield policy
+          self.policy = policy
         end
 
         ##
@@ -971,6 +974,8 @@ module Google
         # @param [Policy] new_policy a new or modified Cloud IAM Policy for this
         #   bucket
         #
+        # @return [Policy] The policy returned by the API update operation.
+        #
         # @example
         #   require "google/cloud/storage"
         #
@@ -987,7 +992,7 @@ module Google
         def policy= new_policy
           ensure_service!
           gapi = service.set_bucket_policy name, new_policy.to_gapi
-          @policy = Policy.from_gapi gapi
+          Policy.from_gapi gapi
         end
 
         ##
@@ -1088,9 +1093,32 @@ module Google
           def initialize gapi
             @updates = []
             @gapi = gapi
+            @labels = @gapi.labels.to_h.dup
             @cors_builder = nil
           end
 
+          ##
+          # A hash of user-provided labels. Changes are allowed.
+          def labels
+            @labels
+          end
+
+          ##
+          # Updates the hash of user-provided labels.
+          def labels= labels
+            @labels = labels
+            @gapi.labels = @labels
+            patch_gapi! :labels
+          end
+
+          ##
+          # @private Make sure any labels changes are saved
+          def check_for_changed_labels!
+            return if @labels == @gapi.labels.to_h
+            @gapi.labels = @labels
+            patch_gapi! :labels
+          end
+
           def cors
             # Same as Bucket#cors, but not frozen
             @cors_builder ||= Bucket::Cors.from_gapi @gapi.cors_configurations

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

@@ -164,9 +164,13 @@ module Google
         ##
         # Returns a deep copy of the policy.
         #
+        # @deprecated Because the latest policy is now always retrieved by
+        #   {Bucket#policy}.
+        #
         # @return [Policy]
         #
         def deep_dup
+          warn "DEPRECATED: Storage::Policy#deep_dup"
           dup.tap do |p|
             roles_dup = p.roles.each_with_object({}) do |(k, v), memo|
               memo[k] = v.dup rescue value

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

@@ -293,6 +293,7 @@ module Google
             b.versioning = versioning unless versioning.nil?
           end
           yield updater if block_given?
+          updater.check_for_changed_labels!
           updater.check_for_mutable_cors!
           gapi = service.insert_bucket \
             new_bucket, acl: acl_rule(acl), default_acl: acl_rule(default_acl)

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

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module Storage
-      VERSION = "1.0.1"
+      VERSION = "1.1.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-storage
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Mike Moore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-10 00:00:00.000000000 Z
+date: 2017-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-core
@@ -208,7 +208,7 @@ files:
 - lib/google/cloud/storage/project.rb
 - lib/google/cloud/storage/service.rb
 - lib/google/cloud/storage/version.rb
-homepage: http://googlecloudplatform.github.io/google-cloud-ruby/
+homepage: https://github.com/GoogleCloudPlatform/google-cloud-ruby/tree/master/google-cloud-storage
 licenses:
 - Apache-2.0
 metadata: {}
@@ -228,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: API Client library for Google Cloud Storage