shrine 2.5.0 → 2.6.0

data/lib/shrine/plugins/validation_helpers.rb

@@ -6,7 +6,7 @@ class Shrine
     #     plugin :validation_helpers
     #
     #     Attacher.validate do
-    #       validat_mime_type_inclusion %w[image/jpeg image/png image/gif]
+    #       validate_mime_type_inclusion %w[image/jpeg image/png image/gif]
     #       validate_max_size 5*1024*1024 if record.guest?
     #     end
     #
@@ -33,7 +33,7 @@ class Shrine
     # If you would like to change the error message inline, you can pass the
     # `:message` option to any validation method:
     #
-    #     validate_mime_type_inclusion [/\Aimage/], message: "is not an image"
+    #     validate_mime_type_inclusion %w[image/jpeg image/png image/gif], message: "must be JPEG, PNG or GIF"
     #
     # For a complete list of all validation helpers, see AttacherMethods.
     module ValidationHelpers
@@ -42,16 +42,16 @@ class Shrine
       end
 
       DEFAULT_MESSAGES = {
-        max_size: ->(max) { "is larger than #{max.to_f/1024/1024} MB" },
-        min_size: ->(min) { "is smaller than #{min.to_f/1024/1024} MB" },
-        max_width: ->(max) { "is wider than #{max} px" },
-        min_width: ->(min) { "is narrower than #{min} px" },
-        max_height: ->(max) { "is taller than #{max} px" },
-        min_height: ->(min) { "is shorter than #{min} px" },
-        mime_type_inclusion: ->(list) { "isn't of allowed type: #{list.inspect}" },
-        mime_type_exclusion: ->(list) { "is of forbidden type: #{list.inspect}" },
-        extension_inclusion: ->(list) { "isn't in allowed format: #{list.inspect}" },
-        extension_exclusion: ->(list) { "is in forbidden format: #{list.inspect}" },
+        max_size: ->(max) { "is too large (max is #{max.to_f/1024/1024} MB)" },
+        min_size: ->(min) { "is too small (min is #{min.to_f/1024/1024} MB)" },
+        max_width: ->(max) { "is too wide (max is #{max} px)" },
+        min_width: ->(min) { "is too narrow (min is #{min} px)" },
+        max_height: ->(max) { "is too tall (max is #{max} px)" },
+        min_height: ->(min) { "is too short (min is #{min} px)" },
+        mime_type_inclusion: ->(list) { "isn't of allowed type (allowed types: #{list.join(", ")})" },
+        mime_type_exclusion: ->(list) { "is of forbidden type" },
+        extension_inclusion: ->(list) { "isn't of allowed format (allowed formats: #{list.join(", ")})" },
+        extension_exclusion: ->(list) { "is of forbidden format" },
       }
 
       module AttacherClassMethods
@@ -76,61 +76,75 @@ class Shrine
         # `store_dimensions` plugin.
         def validate_max_width(max, message: nil)
           raise Error, ":store_dimensions plugin is required" if !get.respond_to?(:width)
-          get.width <= max or add_error(:max_width, message, max) && false if get.width
+          if get.width
+            get.width <= max or add_error(:max_width, message, max) && false
+          else
+            Shrine.deprecation("Width of the uploaded file is nil, and Shrine skipped the validation. In Shrine 3 the validation will fail if width is nil.")
+          end
         end
 
         # Validates that the file is not narrower than `min`. Requires the
         # `store_dimensions` plugin.
         def validate_min_width(min, message: nil)
           raise Error, ":store_dimensions plugin is required" if !get.respond_to?(:width)
-          get.width >= min or add_error(:min_width, message, min) && false if get.width
+          if get.width
+            get.width >= min or add_error(:min_width, message, min) && false
+          else
+            Shrine.deprecation("Width of the uploaded file is nil, and Shrine skipped the validation. In Shrine 3 the validation will fail if width is nil.")
+          end
         end
 
         # Validates that the file is not taller than `max`. Requires the
         # `store_dimensions` plugin.
         def validate_max_height(max, message: nil)
           raise Error, ":store_dimensions plugin is required" if !get.respond_to?(:height)
-          get.height <= max or add_error(:max_height, message, max) && false if get.height
+          if get.height
+            get.height <= max or add_error(:max_height, message, max) && false
+          else
+            Shrine.deprecation("Height of the uploaded file is nil, and Shrine skipped the validation. In Shrine 3 the validation will fail if height is nil.")
+          end
         end
 
         # Validates that the file is not shorter than `min`. Requires the
         # `store_dimensions` plugin.
         def validate_min_height(min, message: nil)
           raise Error, ":store_dimensions plugin is required" if !get.respond_to?(:height)
-          get.height >= min or add_error(:min_height, message, min) && false if get.height
+          if get.height
+            get.height >= min or add_error(:min_height, message, min) && false
+          else
+            Shrine.deprecation("Height of the uploaded file is nil, and Shrine skipped the validation. In Shrine 3 the validation will fail if height is nil.")
+          end
         end
 
-        # Validates that the MIME type is in the `whitelist`. The whitelist is
-        # an array of strings or regexes.
+        # Validates that the MIME type is in the given collection.
         #
-        #     validate_mime_type_inclusion ["audio/mp3", /\Avideo/]
+        #     validate_mime_type_inclusion %w[audio/mp3 audio/flac]
         def validate_mime_type_inclusion(whitelist, message: nil)
           whitelist.any? { |mime_type| regex(mime_type) =~ get.mime_type.to_s } \
             or add_error(:mime_type_inclusion, message, whitelist) && false
         end
 
-        # Validates that the MIME type is not in the `blacklist`. The blacklist
-        # is an array of strings or regexes.
+        # Validates that the MIME type is not in the given collection.
         #
-        #     validate_mime_type_exclusion ["image/gif", /\Aaudio/]
+        #     validate_mime_type_exclusion %w[text/x-php]
         def validate_mime_type_exclusion(blacklist, message: nil)
           blacklist.none? { |mime_type| regex(mime_type) =~ get.mime_type.to_s } \
             or add_error(:mime_type_exclusion, message, blacklist) && false
         end
 
-        # Validates that the extension is in the `whitelist`. The whitelist
-        # is an array of strings or regexes.
+        # Validates that the extension is in the given collection. Comparison
+        # is case insensitive.
         #
-        #     validate_extension_inclusion [/\Ajpe?g\z/i]
+        #     validate_extension_inclusion %w[jpg jpeg png gif]
         def validate_extension_inclusion(whitelist, message: nil)
           whitelist.any? { |extension| regex(extension) =~ get.extension.to_s } \
             or add_error(:extension_inclusion, message, whitelist) && false
         end
 
-        # Validates that the extension is not in the `blacklist`. The blacklist
-        # is an array of strings or regexes.
+        # Validates that the extension is not in the given collection.
+        # Comparison is case insensitive.
         #
-        #     validate_extension_exclusion ["mov", /\Amp/i]
+        #     validate_extension_exclusion %[php jar]
         def validate_extension_exclusion(blacklist, message: nil)
           blacklist.none? { |extension| regex(extension) =~ get.extension.to_s } \
             or add_error(:extension_exclusion, message, blacklist) && false
@@ -140,7 +154,12 @@ class Shrine
 
         # Converts a string to a regex.
         def regex(value)
-          value.is_a?(Regexp) ? value : /\A#{Regexp.escape(value)}\z/i
+          if value.is_a?(Regexp)
+            Shrine.deprecation("Passing regexes to type/extension whitelists/blacklists in validation_helpers plugin is deprecated and will be removed in Shrine 3. Use strings instead.")
+            value
+          else
+            /\A#{Regexp.escape(value)}\z/i
+          end
         end
 
         # Generates an error message and appends it to errors array.

data/lib/shrine/plugins/versions.rb

@@ -14,7 +14,7 @@ class Shrine
     #     process(:store) do |io, context|
     #       original = io.download
     #
-    #       size_800 = resize_to_limit!(original, 800, 800)
+    #       size_800 = resize_to_limit!(original, 800, 800) { |cmd| cmd.auto_orient }
     #       size_500 = resize_to_limit(size_800,  500, 500)
     #       size_300 = resize_to_limit(size_500,  300, 300)
     #
@@ -49,6 +49,16 @@ class Shrine
     #     user.avatar_url(:large)
     #     user.avatar_url(:small, download: true) # with URL options
     #
+    # `Shrine.uploaded_file` will also instantiate a hash of
+    # `Shrine::UploadedFile` objects if given data with versions. If you want
+    # to apply a change to all files in an attachment, regardless of whether
+    # it consists of a single file or a hash of versions, you can pass a block
+    # to `Shrine.uploaded_file` and it will yield each file:
+    #
+    #     Shrine.uploaded_file(attachment_data) do |uploaded_file|
+    #       # ...
+    #     end
+    #
     # ## Original file
     #
     # If you want to keep the original file, you can include the original
@@ -117,7 +127,7 @@ class Shrine
       end
 
       def self.configure(uploader, opts = {})
-        warn "The versions Shrine plugin doesn't need the :names option anymore, you can safely remove it." if opts.key?(:names)
+        Shrine.deprecation("The versions Shrine plugin doesn't need the :names option anymore, you can safely remove it.") if opts.key?(:names)
 
         uploader.opts[:version_names] = opts.fetch(:names, uploader.opts[:version_names])
         uploader.opts[:version_fallbacks] = opts.fetch(:fallbacks, uploader.opts.fetch(:version_fallbacks, {}))
@@ -126,7 +136,7 @@ class Shrine
 
       module ClassMethods
         def version_names
-          warn "Shrine.version_names is deprecated and will be removed in Shrine 3."
+          Shrine.deprecation("Shrine.version_names is deprecated and will be removed in Shrine 3.")
           opts[:version_names]
         end
 
@@ -136,7 +146,7 @@ class Shrine
 
         # Checks that the identifier is a registered version.
         def version?(name)
-          warn "Shrine.version? is deprecated and will be removed in Shrine 3."
+          Shrine.deprecation("Shrine.version? is deprecated and will be removed in Shrine 3.")
           version_names.nil? || version_names.map(&:to_s).include?(name.to_s)
         end
 
@@ -171,9 +181,7 @@ class Shrine
         def _store(io, context)
           if (hash = io).is_a?(Hash)
             raise Error, ":location is not applicable to versions" if context.key?(:location)
-            if duplicates = hash.keys.group_by{|k| hash[k]}.values.reject(&:one?).first
-              raise Error, "The following version keys point to the same IO object: #{duplicates.inspect}. Shrine cannot upload the same IO object multiple times."
-            end
+            raise Error, "detected multiple versions that point to the same IO object: given versions: #{hash.keys}, unique versions: #{hash.invert.invert.keys}" if hash.invert.invert != hash
 
             hash.inject({}) do |result, (name, version)|
               result.update(name => _store(version, version: name, **context))
@@ -233,7 +241,7 @@ class Shrine
 
         def assign_cached(value)
           cached_file = uploaded_file(value)
-          warn "Assigning cached hash of files is deprecated for security reasons and will be removed in Shrine 3." if cached_file.is_a?(Hash)
+          Shrine.deprecation("Assigning cached hash of files is deprecated for security reasons and will be removed in Shrine 3.") if cached_file.is_a?(Hash)
           super(cached_file)
         end
 

data/lib/shrine/storage/file_system.rb

@@ -9,10 +9,14 @@ class Shrine
     #     storage = Shrine::Storage::FileSystem.new("public", prefix: "uploads")
     #     storage.url("image.jpg") #=> "/uploads/image.jpg"
     #
-    # This storage will upload all files to "public/uploads", and the URLs
-    # of the uploaded files will start with "/uploads/*". This way you can
-    # use FileSystem for both cache and store, one having the prefix
-    # "uploads/cache" and other "uploads/store".
+    # This storage will upload all files to "public/uploads", and the URLs of
+    # the uploaded files will start with "/uploads/*". This way you can use
+    # FileSystem for both cache and store, one having the prefix
+    # "uploads/cache" and other "uploads/store". If you're uploading files
+    # to the `public` directory itself, you need to set `:prefix` to `"/"`:
+    #
+    #     storage = Shrine::Storage::FileSystem.new("public", prefix: "/") # no prefix
+    #     storage.url("image.jpg") #=> "/image.jpg"
     #
     # You can also initialize the storage just with the "base" directory, and
     # then the FileSystem storage will generate absolute URLs to files:
@@ -20,6 +24,10 @@ class Shrine
     #     storage = Shrine::Storage::FileSystem.new(Dir.tmpdir)
     #     storage.url("image.jpg") #=> "/var/folders/k7/6zx6dx6x7ys3rv3srh0nyfj00000gn/T/image.jpg"
     #
+    # In general you can always retrieve path to the file using `#path`:
+    #
+    #     storage.path("image.jpg") #=> #<Pathname:public/image.jpg>
+    #
     # ## Host
     #
     # It's generally a good idea to serve your files via a CDN, so an
@@ -94,7 +102,7 @@ class Shrine
       #    deleted, but if it happens that it causes too much load on the
       #    filesystem, you can set this option to `false`.
       def initialize(directory, prefix: nil, host: nil, clean: true, permissions: 0644, directory_permissions: 0755)
-        warn "The :host option to Shrine::Storage::FileSystem#initialize is deprecated and will be removed in Shrine 3. Pass :host to FileSystem#url instead, you can also use default_url_options plugin." if host
+        Shrine.deprecation("The :host option to Shrine::Storage::FileSystem#initialize is deprecated and will be removed in Shrine 3. Pass :host to FileSystem#url instead, you can also use default_url_options plugin.") if host
 
         if prefix
           @prefix = Pathname(relative(prefix))
@@ -127,7 +135,7 @@ class Shrine
           FileUtils.mv io.path, path!(id)
         else
           FileUtils.mv io.storage.path(io.id), path!(id)
-          io.storage.clean(io.id) if io.storage.clean?
+          io.storage.clean(io.storage.path(io.id)) if io.storage.clean?
         end
         path(id).chmod(permissions) if permissions
       end
@@ -153,7 +161,7 @@ class Shrine
       # it's empty.
       def delete(id)
         path(id).delete
-        clean(id) if clean?
+        clean(path(id)) if clean?
       rescue Errno::ENOENT
       end
 
@@ -173,7 +181,10 @@ class Shrine
       def clear!(older_than: nil)
         if older_than
           directory.find do |path|
-            path.mtime < older_than ? path.rmtree : Find.prune
+            if path.file? && path.mtime < older_than
+              path.delete
+              clean(path) if clean?
+            end
           end
         else
           directory.rmtree
@@ -182,10 +193,15 @@ class Shrine
         end
       end
 
+      # Returns the full path to the file.
+      def path(id)
+        directory.join(id.gsub("/", File::SEPARATOR))
+      end
+
       # Catches the deprecated `#download` method.
       def method_missing(name, *args)
         if name == :download
-          warn "Shrine::Storage::FileSystem#download is deprecated and will be removed in Shrine 3."
+          Shrine.deprecation("Shrine::Storage::FileSystem#download is deprecated and will be removed in Shrine 3.")
           require "down"
           open(*args) { |file| Down.copy_to_tempfile(*args, file) }
         else
@@ -195,14 +211,9 @@ class Shrine
 
       protected
 
-      # Returns the full path to the file.
-      def path(id)
-        directory.join(id.gsub("/", File::SEPARATOR))
-      end
-
       # Cleans all empty subdirectories up the hierarchy.
-      def clean(id)
-        path(id).dirname.ascend do |pathname|
+      def clean(path)
+        path.dirname.ascend do |pathname|
           if pathname.children.empty? && pathname != directory
             pathname.rmdir
           else

data/lib/shrine/storage/s3.rb

@@ -3,6 +3,8 @@ require "down"
 require "uri"
 require "cgi/util"
 
+Aws.eager_autoload!(services: ["S3"])
+
 class Shrine
   module Storage
     # The S3 storage handles uploads to Amazon S3 service, using the [aws-sdk]
@@ -12,13 +14,25 @@ class Shrine
     #
     # It is initialized with the following 4 required options:
     #
-    #     Shrine::Storage::S3.new(
-    #       access_key_id: "xyz",
-    #       secret_access_key: "abc",
+    #     storage = Shrine::Storage::S3.new(
+    #       access_key_id: "abc",
+    #       secret_access_key: "xyz",
     #       region: "eu-west-1",
     #       bucket: "my-app",
     #     )
     #
+    # The storage exposes the underlying Aws objects:
+    #
+    #     storage.client #=> #<Aws::S3::Client>
+    #     storage.client.access_key_id #=> "abc"
+    #     storage.client.secret_access_key #=> "xyz"
+    #     storage.client.region #=> "eu-west-1"
+    #
+    #     storage.bucket #=> #<Aws::S3::Bucket>
+    #     storage.bucket.name #=> "my-app"
+    #
+    #     storage.object("key") #=> #<Aws::S3::Object>
+    #
     # ## Prefix
     #
     # The `:prefix` option can be specified for uploading all files inside
@@ -33,7 +47,7 @@ class Shrine
     # Sometimes you'll want to add additional upload options to all S3 uploads.
     # You can do that by passing the `:upload` option:
     #
-    #     Shrine::Storage::S3.new(upload_options: {acl: "public-read"}, **s3_options)
+    #     Shrine::Storage::S3.new(upload_options: {acl: "private"}, **s3_options)
     #
     # These options will be passed to aws-sdk's methods for [uploading],
     # [copying] and [presigning].
@@ -53,7 +67,7 @@ class Shrine
     #
     # or when using the uploader directly
     #
-    #     uploader.upload(file, upload_options: {acl: "public-read"})
+    #     uploader.upload(file, upload_options: {acl: "private"})
     #
     # Note that, unlike the `:upload_options` storage option, upload options
     # given on the uploader level won't be forwarded for generating presigns,
@@ -64,21 +78,20 @@ class Shrine
     # This storage supports various URL options that will be forwarded from
     # uploaded file.
     #
-    #     s3.url(public: true)   # public URL without signed parameters
-    #     s3.url(download: true) # forced download URL
+    #     uploaded_file.url(public: true)   # public URL without signed parameters
+    #     uploaded_file.url(download: true) # forced download URL
     #
     # All other options are forwarded to the [aws-sdk] gem:
     #
-    #     s3.url(expires_in: 15)
-    #     s3.url(virtual_host: true)
+    #     uploaded_file.url(expires_in: 15)
+    #     uploaded_file.url(virtual_host: true)
     #
     # ## CDN
     #
     # If you're using a CDN with S3 like Amazon CloudFront, you can specify
     # the `:host` option to `#url`:
     #
-    #     s3 = Shrine::Storage::S3.new(**s3_options)
-    #     s3.url("image.jpg", host: "http://abc123.cloudfront.net")
+    #     uploaded_file.url("image.jpg", host: "http://abc123.cloudfront.net")
     #     #=> "http://abc123.cloudfront.net/image.jpg"
     #
     # ## Accelerate endpoint
@@ -103,13 +116,24 @@ class Shrine
     # ## Large files
     #
     # The [aws-sdk] gem has the ability to automatically use multipart
-    # upload/copy for larger files, where the file is split into multiple chunks
-    # which are uploaded/copied in parallel.
+    # upload/copy for larger files, splitting the file into multiple chunks
+    # and uploading/copying them in parallel.
+    #
+    # By default any files that are uploaded will use the multipart upload
+    # if they're larger than 15MB, and any files that are copied will use the
+    # multipart copy if they're larger than 150MB, but you can change the
+    # thresholds via `:multipart_threshold`.
     #
-    # By default any files that are larger than 15MB will use this multipart
-    # upload/copy, but you change this threshold:
+    #     thresholds = {upload: 30*1024*1024, copy: 200*1024*1024}
+    #     Shrine::Storage::S3.new(multipart_threshold: thresholds, **s3_options)
     #
-    #     Shrine::Storage::S3.new(multipart_threshold: 30*1024*1024) # 30MB
+    # If you want to change how many threads [aws-sdk] will use for multipart
+    # upload/copy, you can use the `upload_options` plugin to specify
+    # `:thread_count`.
+    #
+    #     plugin :upload_options, store: ->(io, context) do
+    #       {thread_count: 5}
+    #     end
     #
     # ## Clearing cache
     #
@@ -124,7 +148,7 @@ class Shrine
     # [aws-sdk]: https://github.com/aws/aws-sdk-ruby
     # [Transfer Acceleration]: http://docs.aws.amazon.com/AmazonS3/latest/dev/transfer-acceleration.html
     class S3
-      attr_reader :s3, :bucket, :prefix, :host, :upload_options
+      attr_reader :client, :bucket, :prefix, :host, :upload_options
 
       # Initializes a storage for uploading to S3.
       #
@@ -143,8 +167,10 @@ class Shrine
       #     and [`Aws::S3::Bucket#presigned_post`].
       #
       # :multipart_threshold
-      # :   The file size over which the storage will use parallelized
-      #     multipart copy/upload. Default is `15*1024*1024` (15MB).
+      # :   If the input file is larger than the specified size, a parallelized
+      #     multipart will be used for the upload/copy. Defaults to
+      #     `{upload: 15*1024*1024, copy: 100*1024*1024}` (15MB for upload
+      #     requests, 100MB for copy requests).
       #
       # All other options are forwarded to [`Aws::S3::Client#initialize`].
       #
@@ -152,19 +178,35 @@ class Shrine
       # [`Aws::S3::Object#copy_from`]: http://docs.aws.amazon.com/sdkforruby/api/Aws/S3/Object.html#copy_from-instance_method
       # [`Aws::S3::Bucket#presigned_post`]: http://docs.aws.amazon.com/sdkforruby/api/Aws/S3/Object.html#presigned_post-instance_method
       # [`Aws::S3::Client#initialize`]: http://docs.aws.amazon.com/sdkforruby/api/Aws/S3/Client.html#initialize-instance_method
-      def initialize(bucket:, prefix: nil, host: nil, upload_options: {}, multipart_threshold: 15*1024*1024, **s3_options)
-        warn "The :host option to Shrine::Storage::S3#initialize is deprecated and will be removed in Shrine 3. Pass :host to S3#url instead, you can also use default_url_options plugin." if host
+      def initialize(bucket:, prefix: nil, host: nil, upload_options: {}, multipart_threshold: {}, **s3_options)
+        Shrine.deprecation("The :host option to Shrine::Storage::S3#initialize is deprecated and will be removed in Shrine 3. Pass :host to S3#url instead, you can also use default_url_options plugin.") if host
+        resource = Aws::S3::Resource.new(**s3_options)
 
+        if multipart_threshold.is_a?(Integer)
+          Shrine.deprecation("Accepting the :multipart_threshold S3 option as an integer is deprecated, use a hash with :upload and :copy keys instead, e.g. {upload: 15*1024*1024, copy: 150*1024*1024}")
+          multipart_threshold = {upload: multipart_threshold}
+        end
+        multipart_threshold[:upload] ||= 15*1024*1024
+        multipart_threshold[:copy]   ||= 100*1024*1024
+
+        @bucket = resource.bucket(bucket)
+        @client = resource.client
         @prefix = prefix
-        @s3 = Aws::S3::Resource.new(**s3_options)
-        @bucket = @s3.bucket(bucket)
         @host = host
         @upload_options = upload_options
         @multipart_threshold = multipart_threshold
       end
 
+      # Returns an `Aws::S3::Resource` object.
+      def s3
+        Shrine.deprecation("Shrine::Storage::S3#s3 that returns an Aws::S3::Resource is deprecated, use Shrine::Storage::S3#client which returns an Aws::S3::Client object.")
+        Aws::S3::Resource.new(client: @client)
+      end
+
       # If the file is an UploadedFile from S3, issues a COPY command, otherwise
-      # uploads the file.
+      # uploads the file. For files larger than `:multipart_threshold` a
+      # multipart upload/copy will be used for better performance and more
+      # resilient uploads.
       #
       # It assigns the correct "Content-Type" taken from the MIME type, because
       # by default S3 sets everything to "application/octet-stream".
@@ -189,8 +231,8 @@ class Shrine
 
       # Downloads the file from S3, and returns a `Tempfile`.
       def download(id)
-        tempfile = Tempfile.new(["s3", File.extname(id)], binmode: true)
-        (object = object(id)).get(response_target: tempfile.path)
+        tempfile = Tempfile.new(["shrine-s3", File.extname(id)], binmode: true)
+        (object = object(id)).get(response_target: tempfile)
         tempfile.singleton_class.instance_eval { attr_accessor :content_type }
         tempfile.content_type = object.content_type
         tempfile.tap(&:open)
@@ -214,18 +256,18 @@ class Shrine
       # This is called when multiple files are being deleted at once. Issues a
       # single MULTI DELETE command for each 1000 objects (S3 delete limit).
       def multi_delete(ids)
-        objects = ids.take(1000).map { |id| {key: object(id).key} }
-        bucket.delete_objects(delete: {objects: objects})
-
-        rest = Array(ids[1000..-1])
-        multi_delete(rest) unless rest.empty?
+        ids.each_slice(1000) do |ids_batch|
+          delete_params = {objects: ids_batch.map { |id| {key: object(id).key} }}
+          bucket.delete_objects(delete: delete_params)
+        end
       end
 
       # Returns the presigned URL to the file.
       #
       # :public
-      # :  Creates an unsigned version of the URL (the permissions on the S3
-      #    bucket need to be modified to allow public URLs).
+      # :  Controls whether the URL is signed (`false`) or unsigned (`true`).
+      #    Note that for unsigned URLs the S3 bucket need to be modified to allow
+      #    public URLs. Defaults to `false`.
       #
       # :host
       # :  This option replaces the host part of the returned URL, and is
@@ -279,10 +321,15 @@ class Shrine
         object(id).presigned_post(options)
       end
 
+      # Returns an `Aws::S3::Object` for the given id.
+      def object(id)
+        bucket.object([*prefix, id].join("/"))
+      end
+
       # Catches the deprecated `#stream` method.
       def method_missing(name, *args)
         if name == :stream
-          warn "Shrine::Storage::S3#stream is deprecated over calling #each_chunk on S3#open."
+          Shrine.deprecation("Shrine::Storage::S3#stream is deprecated over calling #each_chunk on S3#open.")
           object = object(*args)
           object.get { |chunk| yield chunk, object.content_length }
         else
@@ -290,31 +337,28 @@ class Shrine
         end
       end
 
-      protected
-
-      # Returns the S3 object.
-      def object(id)
-        bucket.object([*prefix, id].join("/"))
-      end
-
-      # This is used to check whether an S3 file is copyable.
-      def access_key_id
-        s3.client.config.credentials.credentials.access_key_id
-      end
-
       private
 
-      # Copies an existing S3 object to a new location.
+      # Copies an existing S3 object to a new location. Uses multipart copy for
+      # large files.
       def copy(io, id, **options)
-        options = {multipart_copy: true, content_length: io.size}.update(options) if multipart?(io)
+        # pass :content_length on multipart copy to avoid an additional HEAD request
+        options = {multipart_copy: true, content_length: io.size}.update(options) if io.size && io.size >= @multipart_threshold[:copy]
         object(id).copy_from(io.storage.object(io.id), **options)
       end
 
-      # Uploads the file to S3.
+      # Uploads the file to S3. Uses multipart upload for large files.
       def put(io, id, **options)
         if io.respond_to?(:path)
-          options = {multipart_threshold: @multipart_threshold}.update(options)
-          object(id).upload_file(io.path, **options)
+          path = io.path
+        elsif io.is_a?(UploadedFile) && defined?(Storage::FileSystem) && io.storage.is_a?(Storage::FileSystem)
+          path = io.storage.path(io.id).to_s
+        end
+
+        if path
+          # use `upload_file` for files because it can do multipart upload
+          options = {multipart_threshold: @multipart_threshold[:upload]}.update(options)
+          object(id).upload_file(path, **options)
         else
           object(id).put(body: io, **options)
         end
@@ -324,15 +368,12 @@ class Shrine
       def copyable?(io)
         io.is_a?(UploadedFile) &&
         io.storage.is_a?(Storage::S3) &&
-        io.storage.access_key_id == access_key_id
-      end
-
-      # Determines whether multipart upload/copy should be used from
-      # `:multipart_threshold`.
-      def multipart?(io)
-        io.size && io.size >= @multipart_threshold
+        io.storage.client.config.access_key_id == client.config.access_key_id
       end
 
+      # Upload requests will fail if filename has non-ASCII characters, because
+      # of how S3 generates signatures, so we URI-encode them. Most browsers
+      # should automatically URI-decode filenames when downloading.
       def encode_content_disposition(content_disposition)
         content_disposition.sub(/(?<=filename=").+(?=")/) do |filename|
           CGI.escape(filename).sub("+", " ")