paperclip 4.3.0 → 5.0.0

data/features/step_definitions/attachment_steps.rb

@@ -10,7 +10,7 @@ end
 World(AttachmentHelpers)
 
 When /^I modify my attachment definition to:$/ do |definition|
-  content = in_current_dir { File.read("app/models/user.rb") }
+  content = cd(".") { File.read("app/models/user.rb") }
   name = content[/has_attached_file :\w+/][/:\w+/]
   content.gsub!(/has_attached_file.+end/m, <<-FILE)
       #{definition}
@@ -19,7 +19,7 @@ When /^I modify my attachment definition to:$/ do |definition|
   FILE
 
   write_file "app/models/user.rb", content
-  in_current_dir { FileUtils.rm_rf ".rbx" }
+  cd(".") { FileUtils.rm_rf ".rbx" }
 end
 
 When /^I upload the fixture "([^"]*)"$/ do |filename|
@@ -27,20 +27,20 @@ When /^I upload the fixture "([^"]*)"$/ do |filename|
 end
 
 Then /^the attachment "([^"]*)" should have a dimension of (\d+x\d+)$/ do |filename, dimension|
-  in_current_dir do
+  cd(".") do
     geometry = `identify -format "%wx%h" "#{attachment_path(filename)}"`.strip
-    geometry.should == dimension
+    expect(geometry).to eq(dimension)
   end
 end
 
 Then /^the attachment "([^"]*)" should exist$/ do |filename|
-  in_current_dir do
-    File.exist?(attachment_path(filename)).should be
+  cd(".") do
+    expect(File.exist?(attachment_path(filename))).to be true
   end
 end
 
 When /^I swap the attachment "([^"]*)" with the fixture "([^"]*)"$/ do |attachment_filename, fixture_filename|
-  in_current_dir do
+  cd(".") do
     require 'fileutils'
     FileUtils.rm_f attachment_path(attachment_filename)
     FileUtils.cp fixture_path(fixture_filename), attachment_path(attachment_filename)
@@ -48,7 +48,7 @@ When /^I swap the attachment "([^"]*)" with the fixture "([^"]*)"$/ do |attachme
 end
 
 Then /^the attachment should have the same content type as the fixture "([^"]*)"$/ do |filename|
-  in_current_dir do
+  cd(".") do
     begin
       # Use mime/types/columnar if available, for reduced memory usage
       require "mime/types/columnar"
@@ -57,32 +57,33 @@ Then /^the attachment should have the same content type as the fixture "([^"]*)"
     end
 
     attachment_content_type = `bundle exec #{runner_command} "puts User.last.attachment_content_type"`.strip
-    attachment_content_type.should == MIME::Types.type_for(filename).first.content_type
+    expected = MIME::Types.type_for(filename).first.content_type
+    expect(attachment_content_type).to eq(expected)
   end
 end
 
 Then /^the attachment should have the same file name as the fixture "([^"]*)"$/ do |filename|
-  in_current_dir do
+  cd(".") do
     attachment_file_name = `bundle exec #{runner_command} "puts User.last.attachment_file_name"`.strip
-    attachment_file_name.should == File.name(fixture_path(filename)).to_s
+    expect(attachment_file_name).to eq(File.name(fixture_path(filename)).to_s)
   end
 end
 
 Then /^the attachment should have the same file size as the fixture "([^"]*)"$/ do |filename|
-  in_current_dir do
+  cd(".") do
     attachment_file_size = `bundle exec #{runner_command} "puts User.last.attachment_file_size"`.strip
-    attachment_file_size.should == File.size(fixture_path(filename)).to_s
+    expect(attachment_file_size).to eq(File.size(fixture_path(filename)).to_s)
   end
 end
 
 Then /^the attachment file "([^"]*)" should (not )?exist$/ do |filename, not_exist|
-  in_current_dir do
-    check_file_presence([attachment_path(filename)], !not_exist)
+  cd(".") do
+    expect(attachment_path(filename)).not_to be_an_existing_file
   end
 end
 
 Then /^I should have attachment columns for "([^"]*)"$/ do |attachment_name|
-  in_current_dir do
+  cd(".") do
     columns = eval(`bundle exec #{runner_command} "puts User.columns.map{ |column| [column.name, column.type] }.inspect"`.strip)
     expect_columns = [
       ["#{attachment_name}_file_name", :string],
@@ -90,13 +91,12 @@ Then /^I should have attachment columns for "([^"]*)"$/ do |attachment_name|
       ["#{attachment_name}_file_size", :integer],
       ["#{attachment_name}_updated_at", :datetime]
     ]
-
-    expect_columns.all?{ |column| columns.include? column }.should eq true
+    expect(columns).to include(*expect_columns)
   end
 end
 
 Then /^I should not have attachment columns for "([^"]*)"$/ do |attachment_name|
-  in_current_dir do
+  cd(".") do
     columns = eval(`bundle exec #{runner_command} "puts User.columns.map{ |column| [column.name, column.type] }.inspect"`.strip)
     expect_columns = [
       ["#{attachment_name}_file_name", :string],
@@ -105,6 +105,6 @@ Then /^I should not have attachment columns for "([^"]*)"$/ do |attachment_name|
       ["#{attachment_name}_updated_at", :datetime]
     ]
 
-    expect_columns.none?{ |column| columns.include? column }.should eq true
+    expect(columns).not_to include(*expect_columns)
   end
 end

data/features/step_definitions/html_steps.rb

@@ -1,5 +1,5 @@
 Then %r{I should see an image with a path of "([^"]*)"} do |path|
-  page.should have_css("img[src^='#{path}']")
+  expect(page).to have_css("img[src^='#{path}']")
 end
 
 Then %r{^the file at "([^"]*)" is the same as "([^"]*)"$} do |web_file, path|
@@ -11,5 +11,5 @@ Then %r{^the file at "([^"]*)" is the same as "([^"]*)"$} do |web_file, path|
     page.body
   end
   actual.force_encoding("UTF-8") if actual.respond_to?(:force_encoding)
-  actual.should == expected
+  expect(actual).to eq(expected)
 end

data/features/step_definitions/rails_steps.rb

@@ -24,7 +24,7 @@ Given /^I generate a new rails application$/ do
 end
 
 Given "I fix the application.rb for 3.0.12" do
-  in_current_dir do
+  cd(".") do
     File.open("config/application.rb", "a") do |f|
       f << "ActionController::Base.config.relative_url_root = ''"
     end
@@ -32,7 +32,7 @@ Given "I fix the application.rb for 3.0.12" do
 end
 
 Given "I allow the attachment to be submitted" do
-  in_current_dir do
+  cd(".") do
     transform_file("app/controllers/users_controller.rb") do |content|
       content.gsub("params.require(:user).permit(:name)",
                    "params.require(:user).permit!")
@@ -41,7 +41,7 @@ Given "I allow the attachment to be submitted" do
 end
 
 Given "I remove turbolinks" do
-  in_current_dir do
+  cd(".") do
     transform_file("app/assets/javascripts/application.js") do |content|
       content.gsub("//= require turbolinks", "")
     end
@@ -70,7 +70,7 @@ def attach_attachment(name, definition = nil)
     snippet += definition
   end
   snippet += "\ndo_not_validate_attachment_file_type :#{name}\n"
-  in_current_dir do
+  cd(".") do
     transform_file("app/models/user.rb") do |content|
       content.sub(/end\Z/, "#{snippet}\nend")
     end
@@ -78,7 +78,7 @@ def attach_attachment(name, definition = nil)
 end
 
 Given "I empty the application.js file" do
-  in_current_dir do
+  cd(".") do
     transform_file("app/assets/javascripts/application.js") do |content|
       ""
     end
@@ -128,7 +128,7 @@ end
 
 Given /^I add this snippet to the User model:$/ do |snippet|
   file_name = "app/models/user.rb"
-  in_current_dir do
+  cd(".") do
     content = File.read(file_name)
     File.open(file_name, 'w') { |f| f << content.sub(/end\Z/, "#{snippet}\nend") }
   end
@@ -136,14 +136,14 @@ end
 
 Given /^I add this snippet to config\/application.rb:$/ do |snippet|
   file_name = "config/application.rb"
-  in_current_dir do
+  cd(".") do
     content = File.read(file_name)
     File.open(file_name, 'w') {|f| f << content.sub(/class Application < Rails::Application.*$/, "class Application < Rails::Application\n#{snippet}\n")}
   end
 end
 
 Given /^I start the rails application$/ do
-  in_current_dir do
+  cd(".") do
     require "./config/environment"
     require "capybara/rails"
   end
@@ -154,7 +154,7 @@ Given /^I reload my application$/ do
 end
 
 When /^I turn off class caching$/ do
-  in_current_dir do
+  cd(".") do
     file = "config/environments/test.rb"
     config = IO.read(file)
     config.gsub!(%r{^\s*config.cache_classes.*$},
@@ -166,7 +166,7 @@ end
 Then /^the file at "([^"]*)" should be the same as "([^"]*)"$/ do |web_file, path|
   expected = IO.read(path)
   actual = read_from_web(web_file)
-  actual.should == expected
+  expect(actual).to eq(expected)
 end
 
 When /^I configure the application to use "([^\"]+)" from this project$/ do |name|
@@ -190,15 +190,9 @@ When /^I comment out the gem "([^"]*)" from the Gemfile$/ do |gemname|
   comment_out_gem_in_gemfile gemname
 end
 
-Given /^I am using Rails newer than ([\d\.]+)$/ do |version|
-  if framework_version < version
-    pending "Not supported in Rails < #{version}"
-  end
-end
-
 Given(/^I add a "(.*?)" processor in "(.*?)"$/) do |processor, directory|
   filename = "#{directory}/#{processor}.rb"
-  in_current_dir do
+  cd(".") do
     FileUtils.mkdir_p directory
     File.open(filename, "w") do |f|
       f.write(<<-CLASS)

data/features/step_definitions/s3_steps.rb

@@ -1,11 +1,11 @@
 When /^I attach the file "([^"]*)" to "([^"]*)" on S3$/ do |file_path, field|
   definition = Paperclip::AttachmentRegistry.definitions_for(User)[field.downcase.to_sym]
-  path = "https://paperclip.s3.amazonaws.com#{definition[:path]}"
+  path = "https://paperclip.s3-us-west-2.amazonaws.com#{definition[:path]}"
   path.gsub!(':filename', File.basename(file_path))
   path.gsub!(/:([^\/\.]+)/) do |match|
     "([^\/\.]+)"
   end
-  FakeWeb.register_uri(:put, Regexp.new(path), :body => "OK")
+  FakeWeb.register_uri(:put, Regexp.new(path), :body => "<xml></xml>")
   step "I attach the file \"#{file_path}\" to \"#{field}\""
 end
 

data/features/step_definitions/web_steps.rb

@@ -103,107 +103,5 @@ When /^(?:|I )attach the file "([^"]*)" to "([^"]*)"$/ do |path, field|
 end
 
 Then /^(?:|I )should see "([^"]*)"$/ do |text|
-  if page.respond_to? :should
-    page.should have_content(text)
-  else
-    assert page.has_content?(text)
-  end
-end
-
-Then /^(?:|I )should see \/([^\/]*)\/$/ do |regexp|
-  regexp = Regexp.new(regexp)
-
-  if page.respond_to? :should
-    page.should have_xpath('//*', :text => regexp)
-  else
-    assert page.has_xpath?('//*', :text => regexp)
-  end
-end
-
-Then /^(?:|I )should not see "([^"]*)"$/ do |text|
-  if page.respond_to? :should
-    page.should have_no_content(text)
-  else
-    assert page.has_no_content?(text)
-  end
-end
-
-Then /^(?:|I )should not see \/([^\/]*)\/$/ do |regexp|
-  regexp = Regexp.new(regexp)
-
-  if page.respond_to? :should
-    page.should have_no_xpath('//*', :text => regexp)
-  else
-    assert page.has_no_xpath?('//*', :text => regexp)
-  end
-end
-
-Then /^the "([^"]*)" field(?: within (.*))? should contain "([^"]*)"$/ do |field, parent, value|
-  with_scope(parent) do
-    field = find_field(field)
-    if field.value.respond_to? :should
-      field.value.should =~ /#{value}/
-    else
-      assert_match(/#{value}/, field.value)
-    end
-  end
-end
-
-Then /^the "([^"]*)" field(?: within (.*))? should not contain "([^"]*)"$/ do |field, parent, value|
-  with_scope(parent) do
-    field = find_field(field)
-    if field.value.respond_to? :should_not
-      field.value.should_not =~ /#{value}/
-    else
-      assert_no_match(/#{value}/, field.value)
-    end
-  end
-end
-
-Then /^the "([^"]*)" checkbox(?: within (.*))? should be checked$/ do |label, parent|
-  with_scope(parent) do
-    field_checked = find_field(label)['checked']
-    if field_checked.respond_to? :should
-      field_checked.should eq true
-    else
-      assert field_checked
-    end
-  end
-end
-
-Then /^the "([^"]*)" checkbox(?: within (.*))? should not be checked$/ do |label, parent|
-  with_scope(parent) do
-    field_checked = find_field(label)['checked']
-    if field_checked.respond_to? :should
-      field_checked.should eq false
-    else
-      assert !field_checked
-    end
-  end
-end
-
-Then /^(?:|I )should be on (.+)$/ do |page_name|
-  current_path = URI.parse(current_url).path
-  if current_path.respond_to? :should
-    current_path.should == path_to(page_name)
-  else
-    assert_equal path_to(page_name), current_path
-  end
-end
-
-Then /^(?:|I )should have the following query string:$/ do |expected_pairs|
-  query = URI.parse(current_url).query
-  actual_params = query ? CGI.parse(query) : {}
-  expected_params = {}
-  expected_pairs.rows_hash.each_pair{|k,v| expected_params[k] = v.split(',')}
-
-  if actual_params.respond_to? :should
-    actual_params.should == expected_params
-  else
-    assert_equal expected_params, actual_params
-  end
-end
-
-Then /^show me the page$/ do
-  save_and_open_page
+  expect(page).to have_content(text)
 end

data/features/support/file_helpers.rb

@@ -1,6 +1,6 @@
 module FileHelpers
   def append_to(path, contents)
-    in_current_dir do
+    cd(".") do
       File.open(path, "a") do |file|
         file.puts
         file.puts contents
@@ -13,7 +13,7 @@ module FileHelpers
   end
 
   def comment_out_gem_in_gemfile(gemname)
-    in_current_dir do
+    cd(".") do
       gemfile = File.read("Gemfile")
       gemfile.sub!(/^(\s*)(gem\s*['"]#{gemname})/, "\\1# \\2")
       File.open("Gemfile", 'w'){ |file| file.write(gemfile) }

data/gemfiles/4.2.awsv2.0.gemfile

@@ -0,0 +1,17 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3", "~> 1.3.8", :platforms => :ruby
+gem "pry"
+gem "rails", "~> 4.2.0"
+gem "aws-sdk", "~> 2.0.0"
+
+group :development, :test do
+  gem "activerecord-import"
+  gem "mime-types"
+  gem "builder"
+  gem "rubocop", :require => false
+end
+
+gemspec :path => "../"

data/gemfiles/4.2.awsv2.1.gemfile

@@ -0,0 +1,17 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3", "~> 1.3.8", :platforms => :ruby
+gem "pry"
+gem "rails", "~> 4.2.0"
+gem "aws-sdk", "~> 2.1.0"
+
+group :development, :test do
+  gem "activerecord-import"
+  gem "mime-types", ">= 1.16", "< 4"
+  gem "builder"
+  gem "rubocop", :require => false
+end
+
+gemspec :path => "../"

data/gemfiles/{4.2.gemfile → 4.2.awsv2.gemfile}

@@ -9,7 +9,7 @@ gem "rubysl", :platforms => :rbx
 gem "racc", :platforms => :rbx
 gem "pry"
 gem "rails", "~> 4.2.0"
-gem "paperclip", :path => "../"
+gem "aws-sdk", "~> 2.0"
 
 group :development, :test do
   gem "mime-types", "~> 1.16"

data/gemfiles/5.0.awsv2.0.gemfile

@@ -0,0 +1,17 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3", "~> 1.3.8", :platforms => :ruby
+gem "pry"
+gem "rails", "5.0.0"
+gem "aws-sdk", "~> 2.0.0"
+
+group :development, :test do
+  gem "activerecord-import"
+  gem "mime-types", ">= 1.16", "< 4"
+  gem "builder"
+  gem "rubocop", :require => false
+end
+
+gemspec :path => "../"

data/gemfiles/5.0.awsv2.1.gemfile

@@ -0,0 +1,17 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3", "~> 1.3.8", :platforms => :ruby
+gem "pry"
+gem "rails", "5.0.0"
+gem "aws-sdk", "~> 2.1.0"
+
+group :development, :test do
+  gem "activerecord-import"
+  gem "mime-types"
+  gem "builder"
+  gem "rubocop", :require => false
+end
+
+gemspec :path => "../"

data/gemfiles/{4.1.gemfile → 5.0.awsv2.gemfile}

@@ -8,8 +8,8 @@ gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
 gem "rubysl", :platforms => :rbx
 gem "racc", :platforms => :rbx
 gem "pry"
-gem "rails", "~> 4.1.0"
-gem "paperclip", :path => "../"
+gem "rails", "~> 5.0.0"
+gem "aws-sdk", "~> 2.0"
 
 group :development, :test do
   gem "mime-types", "~> 1.16"

data/lib/paperclip/attachment.rb

@@ -2,6 +2,7 @@
 require 'uri'
 require 'paperclip/url_generator'
 require 'active_support/deprecation'
+require 'active_support/core_ext/string/inflections'
 
 module Paperclip
   # The Attachment class manages the files for a given attachment. It saves
@@ -49,7 +50,8 @@ module Paperclip
     # +url+ - a relative URL of the attachment. This is interpolated using +interpolator+
     # +path+ - where on the filesystem to store the attachment. This is interpolated using +interpolator+
     # +styles+ - a hash of options for processing the attachment. See +has_attached_file+ for the details
-    # +only_process+ - style args to be run through the post-processor. This defaults to the empty list
+    # +only_process+ - style args to be run through the post-processor. This defaults to the empty list (which is 
+    #                  a special case that indicates all styles should be processed)
     # +default_url+ - a URL for the missing image
     # +default_style+ - the style to use when an argument is not specified e.g. #url, #path
     # +storage+ - the storage mechanism. Defaults to :filesystem
@@ -68,7 +70,8 @@ module Paperclip
     # +url_generator+ - the object used to generate URLs, using the interpolator. Defaults to Paperclip::UrlGenerator
     # +escape_url+ - Perform URI escaping to URLs. Defaults to true
     def initialize(name, instance, options = {})
-      @name              = name
+      @name              = name.to_sym
+      @name_string       = name.to_s
       @instance          = instance
 
       options = self.class.default_options.deep_merge(options)
@@ -137,8 +140,6 @@ module Paperclip
     # +#for(style_name, options_hash)+
 
     def url(style_name = default_style, options = {})
-      return nil if @instance.new_record?
-
       if options == true || options == false # Backwards compatibility.
         @url_generator.for(style_name, default_options.merge(:timestamp => options))
       else
@@ -323,7 +324,7 @@ module Paperclip
       OpenSSL::HMAC.hexdigest(OpenSSL::Digest.const_get(@options[:hash_digest]).new, @options[:hash_secret], data)
     end
 
-    # This method really shouldn't be called that often. It's expected use is
+    # This method really shouldn't be called that often. Its expected use is
     # in the paperclip:refresh rake task and that's it. It will regenerate all
     # thumbnails forcefully, by reobtaining the original file and going through
     # the post-process again.
@@ -348,7 +349,7 @@ module Paperclip
 
     # Returns true if a file has been assigned.
     def file?
-      !original_filename.blank?
+      original_filename.present?
     end
 
     alias :present? :file?
@@ -367,7 +368,7 @@ module Paperclip
     # instance_write(:file_name, "me.jpg") will write "me.jpg" to the instance's
     # "avatar_file_name" field (assuming the attachment is called avatar).
     def instance_write(attr, value)
-      setter = :"#{name}_#{attr}="
+      setter = :"#{@name_string}_#{attr}="
       if instance.respond_to?(setter)
         instance.send(setter, value)
       end
@@ -376,7 +377,7 @@ module Paperclip
     # Reads the attachment-specific attribute on the instance. See instance_write
     # for more details.
     def instance_read(attr)
-      getter = :"#{name}_#{attr}"
+      getter = :"#{@name_string}_#{attr}"
       if instance.respond_to?(getter)
         instance.send(getter)
       end
@@ -404,8 +405,8 @@ module Paperclip
 
     def ensure_required_accessors! #:nodoc:
       %w(file_name).each do |field|
-        unless @instance.respond_to?("#{name}_#{field}") && @instance.respond_to?("#{name}_#{field}=")
-          raise Paperclip::Error.new("#{@instance.class} model missing required attr_accessor for '#{name}_#{field}'")
+        unless @instance.respond_to?("#{@name_string}_#{field}") && @instance.respond_to?("#{@name_string}_#{field}=")
+          raise Paperclip::Error.new("#{@instance.class} model missing required attr_accessor for '#{@name_string}_#{field}'")
         end
       end
     end
@@ -427,7 +428,7 @@ module Paperclip
     def assign_attributes
       @queued_for_write[:original] = @file
       assign_file_information
-      assign_fingerprint(@file.fingerprint)
+      assign_fingerprint { @file.fingerprint }
       assign_timestamps
     end
 
@@ -437,9 +438,9 @@ module Paperclip
       instance_write(:file_size, @file.size)
     end
 
-    def assign_fingerprint(fingerprint)
+    def assign_fingerprint
       if instance_respond_to?(:fingerprint)
-        instance_write(:fingerprint, fingerprint)
+        instance_write(:fingerprint, yield)
       end
     end
 
@@ -465,7 +466,7 @@ module Paperclip
 
     def reset_file_if_original_reprocessed
       instance_write(:file_size, @queued_for_write[:original].size)
-      assign_fingerprint(@queued_for_write[:original].fingerprint)
+      assign_fingerprint { @queued_for_write[:original].fingerprint }
       reset_updater
     end
 
@@ -501,7 +502,7 @@ module Paperclip
 
       instance.run_paperclip_callbacks(:post_process) do
         instance.run_paperclip_callbacks(:"#{name}_post_process") do
-          unless @options[:check_validity_before_processing] && instance.errors.any?
+          if !@options[:check_validity_before_processing] || !instance.errors.any?
             post_process_styles(*style_args)
           end
         end
@@ -522,7 +523,7 @@ module Paperclip
 
         @queued_for_write[name] = style.processors.inject(@queued_for_write[:original]) do |file, processor|
           file = Paperclip.processor(processor).make(file, style.processor_options, self)
-          intermediate_files << file
+          intermediate_files << file unless file == @queued_for_write[:original]
           file
         end
 
@@ -587,7 +588,7 @@ module Paperclip
 
     # You can either specifiy :restricted_characters or you can define your own
     # :filename_cleaner object. This object needs to respond to #call and takes
-    # the filename that will be cleaned. It should return the cleaned filenme.
+    # the filename that will be cleaned. It should return the cleaned filename.
     def filename_cleaner
       @options[:filename_cleaner] || FilenameCleaner.new(@options[:restricted_characters])
     end

data/lib/paperclip/attachment_registry.rb

@@ -51,7 +51,8 @@ module Paperclip
     end
 
     def definitions_for(klass)
-      klass.ancestors.each_with_object({}) do |ancestor, inherited_definitions|
+      parent_classes = klass.ancestors.reverse
+      parent_classes.each_with_object({}) do |ancestor, inherited_definitions|
         inherited_definitions.deep_merge! @attachments[ancestor]
       end
     end

data/lib/paperclip/callbacks.rb

@@ -7,7 +7,7 @@ module Paperclip
 
     module Defining
       def define_paperclip_callbacks(*callbacks)
-        define_callbacks(*[callbacks, {:terminator => callback_terminator}].flatten)
+        define_callbacks(*[callbacks, { terminator: hasta_la_vista_baby }].flatten)
         callbacks.each do |callback|
           eval <<-end_callbacks
             def before_#{callback}(*args, &blk)
@@ -22,11 +22,13 @@ module Paperclip
 
       private
 
-      def callback_terminator
-        if ::ActiveSupport::VERSION::STRING >= '4.1'
-          lambda { |target, result| result == false }
-        else
-          'result == false'
+      def hasta_la_vista_baby
+        lambda do |_, result|
+          if result.respond_to?(:call)
+            result.call == false
+          else
+            result == false
+          end
         end
       end
     end

data/lib/paperclip/content_type_detector.rb

@@ -67,8 +67,9 @@ module Paperclip
     end
 
     def type_from_mime_magic
-      @type_from_mime_magic ||=
-        MimeMagic.by_magic(File.open(@filepath)).try(:type)
+      @type_from_mime_magic ||= File.open(@filepath) do |file|
+        MimeMagic.by_magic(file).try(:type)
+      end
     end
 
     def type_from_file_command