aws-sdk-s3 1.15.0 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2345872e7163a15b156496caadd3521fb3625ce4
-  data.tar.gz: f44c14590d4fed6fb154cd530e8df4adf7869731
+  metadata.gz: '02598771db66274dbc2c0cc54bb89d83d94fc7e9'
+  data.tar.gz: e3fffc5442a66ab75032d4d734ce9e5dd26e80c1
 SHA512:
-  metadata.gz: 0f9d8722c25b2e814dd6fe58c73f1af1c0eb08361797a6e39e25ffa2fda7f2f0e4fb2e2ea62a9c9b6bb299914488bfa99111ddf5243e8900716c10084cb1901d
-  data.tar.gz: da12904e8321a0380ca9472d9cab0bd1568b81dff01b85129edc08819cebd9bc89b31f8a57a251a905e8c529f1ba1df61d0484ed8cd14f5aff8c6719b96fd4f2
+  metadata.gz: 444989423926cf1bfc9a4f0674c32a1412c1c9a3ed26eeb976fb7207a08df75df623ab57275c5d89c7b2cb1b3bb4a972387c6a2d8fd319edc447f78adf6d0fcb
+  data.tar.gz: d61c112b6a5d654b0c97c6c42edff9d98cffcecc5f67efaa44dfd0921fcbd8aed25162b890cfa6908484613ea92c163abece52e14dba048e09d386f21f972bcf

data/lib/aws-sdk-s3.rb

@@ -63,6 +63,6 @@ require_relative 'aws-sdk-s3/event_streams'
 # @service
 module Aws::S3
 
-  GEM_VERSION = '1.15.0'
+  GEM_VERSION = '1.16.0'
 
 end

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

@@ -6384,7 +6384,7 @@ module Aws::S3
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-s3'
-      context[:gem_version] = '1.15.0'
+      context[:gem_version] = '1.16.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 

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

@@ -333,6 +333,10 @@ module Aws
       # @option options [String] thread_count Customize threads used in multipart
       #   download, if not provided, 10 is default value
       #
+      # @option options [String] version_id The object version id used to retrieve
+      #   the object, to know 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.
       def download_file(destination, options = {})

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

@@ -24,15 +24,18 @@ module Aws
         @mode = options[:mode] || "auto"
         @thread_count = options[:thread_count] || THREAD_COUNT
         @chunk_size = options[:chunk_size]
-        @bucket = options[:bucket]
-        @key = options[:key]
+        @params = {
+          bucket: options[:bucket],
+          key: options[:key],
+        }
+        @params[:version_id] = options[:version_id] if options[:version_id]
 
         case @mode
         when "auto" then multipart_download
         when "single_request" then single_request
         when "get_range"
           if @chunk_size
-            resp = @client.head_object(bucket: @bucket, key: @key)
+            resp = @client.head_object(@params)
             multithreaded_get_by_ranges(construct_chunks(resp.content_length))
           else
             msg = "In :get_range mode, :chunk_size must be provided"
@@ -48,7 +51,7 @@ module Aws
       private
 
       def multipart_download
-        resp = @client.head_object(bucket: @bucket, key: @key, part_number: 1)
+        resp = @client.head_object(@params.merge(part_number: 1))
         count = resp.parts_count
         if count.nil? || count <= 1
           resp.content_length < MIN_CHUNK_SIZE ?
@@ -56,7 +59,7 @@ module Aws
             multithreaded_get_by_ranges(construct_chunks(resp.content_length))
         else
           # partNumber is an option
-          resp = @client.head_object(bucket: @bucket, key: @key)
+          resp = @client.head_object(@params)
           resp.content_length < MIN_CHUNK_SIZE ?
             single_request :
             compute_mode(resp.content_length, count)
@@ -112,9 +115,7 @@ module Aws
           batch.each do |chunk|
             threads << Thread.new do
               resp = @client.get_object(
-                :bucket => @bucket,
-                :key => @key,
-                param.to_sym => chunk
+                @params.merge(param.to_sym => chunk)
               )
               write(resp)
             end
@@ -131,7 +132,7 @@ module Aws
 
       def single_request
         @client.get_object(
-          bucket: @bucket, key: @key, response_target: @path
+          @params.merge(response_target: @path)
         )
       end
     end

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

@@ -56,14 +56,12 @@ module Aws
       end
 
       def read_from_file(bytes, output_buffer)
-        if bytes
-          data = @file.read([remaining_bytes, bytes].min)
-          data = nil if data == ''
-        else
-          data = @file.read(remaining_bytes)
-        end
+        length = [remaining_bytes, *bytes].min
+        data   = @file.read(length, output_buffer)
+
         @position += data ? data.bytesize : 0
-        output_buffer ? output_buffer.replace(data || '') : data
+
+        data.to_s unless bytes && (data.nil? || data.empty?)
       end
 
       def remaining_bytes

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

@@ -45,9 +45,7 @@ module Aws
 
       def open_file(source)
         if String === source || Pathname === source
-          file = File.open(source, 'rb')
-          yield(file)
-          file.close
+          File.open(source, 'rb') { |file| yield(file) }
         else
           yield(source)
         end

data/lib/aws-sdk-s3/plugins/md5s.rb

@@ -45,7 +45,7 @@ module Aws
           end
 
           def update_in_chunks(digest, io)
-            while chunk = io.read(CHUNK_SIZE)
+            while chunk = io.read(CHUNK_SIZE, buffer ||= "")
               digest.update(chunk)
             end
             io.rewind

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-s3
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.16.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-26 00:00:00.000000000 Z
+date: 2018-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-kms