aws-sdk-s3 1.48.0 → 1.60.0

data/lib/aws-sdk-s3/client_api.rb

@@ -143,12 +143,15 @@ module Aws::S3
     EncodingType = Shapes::StringShape.new(name: 'EncodingType')
     Encryption = Shapes::StructureShape.new(name: 'Encryption')
     EncryptionConfiguration = Shapes::StructureShape.new(name: 'EncryptionConfiguration')
+    End = Shapes::IntegerShape.new(name: 'End')
     EndEvent = Shapes::StructureShape.new(name: 'EndEvent')
     Error = Shapes::StructureShape.new(name: 'Error')
     ErrorDocument = Shapes::StructureShape.new(name: 'ErrorDocument')
     Errors = Shapes::ListShape.new(name: 'Errors', flattened: true)
     Event = Shapes::StringShape.new(name: 'Event')
     EventList = Shapes::ListShape.new(name: 'EventList', flattened: true)
+    ExistingObjectReplication = Shapes::StructureShape.new(name: 'ExistingObjectReplication')
+    ExistingObjectReplicationStatus = Shapes::StringShape.new(name: 'ExistingObjectReplicationStatus')
     Expiration = Shapes::StringShape.new(name: 'Expiration')
     ExpirationStatus = Shapes::StringShape.new(name: 'ExpirationStatus')
     ExpiredObjectDeleteMarker = Shapes::BooleanShape.new(name: 'ExpiredObjectDeleteMarker')
@@ -310,11 +313,14 @@ module Aws::S3
     MetadataEntry = Shapes::StructureShape.new(name: 'MetadataEntry')
     MetadataKey = Shapes::StringShape.new(name: 'MetadataKey')
     MetadataValue = Shapes::StringShape.new(name: 'MetadataValue')
+    Metrics = Shapes::StructureShape.new(name: 'Metrics')
     MetricsAndOperator = Shapes::StructureShape.new(name: 'MetricsAndOperator')
     MetricsConfiguration = Shapes::StructureShape.new(name: 'MetricsConfiguration')
     MetricsConfigurationList = Shapes::ListShape.new(name: 'MetricsConfigurationList', flattened: true)
     MetricsFilter = Shapes::StructureShape.new(name: 'MetricsFilter')
     MetricsId = Shapes::StringShape.new(name: 'MetricsId')
+    MetricsStatus = Shapes::StringShape.new(name: 'MetricsStatus')
+    Minutes = Shapes::IntegerShape.new(name: 'Minutes')
     MissingMeta = Shapes::IntegerShape.new(name: 'MissingMeta')
     MultipartUpload = Shapes::StructureShape.new(name: 'MultipartUpload')
     MultipartUploadId = Shapes::StringShape.new(name: 'MultipartUploadId')
@@ -433,6 +439,9 @@ module Aws::S3
     ReplicationRuleStatus = Shapes::StringShape.new(name: 'ReplicationRuleStatus')
     ReplicationRules = Shapes::ListShape.new(name: 'ReplicationRules', flattened: true)
     ReplicationStatus = Shapes::StringShape.new(name: 'ReplicationStatus')
+    ReplicationTime = Shapes::StructureShape.new(name: 'ReplicationTime')
+    ReplicationTimeStatus = Shapes::StringShape.new(name: 'ReplicationTimeStatus')
+    ReplicationTimeValue = Shapes::StructureShape.new(name: 'ReplicationTimeValue')
     RequestCharged = Shapes::StringShape.new(name: 'RequestCharged')
     RequestPayer = Shapes::StringShape.new(name: 'RequestPayer')
     RequestPaymentConfiguration = Shapes::StructureShape.new(name: 'RequestPaymentConfiguration')
@@ -463,6 +472,7 @@ module Aws::S3
     SSEKMSEncryptionContext = Shapes::StringShape.new(name: 'SSEKMSEncryptionContext')
     SSEKMSKeyId = Shapes::StringShape.new(name: 'SSEKMSKeyId')
     SSES3 = Shapes::StructureShape.new(name: 'SSES3')
+    ScanRange = Shapes::StructureShape.new(name: 'ScanRange')
     SelectObjectContentEventStream = Shapes::StructureShape.new(name: 'SelectObjectContentEventStream')
     SelectObjectContentOutput = Shapes::StructureShape.new(name: 'SelectObjectContentOutput')
     SelectObjectContentRequest = Shapes::StructureShape.new(name: 'SelectObjectContentRequest')
@@ -477,6 +487,7 @@ module Aws::S3
     SourceSelectionCriteria = Shapes::StructureShape.new(name: 'SourceSelectionCriteria')
     SseKmsEncryptedObjects = Shapes::StructureShape.new(name: 'SseKmsEncryptedObjects')
     SseKmsEncryptedObjectsStatus = Shapes::StringShape.new(name: 'SseKmsEncryptedObjectsStatus')
+    Start = Shapes::IntegerShape.new(name: 'Start')
     StartAfter = Shapes::StringShape.new(name: 'StartAfter')
     Stats = Shapes::StructureShape.new(name: 'Stats')
     StatsEvent = Shapes::StructureShape.new(name: 'StatsEvent')
@@ -889,6 +900,8 @@ module Aws::S3
     Destination.add_member(:storage_class, Shapes::ShapeRef.new(shape: StorageClass, location_name: "StorageClass"))
     Destination.add_member(:access_control_translation, Shapes::ShapeRef.new(shape: AccessControlTranslation, location_name: "AccessControlTranslation"))
     Destination.add_member(:encryption_configuration, Shapes::ShapeRef.new(shape: EncryptionConfiguration, location_name: "EncryptionConfiguration"))
+    Destination.add_member(:replication_time, Shapes::ShapeRef.new(shape: ReplicationTime, location_name: "ReplicationTime"))
+    Destination.add_member(:metrics, Shapes::ShapeRef.new(shape: Metrics, location_name: "Metrics"))
     Destination.struct_class = Types::Destination
 
     Encryption.add_member(:encryption_type, Shapes::ShapeRef.new(shape: ServerSideEncryption, required: true, location_name: "EncryptionType"))
@@ -914,6 +927,9 @@ module Aws::S3
 
     EventList.member = Shapes::ShapeRef.new(shape: Event)
 
+    ExistingObjectReplication.add_member(:status, Shapes::ShapeRef.new(shape: ExistingObjectReplicationStatus, required: true, location_name: "Status"))
+    ExistingObjectReplication.struct_class = Types::ExistingObjectReplication
+
     ExposeHeaders.member = Shapes::ShapeRef.new(shape: ExposeHeader)
 
     FilterRule.add_member(:name, Shapes::ShapeRef.new(shape: FilterRuleName, location_name: "Name"))
@@ -1499,6 +1515,10 @@ module Aws::S3
     MetadataEntry.add_member(:value, Shapes::ShapeRef.new(shape: MetadataValue, location_name: "Value"))
     MetadataEntry.struct_class = Types::MetadataEntry
 
+    Metrics.add_member(:status, Shapes::ShapeRef.new(shape: MetricsStatus, required: true, location_name: "Status"))
+    Metrics.add_member(:event_threshold, Shapes::ShapeRef.new(shape: ReplicationTimeValue, required: true, location_name: "EventThreshold"))
+    Metrics.struct_class = Types::Metrics
+
     MetricsAndOperator.add_member(:prefix, Shapes::ShapeRef.new(shape: Prefix, location_name: "Prefix"))
     MetricsAndOperator.add_member(:tags, Shapes::ShapeRef.new(shape: TagSet, location_name: "Tag", metadata: {"flattened"=>true}))
     MetricsAndOperator.struct_class = Types::MetricsAndOperator
@@ -1918,6 +1938,7 @@ module Aws::S3
     ReplicationRule.add_member(:filter, Shapes::ShapeRef.new(shape: ReplicationRuleFilter, location_name: "Filter"))
     ReplicationRule.add_member(:status, Shapes::ShapeRef.new(shape: ReplicationRuleStatus, required: true, location_name: "Status"))
     ReplicationRule.add_member(:source_selection_criteria, Shapes::ShapeRef.new(shape: SourceSelectionCriteria, location_name: "SourceSelectionCriteria"))
+    ReplicationRule.add_member(:existing_object_replication, Shapes::ShapeRef.new(shape: ExistingObjectReplication, location_name: "ExistingObjectReplication"))
     ReplicationRule.add_member(:destination, Shapes::ShapeRef.new(shape: Destination, required: true, location_name: "Destination"))
     ReplicationRule.add_member(:delete_marker_replication, Shapes::ShapeRef.new(shape: DeleteMarkerReplication, location_name: "DeleteMarkerReplication"))
     ReplicationRule.struct_class = Types::ReplicationRule
@@ -1933,6 +1954,13 @@ module Aws::S3
 
     ReplicationRules.member = Shapes::ShapeRef.new(shape: ReplicationRule)
 
+    ReplicationTime.add_member(:status, Shapes::ShapeRef.new(shape: ReplicationTimeStatus, required: true, location_name: "Status"))
+    ReplicationTime.add_member(:time, Shapes::ShapeRef.new(shape: ReplicationTimeValue, required: true, location_name: "Time"))
+    ReplicationTime.struct_class = Types::ReplicationTime
+
+    ReplicationTimeValue.add_member(:minutes, Shapes::ShapeRef.new(shape: Minutes, location_name: "Minutes"))
+    ReplicationTimeValue.struct_class = Types::ReplicationTimeValue
+
     RequestPaymentConfiguration.add_member(:payer, Shapes::ShapeRef.new(shape: Payer, required: true, location_name: "Payer"))
     RequestPaymentConfiguration.struct_class = Types::RequestPaymentConfiguration
 
@@ -1997,6 +2025,10 @@ module Aws::S3
 
     SSES3.struct_class = Types::SSES3
 
+    ScanRange.add_member(:start, Shapes::ShapeRef.new(shape: Start, location_name: "Start"))
+    ScanRange.add_member(:end, Shapes::ShapeRef.new(shape: End, location_name: "End"))
+    ScanRange.struct_class = Types::ScanRange
+
     SelectObjectContentEventStream.add_member(:records, Shapes::ShapeRef.new(shape: RecordsEvent, event: true, location_name: "Records"))
     SelectObjectContentEventStream.add_member(:stats, Shapes::ShapeRef.new(shape: StatsEvent, event: true, location_name: "Stats"))
     SelectObjectContentEventStream.add_member(:progress, Shapes::ShapeRef.new(shape: ProgressEvent, event: true, location_name: "Progress"))
@@ -2019,6 +2051,7 @@ module Aws::S3
     SelectObjectContentRequest.add_member(:request_progress, Shapes::ShapeRef.new(shape: RequestProgress, location_name: "RequestProgress"))
     SelectObjectContentRequest.add_member(:input_serialization, Shapes::ShapeRef.new(shape: InputSerialization, required: true, location_name: "InputSerialization"))
     SelectObjectContentRequest.add_member(:output_serialization, Shapes::ShapeRef.new(shape: OutputSerialization, required: true, location_name: "OutputSerialization"))
+    SelectObjectContentRequest.add_member(:scan_range, Shapes::ShapeRef.new(shape: ScanRange, location_name: "ScanRange"))
     SelectObjectContentRequest.struct_class = Types::SelectObjectContentRequest
 
     SelectParameters.add_member(:input_serialization, Shapes::ShapeRef.new(shape: InputSerialization, required: true, location_name: "InputSerialization"))

data/lib/aws-sdk-s3/customizations/bucket.rb

@@ -3,6 +3,20 @@ require 'uri'
 module Aws
   module S3
     class Bucket
+      # Save the old initialize method so that we can call 'super'.
+      old_initialize = instance_method(:initialize)
+      # Define a new initialize method that extracts out a bucket ARN.
+      define_method(:initialize) do |*args|
+        old_initialize.bind(self).call(*args)
+        bucket_name, region, arn = Plugins::BucketARN.resolve_arn!(
+          name,
+          client.config.region,
+          client.config.s3_use_arn_region
+        )
+        @name = bucket_name
+        @client.config.region = region
+        @arn = arn
+      end
 
       # Deletes all objects and versioned objects from this bucket
       #
@@ -31,10 +45,10 @@ module Aws
       #   each attempt.
       #
       # @return [void]
-      def delete! options = { }
+      def delete!(options = {})
         options = {
           initial_wait: 1.3,
-          max_attempts: 3,
+          max_attempts: 3
         }.merge(options)
 
         attempts = 0
@@ -43,20 +57,30 @@ module Aws
           delete
         rescue Errors::BucketNotEmpty
           attempts += 1
-          if attempts >= options[:max_attempts]
-            raise
-          else
-            Kernel.sleep(options[:initial_wait] ** attempts)
-            retry
-          end
+          raise if attempts >= options[:max_attempts]
+
+          Kernel.sleep(options[:initial_wait]**attempts)
+          retry
         end
       end
 
       # Returns a public URL for this bucket.
       #
-      #     bucket = s3.bucket('bucket-name')
-      #     bucket.url
-      #     #=> "https://bucket-name.s3.amazonaws.com"
+      # @example
+      #
+      #   bucket = s3.bucket('bucket-name')
+      #   bucket.url
+      #   #=> "https://bucket-name.s3.amazonaws.com"
+      #
+      # It will also work when provided an Access Point ARN.
+      #
+      # @example
+      #
+      #   bucket = s3.bucket(
+      #     'arn:aws:s3:us-east-1:123456789012:accesspoint:myendpoint'
+      #   )
+      #   bucket.url
+      #   #=> "https://myendpoint-123456789012.s3-accesspoint.us-west-2.amazonaws.com"
       #
       # You can pass `virtual_host: true` to use the bucket name as the
       # host name.
@@ -73,6 +97,8 @@ module Aws
       def url(options = {})
         if options[:virtual_host]
           "http://#{name}"
+        elsif @arn
+          Plugins::BucketARN.resolve_url!(URI.parse(s3_bucket_url), @arn).to_s
         else
           s3_bucket_url
         end
@@ -93,7 +119,7 @@ module Aws
           client.config.credentials,
           client.config.region,
           name,
-          {url: url}.merge(options)
+          { url: url }.merge(options)
         )
       end
 
@@ -101,6 +127,7 @@ module Aws
       def load
         @data = client.list_buckets.buckets.find { |b| b.name == name }
         raise "unable to load bucket #{name}" if @data.nil?
+
         self
       end
 
@@ -114,12 +141,16 @@ module Aws
           url.path += '/' unless url.path[-1] == '/'
           url.path += Seahorse::Util.uri_escape(name)
         end
+        if (client.config.region == 'us-east-1') &&
+           (client.config.s3_us_east_1_regional_endpoint == 'legacy')
+          url.host = Plugins::IADRegionalEndpoint.legacy_host(url.host)
+        end
         url.to_s
       end
 
       def bucket_as_hostname?(https)
         Plugins::BucketDns.dns_compatible?(name, https) &&
-        !client.config.force_path_style
+          !client.config.force_path_style
       end
 
     end

data/lib/aws-sdk-s3/customizations/object.rb

@@ -1,14 +1,14 @@
 module Aws
   module S3
     class Object
-
       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, S3::ObjectVersion, S3::ObjectSummary, 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}
       #   * {Aws::S3::ObjectSummary}
@@ -103,8 +103,9 @@ module Aws
         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.
+      # Copies and deletes the current object. The object will only be deleted
+      # if the copy operation succeeds.
+      #
       # @param (see Object#copy_to)
       # @option (see Object#copy_to)
       # @return [void]
@@ -129,10 +130,7 @@ module Aws
           client.config.credentials,
           client.config.region,
           bucket_name,
-          {
-            key: key,
-            url: bucket.url,
-          }.merge(options)
+          { key: key, url: bucket.url }.merge(options)
         )
       end
 
@@ -186,10 +184,10 @@ module Aws
       #
       def presigned_url(http_method, params = {})
         presigner = Presigner.new(client: client)
-        presigner.presigned_url("#{http_method.downcase}_object", params.merge(
-          bucket: bucket_name,
-          key: key,
-        ))
+        presigner.presigned_url(
+          "#{http_method.downcase}_object",
+          params.merge(bucket: bucket_name, key: key)
+        )
       end
 
       # Returns the public (un-signed) URL for this object.
@@ -199,7 +197,8 @@ module Aws
       #
       # To use virtual hosted bucket url (disables https):
       #
-      #     s3.bucket('my.bucket.com').object('key').public_url(virtual_host: true)
+      #     s3.bucket('my.bucket.com').object('key')
+      #       .public_url(virtual_host: true)
       #     #=> "http://my.bucket.com/key"
       #
       # @option options [Boolean] :virtual_host (false) When `true`, the bucket
@@ -216,11 +215,12 @@ module Aws
 
       # Uploads a stream in a streaming fashion to the current object in S3.
       #
-      #     # Passed chunks automatically split into multipart upload parts
-      #     # and the parts are uploaded in parallel. This allows for streaming uploads
-      #     # that never touch the disk.
+      # Passed chunks automatically split into multipart upload parts and the
+      # parts are uploaded in parallel. This allows for streaming uploads that
+      # never touch the disk.
       #
-      #  Note that this is known to have issues in JRuby until jruby-9.1.15.0, so avoid using this with older versions of JRuby.
+      # Note that this is known to have issues in JRuby until jruby-9.1.15.0,
+      # so avoid using this with older versions of JRuby.
       #
       # @example Streaming chunks of data
       #     obj.upload_stream do |write_stream|
@@ -235,17 +235,15 @@ module Aws
       #       IO.copy_stream(STDIN, write_stream)
       #     end
       #
-      # @option options [Integer] :thread_count
-      #   The number of parallel multipart uploads
-      #   Default `:thread_count` is `10`.
+      # @option options [Integer] :thread_count (10) The number of parallel
+      #   multipart uploads
       #
-      # @option options [Boolean] :tempfile
-      #   Normally read data is stored in memory when building the parts in order to complete
-      #   the underlying multipart upload. By passing `:tempfile => true` data read will be
+      # @option options [Boolean] :tempfile (false) Normally read data is stored
+      #   in memory when building the parts in order to complete the underlying
+      #   multipart upload. By passing `:tempfile => true` data read will be
       #   temporarily stored on disk reducing the memory footprint vastly.
-      #   Default `:tempfile` is `false`.
       #
-      # @option options [Integer] :part_size
+      # @option options [Integer] :part_size (5242880)
       #   Define how big each part size but the last should be.
       #   Default `:part_size` is `5 * 1024 * 1024`.
       #
@@ -264,9 +262,12 @@ module Aws
           client: client,
           thread_count: uploading_options.delete(:thread_count),
           tempfile: uploading_options.delete(:tempfile),
-          part_size: uploading_options.delete(:part_size),
+          part_size: uploading_options.delete(:part_size)
+        )
+        uploader.upload(
+          uploading_options.merge(bucket: bucket_name, key: key),
+          &block
         )
-        uploader.upload(uploading_options.merge(bucket: bucket_name, key: key), &block)
         true
       end
 
@@ -282,15 +283,29 @@ module Aws
       #     # and the parts are uploaded in parallel
       #     obj.upload_file('/path/to/very_large_file')
       #
-      # @param [String,Pathname,File,Tempfile] source A file or path to a file
-      #   on the local file system that should be uploaded to this object.
-      #   If you pass an open file object, then it is your responsibility
-      #   to close the file object once the upload completes.
+      # The response of the S3 upload API is yielded if a block given.
+      #
+      #     # API response will have etag value of the file
+      #     obj.upload_file('/path/to/file') do |response|
+      #       etag = response.etag
+      #     end
+      #
+      # @param [String, Pathname, File, Tempfile] source A file on the local
+      #   file system that will be uploaded as this object. This can either be
+      #   a String or Pathname to the file, an open File object, or an open
+      #   Tempfile object. If you pass an open File or Tempfile object, then
+      #   you are responsible for closing it after the upload completes. When
+      #   using an open Tempfile, rewind it before uploading or else the object
+      #   will be empty.
       #
       # @option options [Integer] :multipart_threshold (15728640) Files larger
       #   than `:multipart_threshold` are uploaded using the S3 multipart APIs.
       #   Default threshold is 15MB.
       #
+      # @option options [Integer] :thread_count (10) The number of parallel
+      #   multipart uploads. This option is not used if the file is smaller than
+      #   `:multipart_threshold`.
+      #
       # @raise [MultipartUploadError] If an object is being uploaded in
       #   parts, and the upload can not be completed, then the upload is
       #   aborted and this error is raised.  The raised error has a `#errors`
@@ -304,8 +319,13 @@ module Aws
         uploading_options = options.dup
         uploader = FileUploader.new(
           multipart_threshold: uploading_options.delete(:multipart_threshold),
-          client: client)
-        uploader.upload(source, uploading_options.merge(bucket: bucket_name, key: key))
+          client: client
+        )
+        response = uploader.upload(
+          source,
+          uploading_options.merge(bucket: bucket_name, key: key)
+        )
+        yield response if block_given?
         true
       end
 
@@ -320,7 +340,7 @@ module Aws
       #     # and the parts are downloaded in parallel
       #     obj.download_file('/path/to/very_large_file')
       #
-      # @param [String] destination Where to download the file to
+      # @param [String] destination Where to download the file to.
       #
       # @option options [String] mode `auto`, `single_request`, `get_range`
       #  `single_request` mode forces only 1 GET request is made in download,
@@ -328,21 +348,23 @@ module Aws
       #  customizing each range size in multipart_download,
       #  By default, `auto` mode is enabled, which performs multipart_download
       #
-      # @option options [String] chunk_size required in get_range mode
+      # @option options [String] chunk_size required in get_range mode.
       #
-      # @option options [String] thread_count Customize threads used in multipart
-      #   download, if not provided, 10 is default value
+      # @option options [Integer] thread_count (10) Customize threads used in
+      #   the multipart download.
       #
-      # @option options [String] version_id The object version id used to retrieve
-      #   the object, to know more about object versioning, see:
+      # @option options [String] version_id The object version id used to
+      #   retrieve the object. For more about object versioning, see:
       #   https://docs.aws.amazon.com/AmazonS3/latest/dev/ObjectVersioning.html
       #
-      # @return [Boolean] Returns `true` when the file is downloaded
-      #   without any errors.
+      # @return [Boolean] Returns `true` when the file is downloaded without
+      #   any errors.
       def download_file(destination, options = {})
         downloader = FileDownloader.new(client: client)
         downloader.download(
-          destination, options.merge(bucket: bucket_name, key: key))
+          destination,
+          options.merge(bucket: bucket_name, key: key)
+        )
         true
       end
     end

data/lib/aws-sdk-s3/encryption/client.rb

@@ -1,3 +1,5 @@
+require 'forwardable'
+
 module Aws
   module S3
 
@@ -178,6 +180,8 @@ module Aws
       class Client
 
         extend Deprecations
+        extend Forwardable
+        def_delegators :@client, :delete_object, :head_object
 
         # Creates a new encryption client. You must provide one of the following
         # options:

data/lib/aws-sdk-s3/file_part.rb

@@ -1,15 +1,18 @@
 module Aws
   module S3
 
-    # A utility class that provides an IO-like interface to a portion of
-    # a file on disk.
+    # A utility class that provides an IO-like interface to a portion of a file
+    # on disk.
     # @api private
     class FilePart
 
-      # @option options [required,String,Pathname,File,Tempfile] :source
-      # @option options [required,Integer] :offset The file part will read
+      # @option options [required, String, Pathname, File, Tempfile] :source
+      #   The file to upload.
+      #
+      # @option options [required, Integer] :offset The file part will read
       #   starting at this byte offset.
-      # @option options [required,Integer] :size The maximum number of bytes to
+      #
+      # @option options [required, Integer] :size The maximum number of bytes to
       #   read from the `:offset`.
       def initialize(options = {})
         @source = options[:source]
@@ -19,7 +22,7 @@ module Aws
         @file = nil
       end
 
-      # @return [String,Pathname,File,Tempfile]
+      # @return [String, Pathname, File, Tempfile]
       attr_reader :source
 
       # @return [Integer]

data/lib/aws-sdk-s3/file_uploader.rb

@@ -7,13 +7,14 @@ module Aws
 
       FIFTEEN_MEGABYTES = 15 * 1024 * 1024
 
+      # @param [Hash] options
       # @option options [Client] :client
-      # @option options [Integer] :multipart_threshold Files greater than
-      #   `:multipart_threshold` bytes are uploaded using S3 multipart APIs.
+      # @option options [Integer] :multipart_threshold (15728640)
       def initialize(options = {})
         @options = options
         @client = options[:client] || Client.new
-        @multipart_threshold = options[:multipart_threshold] || FIFTEEN_MEGABYTES
+        @multipart_threshold = options[:multipart_threshold] ||
+                               FIFTEEN_MEGABYTES
       end
 
       # @return [Client]
@@ -23,9 +24,9 @@ module Aws
       #   using a {MultipartFileUploader}.
       attr_reader :multipart_threshold
 
-      # @param [String,Pathname,File,Tempfile] source
-      # @option options [required,String] :bucket
-      # @option options [required,String] :key
+      # @param [String, Pathname, File, Tempfile] source The file to upload.
+      # @option options [required, String] :bucket The bucket to upload to.
+      # @option options [required, String] :key The key for the object.
       # @return [void]
       def upload(source, options = {})
         if File.size(source) >= multipart_threshold
@@ -37,12 +38,6 @@ module Aws
 
       private
 
-      def put_object(source, options)
-        open_file(source) do |file|
-          @client.put_object(options.merge(body: file))
-        end
-      end
-
       def open_file(source)
         if String === source || Pathname === source
           File.open(source, 'rb') { |file| yield(file) }
@@ -51,6 +46,12 @@ module Aws
         end
       end
 
+      def put_object(source, options)
+        open_file(source) do |file|
+          @client.put_object(options.merge(body: file))
+        end
+      end
+
     end
   end
 end

data/lib/aws-sdk-s3/multipart_file_uploader.rb

@@ -1,5 +1,4 @@
 require 'pathname'
-require 'thread'
 require 'set'
 
 module Aws
@@ -16,14 +15,17 @@ module Aws
       THREAD_COUNT = 10
 
       # @api private
-      CREATE_OPTIONS =
-        Set.new(Client.api.operation(:create_multipart_upload).input.shape.member_names)
+      CREATE_OPTIONS = Set.new(
+        Client.api.operation(:create_multipart_upload).input.shape.member_names
+      )
 
       # @api private
-      UPLOAD_PART_OPTIONS =
-        Set.new(Client.api.operation(:upload_part).input.shape.member_names)
+      UPLOAD_PART_OPTIONS = Set.new(
+        Client.api.operation(:upload_part).input.shape.member_names
+      )
 
       # @option options [Client] :client
+      # @option options [Integer] :thread_count (THREAD_COUNT)
       def initialize(options = {})
         @client = options[:client] || Client.new
         @thread_count = options[:thread_count] || THREAD_COUNT
@@ -32,9 +34,9 @@ module Aws
       # @return [Client]
       attr_reader :client
 
-      # @param [String,Pathname,File,Tempfile] source
-      # @option options [required,String] :bucket
-      # @option options [required,String] :key
+      # @param [String, Pathname, File, Tempfile] source The file to upload.
+      # @option options [required, String] :bucket The bucket to upload to.
+      # @option options [required, String] :key The key for the object.
       # @return [void]
       def upload(source, options = {})
         if File.size(source) < MIN_PART_SIZE
@@ -57,7 +59,8 @@ module Aws
           bucket: options[:bucket],
           key: options[:key],
           upload_id: upload_id,
-          multipart_upload: { parts: parts })
+          multipart_upload: { parts: parts }
+        )
       end
 
       def upload_parts(upload_id, source, options)
@@ -93,7 +96,7 @@ module Aws
         part_number = 1
         parts = []
         while offset < size
-          parts << upload_part_opts(options).merge({
+          parts << upload_part_opts(options).merge(
             upload_id: upload_id,
             part_number: part_number,
             body: FilePart.new(
@@ -101,7 +104,7 @@ module Aws
               offset: offset,
               size: part_size(size, default_part_size, offset)
             )
-          })
+          )
           part_number += 1
           offset += default_part_size
         end