kt-paperclip 5.4.0 → 6.2.0

data/lib/paperclip/storage/s3.rb

@@ -3,8 +3,8 @@ module Paperclip
     # Amazon's S3 file hosting service is a scalable, easy place to store files for
     # distribution. You can find out more about it at http://aws.amazon.com/s3
     #
-    # To use Paperclip with S3, include the +aws-sdk+ gem in your Gemfile:
-    #   gem 'aws-sdk'
+    # To use Paperclip with S3, include the +aws-sdk-s3+ gem in your Gemfile:
+    #   gem 'aws-sdk-s3'
     # There are a few S3-specific options for has_attached_file:
     # * +s3_credentials+: Takes a path, a File, a Hash or a Proc. The path (or File) must point
     #   to a YAML file containing the +access_key_id+ and +secret_access_key+ that Amazon
@@ -96,7 +96,7 @@ module Paperclip
     #   separate parts of your file name.
     # * +s3_host_name+: If you are using your bucket in Tokyo region
     #   etc, write host_name (e.g., 's3-ap-northeast-1.amazonaws.com').
-    # * +s3_region+: For aws-sdk v2, s3_region is required.
+    # * +s3_region+: For aws-sdk-s3, s3_region is required.
     # * +s3_metadata+: These key/value pairs will be stored with the
     #   object.  This option works by prefixing each key with
     #   "x-amz-meta-" before sending it as a header on the object
@@ -118,25 +118,21 @@ module Paperclip
     #     :s3_storage_class => :REDUCED_REDUNDANCY
     #
     #   Other storage classes, such as <tt>:STANDARD_IA</tt>, are also available—see the
-    #   documentation for the <tt>aws-sdk</tt> gem for the full list.
+    #   documentation for the <tt>aws-sdk-s3</tt> gem for the full list.
 
     module S3
-      def self.extended base
+      def self.extended(base)
         begin
-          require 'aws-sdk'
+          require "aws-sdk-s3"
         rescue LoadError => e
-          e.message << " (You may need to install the aws-sdk gem)"
+          e.message << " (You may need to install the aws-sdk-s3 gem)"
           raise e
         end
-        if Gem::Version.new(Aws::VERSION) >= Gem::Version.new(2) &&
-           Gem::Version.new(Aws::VERSION) <= Gem::Version.new("2.0.33")
-          raise LoadError, "paperclip does not support aws-sdk versions 2.0.0 - 2.0.33.  Please upgrade aws-sdk to a newer version."
-        end
 
         base.instance_eval do
-          @s3_options     = @options[:s3_options]     || {}
+          @s3_options     = @options[:s3_options] || {}
           @s3_permissions = set_permissions(@options[:s3_permissions])
-          @s3_protocol    = @options[:s3_protocol] || "".freeze
+          @s3_protocol    = @options[:s3_protocol] || ""
           @s3_metadata = @options[:s3_metadata] || {}
           @s3_headers = {}
           merge_s3_headers(@options[:s3_headers], @s3_headers, @s3_metadata)
@@ -144,47 +140,46 @@ module Paperclip
           @s3_storage_class = set_storage_class(@options[:s3_storage_class])
 
           @s3_server_side_encryption = "AES256"
-          if @options[:s3_server_side_encryption].blank?
-            @s3_server_side_encryption = false
-          end
-          if @s3_server_side_encryption
-            @s3_server_side_encryption = @options[:s3_server_side_encryption]
-          end
+          @s3_server_side_encryption = false if @options[:s3_server_side_encryption].blank?
+          @s3_server_side_encryption = @options[:s3_server_side_encryption] if @s3_server_side_encryption
 
-          unless @options[:url].to_s.match(/\A:s3.*url\z/) || @options[:url] == ":asset_host".freeze
-            @options[:path] = path_option.gsub(/:url/, @options[:url]).sub(/\A:rails_root\/public\/system/, "".freeze)
-            @options[:url]  = ":s3_path_url".freeze
+          unless @options[:url].to_s.match(/\A:s3.*url\z/) || @options[:url] == ":asset_host"
+            @options[:path] = path_option.gsub(/:url/, @options[:url]).sub(/\A:rails_root\/public\/system/, "")
+            @options[:url]  = ":s3_path_url"
           end
           @options[:url] = @options[:url].inspect if @options[:url].is_a?(Symbol)
 
           @http_proxy = @options[:http_proxy] || nil
 
-          if @options.has_key?(:use_accelerate_endpoint) &&
-              Gem::Version.new(Aws::VERSION) < Gem::Version.new("2.3.0")
-            raise LoadError, ":use_accelerate_endpoint is only available from aws-sdk version 2.3.0. Please upgrade aws-sdk to a newer version."
-          end
-
           @use_accelerate_endpoint = @options[:use_accelerate_endpoint]
         end
 
-        Paperclip.interpolates(:s3_alias_url) do |attachment, style|
-          protocol = attachment.s3_protocol(style, true)
-          host = attachment.s3_host_alias
-          path = attachment.path(style).
-            split("/")[attachment.s3_prefixes_in_alias..-1].
-            join("/").
-            sub(%r{\A/}, "".freeze)
-          "#{protocol}//#{host}/#{path}"
-        end unless Paperclip::Interpolations.respond_to? :s3_alias_url
-        Paperclip.interpolates(:s3_path_url) do |attachment, style|
-          "#{attachment.s3_protocol(style, true)}//#{attachment.s3_host_name}/#{attachment.bucket_name}/#{attachment.path(style).sub(%r{\A/}, "".freeze)}"
-        end unless Paperclip::Interpolations.respond_to? :s3_path_url
-        Paperclip.interpolates(:s3_domain_url) do |attachment, style|
-          "#{attachment.s3_protocol(style, true)}//#{attachment.bucket_name}.#{attachment.s3_host_name}/#{attachment.path(style).sub(%r{\A/}, "".freeze)}"
-        end unless Paperclip::Interpolations.respond_to? :s3_domain_url
-        Paperclip.interpolates(:asset_host) do |attachment, style|
-          "#{attachment.path(style).sub(%r{\A/}, "".freeze)}"
-        end unless Paperclip::Interpolations.respond_to? :asset_host
+        unless Paperclip::Interpolations.respond_to? :s3_alias_url
+          Paperclip.interpolates(:s3_alias_url) do |attachment, style|
+            protocol = attachment.s3_protocol(style, true)
+            host = attachment.s3_host_alias
+            path = attachment.path(style).
+                   split("/")[attachment.s3_prefixes_in_alias..-1].
+                   join("/").
+                   sub(%r{\A/}, "")
+            "#{protocol}//#{host}/#{path}"
+          end
+        end
+        unless Paperclip::Interpolations.respond_to? :s3_path_url
+          Paperclip.interpolates(:s3_path_url) do |attachment, style|
+            "#{attachment.s3_protocol(style, true)}//#{attachment.s3_host_name}/#{attachment.bucket_name}/#{attachment.path(style).sub(%r{\A/}, '')}"
+          end
+        end
+        unless Paperclip::Interpolations.respond_to? :s3_domain_url
+          Paperclip.interpolates(:s3_domain_url) do |attachment, style|
+            "#{attachment.s3_protocol(style, true)}//#{attachment.bucket_name}.#{attachment.s3_host_name}/#{attachment.path(style).sub(%r{\A/}, '')}"
+          end
+        end
+        unless Paperclip::Interpolations.respond_to? :asset_host
+          Paperclip.interpolates(:asset_host) do |attachment, style|
+            attachment.path(style).sub(%r{\A/}, "").to_s
+          end
+        end
       end
 
       def expiring_url(time = 3600, style_name = default_style)
@@ -192,7 +187,7 @@ module Paperclip
           base_options = { expires_in: time }
           s3_object(style_name).presigned_url(
             :get,
-            base_options.merge(s3_url_options),
+            base_options.merge(s3_url_options)
           ).to_s
         else
           url(style_name)
@@ -207,7 +202,7 @@ module Paperclip
         host_name = @options[:s3_host_name]
         host_name = host_name.call(self) if host_name.is_a?(Proc)
 
-        host_name || s3_credentials[:s3_host_name] || "s3.amazonaws.com".freeze
+        host_name || s3_credentials[:s3_host_name] || "s3.amazonaws.com"
       end
 
       def s3_region
@@ -236,7 +231,7 @@ module Paperclip
       def bucket_name
         @bucket = @options[:bucket] || s3_credentials[:bucket]
         @bucket = @bucket.call(self) if @bucket.respond_to?(:call)
-        @bucket or raise ArgumentError, "missing required :bucket option"
+        @bucket || raise(ArgumentError, "missing required :bucket option")
       end
 
       def s3_interface
@@ -245,7 +240,7 @@ module Paperclip
 
           if using_http_proxy?
 
-            proxy_opts = { :host => http_proxy_host }
+            proxy_opts = { host: http_proxy_host }
             proxy_opts[:port] = http_proxy_port if http_proxy_port
             if http_proxy_user
               userinfo = http_proxy_user.to_s
@@ -275,10 +270,10 @@ module Paperclip
       end
 
       def style_name_as_path(style_name)
-        path(style_name).sub(%r{\A/},'')
+        path(style_name).sub(%r{\A/}, "")
       end
 
-      def s3_object style_name = default_style
+      def s3_object(style_name = default_style)
         s3_bucket.object style_name_as_path(style_name)
       end
 
@@ -306,17 +301,17 @@ module Paperclip
         using_http_proxy? ? @http_proxy[:password] : nil
       end
 
-      def set_permissions permissions
-        permissions = { :default => permissions } unless permissions.respond_to?(:merge)
-        permissions.merge :default => (permissions[:default] || :"public-read")
+      def set_permissions(permissions)
+        permissions = { default: permissions } unless permissions.respond_to?(:merge)
+        permissions.merge default: (permissions[:default] || :"public-read")
       end
 
       def set_storage_class(storage_class)
-        storage_class = {:default => storage_class} unless storage_class.respond_to?(:merge)
+        storage_class = { default: storage_class } unless storage_class.respond_to?(:merge)
         storage_class
       end
 
-      def parse_credentials creds
+      def parse_credentials(creds)
         creds = creds.respond_to?(:call) ? creds.call(self) : creds
         creds = find_credentials(creds).stringify_keys
         (creds[RailsEnvironment.get] || creds).symbolize_keys
@@ -359,26 +354,26 @@ module Paperclip
 
       def flush_writes #:nodoc:
         @queued_for_write.each do |style, file|
-        retries = 0
+          retries = 0
           begin
             log("saving #{path(style)}")
             write_options = {
-              :content_type => file.content_type,
-              :acl => s3_permissions(style)
+              content_type: file.content_type,
+              acl: s3_permissions(style)
             }
 
             # add storage class for this style if defined
             storage_class = s3_storage_class(style)
-            write_options.merge!(:storage_class => storage_class) if storage_class
+            write_options.merge!(storage_class: storage_class) if storage_class
 
-            if @s3_server_side_encryption
-              write_options[:server_side_encryption] = @s3_server_side_encryption
-            end
+            write_options[:server_side_encryption] = @s3_server_side_encryption if @s3_server_side_encryption
 
             style_specific_options = styles[style]
 
             if style_specific_options
-              merge_s3_headers( style_specific_options[:s3_headers], @s3_headers, @s3_metadata) if style_specific_options[:s3_headers]
+              if style_specific_options[:s3_headers]
+                merge_s3_headers(style_specific_options[:s3_headers], @s3_headers, @s3_metadata)
+                end
               @s3_metadata.merge!(style_specific_options[:s3_metadata]) if style_specific_options[:s3_metadata]
             end
 
@@ -392,7 +387,7 @@ module Paperclip
           rescue ::Aws::S3::Errors::SlowDown
             retries += 1
             if retries <= 5
-              sleep((2 ** retries) * 0.5)
+              sleep((2**retries) * 0.5)
               retry
             else
               raise
@@ -421,11 +416,7 @@ module Paperclip
 
       def copy_to_local_file(style, local_dest_path)
         log("copying #{path(style)} to local file #{local_dest_path}")
-        ::File.open(local_dest_path, 'wb') do |local_file|
-          s3_object(style).get do |chunk|
-            local_file.write(chunk)
-          end
-        end
+        s3_object(style).download_file(local_dest_path)
       rescue Aws::Errors::ServiceError => e
         warn("#{e} - cannot copy #{path(style)} to local file #{local_dest_path}")
         false
@@ -433,12 +424,12 @@ module Paperclip
 
       private
 
-      def find_credentials creds
+      def find_credentials(creds)
         case creds
         when File
-          YAML::load(ERB.new(File.read(creds.path)).result)
+          YAML::safe_load(ERB.new(File.read(creds.path)).result)
         when String, Pathname
-          YAML::load(ERB.new(File.read(creds)).result)
+          YAML::safe_load(ERB.new(File.read(creds)).result)
         when Hash
           creds
         when NilClass
@@ -454,13 +445,14 @@ module Paperclip
 
       def merge_s3_headers(http_headers, s3_headers, s3_metadata)
         return if http_headers.nil?
+
         http_headers = http_headers.call(instance) if http_headers.respond_to?(:call)
-        http_headers.inject({}) do |headers,(name,value)|
+        http_headers.inject({}) do |_headers, (name, value)|
           case name.to_s
           when /\Ax-amz-meta-(.*)/i
             s3_metadata[$1.downcase] = value
           else
-            s3_headers[name.to_s.downcase.sub(/\Ax-amz-/,'').tr("-","_").to_sym] = value
+            s3_headers[name.to_s.downcase.sub(/\Ax-amz-/, "").tr("-", "_").to_sym] = value
           end
         end
       end

data/lib/paperclip/style.rb

@@ -1,17 +1,15 @@
-# encoding: utf-8
 module Paperclip
   # The Style class holds the definition of a thumbnail style,  applying
   # whatever processing is required to normalize the definition and delaying
   # the evaluation of block parameters until useful context is available.
 
   class Style
-
     attr_reader :name, :attachment, :format
 
     # Creates a Style object. +name+ is the name of the attachment,
     # +definition+ is the style definition from has_attached_file, which
     # can be string, array or hash
-    def initialize name, definition, attachment
+    def initialize(name, definition, attachment)
       @name = name
       @attachment = attachment
       if definition.is_a? Hash
@@ -71,8 +69,8 @@ module Paperclip
     # Arguments other than the standard geometry, format etc are just passed through from
     # initialization and any procs are called here, just before post-processing.
     def processor_options
-      args = {:style => name}
-      @other_args.each do |k,v|
+      args = { style: name }
+      @other_args.each do |k, v|
         args[k] = v.respond_to?(:call) ? v.call(attachment) : v
       end
       [:processors, :geometry, :format, :whiny, :convert_options, :source_file_options].each do |k|
@@ -104,6 +102,5 @@ module Paperclip
       base = attachment.options[:default_format]
       base.respond_to?(:call) ? base.call(attachment, name) : base
     end
-
   end
 end

data/lib/paperclip/tempfile.rb

@@ -12,7 +12,8 @@ module Paperclip
       if RUBY_PLATFORM =~ /java/
         case prefix_suffix
         when String
-          prefix, suffix = prefix_suffix, ''
+          prefix = prefix_suffix
+          suffix = ""
         when Array
           prefix, suffix = *prefix_suffix
         else
@@ -32,12 +33,10 @@ module Paperclip
     # for binary mode is ASCII-8BIT. This behavior is what's in CRuby, but not
     # in JRuby
     def binmode
-      set_encoding('ASCII-8BIT')
+      set_encoding("ASCII-8BIT")
       super
     end
   end
 end
 
-if RUBY_PLATFORM =~ /java/
-  ::Tempfile.send :include, Paperclip::TempfileEncoding
-end
+::Tempfile.include Paperclip::TempfileEncoding if RUBY_PLATFORM =~ /java/

data/lib/paperclip/tempfile_factory.rb

@@ -1,6 +1,5 @@
 module Paperclip
   class TempfileFactory
-
     def generate(name = random_name)
       @name = name
       file = Tempfile.new([basename, extension])

data/lib/paperclip/thumbnail.rb

@@ -1,13 +1,12 @@
 module Paperclip
   # Handles thumbnailing images that are uploaded.
   class Thumbnail < Processor
-
     attr_accessor :current_geometry, :target_geometry, :format, :whiny, :convert_options,
                   :source_file_options, :animated, :auto_orient, :frame_index
 
     # List of formats that we need to preserve animation
-    ANIMATED_FORMATS = %w(gif)
-    MULTI_FRAME_FORMATS = %w(.mkv .avi .mp4 .mov .mpg .mpeg .gif)
+    ANIMATED_FORMATS = %w(gif).freeze
+    MULTI_FRAME_FORMATS = %w(.mkv .avi .mp4 .mov .mpg .mpeg .gif).freeze
 
     # Creates a Thumbnail object set to work on the +file+ given. It
     # will attempt to transform the image into one defined by +target_geometry+
@@ -31,7 +30,7 @@ module Paperclip
       super
 
       geometry             = options[:geometry].to_s
-      @crop                = geometry[-1,1] == '#'
+      @crop                = geometry[-1, 1] == "#"
       @target_geometry     = options.fetch(:string_geometry_parser, Geometry).parse(geometry)
       @current_geometry    = options.fetch(:file_geometry_parser, Geometry).from_file(@file)
       @source_file_options = options[:source_file_options]
@@ -40,9 +39,7 @@ module Paperclip
       @format              = options[:format]
       @animated            = options.fetch(:animated, true)
       @auto_orient         = options.fetch(:auto_orient, true)
-      if @auto_orient && @current_geometry.respond_to?(:auto_orient)
-        @current_geometry.auto_orient
-      end
+      @current_geometry.auto_orient if @auto_orient && @current_geometry.respond_to?(:auto_orient)
       @source_file_options = @source_file_options.split(/\s+/) if @source_file_options.respond_to?(:split)
       @convert_options     = @convert_options.split(/\s+/)     if @convert_options.respond_to?(:split)
 
@@ -82,10 +79,13 @@ module Paperclip
         convert(
           parameters,
           source: "#{File.expand_path(src.path)}#{frame}",
-          dest: File.expand_path(dst.path),
+          dest: File.expand_path(dst.path)
         )
       rescue Terrapin::ExitStatusError => e
-        raise Paperclip::Error, "There was an error processing the thumbnail for #{@basename}" if @whiny
+        if @whiny
+          message = "There was an error processing the thumbnail for #{@basename}:\n" + e.message
+          raise Paperclip::Error, message
+        end
       rescue Terrapin::CommandNotFoundError => e
         raise Paperclip::Errors::CommandNotFoundError.new("Could not run the `convert` command. Please install ImageMagick.")
       end
@@ -113,13 +113,13 @@ module Paperclip
     end
 
     def animated?
-      @animated && (ANIMATED_FORMATS.include?(@format.to_s) || @format.blank?)  && identified_as_animated?
+      @animated && (ANIMATED_FORMATS.include?(@format.to_s) || @format.blank?) && identified_as_animated?
     end
 
     # Return true if ImageMagick's +identify+ returns an animated format
     def identified_as_animated?
       if @identified_as_animated.nil?
-        @identified_as_animated = ANIMATED_FORMATS.include? identify("-format %m :file", :file => "#{@file.path}[0]").to_s.downcase.strip
+        @identified_as_animated = ANIMATED_FORMATS.include? identify("-format %m :file", file: "#{@file.path}[0]").to_s.downcase.strip
       end
       @identified_as_animated
     rescue Terrapin::ExitStatusError => e

data/lib/paperclip/url_generator.rb

@@ -1,15 +1,8 @@
-require 'uri'
-require 'active_support/core_ext/module/delegation'
+require "uri"
+require "active_support/core_ext/module/delegation"
 
 module Paperclip
   class UrlGenerator
-    class << self
-      def encoder
-        @encoder ||= URI::RFC2396_Parser.new
-      end
-      delegate :escape, :unescape, to: :encoder
-    end
-
     def initialize(attachment)
       @attachment = attachment
     end
@@ -49,8 +42,8 @@ module Paperclip
 
     def timestamp_as_needed(url, options)
       if options[:timestamp] && timestamp_possible?
-        delimiter_char = url.match(/\?.+=/) ? '&' : '?'
-        "#{url}#{delimiter_char}#{@attachment.updated_at.to_s}"
+        delimiter_char = url.match(/\?.+=/) ? "&" : "?"
+        "#{url}#{delimiter_char}#{@attachment.updated_at}"
       else
         url
       end
@@ -72,7 +65,7 @@ module Paperclip
       if url.respond_to?(:escape)
         url.escape
       else
-        self.class.escape(url).gsub(escape_regex){|m| "%#{m.ord.to_s(16).upcase}" }
+        URI.escape(url).gsub(escape_regex) { |m| "%#{m.ord.to_s(16).upcase}" }
       end
     end
 

data/lib/paperclip/validators/attachment_content_type_validator.rb

@@ -2,7 +2,7 @@ module Paperclip
   module Validators
     class AttachmentContentTypeValidator < ActiveModel::EachValidator
       def initialize(options)
-        options[:allow_nil] = true unless options.has_key?(:allow_nil)
+        options[:allow_nil] = true unless options.key?(:allow_nil)
         super
       end
 
@@ -40,7 +40,7 @@ module Paperclip
       end
 
       def mark_invalid(record, attribute, types)
-        record.errors.add attribute, :invalid, options.merge(:types => types.join(', '))
+        record.errors.add attribute, :invalid, options.merge(types: types.join(", "))
       end
 
       def allowed_types
@@ -52,7 +52,7 @@ module Paperclip
       end
 
       def check_validity!
-        unless options.has_key?(:content_type) || options.has_key?(:not)
+        unless options.key?(:content_type) || options.key?(:not)
           raise ArgumentError, "You must pass in either :content_type or :not to the validator"
         end
       end

data/lib/paperclip/validators/attachment_file_name_validator.rb

@@ -2,7 +2,7 @@ module Paperclip
   module Validators
     class AttachmentFileNameValidator < ActiveModel::EachValidator
       def initialize(options)
-        options[:allow_nil] = true unless options.has_key?(:allow_nil)
+        options[:allow_nil] = true unless options.key?(:allow_nil)
         super
       end
 
@@ -28,19 +28,15 @@ module Paperclip
       end
 
       def validate_whitelist(record, attribute, value)
-        if allowed.present? && allowed.none? { |type| type === value }
-          mark_invalid record, attribute, allowed
-        end
+        mark_invalid record, attribute, allowed if allowed.present? && allowed.none? { |type| type === value }
       end
 
       def validate_blacklist(record, attribute, value)
-        if forbidden.present? && forbidden.any? { |type| type === value }
-          mark_invalid record, attribute, forbidden
-        end
+        mark_invalid record, attribute, forbidden if forbidden.present? && forbidden.any? { |type| type === value }
       end
 
       def mark_invalid(record, attribute, patterns)
-        record.errors.add attribute, :invalid, options.merge(:names => patterns.join(', '))
+        record.errors.add attribute, :invalid, options.merge(names: patterns.join(", "))
       end
 
       def allowed
@@ -52,7 +48,7 @@ module Paperclip
       end
 
       def check_validity!
-        unless options.has_key?(:matches) || options.has_key?(:not)
+        unless options.key?(:matches) || options.key?(:not)
           raise ArgumentError, "You must pass in either :matches or :not to the validator"
         end
       end
@@ -77,4 +73,3 @@ module Paperclip
     end
   end
 end
-

data/lib/paperclip/validators/attachment_file_type_ignorance_validator.rb

@@ -1,4 +1,4 @@
-require 'active_model/validations/presence'
+require "active_model/validations/presence"
 
 module Paperclip
   module Validators
@@ -26,4 +26,3 @@ module Paperclip
     end
   end
 end
-

data/lib/paperclip/validators/attachment_presence_validator.rb

@@ -1,12 +1,10 @@
-require 'active_model/validations/presence'
+require "active_model/validations/presence"
 
 module Paperclip
   module Validators
     class AttachmentPresenceValidator < ActiveModel::EachValidator
-      def validate_each(record, attribute, value)
-        if record.send("#{attribute}_file_name").blank?
-          record.errors.add(attribute, :blank, options)
-        end
+      def validate_each(record, attribute, _value)
+        record.errors.add(attribute, :blank, options) if record.send("#{attribute}_file_name").blank?
       end
 
       def self.helper_method_name

data/lib/paperclip/validators/attachment_size_validator.rb

@@ -1,9 +1,9 @@
-require 'active_model/validations/numericality'
+require "active_model/validations/numericality"
 
 module Paperclip
   module Validators
     class AttachmentSizeValidator < ActiveModel::Validations::NumericalityValidator
-      AVAILABLE_CHECKS = [:less_than, :less_than_or_equal_to, :greater_than, :greater_than_or_equal_to]
+      AVAILABLE_CHECKS = [:less_than, :less_than_or_equal_to, :greater_than, :greater_than_or_equal_to].freeze
 
       def initialize(options)
         extract_options(options)
@@ -26,12 +26,12 @@ module Paperclip
 
             unless value.send(CHECKS[option], option_value)
               error_message_key = options[:in] ? :in_between : option
-              [ attr_name, base_attr_name ].each do |error_attr_name|
+              [attr_name, base_attr_name].each do |error_attr_name|
                 record.errors.add(error_attr_name, error_message_key, filtered_options(value).merge(
-                  :min => min_value_in_human_size(record),
-                  :max => max_value_in_human_size(record),
-                  :count => human_size(option_value)
-                ))
+                                                                        min: min_value_in_human_size(record),
+                                                                        max: max_value_in_human_size(record),
+                                                                        count: human_size(option_value)
+                                                                      ))
               end
             end
           end
@@ -39,7 +39,7 @@ module Paperclip
       end
 
       def check_validity!
-        unless (AVAILABLE_CHECKS + [:in]).any? { |argument| options.has_key?(argument) }
+        unless (AVAILABLE_CHECKS + [:in]).any? { |argument| options.key?(argument) }
           raise ArgumentError, "You must pass either :less_than, :greater_than, or :in to the validator"
         end
       end

data/lib/paperclip/validators/media_type_spoof_detection_validator.rb

@@ -1,4 +1,4 @@
-require 'active_model/validations/presence'
+require "active_model/validations/presence"
 
 module Paperclip
   module Validators
@@ -8,6 +8,8 @@ module Paperclip
         if Paperclip::MediaTypeSpoofDetector.using(adapter, value.original_filename, value.content_type).spoofed?
           record.errors.add(attribute, :spoofed_media_type)
         end
+
+        adapter.tempfile.close(true) if adapter.tempfile
       end
     end