shrine 2.10.1 → 2.11.0

data/lib/shrine/plugins/determine_mime_type.rb

@@ -11,7 +11,7 @@ class Shrine
     # and the result is automatically written to the `mime_type` metadata
     # field. You can choose a different built-in MIME type analyzer:
     #
-    #     plugin :determine_mime_type, analyzer: :filemagic
+    #     plugin :determine_mime_type, analyzer: :marcel
     #
     # The following analyzers are accepted:
     #
@@ -166,6 +166,8 @@ class Shrine
         def extract_with_file(io)
           require "open3"
 
+          return nil if io.eof? # file command returns "application/x-empty" for empty files
+
           Open3.popen3(*%W[file --mime-type --brief -]) do |stdin, stdout, stderr, thread|
             begin
               IO.copy_stream(io, stdin.binmode)
@@ -178,8 +180,7 @@ class Shrine
             raise Error, stderr.read unless status.success?
             $stderr.print(stderr.read)
 
-            mime_type = stdout.read.strip
-            mime_type unless mime_type == "application/x-empty"
+            stdout.read.strip
           end
         rescue Errno::ENOENT
           raise Error, "The `file` command-line tool is not installed"
@@ -195,9 +196,10 @@ class Shrine
         def extract_with_filemagic(io)
           require "filemagic"
 
+          return nil if io.eof? # FileMagic returns "application/x-empty" for empty files
+
           FileMagic.open(FileMagic::MAGIC_MIME_TYPE) do |filemagic|
-            mime_type = filemagic.buffer(io.read(MAGIC_NUMBER).to_s)
-            mime_type unless mime_type == "application/x-empty"
+            filemagic.buffer(io.read(MAGIC_NUMBER))
           end
         end
 

data/lib/shrine/plugins/direct_upload.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+Shrine.deprecation("The direct_upload plugin has been deprecated in favor of upload_endpoint and presign_endpoint plugins. The direct_upload plugin will be removed in Shrine 3.")
+
 require "roda"
 require "json"
 
@@ -159,7 +161,7 @@ class Shrine
     # [Roda]: https://github.com/jeremyevans/roda
     # [Uppy]: https://uppy.io
     # [Roda request]: http://roda.jeremyevans.net/rdoc/classes/Roda/RodaPlugins/Base/RequestMethods.html
-    # [Direct Uploads to S3]: http://shrinerb.com/rdoc/files/doc/direct_s3_md.html
+    # [Direct Uploads to S3]: https://shrinerb.com/rdoc/files/doc/direct_s3_md.html
     module DirectUpload
       def self.load_dependencies(uploader, *)
         uploader.plugin :rack_file

data/lib/shrine/plugins/infer_extension.rb

@@ -30,7 +30,7 @@ class Shrine
     #
     #     plugin :infer_extension, inferrer: -> (mime_type, inferrers) do
     #       # don't add extension if the file is a text file
-    #       inferrrs[:rack_mime].call(mime_type) unless mime_type == "text/plain"
+    #       inferrers[:rack_mime].call(mime_type) unless mime_type == "text/plain"
     #     end
     #
     # You can also use methods for inferring extension directly:

data/lib/shrine/plugins/metadata_attributes.rb

@@ -9,7 +9,7 @@ class Shrine
     #     plugin :metadata_attributes, :size => :size, :mime_type => :type
     #     # or
     #     plugin :metadata_attributes
-    #     Attacher.metadata_attributes, :size => :size, :mime_type => :type
+    #     Attacher.metadata_attributes :size => :size, :mime_type => :type
     #
     # The above configuration will sync `size` metadata field to
     # `<attachment>_size` record attribute, and `mime_type` metadata field to
@@ -28,7 +28,7 @@ class Shrine
     # If you want to specify the full record attribute name, pass the record
     # attribute name as a string instead of a symbol.
     #
-    #     Attacher.metadata_attributes, :filename => "original_filename"
+    #     Attacher.metadata_attributes :filename => "original_filename"
     #
     #     # ...
     #

data/lib/shrine/plugins/presign_endpoint.rb

@@ -36,16 +36,18 @@ class Shrine
     # the default synchronous workflow, so we want to generate parameters for
     # uploads to the temporary (`:cache`) storage.
     #
-    # The above will create a `GET /presign` endpoint, which generates presign
-    # URL, fields, and headers using the specified storage, and returns it in
+    # The above will create a `GET /images/presign` endpoint, which calls
+    # `#presign` on the storage and returns the HTTP verb, URL, fields, and
+    # headers needed for a single upload directly to the storage service, in
     # JSON format.
     #
     #     # GET /images/presign
     #     {
+    #       "method": "post",
     #       "url": "https://my-bucket.s3-eu-west-1.amazonaws.com",
     #       "fields": {
     #         "key": "b7d575850ba61b44c8a9ff889dfdb14d88cdc25f8dd121004c8",
-    #         "policy": "eyJleHBpcmF0aW9uIjoiMjAxNS0QwMToxMToyOVoiLCJjb25kaXRpb25zIjpbeyJidWNrZXQiOiJzaHJpbmUtdGVzdGluZyJ9LHsia2V5IjoiYjdkNTc1ODUwYmE2MWI0NGU3Y2M4YTliZmY4OGU5ZGZkYjE2NTQ0ZDk4OGNkYzI1ZjhkZDEyMTAwNGM4In0seyJ4LWFtei1jcmVkZW50aWFsIjoiQUtJQUlKRjU1VE1aWlk0NVVUNlEvMjAxNTEwMjQvZXUtd2VzdC0xL3MzL2F3czRfcmVxdWVzdCJ9LHsieC1hbXotYWxnb3JpdGhtIjoiQVdTNC1ITUFDLVNIQTI1NiJ9LHsieC1hbXotZGF0ZSI6IjIwMTUxMDI0VDAwMTEyOVoifV19",
+    #         "policy": "eyJleHBpcmF0aW9uIjoiMjAxNS0QwMToxMToyOVoiLCJjb25kaXRpb25zIjpbeyJidWNrZXQiOiJ...",
     #         "x-amz-credential": "AKIAIJF55TMZYT6Q/20151024/eu-west-1/s3/aws4_request",
     #         "x-amz-algorithm": "AWS4-HMAC-SHA256",
     #         "x-amz-date": "20151024T001129Z",
@@ -54,17 +56,17 @@ class Shrine
     #       "headers": {}
     #     }
     #
-    # This gives the client all the information it needs to make the upload
-    # request to the selected file to the storage service. The `url` field is
-    # the request URL, `fields` are the required POST parameters, and `headers`
-    # are the required request headers.
+    # * `method` – HTTP verb
+    # * `url` – request URL
+    # * `fields` – POST parameters
+    # * `headers` – request headers
     #
     # ## Location
     #
     # By default the generated location won't have any file extension, but you
     # can specify one by sending the `filename` query parameter:
     #
-    #     GET /images/presign?filename=nature.jpg
+    #     # GET /images/presign?filename=nature.jpg
     #
     # It's also possible to customize how the presign location is generated:
     #
@@ -89,13 +91,15 @@ class Shrine
     #       }
     #     end
     #
+    # The `:presign_options` can be a Proc or a Hash.
+    #
     # ## Presign
     #
     # You can also customize how the presign itself is generated via the
     # `:presign` option:
     #
     #     plugin :presign_endpoint, presign: -> (id, options, request) do
-    #       # return an object that responds to #url, #fields, and #headers
+    #       # return a Hash with :url, :fields, and :headers keys
     #     end
     #
     # ## Response
@@ -103,8 +107,8 @@ class Shrine
     # The response returned by the endpoint can be customized via the
     # `:rack_response` option:
     #
-    #     plugin :presign_endpoint, rack_response: -> (hash, request) do
-    #       body = { endpoint: hash[:url], params: hash[:fields], headers: hash[:headers] }.to_json
+    #     plugin :presign_endpoint, rack_response: -> (data, request) do
+    #       body = { endpoint: data[:url], params: data[:fields], headers: data[:headers] }.to_json
     #       [201, { "Content-Type" => "application/json" }, [body]]
     #     end
     #
@@ -215,16 +219,22 @@ class Shrine
         # option is given, calls that instead of calling `#presign`.
         def generate_presign(location, options, request)
           if @presign
-            presign = @presign.call(location, options, request)
+            data = @presign.call(location, options, request)
           else
-            presign = storage.presign(location, options)
+            data = storage.presign(location, options)
           end
 
-          url     = presign.url
-          fields  = presign.fields
-          headers = presign.headers if presign.respond_to?(:headers)
+          if data.respond_to?(:to_h)
+            { fields: {}, headers: {} }.merge(data.to_h)
+          else
+            Shrine.deprecation("Returning a custom object in Storage#presign is deprecated, presign_endpoint will not support it in Shrine 3. Storage#presign should return a Hash instead.")
+
+            url     = data.url
+            fields  = data.fields
+            headers = data.headers if data.respond_to?(:headers)
 
-          { url: url, fields: fields.to_h, headers: headers.to_h }
+            { url: url, fields: fields.to_h, headers: headers.to_h }
+          end
         end
 
         # Transforms the presign hash into a JSON response. It returns a Rack

data/lib/shrine/plugins/rack_response.rb

@@ -29,11 +29,11 @@ class Shrine
     #     class FilesController < ActionController::Base
     #       def download
     #         # ...
-    #         file_response = record.attachment.to_rack_response
+    #         file_status, file_headers, file_body = record.attachment.to_rack_response
     #
-    #         response.status = file_response[0]
-    #         response.headers.merge!(file_response[1])
-    #         self.response_body = file_response[2]
+    #         response.status = file_status
+    #         response.headers.merge!(file_headers)
+    #         self.response_body = file_body
     #       end
     #     end
     #

data/lib/shrine/plugins/signature.rb

@@ -36,7 +36,7 @@ class Shrine
     #
     # You can also choose which format will the calculated hash be encoded in:
     #
-    #     Shrine.calculate_signature(io, :sha256, format: :hex)
+    #     Shrine.calculate_signature(io, :sha256, format: :base64)
     #
     # The supported encoding formats are `hex` (default), `base64`, and `none`.
     module Signature

data/lib/shrine/plugins/store_dimensions.rb

@@ -3,7 +3,8 @@
 class Shrine
   module Plugins
     # The `store_dimensions` plugin extracts dimensions of uploaded images and
-    # stores them into the metadata hash.
+    # stores them into the metadata hash (by default it uses the [fastimage]
+    # gem).
     #
     #     plugin :store_dimensions
     #
@@ -29,11 +30,11 @@ class Shrine
     # The following analyzers are supported:
     #
     # :fastimage
-    # : (Default). Uses the [FastImage] gem to extract dimensions from any IO
+    # : (Default). Uses the [fastimage] gem to extract dimensions from any IO
     #   object.
     #
     # :mini_magick
-    # : Uses the [MiniMagick] gem to extract dimensions from File objects. If
+    # : Uses the [mini_magick] gem to extract dimensions from File objects. If
     #   non-file IO object is given it will be temporarily downloaded to disk.
     #
     # :ruby_vips
@@ -61,8 +62,8 @@ class Shrine
     #     Shrine.dimensions_analyzers[:fastimage].call(io) # calls a built-in analyzer
     #     #=> [300, 400]
     #
-    # [FastImage]: https://github.com/sdsykes/fastimage
-    # [MiniMagick]: https://github.com/minimagick/minimagick
+    # [fastimage]: https://github.com/sdsykes/fastimage
+    # [mini_magick]: https://github.com/minimagick/minimagick
     # [ruby-vips]: https://github.com/jcupitt/ruby-vips
     module StoreDimensions
       def self.configure(uploader, opts = {})
@@ -157,23 +158,14 @@ class Shrine
 
         def extract_with_mini_magick(io)
           require "mini_magick"
-          ensure_file(io) { |file| MiniMagick::Image.new(file.path).dimensions }
+          Shrine.with_file(io) { |file| MiniMagick::Image.new(file.path).dimensions }
+        rescue MiniMagick::Error
         end
 
         def extract_with_ruby_vips(io)
           require "vips"
-          ensure_file(io) { |file| Vips::Image.new_from_file(file.path).size }
-        end
-
-        def ensure_file(io)
-          if io.respond_to?(:path)
-            yield io
-          else
-            Tempfile.create("shrine-store_dimensions") do |tempfile|
-              IO.copy_stream(io, tempfile.path)
-              yield tempfile
-            end
-          end
+          Shrine.with_file(io) { |file| Vips::Image.new_from_file(file.path).size }
+        rescue Vips::Error
         end
       end
     end

data/lib/shrine/plugins/upload_endpoint.rb

@@ -3,6 +3,7 @@
 require "rack"
 
 require "json"
+require "digest"
 
 class Shrine
   module Plugins
@@ -62,6 +63,17 @@ class Shrine
     # If the uploaded file is larger than the specified value, a `413 Payload
     # Too Large` response will be returned.
     #
+    # ## Checksum
+    #
+    # If you want the upload endpoint to verify the integrity of the uploaded
+    # file, you can include the `Content-MD5` header in the request filled with
+    # the base64-encoded MD5 hash of the file that was calculated prior to the
+    # upload, and the endpoint will automatically use it to verify the uploaded
+    # data.
+    #
+    # If the checksums don't match, a `460 Checksum Mismatch` response is
+    # returned.
+    #
     # ## Context
     #
     # The upload context will *not* contain `:record` and `:name` values, as
@@ -187,6 +199,8 @@ class Shrine
           error!(400, "Upload Not Found") unless file.is_a?(Hash) && file[:tempfile]
           error!(413, "Upload Too Large") if @max_size && file[:tempfile].size > @max_size
 
+          verify_checksum!(file[:tempfile], request.env["HTTP_CONTENT_MD5"]) if request.env["HTTP_CONTENT_MD5"]
+
           @shrine_class.rack_file(file)
         end
 
@@ -222,6 +236,14 @@ class Shrine
           end
         end
 
+        # Verifies the provided checksum against the received file.
+        def verify_checksum!(file, provided_checksum)
+          error!(400, "The Content-MD5 you specified was invalid") if provided_checksum.length != 24
+
+          calculated_checksum = Digest::MD5.file(file.path).base64digest
+          error!(460, "The Content-MD5 you specified did not match what was recieved") if provided_checksum != calculated_checksum
+        end
+
         # Used for early returning an error response.
         def error!(status, message)
           throw :halt, [status, {"Content-Type" => "text/plain"}, [message]]

data/lib/shrine/plugins/versions.rb

@@ -105,21 +105,17 @@ class Shrine
     # example, you might want to split a PDf into pages:
     #
     #     process(:store) do |io, context|
-    #       pdf      = io.download
-    #       image    = MiniMagick::Image.new(pdf.path)
-    #       versions = []
-    #
-    #       image.pages.each_with_index do |page, index|
-    #         page_file = Tempfile.new("version-#{index}", binmode: true)
-    #         MiniMagick::Tool::Convert.new do |convert|
-    #           convert << page.path
-    #           convert << page_file.path
-    #         end
-    #         page_file.open # refresh updated file
-    #         versions << page_file
+    #       pdf        = io.download
+    #       page_count = MiniMagick::Image.new(pdf.path).pages.count
+    #       pipeline   = ImageProcessing::MiniMagick.source(pdf).convert("jpg")
+    #
+    #       pages = page_count.times.map do |page_number|
+    #         pipeline.loader(page: page_number).call
     #       end
     #
-    #       versions # array of pages
+    #       pdf.close!
+    #
+    #       { pages: pages } # array of pages
     #     end
     #
     # You can also combine Hashes and Arrays, there is no limit to the level of
@@ -158,7 +154,7 @@ class Shrine
     #
     # If you want to re-create a single or all versions, refer to the [reprocessing versions] guide for details.
     #
-    # [reprocessing versions]: http://shrinerb.com/rdoc/files/doc/regenerating_versions_md.html
+    # [reprocessing versions]: https://shrinerb.com/rdoc/files/doc/regenerating_versions_md.html
     # [image_processing]: https://github.com/janko-m/image_processing
     module Versions
       def self.load_dependencies(uploader, *)

data/lib/shrine/storage/linter.rb

@@ -53,6 +53,10 @@ class Shrine
           storage.upload(io_factory.call, id = "quux".dup)
           lint_clear(id)
         end
+
+        if storage.respond_to?(:presign)
+          lint_presign(id)
+        end
       end
 
       def lint_download(id)
@@ -101,6 +105,13 @@ class Shrine
         error :clear!, "file still #exists? after clearing" if storage.exists?(id)
       end
 
+      def lint_presign(id)
+        data = storage.presign(id, {})
+        error :presign, "result should be a Hash" unless data.respond_to?(:to_h)
+        error :presign, "result should include :method key" unless data.to_h.key?(:method)
+        error :presign, "result should include :url key" unless data.to_h.key?(:url)
+      end
+
       private
 
       attr_reader :storage

data/lib/shrine/storage/s3.rb

@@ -28,7 +28,7 @@ class Shrine
     #
     #     gem "aws-sdk-s3", "~> 1.2"
     #
-    # It is initialized with the following 4 required options:
+    # It can be initialized by providing the bucket name and credentials:
     #
     #     s3 = Shrine::Storage::S3.new(
     #       access_key_id: "abc",
@@ -37,6 +37,11 @@ class Shrine
     #       bucket: "my-app",
     #     )
     #
+    # The core features of this storage requires the following AWS permissions:
+    # `s3:ListBucket`, `s3:PutObject`, `s3:GetObject`, and `s3:DeleteObject`.
+    # If you have additional upload options configured such as setting object
+    # ACLs, then additional permissions may be required.
+    #
     # The storage exposes the underlying Aws objects:
     #
     #     s3.client #=> #<Aws::S3::Client>
@@ -56,14 +61,13 @@ class Shrine
     # cache and store:
     #
     #     Shrine::Storage::S3.new(prefix: "cache", **s3_options)
-    #     Shrine::Storage::S3.new(prefix: "store", **s3_options)
     #
     # ## Upload options
     #
     # 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: "private"}, **s3_options)
+    #     Shrine::Storage::S3.new(upload_options: { acl: "private" }, **s3_options)
     #
     # These options will be passed to aws-sdk-s3's methods for [uploading],
     # [copying] and [presigning].
@@ -83,7 +87,7 @@ class Shrine
     #
     # or when using the uploader directly
     #
-    #     uploader.upload(file, upload_options: {acl: "private"})
+    #     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,
@@ -145,15 +149,15 @@ class Shrine
     # multipart copy if they're larger than 150MB, but you can change the
     # thresholds via `:multipart_threshold`.
     #
-    #     thresholds = {upload: 30*1024*1024, copy: 200*1024*1024}
+    #     thresholds = { upload: 30*1024*1024, copy: 200*1024*1024 }
     #     Shrine::Storage::S3.new(multipart_threshold: thresholds, **s3_options)
     #
     # If you want to change how many threads aws-sdk-s3 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}
+    #     plugin :upload_options, store: -> (io, context) do
+    #       { thread_count: 5 }
     #     end
     #
     # ## Clearing cache
@@ -178,34 +182,37 @@ class Shrine
 
       attr_reader :client, :bucket, :prefix, :host, :upload_options
 
-      # Initializes a storage for uploading to S3.
+      # Initializes a storage for uploading to S3. All options are forwarded to
+      # [`Aws::S3::Client#initialize`], except the following:
       #
-      # :access_key_id
-      # :secret_access_key
-      # :region
       # :bucket
-      # :   Credentials required by the `aws-sdk-s3` gem.
+      # : (Required). Name of the S3 bucket.
       #
       # :prefix
-      # :   "Folder" name inside the bucket to store files into.
+      # : "Directory" inside the bucket to store files into.
       #
       # :upload_options
-      # :   Additional options that will be used for uploading files, they will
-      #     be passed to [`Aws::S3::Object#put`], [`Aws::S3::Object#copy_from`]
-      #     and [`Aws::S3::Bucket#presigned_post`].
+      # : Additional options that will be used for uploading files, they will
+      #   be passed to [`Aws::S3::Object#put`], [`Aws::S3::Object#copy_from`]
+      #   and [`Aws::S3::Bucket#presigned_post`].
       #
       # :multipart_threshold
-      # :   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).
+      # : 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`].
+      # In addition to specifying the `:bucket`, you'll also need to provide
+      # AWS credentials. The most common way is to provide them directly via
+      # `:access_key_id`, `:secret_access_key`, and `:region` options. But you
+      # can also use any other way of authentication specified in the [AWS SDK
+      # documentation][configuring AWS SDK].
       #
       # [`Aws::S3::Object#put`]: http://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/S3/Object.html#put-instance_method
       # [`Aws::S3::Object#copy_from`]: http://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/S3/Object.html#copy_from-instance_method
       # [`Aws::S3::Bucket#presigned_post`]: http://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/S3/Object.html#presigned_post-instance_method
       # [`Aws::S3::Client#initialize`]: http://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/S3/Client.html#initialize-instance_method
+      # [configuring AWS SDK]: https://docs.aws.amazon.com/sdk-for-ruby/v3/developer-guide/setup-config.html
       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)
@@ -322,23 +329,44 @@ class Shrine
 
         if host
           uri = URI.parse(url)
-          uri.path = uri.path.match(/^\/#{bucket.name}/).post_match unless uri.host.include?(bucket.name)
+          uri.path = uri.path.match(/^\/#{bucket.name}/).post_match unless uri.host.include?(bucket.name) || client.config.force_path_style
           url = URI.join(host, uri.request_uri).to_s
         end
 
         url
       end
 
-      # Returns a signature for direct uploads. Internally it calls
-      # [`Aws::S3::Bucket#presigned_post`], and forwards any additional options
-      # to it.
+      # Returns URL, params and headers for direct uploads. By default it
+      # generates data for a POST request, calling [`Aws::S3::Object#presigned_post`].
+      # You can also specify `method: :put` to generate data for a PUT request,
+      # using [`Aws::S3::Object#presigned_url`]. Any additional options are
+      # forwarded to the underlying AWS SDK method.
       #
-      # [`Aws::S3::Bucket#presigned_post`]: http://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/S3/Bucket.html#presigned_post-instance_method
-      def presign(id, **options)
+      # [`Aws::S3::Object#presigned_post`]: http://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/S3/Object.html#presigned_post-instance_method
+      # [`Aws::S3::Object#presigned_url`]: https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/S3/Object.html#presigned_url-instance_method
+      def presign(id, method: :post, **options)
         options = @upload_options.merge(options)
         options[:content_disposition] = encode_content_disposition(options[:content_disposition]) if options[:content_disposition]
 
-        object(id).presigned_post(options)
+        if method == :post
+          presigned_post = object(id).presigned_post(options)
+
+          Struct.new(:method, :url, :fields).new(method, presigned_post.url, presigned_post.fields)
+        else
+          url = object(id).presigned_url(method, options)
+
+          # When any of these options are specified, the corresponding request
+          # headers must be included in the upload request.
+          headers = {}
+          headers["Content-Length"]      = options[:content_length]      if options[:content_length]
+          headers["Content-Type"]        = options[:content_type]        if options[:content_type]
+          headers["Content-Disposition"] = options[:content_disposition] if options[:content_disposition]
+          headers["Content-Encoding"]    = options[:content_encoding]    if options[:content_encoding]
+          headers["Content-Language"]    = options[:content_language]    if options[:content_language]
+          headers["Content-MD5"]         = options[:content_md5]         if options[:content_md5]
+
+          { method: method, url: url, headers: headers }
+        end
       end
 
       # Deletes the file from the storage.
@@ -355,8 +383,7 @@ class Shrine
       def clear!(&block)
         objects_to_delete = Enumerator.new do |yielder|
           bucket.objects(prefix: prefix).each do |object|
-            condition = block.call(object) if block
-            yielder << object unless condition == false
+            yielder << object if block.nil? || block.call(object)
           end
         end