aws-sdk-resources 2.2.22 → 2.2.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6927f53e9941e05e1eb1b6b573ea5339108a47d7
-  data.tar.gz: eccac718bb1c01430c925e6f52dcbccbc699e091
+  metadata.gz: 6a01b622bd2d85e55ec7ccec0a9dc9af44bb0797
+  data.tar.gz: 8205da57ea4f8a925bdb76f892bb88f6d581ab1c
 SHA512:
-  metadata.gz: a094b814a59d8ee7c09e67c981aa71c85a4f4f81f6f4c35ab48238ba3b69003bbf7bae178100c76d20e83ee383de2311ba5e0d8ee297138788af08853a1847b7
-  data.tar.gz: ef6c2872a289b7515df096520f433ccc296fddf0ee7732b494fc2d5e5d1fa339f11e0c3e7a186325d887f27d4dc74ced2f5ad0775ad1c8a1d74877ecc298c228
+  metadata.gz: 5058fefb5688a6805e4d49adc6f50c5c66049ac872e07967495f908ef46cdf9c5fd2ebbcc57bf9eed350d191716ae3b42adb900ced9f19964febb65c3e108d91
+  data.tar.gz: 2ff596c2648cf4520e94a893453d8f2c4b7c881649549551bd921e66405293d9efedcf65e90dd11378cebdd8633b3355d26d691af43b669d8f31a8994254db9a

data/lib/aws-sdk-resources/services/s3/object.rb

@@ -5,14 +5,17 @@ module Aws
       alias size content_length
 
       # Copies another object to this object. Use `multipart_copy: true`
-      # for large objects. This is required for objects that exceed 5GB.'
+      # for large objects. This is required for objects that exceed 5GB.
       #
-      # @param [S3::Object, String, Hash] source Where to copy object
-      #   data from. `source` must be one of the following:
+      # @param [S3::Object, S3::ObjectVersion, S3::ObjectSummary, String, Hash] source
+      #   Where to copy object data from. `source` must be one of the following:
       #
       #   * {Aws::S3::Object}
-      #   * Hash - with `:bucket` and `:key`
-      #   * String - formatted like `"source-bucket-name/source-key"`
+      #   * {Aws::S3::ObjectSummary}
+      #   * {Aws::S3::ObjectVersion}
+      #   * Hash - with `:bucket` and `:key` and optional `:version_id`
+      #   * String - formatted like `"source-bucket-name/uri-escaped-key"`
+      #     or `"source-bucket-name/uri-escaped-key?versionId=version-id"`
       #
       # @option options [Boolean] :multipart_copy (false) When `true`,
       #   the object will be copied using the multipart APIs. This is
@@ -20,6 +23,20 @@ module Aws
       #   performance improvements on large objects. Amazon S3 does
       #   not accept multipart copies for objects smaller than 5MB.
       #
+      # @options options [Integer] :content_length Only used when
+      #   `:multipart_copy` is `true`. Passing this options avoids a HEAD
+      #   request to query the source object size.
+      #
+      # @options options [S3::Client] :copy_source_client Only used when
+      #   `:multipart_copy` is `true` and the source object is in a
+      #   different region. You do not need to specify this option
+      #   if you have provided `:content_length`.
+      #
+      # @options options [String] :copy_source_region Only used when
+      #   `:multipart_copy` is `true` and the source object is in a
+      #   different region. You do not need to specify this option
+      #   if you have provided a `:source_client` or a `:content_length`.
+      #
       # @example Basic object copy
       #
       #   bucket = Aws::S3::Bucket.new('target-bucket')

data/lib/aws-sdk-resources/services/s3/object_copier.rb

@@ -15,7 +15,6 @@ module Aws
         copy_object(source, @object, merge_options(source, options))
       end
 
-
       def copy_to(target, options = {})
         copy_object(@object, target, merge_options(target, options))
       end
@@ -28,6 +27,7 @@ module Aws
         options[:key] = target_key
         options[:copy_source] = copy_source(source)
         if options.delete(:multipart_copy)
+          apply_source_client(source, options)
           ObjectMultipartCopier.new(@options).copy(options)
         else
           @object.client.copy_object(options)
@@ -37,8 +37,14 @@ module Aws
       def copy_source(source)
         case source
         when String then escape(source)
-        when Hash then "#{source[:bucket]}/#{escape(source[:key])}"
-        when S3::Object then "#{source.bucket_name}/#{escape(source.key)}"
+        when Hash
+          src = "#{source[:bucket]}/#{escape(source[:key])}"
+          src += "?versionId=#{source[:version_id]}" if source.key?(:version_id)
+          src
+        when S3::Object, S3::ObjectSummary
+          "#{source.bucket_name}/#{escape(source.key)}"
+        when S3::ObjectVersion
+          "#{source.bucket_name}/#{escape(source.object_key)}?versionId=#{source.id}"
         else
           msg = "expected source to be an Aws::S3::Object, Hash, or String"
           raise ArgumentError, msg
@@ -59,7 +65,7 @@ module Aws
       def merge_options(source_or_target, options)
         if Hash === source_or_target
           source_or_target.inject(options.dup) do |opts, (key, value)|
-            opts[key] = value unless [:bucket, :key].include?(key)
+            opts[key] = value unless [:bucket, :key, :version_id].include?(key)
             opts
           end
         else
@@ -67,6 +73,22 @@ module Aws
         end
       end
 
+      def apply_source_client(source, options)
+
+        if source.respond_to?(:client)
+          options[:copy_source_client] ||= source.client
+        end
+
+        if options[:copy_source_region]
+          options[:copy_source_client] ||= S3::Client.new(
+            @object.client.config.to_h.merge(region: options.delete(:copy_source_region))
+          )
+        end
+
+        options[:copy_source_client] ||= @object.client
+
+      end
+
       def escape(str)
         Seahorse::Util.uri_path_escape(str)
       end

data/lib/aws-sdk-resources/services/s3/object_multipart_copier.rb

@@ -116,12 +116,12 @@ module Aws
       end
 
       def source_size(options)
-        if options[:content_length]
-          options.delete(:content_length)
-        else
-          bucket, key = options[:copy_source].match(/([^\/]+?)\/(.+)/)[1,2]
-          @client.head_object(bucket:bucket, key:key).content_length
-        end
+        return options.delete(:content_length) if options[:content_length]
+
+        client = options[:copy_source_client] || @client
+
+        bucket, key = options[:copy_source].match(/([^\/]+?)\/(.+)/)[1,2]
+        client.head_object(bucket: bucket, key: key).content_length
       end
 
       def default_part_size(source_size)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-resources
 version: !ruby/object:Gem::Version
-  version: 2.2.22
+  version: 2.2.23
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-02 00:00:00.000000000 Z
+date: 2016-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.22
+        version: 2.2.23
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.22
+        version: 2.2.23
 description: Provides resource oriented interfaces and other higher-level abstractions
   for many AWS services. This gem is part of the official AWS SDK for Ruby.
 email: