aws-sdk-resources 2.1.30 → 2.1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab68f7263e0966e791b931b50b8b998c0c5fb71b
-  data.tar.gz: 3334bebb1b8e9336a810d865c4b6eaa7bd0ecd9f
+  metadata.gz: e1eea8fc30ff11dca63249ab169a4c32aa7e60c7
+  data.tar.gz: 0f857bd86d5edfeffe6493e0e36a0b953f3a8cfa
 SHA512:
-  metadata.gz: da1ddd72ae87d743da8ba138b5939d1752ea3fd87711731f1bbe2b51c8391a4c803bebfa4fc4dcfdfc9baf8c51bdf22745e44be22fa9ac4daf471e5e86cf2f97
-  data.tar.gz: 94bb71ee06258819fe4547afcf8c27abea0286bafaba43037165216a92f07f65eb09c31f344db97be6fdbad93072ab8b17db300e4035f190b28690332ba7c4d8
+  metadata.gz: a7cc8ee0360dcb205cfa051a7f4d2cecea5b742cf5b5b2421b781cd427801a62bd50cab39e8b7f50271f3981defacaf6da1cc10c5b6870383370674100495a7c
+  data.tar.gz: ecf6d473cb099861317c90fc9431a910d24d69b42c9fdaafabf2def5c3e8720f51c5685ff1445f331fbaaf7b47e61f04cbc44a60d242508c5dd6ed997149fe1b

data/lib/aws-sdk-resources/documenter.rb

@@ -52,36 +52,12 @@ module Aws
           copy_from = YARD::Registry['Aws::S3::Object#copy_from']
           copy_to = YARD::Registry['Aws::S3::Object#copy_to']
           existing_tags = copy_from.tags
-          copy_from.docstring = 'Copies another object to this object.  Use `multipart_copy: true` for large objects. This is required for objects that exceed 5GB.'
           existing_tags.each do |tag|
             if tag.tag_name == 'option' && tag.pair.name != ":copy_source"
               copy_from.add_tag(tag)
               copy_to.add_tag(tag)
             end
           end
-          copy_from.add_tag(tag(<<-EXAMPLE))
-@example Basic object copy
-
-  bucket = Aws::S3::Bucket.new('target-bucket')
-  object = bucket.object('target-key')
-
-  # source as String
-  object.copy_from('source-bucket/source-key')
-
-  # source as Hash
-  object.copy_from(bucket:'source-bucket', key:'source-key')
-
-  # source as Aws::S3::Object
-  object.copy_from(bucket.object('source-key'))
-          EXAMPLE
-
-          copy_from.add_tag(tag(<<-EXAMPLE))
-@example Managed copy of large objects
-
-  # uses multipart upload APIs to copy object
-  object.copy_from('src-bucket/src-key', multipart_copy: true)
-          EXAMPLE
-
         end
 
         def tag(string)

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

@@ -87,7 +87,7 @@ module Aws
           url.host = "#{name}.#{url.host}"
         else
           url.path += '/' unless url.path[-1] == '/'
-          url.path += path_escape(name)
+          url.path += Seahorse::Util.uri_escape(name)
         end
         url.to_s
       end
@@ -97,9 +97,6 @@ module Aws
         !client.config.force_path_style
       end
 
-      def path_escape(name)
-        name.gsub(/[^\/]+/) {|part| Seahorse::Util.uri_escape(part) }
-      end
     end
   end
 end

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

@@ -4,6 +4,9 @@ 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.'
+      #
       # @param [S3::Object, String, Hash] source Where to copy object
       #   data from. `source` must be one of the following:
       #
@@ -17,6 +20,25 @@ module Aws
       #   performance improvements on large objects. Amazon S3 does
       #   not accept multipart copies for objects smaller than 5MB.
       #
+      # @example Basic object copy
+      #
+      #   bucket = Aws::S3::Bucket.new('target-bucket')
+      #   object = bucket.object('target-key')
+      #
+      #   # source as String
+      #   object.copy_from('source-bucket/source-key')
+      #
+      #   # source as Hash
+      #   object.copy_from(bucket:'source-bucket', key:'source-key')
+      #
+      #   # source as Aws::S3::Object
+      #   object.copy_from(bucket.object('source-key'))
+      #
+      # @example Managed copy of large objects
+      #
+      #   # uses multipart upload APIs to copy object
+      #   object.copy_from('src-bucket/src-key', multipart_copy: true)
+      #
       # @see #copy_to
       #
       def copy_from(source, options = {})

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

@@ -12,12 +12,12 @@ module Aws
       end
 
       def copy_from(source, options = {})
-        copy_object(source, @object, options)
+        copy_object(source, @object, merge_options(source, options))
       end
 
 
       def copy_to(target, options = {})
-        copy_object(@object, target, options)
+        copy_object(@object, target, merge_options(target, options))
       end
 
       private
@@ -36,9 +36,9 @@ module Aws
 
       def copy_source(source)
         case source
-        when String then source
-        when Hash then "#{source[:bucket]}/#{source[:key]}"
-        when S3::Object then "#{source.bucket_name}/#{source.key}"
+        when String then escape(source)
+        when Hash then "#{source[:bucket]}/#{escape(source[:key])}"
+        when S3::Object then "#{source.bucket_name}/#{escape(source.key)}"
         else
           msg = "expected source to be an Aws::S3::Object, Hash, or String"
           raise ArgumentError, msg
@@ -56,6 +56,21 @@ module Aws
         end
       end
 
+      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
+          end
+        else
+          options.dup
+        end
+      end
+
+      def escape(str)
+        Seahorse::Util.uri_path_escape(str)
+      end
+
     end
   end
 end

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

@@ -385,7 +385,7 @@ module Aws
       end
 
       # The minimum and maximum allowable size for the uploaded content.
-      # @param [Range<Ineger>] byte_range
+      # @param [Range<Integer>] byte_range
       # @return [self]
       def content_length_range(byte_range)
         min = byte_range.begin

metadata

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