aws-sdk-resources 2.1.19 → 2.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3046b375470447b9fc609cadc93ae5bea512f862
-  data.tar.gz: cd56ef5457ec4d301047a140205f9705dc9ebfbe
+  metadata.gz: 97c22ba987e7bf8003909c68607298bfd16f42d3
+  data.tar.gz: 7d33e93aea99351da13cd9fa82ccfcf1668ed44e
 SHA512:
-  metadata.gz: 1c17ba74fa50090c52ea291c10b61f6e1eecea5d1371809635ad5f09ad6b412e5c9ef4caeee7532d275ab78501ad4f373f13455395ce8659cbd7263e158d8488
-  data.tar.gz: f2b1a4b479cc4c39cb560ea6b274718db649ebee69582b181908986e6797377f0b75c4d93b6467a13181d2b6e7bf2d2988539bcd6de926fda7bed27133a3ee1d
+  metadata.gz: 03de55daffd4123b8c163171700299af464a4d0fdd8d0da6587dadaa2b59ef9c5ad95e188ea300fdde6e130f52de6e6f041c798f5bf5762548056c2c82661b33
+  data.tar.gz: 157918fb9ab7b17edd847b20c2101543ddec0cf70aa992c86adaf80f95d4eb725e4e6c4ff6ec6235e9ded817f40bac5b85735d07ba9d7273c72f512839a7f10f

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

@@ -4,6 +4,100 @@ module Aws
 
       alias size content_length
 
+      # @param [S3::Object, 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"`
+      #
+      # @option options [Boolean] :multipart_copy (false) When `true`,
+      #   the object will be copied using the multipart APIs. This is
+      #   necessary for objects larger than 5GB and can provide
+      #   performance improvements on large objects. Amazon S3 does
+      #   not accept multipart copies for objects smaller than 5MB.
+      #
+      # @see #copy_to
+      #
+      def copy_from(source, options = {})
+        if Hash === source && source[:copy_source]
+          # for backwards compatibility
+          @client.copy_object(source.merge(bucket: bucket_name, key: key))
+        else
+          ObjectCopier.new(self, options).copy_from(source, options)
+        end
+      end
+
+      # Copies this object to another object. Use `multipart_copy: true`
+      # for large objects. This is required for objects that exceed 5GB.
+      #
+      # @note If you need to copy to a bucket in a different region, use
+      #   #{copy_from}.
+      #
+      # @param [S3::Object, String, Hash] target Where to copy the object
+      #   data to. `target` must be one of the following:
+      #
+      #   * {Aws::S3::Object}
+      #   * Hash - with `:bucket` and `:key`
+      #   * String - formatted like `"target-bucket-name/target-key"`
+      #
+      # @example Basic object copy
+      #
+      #   bucket = Aws::S3::Bucket.new('source-bucket')
+      #   object = bucket.object('source-key')
+      #
+      #   # target as String
+      #   object.copy_to('target-bucket/target-key')
+      #
+      #   # target as Hash
+      #   object.copy_to(bucket: 'target-bucket', key: 'target-key')
+      #
+      #   # target as Aws::S3::Object
+      #   object.copy_to(bucket.object('target-key'))
+      #
+      # @example Managed copy of large objects
+      #
+      #   # uses multipart upload APIs to copy object
+      #   object.copy_to('src-bucket/src-key', multipart_copy: true)
+      #
+      def copy_to(target, options = {})
+        ObjectCopier.new(self, options).copy_to(target, options)
+      end
+
+      # Copies and deletes the current object. The object will only be
+      # deleted if the copy operation succeeds.
+      # @param (see Object#copy_to)
+      # @options (see Object#copy_to)
+      # @return [void]
+      # @see Object#copy_to
+      # @see Object#delete
+      def move_to(target, options = {})
+        copy_to(target, options)
+        delete
+      end
+
+      # Creates a {PresignedPost} that makes it easy to upload a file from
+      # a web browser direct to Amazon S3 using an HTML post form with
+      # a file field.
+      #
+      # See the {PresignedPost} documentation for more information.
+      # @note The `:key` is populated by {#key}. Do not specify
+      #   the `:key` or `:key_starts_with` options.
+      # @option (see PresignedPost#initialize)
+      # @return [PresignedPost]
+      # @see PresignedPost
+      def presigned_post(options = {})
+        PresignedPost.new(
+          client.config.credentials,
+          client.config.region,
+          bucket_name,
+          {
+            key: key,
+            url: bucket.url,
+          }.merge(options)
+        )
+      end
+
       # Generates a pre-signed URL for this object.
       #
       # @example Pre-signed GET URL, valid for one hour
@@ -117,81 +211,6 @@ module Aws
         true
       end
 
-      # Creates a {PresignedPost} that makes it easy to upload a file from
-      # a web browser direct to Amazon S3 using an HTML post form with
-      # a file field.
-      #
-      # See the {PresignedPost} documentation for more information.
-      # @note The `:key` is populated by {#key}. Do not specify
-      #   the `:key` or `:key_starts_with` options.
-      # @option (see PresignedPost#initialize)
-      # @return [PresignedPost]
-      # @see PresignedPost
-      def presigned_post(options = {})
-        PresignedPost.new(
-          client.config.credentials,
-          client.config.region,
-          bucket_name,
-          options.merge(key: key))
-      end
-
-      # @param [S3::Object, 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"`
-      #
-      # @option options [Boolean] :multipart_copy (false) When `true`,
-      #   the object will be copied using the multipart APIs. This is
-      #   necessary for objects larger than 5GB and can provide
-      #   performance improvements on large objects. Amazon S3 does
-      #   not accept multipart copies for objects smaller than 5MB.
-      #
-      # @see #copy_to
-      #
-      def copy_from(source, options = {})
-        if Hash === source && source[:copy_source]
-          # for backwards compatibility
-          @client.copy_object(source.merge(bucket: bucket_name, key: key))
-        else
-          ObjectCopier.new(self, options).copy_from(source, options)
-        end
-      end
-
-      # Copies this object to another object. Use `multipart_copy: true`
-      # for large objects. This is required for objects that exceed 5GB.
-      #
-      # @param [S3::Object, String, Hash] target Where to copy the object
-      #   data to. `target` must be one of the following:
-      #
-      #   * {Aws::S3::Object}
-      #   * Hash - with `:bucket` and `:key`
-      #   * String - formatted like `"target-bucket-name/target-key"`
-      #
-      # @example Basic object copy
-      #
-      #   bucket = Aws::S3::Bucket.new('source-bucket')
-      #   object = bucket.object('source-key')
-      #
-      #   # target as String
-      #   object.copy_to('target-bucket/target-key')
-      #
-      #   # target as Hash
-      #   object.copy_to(bucket: 'target-bucket', key: 'target-key')
-      #
-      #   # target as Aws::S3::Object
-      #   object.copy_to(bucket.object('target-key'))
-      #
-      # @example Managed copy of large objects
-      #
-      #   # uses multipart upload APIs to copy object
-      #   object.copy_to('src-bucket/src-key', multipart_copy: true)
-      #
-      def copy_to(target, options = {})
-        ObjectCopier.new(self, options).copy_to(target, options)
-      end
-
     end
   end
 end

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

@@ -4,6 +4,54 @@ module Aws
 
       alias content_length size
 
+      # @param (see Object#copy_from)
+      # @options (see Object#copy_from)
+      # @return (see Object#copy_from)
+      # @see Object#copy_from
+      def copy_from(source, options = {})
+        object.copy_from(source, options)
+      end
+
+      # @param (see Object#copy_to)
+      # @options (see Object#copy_to)
+      # @return (see Object#copy_to)
+      # @see Object#copy_to
+      def copy_to(target, options = {})
+        object.copy_to(target, options)
+      end
+
+      # @param (see Object#move_to)
+      # @options (see Object#move_to)
+      # @return (see Object#move_to)
+      # @see Object#move_to
+      def move_to(target, options = {})
+        object.move_to(target, options)
+      end
+
+      # @param (see Object#presigned_post)
+      # @options (see Object#presigned_post)
+      # @return (see Object#presigned_post)
+      # @see Object#presigned_post
+      def presigned_post(options = {})
+        object.presigned_post(options)
+      end
+
+      # @param (see Object#presigned_url)
+      # @options (see Object#presigned_url)
+      # @return (see Object#presigned_url)
+      # @see Object#presigned_url
+      def presigned_url(http_method, params = {})
+        object.presigned_url(http_method, params)
+      end
+
+      # @param (see Object#public_url)
+      # @options (see Object#public_url)
+      # @return (see Object#public_url)
+      # @see Object#public_url
+      def public_url(options = {})
+        object.public_url(options)
+      end
+
       # @param (see Object#upload_file)
       # @options (see Object#upload_file)
       # @return (see Object#upload_file)

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

@@ -212,7 +212,7 @@ module Aws
         @credentials = credentials.credentials
         @bucket_region = bucket_region
         @bucket_name = bucket_name
-        @url = bucket_url
+        @url = options.delete(:url) || bucket_url
         @fields = {}
         @key_set = false
         @signature_expiration = Time.now + 3600

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-resources
 version: !ruby/object:Gem::Version
-  version: 2.1.19
+  version: 2.1.20
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-03 00:00:00.000000000 Z
+date: 2015-09-10 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.1.19
+        version: 2.1.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.19
+        version: 2.1.20
 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: