google-cloud-storage 0.25.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4450abcfeebceca2abde8444b448c4361cd66bba
-  data.tar.gz: 9f9d2b7ec0dfcece945d361f3cc9828b8560d189
+  metadata.gz: e2f69d45d27d36cc09db5b968a09cbbecf4d8354
+  data.tar.gz: 62b776735c66856f21cfc352541c87c3452f1dc5
 SHA512:
-  metadata.gz: 21241923c3f1b341eb21f495ae3e747ee2508df599c7ac1cf27ecccab85960eda2e7cdac878580d6def3343d551ff9de48cba5b2bda3fb73374be9eb77ada937
-  data.tar.gz: a685308ed10e4cece3b05d15c48c9a4f1c04bdba60587332db912646b9fd998e1e4c479f158472ac07a0b4079dc8bbe6c843880fef959f3000d17ee9d078fc85
+  metadata.gz: 93933194f259974df44e8961ed44f72d03e666dd15ad65aa082c05546f50438417811619f74e17ba8dc0c2b30a48ec7fa6ec706cd9e93cae454a03aa19965b26
+  data.tar.gz: 825b6a69664ce2c0fab0910234b7b512f430369102db779b627b4083a8b14b9e2e1c50636a0bb74437e07f929f14bebe22539f34a84655325e239aa4bf83661c

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

@@ -171,7 +171,7 @@ module Google
         # directive for the file data.
         def cache_control= cache_control
           @gapi.cache_control = cache_control
-          patch_gapi! :cache_control
+          update_gapi! :cache_control
         end
 
         ##
@@ -186,7 +186,7 @@ module Google
         # of the file data.
         def content_disposition= content_disposition
           @gapi.content_disposition = content_disposition
-          patch_gapi! :content_disposition
+          update_gapi! :content_disposition
         end
 
         ##
@@ -203,7 +203,7 @@ module Google
         # data.
         def content_encoding= content_encoding
           @gapi.content_encoding = content_encoding
-          patch_gapi! :content_encoding
+          update_gapi! :content_encoding
         end
 
         ##
@@ -218,7 +218,7 @@ module Google
         # the file data.
         def content_language= content_language
           @gapi.content_language = content_language
-          patch_gapi! :content_language
+          update_gapi! :content_language
         end
 
         ##
@@ -234,7 +234,7 @@ module Google
         # the file data.
         def content_type= content_type
           @gapi.content_type = content_type
-          patch_gapi! :content_type
+          update_gapi! :content_type
         end
 
         ##
@@ -253,7 +253,7 @@ module Google
         # "x-goog-meta-" response headers.
         def metadata= metadata
           @gapi.metadata = metadata
-          patch_gapi! :metadata
+          update_gapi! :metadata
         end
 
         ##
@@ -292,9 +292,8 @@ module Google
         # {Bucket#storage_class}.
         # @param [Symbol, String] storage_class Storage class of the file.
         def storage_class= storage_class
-          resp = service.update_file_storage_class \
-            bucket, name, storage_class_for(storage_class)
-          @gapi = resp.resource
+          @gapi.storage_class = storage_class_for(storage_class)
+          update_gapi! :storage_class
         end
 
         ##
@@ -329,7 +328,7 @@ module Google
           updater = Updater.new gapi
           yield updater
           updater.check_for_changed_metadata!
-          patch_gapi! updater.updates unless updater.updates.empty?
+          update_gapi! updater.updates unless updater.updates.empty?
         end
 
         ##
@@ -469,6 +468,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}.
+        # @yield [file] a block yielding a delegate object for updating
         #
         # @return [Google::Cloud::Storage::File]
         #
@@ -504,17 +504,43 @@ module Google
         #   file.copy "copy/of/previous/generation/file.ext",
         #             generation: 123456
         #
+        # @example The file can be modified during copying:
+        #   require "google/cloud/storage"
+        #
+        #   storage = Google::Cloud::Storage.new
+        #
+        #   bucket = storage.bucket "my-bucket"
+        #
+        #   file = bucket.file "path/to/my-file.ext"
+        #   file.copy "new-destination-bucket",
+        #             "path/to/destination/file.ext" do |f|
+        #     f.metadata["copied_from"] = "#{file.bucket}/#{file.name}"
+        #   end
+        #
         def copy dest_bucket_or_path, dest_path = nil, acl: nil,
                  generation: nil, encryption_key: nil
           ensure_service!
-          options = { acl: acl, generation: generation,
-                      key: encryption_key }
+          options = { acl: acl, generation: generation, key: encryption_key }
           dest_bucket, dest_path, options = fix_copy_args dest_bucket_or_path,
                                                           dest_path, options
 
-          gapi = service.copy_file bucket, name,
-                                   dest_bucket, dest_path, options
-          File.from_gapi gapi, service
+          copy_gapi = nil
+          if block_given?
+            updater = Updater.new gapi
+            yield updater
+            updater.check_for_changed_metadata!
+            copy_gapi = gapi_from_attrs(updater.updates) if updater.updates.any?
+          end
+
+          resp = service.copy_file bucket, name, dest_bucket, dest_path,
+                                   copy_gapi, options
+          until resp.done
+            sleep 1
+            resp = service.copy_file bucket, name, dest_bucket, dest_path,
+                                     copy_gapi,
+                                     options.merge(token: resp.rewrite_token)
+          end
+          File.from_gapi resp.resource, service
         end
 
         ##
@@ -566,10 +592,11 @@ module Google
           ensure_service!
           options = { source_key: encryption_key,
                       destination_key: new_encryption_key }
-          gapi = service.rewrite_file bucket, name, bucket, name, options
+          gapi = service.rewrite_file bucket, name, bucket, name, nil, options
           until gapi.done
+            sleep 1
             options[:token] = gapi.rewrite_token
-            gapi = service.rewrite_file bucket, name, bucket, name, options
+            gapi = service.rewrite_file bucket, name, bucket, name, nil, options
           end
           File.from_gapi gapi.resource, service
         end
@@ -805,15 +832,39 @@ module Google
           fail "Must have active connection" unless service
         end
 
-        def patch_gapi! *attributes
+        def update_gapi! *attributes
           attributes.flatten!
           return if attributes.empty?
+          update_gapi = gapi_from_attrs attributes
+          return if update_gapi.nil?
+
           ensure_service!
-          patch_args = Hash[attributes.map do |attr|
+
+          if attributes.include? :storage_class
+            @gapi = rewrite_gapi bucket, name, update_gapi
+          else
+            @gapi = service.patch_file bucket, name, update_gapi
+          end
+        end
+
+        def gapi_from_attrs *attributes
+          attributes.flatten!
+          return nil if attributes.empty?
+          attr_params = Hash[attributes.map do |attr|
             [attr, @gapi.send(attr)]
           end]
-          patch_gapi = Google::Apis::StorageV1::Object.new patch_args
-          @gapi = service.patch_file bucket, name, patch_gapi
+          Google::Apis::StorageV1::Object.new attr_params
+        end
+
+        def rewrite_gapi bucket, name, update_gapi
+          resp = service.rewrite_file bucket, name, bucket, name, update_gapi
+          until resp.done
+            sleep 1
+            rewrite_options = { token: resp.rewrite_token }
+            resp = service.rewrite_file bucket, name, bucket, name,
+                                        update_gapi, rewrite_options
+          end
+          resp.resource
         end
 
         def fix_copy_args dest_bucket, dest_path, options = {}
@@ -853,10 +904,6 @@ module Google
         ##
         # Yielded to a block to accumulate changes for a patch request.
         class Updater < File
-          # @private Do not allow storage_class to be set in an update call.
-          # It cannot be set with PATCH.
-          undef :storage_class=
-
           # @private
           attr_reader :updates
 
@@ -865,6 +912,7 @@ module Google
           def initialize gapi
             @updates = []
             @gapi = gapi
+            @metadata ||= @gapi.metadata.to_h.dup
           end
 
           ##
@@ -872,8 +920,7 @@ module Google
           # values that will returned with requests for the file as
           # "x-goog-meta-" response headers.
           def metadata
-            # do not freeze metadata
-            @metadata ||= @gapi.metadata.to_h.dup
+            @metadata
           end
 
           ##
@@ -883,22 +930,22 @@ module Google
           def metadata= metadata
             @metadata = metadata
             @gapi.metadata = @metadata
-            patch_gapi! :metadata
+            update_gapi! :metadata
           end
 
           ##
           # @private Make sure any metadata changes are saved
           def check_for_changed_metadata!
-            return if @metadata == @gapi.metadata
+            return if @metadata == @gapi.metadata.to_h
             @gapi.metadata = @metadata
-            patch_gapi! :metadata
+            update_gapi! :metadata
           end
 
           protected
 
           ##
           # Queue up all the updates instead of making them.
-          def patch_gapi! attribute
+          def update_gapi! attribute
             @updates << attribute
             @updates.uniq!
           end

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

@@ -46,9 +46,10 @@ module Google
           @service.client_options.application_name    = "gcloud-ruby"
           @service.client_options.application_version = \
             Google::Cloud::Storage::VERSION
+          @service.client_options.open_timeout_sec = timeout
+          @service.client_options.read_timeout_sec = timeout
+          @service.client_options.send_timeout_sec = timeout
           @service.request_options.retries = retries || 3
-          @service.request_options.timeout_sec      = timeout
-          @service.request_options.open_timeout_sec = timeout
           @service.request_options.header ||= {}
           @service.request_options.header["x-goog-api-client"] = \
             "gl-ruby/#{RUBY_VERSION} gccl/#{Google::Cloud::Storage::VERSION}"
@@ -207,14 +208,18 @@ module Google
         # destination bucket/object.
         def copy_file source_bucket_name, source_file_path,
                       destination_bucket_name, destination_file_path,
-                      options = {}
+                      file_gapi = nil, options = {}
+          key_options = rewrite_key_options options[:key],
+                                            options[:key]
           execute do
-            service.copy_object \
+            service.rewrite_object \
               source_bucket_name, source_file_path,
               destination_bucket_name, destination_file_path,
+              file_gapi,
               destination_predefined_acl: options[:acl],
               source_generation: options[:generation],
-              options: key_options(options[:key])
+              rewrite_token: options[:token],
+              options: key_options
           end
         end
 
@@ -222,28 +227,18 @@ module Google
         # destination bucket/object.
         def rewrite_file source_bucket_name, source_file_path,
                          destination_bucket_name, destination_file_path,
-                         options = {}
-          options = rewrite_key_options options[:source_key],
-                                        options[:destination_key]
+                         file_gapi = nil, options = {}
+          key_options = rewrite_key_options options[:source_key],
+                                            options[:destination_key]
           execute do
             service.rewrite_object \
               source_bucket_name, source_file_path,
               destination_bucket_name, destination_file_path,
+              file_gapi,
               destination_predefined_acl: options[:acl],
               source_generation: options[:generation],
               rewrite_token: options[:token],
-              options: options
-          end
-        end
-
-        ## Rewrite a file from source bucket/object to a
-        # destination bucket/object.
-        def update_file_storage_class bucket_name, file_path, storage_class
-          execute do
-            service.rewrite_object \
-              bucket_name, file_path,
-              bucket_name, file_path,
-              Google::Apis::StorageV1::Object.new(storage_class: storage_class)
+              options: key_options
           end
         end
 

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

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module Storage
-      VERSION = "0.25.0"
+      VERSION = "1.0.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-storage
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Mike Moore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-01 00:00:00.000000000 Z
+date: 2017-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-core
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: digest-crc
   requirement: !ruby/object:Gem::Requirement