paperclip 3.4.0 → 6.1.0

data/{test/attachment_test.rb → spec/paperclip/attachment_spec.rb}

@@ -1,185 +1,219 @@
-# encoding: utf-8
-require './test/helper'
-require 'paperclip/attachment'
+require 'spec_helper'
 
-class Dummy; end
+describe Paperclip::Attachment do
 
-class AttachmentTest < Test::Unit::TestCase
-
-  context "presence" do
-    setup do
-      rebuild_class
-      @dummy = Dummy.new
-    end
-
-    context "when file not set" do
-      should "not be present" do
-        assert @dummy.avatar.blank?
-        refute @dummy.avatar.present?
-      end
-    end
-
-    context "when file set" do
-      setup { @dummy.avatar = File.new(fixture_file("50x50.png"), "rb") }
+  it "is not present when file not set" do
+    rebuild_class
+    dummy = Dummy.new
+    expect(dummy.avatar).to be_blank
+    expect(dummy.avatar).to_not be_present
+  end
 
-      should "be present" do
-        refute @dummy.avatar.blank?
-        assert @dummy.avatar.present?
-      end
-    end
+  it "is present when the file is set" do
+    rebuild_class
+    dummy = Dummy.new
+    dummy.avatar = File.new(fixture_file("50x50.png"), "rb")
+    expect(dummy.avatar).to_not be_blank
+    expect(dummy.avatar).to be_present
   end
 
-  should "process :original style first" do
+  it "processes :original style first" do
     file = File.new(fixture_file("50x50.png"), 'rb')
-    rebuild_class :styles => { :small => '100x>', :original => '42x42#' }
+    rebuild_class styles: { small: '100x>', original: '42x42#' }
     dummy = Dummy.new
     dummy.avatar = file
     dummy.save
 
     # :small avatar should be 42px wide (processed original), not 50px (preprocessed original)
-    assert_equal `identify -format "%w" "#{dummy.avatar.path(:small)}"`.strip, "42"
+    expect(`identify -format "%w" "#{dummy.avatar.path(:small)}"`.strip).to eq "42"
 
     file.close
   end
 
-  should "not delete styles that don't get reprocessed" do
+  it "does not delete styles that don't get reprocessed" do
     file = File.new(fixture_file("50x50.png"), 'rb')
-    rebuild_class :styles => { :small => '100x>',
-                               :large => '500x>',
-                               :original => '42x42#' }
+    rebuild_class styles: {
+      small: "100x>",
+      large: "500x>",
+      original: "42x42#"
+    }
+
     dummy = Dummy.new
     dummy.avatar = file
     dummy.save
 
-    assert_file_exists(dummy.avatar.path(:small))
-    assert_file_exists(dummy.avatar.path(:large))
-    assert_file_exists(dummy.avatar.path(:original))
+    expect(dummy.avatar.path(:small)).to exist
+    expect(dummy.avatar.path(:large)).to exist
+    expect(dummy.avatar.path(:original)).to exist
 
     dummy.avatar.reprocess!(:small)
 
-    assert_file_exists(dummy.avatar.path(:small))
-    assert_file_exists(dummy.avatar.path(:large))
-    assert_file_exists(dummy.avatar.path(:original))
+    expect(dummy.avatar.path(:small)).to exist
+    expect(dummy.avatar.path(:large)).to exist
+    expect(dummy.avatar.path(:original)).to exist
   end
 
-  should "handle a boolean second argument to #url" do
+  it "reprocess works with virtual content_type attribute" do
+    rebuild_class styles: { small: "100x>" }
+    modify_table { |t| t.remove :avatar_content_type }
+    Dummy.send :attr_accessor, :avatar_content_type
+    Dummy.validates_attachment_content_type(
+      :avatar,
+      content_type: %w(image/jpeg image/png)
+    )
+    Dummy.create!(avatar: File.new(fixture_file("50x50.png"), "rb"))
+
+    dummy = Dummy.first
+    dummy.avatar.reprocess!(:small)
+
+    expect(dummy.avatar.path(:small)).to exist
+  end
+
+  context "having a not empty hash as a default option" do
+    before do
+      @old_default_options = Paperclip::Attachment.default_options.dup
+      @new_default_options = { convert_options: { all: "-background white" } }
+      Paperclip::Attachment.default_options.merge!(@new_default_options)
+    end
+
+    after do
+      Paperclip::Attachment.default_options.merge!(@old_default_options)
+    end
+
+    it "deep merges when it is overridden" do
+      new_options = { convert_options: { thumb: "-thumbnailize" } }
+      attachment = Paperclip::Attachment.new(:name, :instance, new_options)
+
+      expect(Paperclip::Attachment.default_options.deep_merge(new_options)).to eq attachment.instance_variable_get("@options")
+    end
+  end
+
+  it "handles a boolean second argument to #url" do
     mock_url_generator_builder = MockUrlGeneratorBuilder.new
-    attachment = Paperclip::Attachment.new(:name, :instance, :url_generator => mock_url_generator_builder)
+    attachment = Paperclip::Attachment.new(
+      :name,
+      FakeModel.new,
+      url_generator: mock_url_generator_builder
+      )
 
     attachment.url(:style_name, true)
-    assert mock_url_generator_builder.has_generated_url_with_options?(:timestamp => true, :escape => true)
+    expect(mock_url_generator_builder.has_generated_url_with_options?(timestamp: true, escape: true)).to eq true
 
     attachment.url(:style_name, false)
-    assert mock_url_generator_builder.has_generated_url_with_options?(:timestamp => false, :escape => true)
+    expect(mock_url_generator_builder.has_generated_url_with_options?(timestamp: false, escape: true)).to eq true
   end
 
-  should "pass the style and options through to the URL generator on #url" do
+  it "passes the style and options through to the URL generator on #url" do
     mock_url_generator_builder = MockUrlGeneratorBuilder.new
-    attachment = Paperclip::Attachment.new(:name, :instance, :url_generator => mock_url_generator_builder)
-
-    attachment.url(:style_name, :options => :values)
-    assert mock_url_generator_builder.has_generated_url_with_options?(:options => :values)
+    attachment = Paperclip::Attachment.new(
+      :name,
+      FakeModel.new,
+      url_generator: mock_url_generator_builder
+      )
+
+    attachment.url(:style_name, options: :values)
+    expect(mock_url_generator_builder.has_generated_url_with_options?(options: :values)).to eq true
   end
 
-  should "pass default options through when #url is given one argument" do
+  it "passes default options through when #url is given one argument" do
     mock_url_generator_builder = MockUrlGeneratorBuilder.new
     attachment = Paperclip::Attachment.new(:name,
-                                           :instance,
-                                           :url_generator => mock_url_generator_builder,
-                                           :use_timestamp => true)
+                                           FakeModel.new,
+                                           url_generator: mock_url_generator_builder,
+                                           use_timestamp: true)
 
     attachment.url(:style_name)
-    assert mock_url_generator_builder.has_generated_url_with_options?(:escape => true, :timestamp => true)
+    assert mock_url_generator_builder.has_generated_url_with_options?(escape: true, timestamp: true)
   end
 
-  should "pass default style and options through when #url is given no arguments" do
+  it "passes default style and options through when #url is given no arguments" do
     mock_url_generator_builder = MockUrlGeneratorBuilder.new
     attachment = Paperclip::Attachment.new(:name,
-                                           :instance,
-                                           :default_style => 'default style',
-                                           :url_generator => mock_url_generator_builder,
-                                           :use_timestamp => true)
+                                           FakeModel.new,
+                                           default_style: 'default style',
+                                           url_generator: mock_url_generator_builder,
+                                           use_timestamp: true)
 
     attachment.url
-    assert mock_url_generator_builder.has_generated_url_with_options?(:escape => true, :timestamp => true)
+    assert mock_url_generator_builder.has_generated_url_with_options?(escape: true, timestamp: true)
     assert mock_url_generator_builder.has_generated_url_with_style_name?('default style')
   end
 
-  should "pass the option :timestamp => true if :use_timestamp is true and :timestamp is not passed" do
+  it "passes the option timestamp: true if :use_timestamp is true and :timestamp is not passed" do
     mock_url_generator_builder = MockUrlGeneratorBuilder.new
     attachment = Paperclip::Attachment.new(:name,
-                                           :instance,
-                                           :url_generator => mock_url_generator_builder,
-                                           :use_timestamp => true)
+                                           FakeModel.new,
+                                           url_generator: mock_url_generator_builder,
+                                           use_timestamp: true)
 
     attachment.url(:style_name)
-    assert mock_url_generator_builder.has_generated_url_with_options?(:escape => true, :timestamp => true)
+    assert mock_url_generator_builder.has_generated_url_with_options?(escape: true, timestamp: true)
   end
 
-  should "pass the option :timestamp => false if :use_timestamp is false and :timestamp is not passed" do
+  it "passes the option timestamp: false if :use_timestamp is false and :timestamp is not passed" do
     mock_url_generator_builder = MockUrlGeneratorBuilder.new
     attachment = Paperclip::Attachment.new(:name,
-                                           :instance,
-                                           :url_generator => mock_url_generator_builder,
-                                           :use_timestamp => false)
+                                           FakeModel.new,
+                                           url_generator: mock_url_generator_builder,
+                                           use_timestamp: false)
 
     attachment.url(:style_name)
-    assert mock_url_generator_builder.has_generated_url_with_options?(:escape => true, :timestamp => false)
+    assert mock_url_generator_builder.has_generated_url_with_options?(escape: true, timestamp: false)
   end
 
-  should "not change the :timestamp if :timestamp is passed" do
+  it "does not change the :timestamp if :timestamp is passed" do
     mock_url_generator_builder = MockUrlGeneratorBuilder.new
     attachment = Paperclip::Attachment.new(:name,
-                                           :instance,
-                                           :url_generator => mock_url_generator_builder,
-                                           :use_timestamp => false)
+                                           FakeModel.new,
+                                           url_generator: mock_url_generator_builder,
+                                           use_timestamp: false)
 
-    attachment.url(:style_name, :timestamp => true)
-    assert mock_url_generator_builder.has_generated_url_with_options?(:escape => true, :timestamp => true)
+    attachment.url(:style_name, timestamp: true)
+    assert mock_url_generator_builder.has_generated_url_with_options?(escape: true, timestamp: true)
   end
 
-  should "render JSON as default style" do
+  it "renders JSON as default style" do
     mock_url_generator_builder = MockUrlGeneratorBuilder.new
     attachment = Paperclip::Attachment.new(:name,
-                                           :instance,
-                                           :default_style => 'default style',
-                                           :url_generator => mock_url_generator_builder)
+                                           FakeModel.new,
+                                           default_style: 'default style',
+                                           url_generator: mock_url_generator_builder)
 
-    attachment_json = attachment.as_json
+    attachment.as_json
     assert mock_url_generator_builder.has_generated_url_with_style_name?('default style')
   end
 
-  should "pass the option :escape => true if :escape_url is true and :escape is not passed" do
+  it "passes the option escape: true if :escape_url is true and :escape is not passed" do
     mock_url_generator_builder = MockUrlGeneratorBuilder.new
     attachment = Paperclip::Attachment.new(:name,
-                                           :instance,
-                                           :url_generator => mock_url_generator_builder,
-                                           :escape_url => true)
+                                           FakeModel.new,
+                                           url_generator: mock_url_generator_builder,
+                                           escape_url: true)
 
     attachment.url(:style_name)
-    assert mock_url_generator_builder.has_generated_url_with_options?(:escape => true)
+    assert mock_url_generator_builder.has_generated_url_with_options?(escape: true)
   end
 
-  should "pass the option :escape => false if :escape_url is false and :escape is not passed" do
+  it "passes the option escape: false if :escape_url is false and :escape is not passed" do
     mock_url_generator_builder = MockUrlGeneratorBuilder.new
     attachment = Paperclip::Attachment.new(:name,
-                                           :instance,
-                                           :url_generator => mock_url_generator_builder,
-                                           :escape_url => false)
+                                           FakeModel.new,
+                                           url_generator: mock_url_generator_builder,
+                                           escape_url: false)
 
     attachment.url(:style_name)
-    assert mock_url_generator_builder.has_generated_url_with_options?(:escape => false)
+    assert mock_url_generator_builder.has_generated_url_with_options?(escape: false)
   end
 
-  should "return the path based on the url by default" do
-    @attachment = attachment :url => "/:class/:id/:basename"
+  it "returns the path based on the url by default" do
+    @attachment = attachment url: "/:class/:id/:basename"
     @model = @attachment.instance
     @model.id = 1234
     @model.avatar_file_name = "fake.jpg"
     assert_equal "#{Rails.root}/public/fake_models/1234/fake", @attachment.path
   end
 
-  should "default to a path that scales" do
+  it "defaults to a path that scales" do
     avatar_attachment = attachment
     model = avatar_attachment.instance
     model.id = 1234
@@ -188,7 +222,7 @@ class AttachmentTest < Test::Unit::TestCase
     assert_equal expected_path, avatar_attachment.path
   end
 
-  should "render JSON as the URL to the attachment" do
+  it "renders JSON as the URL to the attachment" do
     avatar_attachment = attachment
     model = avatar_attachment.instance
     model.id = 1234
@@ -196,32 +230,33 @@ class AttachmentTest < Test::Unit::TestCase
     assert_equal attachment.url, attachment.as_json
   end
 
-  should "render JSON from the model when requested by :methods" do
+  it "renders JSON from the model when requested by :methods" do
     rebuild_model
     dummy = Dummy.new
     dummy.id = 1234
     dummy.avatar_file_name = "fake.jpg"
-    expected_string = '{"dummy":{"avatar":"/system/dummies/avatars/000/001/234/original/fake.jpg"}}'
+    dummy.stubs(:new_record?).returns(false)
+    expected_string = '{"avatar":"/system/dummies/avatars/000/001/234/original/fake.jpg"}'
     # active_model pre-3.2 checks only by calling any? on it, thus it doesn't work if it is empty
-    assert_equal expected_string, dummy.to_json(:only => [:dummy_key_for_old_active_model], :methods => [:avatar])
+    assert_equal expected_string, dummy.to_json(only: [:dummy_key_for_old_active_model], methods: [:avatar])
   end
 
   context "Attachment default_options" do
-    setup do
+    before do
       rebuild_model
       @old_default_options = Paperclip::Attachment.default_options.dup
       @new_default_options = @old_default_options.merge({
-        :path => "argle/bargle",
-        :url => "fooferon",
-        :default_url => "not here.png"
+        path: "argle/bargle",
+        url: "fooferon",
+        default_url: "not here.png"
       })
     end
 
-    teardown do
+    after do
       Paperclip::Attachment.default_options.merge! @old_default_options
     end
 
-    should "be overrideable" do
+    it "is overrideable" do
       Paperclip::Attachment.default_options.merge!(@new_default_options)
       @new_default_options.keys.each do |key|
         assert_equal @new_default_options[key],
@@ -230,41 +265,46 @@ class AttachmentTest < Test::Unit::TestCase
     end
 
     context "without an Attachment" do
-      setup do
+      before do
+        rebuild_model default_url: "default.url"
         @dummy = Dummy.new
       end
 
-      should "return false when asked exists?" do
+      it "returns false when asked exists?" do
         assert !@dummy.avatar.exists?
       end
+
+      it "#url returns the default_url" do
+        expect(@dummy.avatar.url).to eq "default.url"
+      end
     end
 
     context "on an Attachment" do
-      setup do
+      before do
         @dummy = Dummy.new
         @attachment = @dummy.avatar
       end
 
       Paperclip::Attachment.default_options.keys.each do |key|
-        should "be the default_options for #{key}" do
+        it "is the default_options for #{key}" do
           assert_equal @old_default_options[key],
                        @attachment.instance_variable_get("@options")[key],
-                       key
+                       key.to_s
         end
       end
 
       context "when redefined" do
-        setup do
+        before do
           Paperclip::Attachment.default_options.merge!(@new_default_options)
           @dummy = Dummy.new
           @attachment = @dummy.avatar
         end
 
         Paperclip::Attachment.default_options.keys.each do |key|
-          should "be the new default_options for #{key}" do
+          it "is the new default_options for #{key}" do
             assert_equal @new_default_options[key],
                          @attachment.instance_variable_get("@options")[key],
-                         key
+                         key.to_s
           end
         end
       end
@@ -272,23 +312,23 @@ class AttachmentTest < Test::Unit::TestCase
   end
 
   context "An attachment with similarly named interpolations" do
-    setup do
-      rebuild_model :path => ":id.omg/:id-bbq/:idwhat/:id_partition.wtf"
+    before do
+      rebuild_model path: ":id.omg/:id-bbq/:idwhat/:id_partition.wtf"
       @dummy = Dummy.new
       @dummy.stubs(:id).returns(1024)
       @file = File.new(fixture_file("5k.png"), 'rb')
       @dummy.avatar = @file
     end
 
-    teardown { @file.close }
+    after { @file.close }
 
-    should "make sure that they are interpolated correctly" do
+    it "makes sure that they are interpolated correctly" do
       assert_equal "1024.omg/1024-bbq/1024what/000/001/024.wtf", @dummy.avatar.path
     end
   end
 
   context "An attachment with :timestamp interpolations" do
-    setup do
+    before do
       @file = StringIO.new("...")
       @zone = 'UTC'
       Time.stubs(:zone).returns(@zone)
@@ -297,78 +337,77 @@ class AttachmentTest < Test::Unit::TestCase
     end
 
     context "using default time zone" do
-      setup do
-        rebuild_model :path => ":timestamp", :use_default_time_zone => true
+      before do
+        rebuild_model path: ":timestamp", use_default_time_zone: true
         @dummy = Dummy.new
         @dummy.avatar = @file
       end
 
-      should "return a time in the default zone" do
+      it "returns a time in the default zone" do
         assert_equal @dummy.avatar_updated_at.in_time_zone(@zone_default).to_s, @dummy.avatar.path
       end
     end
 
     context "using per-thread time zone" do
-      setup do
-        rebuild_model :path => ":timestamp", :use_default_time_zone => false
+      before do
+        rebuild_model path: ":timestamp", use_default_time_zone: false
         @dummy = Dummy.new
         @dummy.avatar = @file
       end
 
-      should "return a time in the per-thread zone" do
+      it "returns a time in the per-thread zone" do
         assert_equal @dummy.avatar_updated_at.in_time_zone(@zone).to_s, @dummy.avatar.path
       end
     end
   end
 
   context "An attachment with :hash interpolations" do
-    setup do
-      @file = StringIO.new("...")
+    before do
+      @file = File.open(fixture_file("5k.png"))
     end
 
-    should "raise if no secret is provided" do
-      @attachment = attachment :path => ":hash"
+    after do
+      @file.close
+    end
+
+    it "raises if no secret is provided" do
+      rebuild_model path: ":hash"
+      @attachment = Dummy.new.avatar
       @attachment.assign @file
 
-      assert_raise ArgumentError do
+      assert_raises ArgumentError do
         @attachment.path
       end
     end
 
     context "when secret is set" do
-      setup do
-        @attachment = attachment :path => ":hash", :hash_secret => "w00t"
-        @attachment.stubs(:instance_read).with(:updated_at).returns(Time.at(1234567890))
-        @attachment.stubs(:instance_read).with(:file_name).returns("bla.txt")
-        @attachment.instance.id = 1234
+      before do
+        rebuild_model path: ":hash",
+          hash_secret: "w00t",
+          hash_data: ":class/:attachment/:style/:filename"
+        @attachment = Dummy.new.avatar
         @attachment.assign @file
       end
 
-      should "interpolate the hash data" do
-        @attachment.expects(:interpolate).with(@attachment.options[:hash_data],anything).returns("interpolated_stuff")
-        @attachment.hash_key
+      it "results in the correct interpolation" do
+        assert_equal "dummies/avatars/original/5k.png",
+          @attachment.send(:interpolate, @attachment.options[:hash_data])
+        assert_equal "dummies/avatars/thumb/5k.png",
+          @attachment.send(:interpolate, @attachment.options[:hash_data], :thumb)
       end
 
-      should "result in the correct interpolation" do
-        assert_equal "fake_models/avatars/1234/original/1234567890", @attachment.send(:interpolate,@attachment.options[:hash_data])
-      end
-
-      should "result in a correct hash" do
-        assert_equal "d22b617d1bf10016aa7d046d16427ae203f39fce", @attachment.path
-      end
-
-      should "generate a hash digest with the correct style" do
-        OpenSSL::HMAC.expects(:hexdigest).with(anything, anything, "fake_models/avatars/1234/medium/1234567890")
-        @attachment.path("medium")
+      it "results in a correct hash" do
+        assert_equal "0a59e9142bba11576de1d353d8747b1acad5ad34", @attachment.path
+        assert_equal "b39a062c1e62e85a6c785ed00cf3bebf5f850e2b", @attachment.path(:thumb)
       end
     end
   end
 
   context "An attachment with a :rails_env interpolation" do
-    setup do
+    before do
       @rails_env = "blah"
       @id = 1024
-      rebuild_model :path => ":rails_env/:id.png"
+      rebuild_model path: ":rails_env/:id.png"
       @dummy = Dummy.new
       @dummy.stubs(:id).returns(@id)
       @file = StringIO.new(".")
@@ -376,83 +415,84 @@ class AttachmentTest < Test::Unit::TestCase
       Rails.stubs(:env).returns(@rails_env)
     end
 
-    should "return the proper path" do
+    it "returns the proper path" do
       assert_equal "#{@rails_env}/#{@id}.png", @dummy.avatar.path
     end
   end
 
   context "An attachment with a default style and an extension interpolation" do
-    setup do
-      @attachment = attachment :path => ":basename.:extension",
-                               :styles => { :default => ["100x100", :png] },
-                               :default_style => :default
-      @file = StringIO.new("...")
-      @file.stubs(:original_filename).returns("file.jpg")
+    before do
+      rebuild_model path: ":basename.:extension",
+        styles: { default: ["100x100", :jpg] },
+        default_style: :default
+      @attachment = Dummy.new.avatar
+      @file = File.open(fixture_file("5k.png"))
+      @file.stubs(:original_filename).returns("file.png")
     end
-    should "return the right extension for the path" do
+    it "returns the right extension for the path" do
       @attachment.assign(@file)
-      assert_equal "file.png", @attachment.path
+      assert_equal "file.jpg", @attachment.path
     end
   end
 
   context "An attachment with :convert_options" do
-    setup do
-      rebuild_model :styles => {
-                      :thumb => "100x100",
-                      :large => "400x400"
+    before do
+      rebuild_model styles: {
+                      thumb: "100x100",
+                      large: "400x400"
                     },
-                    :convert_options => {
-                      :all => "-do_stuff",
-                      :thumb => "-thumbnailize"
+                    convert_options: {
+                      all: "-do_stuff",
+                      thumb: "-thumbnailize"
                     }
       @dummy = Dummy.new
       @dummy.avatar
     end
 
-    should "report the correct options when sent #extra_options_for(:thumb)" do
+    it "reports the correct options when sent #extra_options_for(:thumb)" do
       assert_equal "-thumbnailize -do_stuff", @dummy.avatar.send(:extra_options_for, :thumb), @dummy.avatar.convert_options.inspect
     end
 
-    should "report the correct options when sent #extra_options_for(:large)" do
+    it "reports the correct options when sent #extra_options_for(:large)" do
       assert_equal "-do_stuff", @dummy.avatar.send(:extra_options_for, :large)
     end
   end
 
   context "An attachment with :source_file_options" do
-    setup do
-      rebuild_model :styles => {
-                      :thumb => "100x100",
-                      :large => "400x400"
+    before do
+      rebuild_model styles: {
+                      thumb: "100x100",
+                      large: "400x400"
                     },
-                    :source_file_options => {
-                      :all => "-density 400",
-                      :thumb => "-depth 8"
+                    source_file_options: {
+                      all: "-density 400",
+                      thumb: "-depth 8"
                     }
       @dummy = Dummy.new
       @dummy.avatar
     end
 
-    should "report the correct options when sent #extra_source_file_options_for(:thumb)" do
+    it "reports the correct options when sent #extra_source_file_options_for(:thumb)" do
       assert_equal "-depth 8 -density 400", @dummy.avatar.send(:extra_source_file_options_for, :thumb), @dummy.avatar.source_file_options.inspect
     end
 
-    should "report the correct options when sent #extra_source_file_options_for(:large)" do
+    it "reports the correct options when sent #extra_source_file_options_for(:large)" do
       assert_equal "-density 400", @dummy.avatar.send(:extra_source_file_options_for, :large)
     end
   end
 
   context "An attachment with :only_process" do
-    setup do
-      rebuild_model :styles => {
-                      :thumb => "100x100",
-                      :large => "400x400"
+    before do
+      rebuild_model styles: {
+                      thumb: "100x100",
+                      large: "400x400"
                     },
-                    :only_process => [:thumb]
+                    only_process: [:thumb]
       @file = StringIO.new("...")
       @attachment = Dummy.new.avatar
     end
 
-    should "only process the provided style" do
+    it "only processes the provided style" do
       @attachment.expects(:post_process).with(:thumb)
       @attachment.expects(:post_process).with(:large).never
       @attachment.assign(@file)
@@ -460,33 +500,34 @@ class AttachmentTest < Test::Unit::TestCase
   end
 
   context "An attachment with :only_process that is a proc" do
-    setup do
-      rebuild_model :styles => {
-                      :thumb => "100x100",
-                      :large => "400x400"
+    before do
+      rebuild_model styles: {
+                      thumb: "100x100",
+                      large: "400x400"
                     },
-                    :only_process => lambda { |attachment| [:thumb] }
+                    only_process: lambda { |attachment| [:thumb] }
 
       @file = StringIO.new("...")
       @attachment = Dummy.new.avatar
     end
 
-    should "only process the provided style" do
+    it "only processes the provided style" do
       @attachment.expects(:post_process).with(:thumb)
       @attachment.expects(:post_process).with(:large).never
       @attachment.assign(@file)
+      @attachment.save
     end
   end
 
   context "An attachment with :convert_options that is a proc" do
-    setup do
-      rebuild_model :styles => {
-                      :thumb => "100x100",
-                      :large => "400x400"
+    before do
+      rebuild_model styles: {
+                      thumb: "100x100",
+                      large: "400x400"
                     },
-                    :convert_options => {
-                      :all => lambda{|i| i.all },
-                      :thumb => lambda{|i| i.thumb }
+                    convert_options: {
+                      all: lambda{|i| i.all },
+                      thumb: lambda{|i| i.thumb }
                     }
       Dummy.class_eval do
         def all;   "-all";   end
@@ -496,54 +537,54 @@ class AttachmentTest < Test::Unit::TestCase
       @dummy.avatar
     end
 
-    should "report the correct options when sent #extra_options_for(:thumb)" do
+    it "reports the correct options when sent #extra_options_for(:thumb)" do
       assert_equal "-thumb -all", @dummy.avatar.send(:extra_options_for, :thumb), @dummy.avatar.convert_options.inspect
     end
 
-    should "report the correct options when sent #extra_options_for(:large)" do
+    it "reports the correct options when sent #extra_options_for(:large)" do
       assert_equal "-all", @dummy.avatar.send(:extra_options_for, :large)
     end
   end
 
   context "An attachment with :path that is a proc" do
-    setup do
-      rebuild_model :path => lambda{ |attachment| "path/#{attachment.instance.other}.:extension" }
+    before do
+      rebuild_model path: lambda{ |attachment| "path/#{attachment.instance.other}.:extension" }
 
       @file = File.new(fixture_file("5k.png"), 'rb')
-      @dummyA = Dummy.new(:other => 'a')
+      @dummyA = Dummy.new(other: 'a')
       @dummyA.avatar = @file
-      @dummyB = Dummy.new(:other => 'b')
+      @dummyB = Dummy.new(other: 'b')
       @dummyB.avatar = @file
     end
 
-    teardown { @file.close }
+    after { @file.close }
 
-    should "return correct path" do
+    it "returns correct path" do
       assert_equal "path/a.png", @dummyA.avatar.path
       assert_equal "path/b.png", @dummyB.avatar.path
     end
   end
 
   context "An attachment with :styles that is a proc" do
-    setup do
-      rebuild_model :styles => lambda{ |attachment| {:thumb => "50x50#", :large => "400x400"} }
+    before do
+      rebuild_model styles: lambda{ |attachment| {thumb: "50x50#", large: "400x400"} }
 
       @attachment = Dummy.new.avatar
     end
 
-    should "have the correct geometry" do
+    it "has the correct geometry" do
       assert_equal "50x50#", @attachment.styles[:thumb][:geometry]
     end
   end
 
   context "An attachment with conditional :styles that is a proc" do
-    setup do
-      rebuild_model :styles => lambda{ |attachment| attachment.instance.other == 'a' ? {:thumb => "50x50#"} : {:large => "400x400"} }
+    before do
+      rebuild_model styles: lambda{ |attachment| attachment.instance.other == 'a' ? {thumb: "50x50#"} : {large: "400x400"} }
 
-      @dummy = Dummy.new(:other => 'a')
+      @dummy = Dummy.new(other: 'a')
     end
 
-    should "have the correct styles for the assigned instance values" do
+    it "has the correct styles for the assigned instance values" do
       assert_equal "50x50#", @dummy.avatar.styles[:thumb][:geometry]
       assert_nil @dummy.avatar.styles[:large]
 
@@ -557,22 +598,22 @@ class AttachmentTest < Test::Unit::TestCase
   geometry_specs = [
     [ lambda{|z| "50x50#" }, :png ],
     lambda{|z| "50x50#" },
-    { :geometry => lambda{|z| "50x50#" } }
+    { geometry: lambda{|z| "50x50#" } }
   ]
   geometry_specs.each do |geometry_spec|
     context "An attachment geometry like #{geometry_spec}" do
-      setup do
-        rebuild_model :styles => { :normal => geometry_spec }
+      before do
+        rebuild_model styles: { normal: geometry_spec }
         @attachment = Dummy.new.avatar
       end
 
       context "when assigned" do
-        setup do
+        before do
           @file = StringIO.new(".")
           @attachment.assign(@file)
         end
 
-        should "have the correct geometry" do
+        it "has the correct geometry" do
           assert_equal "50x50#", @attachment.styles[:normal][:geometry]
         end
       end
@@ -580,122 +621,178 @@ class AttachmentTest < Test::Unit::TestCase
   end
 
   context "An attachment with both 'normal' and hash-style styles" do
-    setup do
-      rebuild_model :styles => {
-                      :normal => ["50x50#", :png],
-                      :hash => { :geometry => "50x50#", :format => :png }
+    before do
+      rebuild_model styles: {
+                      normal: ["50x50#", :png],
+                      hash: { geometry: "50x50#", format: :png }
                     }
       @dummy = Dummy.new
       @attachment = @dummy.avatar
     end
 
     [:processors, :whiny, :convert_options, :geometry, :format].each do |field|
-      should "have the same #{field} field" do
+      it "has the same #{field} field" do
         assert_equal @attachment.styles[:normal][field], @attachment.styles[:hash][field]
       end
     end
   end
 
   context "An attachment with :processors that is a proc" do
-    setup do
+    before do
       class Paperclip::Test < Paperclip::Processor; end
       @file = StringIO.new("...")
       Paperclip::Test.stubs(:make).returns(@file)
 
-      rebuild_model :styles => { :normal => '' }, :processors => lambda { |a| [ :test ] }
+      rebuild_model styles: { normal: '' }, processors: lambda { |a| [ :test ] }
       @attachment = Dummy.new.avatar
     end
 
     context "when assigned" do
-      setup do
+      before do
         @attachment.assign(StringIO.new("."))
       end
 
-      should "have the correct processors" do
+      it "has the correct processors" do
         assert_equal [ :test ], @attachment.styles[:normal][:processors]
       end
     end
   end
 
   context "An attachment with erroring processor" do
-    setup do
-      rebuild_model :processor => [:thumbnail], :styles => { :small => '' }, :whiny_thumbnails => true
+    before do
+      rebuild_model processor: [:thumbnail], styles: { small: '' }, whiny_thumbnails: true
       @dummy = Dummy.new
-      Paperclip::Thumbnail.expects(:make).raises(Paperclip::Error, "cannot be processed.")
       @file = StringIO.new("...")
       @file.stubs(:to_tempfile).returns(@file)
-      @dummy.avatar = @file
     end
 
-    should "correctly forward processing error message to the instance" do
-      @dummy.valid?
-      assert_contains @dummy.errors.full_messages, "Avatar cannot be processed."
+    context "when error is meaningful for the end user" do
+      before do
+        Paperclip::Thumbnail.expects(:make).raises(
+          Paperclip::Errors::NotIdentifiedByImageMagickError,
+          "cannot be processed."
+        )
+      end
+
+      it "correctly forwards processing error message to the instance" do
+        @dummy.avatar = @file
+        @dummy.valid?
+        assert_contains(
+          @dummy.errors.full_messages,
+          "Avatar cannot be processed."
+        )
+      end
+    end
+
+    context "when error is intended for the developer" do
+      before do
+        Paperclip::Thumbnail.expects(:make).raises(
+          Paperclip::Errors::CommandNotFoundError
+        )
+      end
+
+      it "propagates the error" do
+        assert_raises(Paperclip::Errors::CommandNotFoundError) do
+          @dummy.avatar = @file
+        end
+      end
     end
   end
 
   context "An attachment with multiple processors" do
-    setup do
+    before do
       class Paperclip::Test < Paperclip::Processor; end
-      @style_params = { :once => {:one => 1, :two => 2} }
-      rebuild_model :processors => [:thumbnail, :test], :styles => @style_params
+      @style_params = { once: {one: 1, two: 2} }
+      rebuild_model processors: [:thumbnail, :test], styles: @style_params
       @dummy = Dummy.new
       @file = StringIO.new("...")
-      @file.stubs(:to_tempfile).returns(@file)
+      @file.stubs(:close)
       Paperclip::Test.stubs(:make).returns(@file)
       Paperclip::Thumbnail.stubs(:make).returns(@file)
     end
 
     context "when assigned" do
-      setup { @dummy.avatar = @file }
+      it "calls #make on all specified processors" do
+        @dummy.avatar = @file
 
-      before_should "call #make on all specified processors" do
-        Paperclip::Thumbnail.expects(:make).with(any_parameters).returns(@file)
-        Paperclip::Test.expects(:make).with(any_parameters).returns(@file)
+        expect(Paperclip::Thumbnail).to have_received(:make)
+        expect(Paperclip::Test).to have_received(:make)
       end
 
-      before_should "call #make with the right parameters passed as second argument" do
+      it "calls #make with the right parameters passed as second argument" do
         expected_params = @style_params[:once].merge({
-          :processors => [:thumbnail, :test],
-          :whiny => true,
-          :convert_options => "",
-          :source_file_options => ""
+          style: :once,
+          processors: [:thumbnail, :test],
+          whiny: true,
+          convert_options: "",
+          source_file_options: ""
         })
-        Paperclip::Thumbnail.expects(:make).with(anything, expected_params, anything).returns(@file)
+
+        @dummy.avatar = @file
+
+        expect(Paperclip::Thumbnail).to have_received(:make).with(anything, expected_params, anything)
+      end
+
+      it "calls #make with attachment passed as third argument" do
+        @dummy.avatar = @file
+
+        expect(Paperclip::Test).to have_received(:make).with(anything, anything, @dummy.avatar)
       end
 
-      before_should "call #make with attachment passed as third argument" do
-        Paperclip::Test.expects(:make).with(anything, anything, @dummy.avatar).returns(@file)
+      it "calls #make and unlinks intermediary files afterward" do
+        @dummy.avatar.expects(:unlink_files).with([@file, @file])
+
+        @dummy.avatar = @file
       end
     end
   end
 
-  should "include the filesystem module when loading the filesystem storage" do
-    rebuild_model :storage => :filesystem
+  context "An attachment with a processor that returns original file" do
+    before do
+      class Paperclip::Test < Paperclip::Processor
+        def make; @file; end
+      end
+      rebuild_model processors: [:test], styles: { once: "100x100" }
+      @file = StringIO.new("...")
+      @file.stubs(:close)
+      @dummy = Dummy.new
+    end
+
+    context "when assigned" do
+      it "#calls #make and doesn't unlink the original file" do
+        @dummy.avatar.expects(:unlink_files).with([])
+
+        @dummy.avatar = @file
+      end
+    end
+  end
+
+  it "includes the filesystem module when loading the filesystem storage" do
+    rebuild_model storage: :filesystem
     @dummy = Dummy.new
     assert @dummy.avatar.is_a?(Paperclip::Storage::Filesystem)
   end
 
-  should "include the filesystem module even if capitalization is wrong" do
-    rebuild_model :storage => :FileSystem
+  it "includes the filesystem module even if capitalization is wrong" do
+    rebuild_model storage: :FileSystem
     @dummy = Dummy.new
     assert @dummy.avatar.is_a?(Paperclip::Storage::Filesystem)
 
-    rebuild_model :storage => :Filesystem
+    rebuild_model storage: :Filesystem
     @dummy = Dummy.new
     assert @dummy.avatar.is_a?(Paperclip::Storage::Filesystem)
   end
 
-  should "convert underscored storage name to camelcase" do
-    rebuild_model :storage => :not_here
+  it "converts underscored storage name to camelcase" do
+    rebuild_model storage: :not_here
     @dummy = Dummy.new
-    exception = assert_raises(Paperclip::Errors::StorageMethodNotFound) do
+    exception = assert_raises(Paperclip::Errors::StorageMethodNotFound, /NotHere/) do
       @dummy.avatar
     end
-    assert exception.message.include?("NotHere")
   end
 
-  should "raise an error if you try to include a storage module that doesn't exist" do
-    rebuild_model :storage => :not_here
+  it "raises an error if you try to include a storage module that doesn't exist" do
+    rebuild_model storage: :not_here
     @dummy = Dummy.new
     assert_raises(Paperclip::Errors::StorageMethodNotFound) do
       @dummy.avatar
@@ -703,30 +800,30 @@ class AttachmentTest < Test::Unit::TestCase
   end
 
   context "An attachment with styles but no processors defined" do
-    setup do
-      rebuild_model :processors => [], :styles => {:something => '1'}
+    before do
+      rebuild_model processors: [], styles: {something: '1'}
       @dummy = Dummy.new
       @file = StringIO.new("...")
     end
-    should "raise when assigned to" do
+    it "raises when assigned to" do
       assert_raises(RuntimeError){ @dummy.avatar = @file }
     end
   end
 
   context "An attachment without styles and with no processors defined" do
-    setup do
-      rebuild_model :processors => [], :styles => {}
+    before do
+      rebuild_model processors: [], styles: {}
       @dummy = Dummy.new
       @file = StringIO.new("...")
     end
-    should "not raise when assigned to" do
+    it "does not raise when assigned to" do
       @dummy.avatar = @file
     end
   end
 
   context "Assigning an attachment with post_process hooks" do
-    setup do
-      rebuild_class :styles => { :something => "100x100#" }
+    before do
+      rebuild_class styles: { something: "100x100#" }
       Dummy.class_eval do
         before_avatar_post_process :do_before_avatar
         after_avatar_post_process :do_after_avatar
@@ -744,7 +841,7 @@ class AttachmentTest < Test::Unit::TestCase
       @attachment = @dummy.avatar
     end
 
-    should "call the defined callbacks when assigned" do
+    it "calls the defined callbacks when assigned" do
       @dummy.expects(:do_before_avatar).with()
       @dummy.expects(:do_after_avatar).with()
       @dummy.expects(:do_before_all).with()
@@ -753,7 +850,7 @@ class AttachmentTest < Test::Unit::TestCase
       @dummy.avatar = @file
     end
 
-    should "not cancel the processing if a before_post_process returns nil" do
+    it "does not cancel the processing if a before_post_process returns nil" do
       @dummy.expects(:do_before_avatar).with().returns(nil)
       @dummy.expects(:do_after_avatar).with()
       @dummy.expects(:do_before_all).with().returns(nil)
@@ -762,7 +859,7 @@ class AttachmentTest < Test::Unit::TestCase
       @dummy.avatar = @file
     end
 
-    should "cancel the processing if a before_post_process returns false" do
+    it "cancels the processing if a before_post_process returns false" do
       @dummy.expects(:do_before_avatar).never
       @dummy.expects(:do_after_avatar).never
       @dummy.expects(:do_before_all).with().returns(false)
@@ -771,7 +868,7 @@ class AttachmentTest < Test::Unit::TestCase
       @dummy.avatar = @file
     end
 
-    should "cancel the processing if a before_avatar_post_process returns false" do
+    it "cancels the processing if a before_avatar_post_process returns false" do
       @dummy.expects(:do_before_avatar).with().returns(false)
       @dummy.expects(:do_after_avatar)
       @dummy.expects(:do_before_all).with().returns(true)
@@ -782,37 +879,37 @@ class AttachmentTest < Test::Unit::TestCase
   end
 
   context "Assigning an attachment" do
-    setup do
-      rebuild_model :styles => { :something => "100x100#" }
+    before do
+      rebuild_model styles: { something: "100x100#" }
       @file = File.new(fixture_file("5k.png"), "rb")
       @dummy = Dummy.new
       @dummy.avatar = @file
     end
 
-    should "strip whitespace from original_filename field" do
+    it "strips whitespace from original_filename field" do
       assert_equal "5k.png", @dummy.avatar.original_filename
     end
 
-    should "strip whitespace from content_type field" do
+    it "strips whitespace from content_type field" do
       assert_equal "image/png", @dummy.avatar.instance.avatar_content_type
     end
   end
 
   context "Assigning an attachment" do
-    setup do
-      rebuild_model :styles => { :something => "100x100#" }
+    before do
+      rebuild_model styles: { something: "100x100#" }
       @file = File.new(fixture_file("5k.png"), "rb")
       @dummy = Dummy.new
       @dummy.avatar = @file
     end
 
-    should "make sure the content_type is a string" do
+    it "makes sure the content_type is a string" do
       assert_equal "image/png", @dummy.avatar.instance.avatar_content_type
     end
   end
 
   context "Attachment with strange letters" do
-    setup do
+    before do
       rebuild_model
       @file = File.new(fixture_file("5k.png"), "rb")
       @file.stubs(:original_filename).returns("sheep_say_bæ.png")
@@ -820,18 +917,18 @@ class AttachmentTest < Test::Unit::TestCase
       @dummy.avatar = @file
     end
 
-    should "not remove strange letters" do
+    it "does not remove strange letters" do
       assert_equal "sheep_say_bæ.png", @dummy.avatar.original_filename
     end
   end
 
   context "Attachment with reserved filename" do
-    setup do
+    before do
       rebuild_model
       @file = Tempfile.new(["filename","png"])
     end
 
-    teardown do
+    after do
       @file.unlink
     end
 
@@ -840,37 +937,37 @@ class AttachmentTest < Test::Unit::TestCase
         context "with character #{character}" do
 
           context "at beginning of filename" do
-            setup do
+            before do
               @file.stubs(:original_filename).returns("#{character}filename.png")
               @dummy = Dummy.new
               @dummy.avatar = @file
             end
 
-            should "convert special character into underscore" do
+            it "converts special character into underscore" do
               assert_equal "_filename.png", @dummy.avatar.original_filename
             end
           end
 
           context "at end of filename" do
-            setup do
+            before do
               @file.stubs(:original_filename).returns("filename.png#{character}")
               @dummy = Dummy.new
               @dummy.avatar = @file
             end
 
-            should "convert special character into underscore" do
+            it "converts special character into underscore" do
               assert_equal "filename.png_", @dummy.avatar.original_filename
             end
           end
 
           context "in the middle of filename" do
-            setup do
+            before do
               @file.stubs(:original_filename).returns("file#{character}name.png")
               @dummy = Dummy.new
               @dummy.avatar = @file
             end
 
-            should "convert special character into underscore" do
+            it "converts special character into underscore" do
               assert_equal "file_name.png", @dummy.avatar.original_filename
             end
           end
@@ -880,123 +977,174 @@ class AttachmentTest < Test::Unit::TestCase
     end
 
     context "with specified regexp replacement" do
-      setup do
+      before do
         @old_defaults = Paperclip::Attachment.default_options.dup
       end
 
-      teardown do
+      after do
         Paperclip::Attachment.default_options.merge! @old_defaults
       end
 
       context 'as another regexp' do
-        setup do
-          Paperclip::Attachment.default_options.merge! :restricted_characters => /o/
+        before do
+          Paperclip::Attachment.default_options.merge! restricted_characters: /o/
 
           @file.stubs(:original_filename).returns("goood.png")
           @dummy = Dummy.new
           @dummy.avatar = @file
         end
 
-        should "match and convert that character" do
+        it "matches and converts that character" do
           assert_equal "g___d.png", @dummy.avatar.original_filename
         end
       end
 
       context 'as nil' do
-        setup do
-          Paperclip::Attachment.default_options.merge! :restricted_characters => nil
+        before do
+          Paperclip::Attachment.default_options.merge! restricted_characters: nil
 
           @file.stubs(:original_filename).returns("goood.png")
           @dummy = Dummy.new
           @dummy.avatar = @file
         end
 
-        should "ignore and return the original file name" do
+        it "ignores and returns the original file name" do
           assert_equal "goood.png", @dummy.avatar.original_filename
         end
       end
     end
+
+    context 'with specified cleaner' do
+      before do
+        @old_defaults = Paperclip::Attachment.default_options.dup
+      end
+
+      after do
+        Paperclip::Attachment.default_options.merge! @old_defaults
+      end
+
+      it 'calls the given proc and take the result as cleaned filename' do
+        Paperclip::Attachment.default_options[:filename_cleaner] = lambda do |str|
+          "from_proc_#{str}"
+        end
+
+        @file.stubs(:original_filename).returns("goood.png")
+        @dummy = Dummy.new
+        @dummy.avatar = @file
+        assert_equal "from_proc_goood.png", @dummy.avatar.original_filename
+      end
+
+      it 'calls the given object and take the result as the cleaned filename' do
+        class MyCleaner
+          def call(filename)
+            "foo"
+          end
+        end
+        Paperclip::Attachment.default_options[:filename_cleaner] = MyCleaner.new
+
+        @file.stubs(:original_filename).returns("goood.png")
+        @dummy = Dummy.new
+        @dummy.avatar = @file
+        assert_equal "foo", @dummy.avatar.original_filename
+      end
+    end
   end
 
   context "Attachment with uppercase extension and a default style" do
-    setup do
+    before do
       @old_defaults = Paperclip::Attachment.default_options.dup
       Paperclip::Attachment.default_options.merge!({
-        :path => ":rails_root/:attachment/:class/:style/:id/:basename.:extension"
+        path: ":rails_root/:attachment/:class/:style/:id/:basename.:extension"
       })
       FileUtils.rm_rf("tmp")
-      rebuild_model
+      rebuild_model styles: { large: ["400x400", :jpg],
+                             medium: ["100x100", :jpg],
+                             small: ["32x32#", :jpg]},
+                    default_style: :small
       @instance = Dummy.new
       @instance.stubs(:id).returns 123
-
       @file = File.new(fixture_file("uppercase.PNG"), 'rb')
 
-      styles = {:styles => { :large  => ["400x400", :jpg],
-                             :medium => ["100x100", :jpg],
-                             :small => ["32x32#", :jpg]},
-                :default_style => :small}
-      @attachment = Paperclip::Attachment.new(:avatar,
-                                              @instance,
-                                              styles)
+      @attachment = @instance.avatar
+
       now = Time.now
       Time.stubs(:now).returns(now)
       @attachment.assign(@file)
       @attachment.save
     end
 
-    teardown do
+    after do
       @file.close
       Paperclip::Attachment.default_options.merge!(@old_defaults)
     end
 
-    should "should have matching to_s and url methods" do
-      assert_match @attachment.to_s, @attachment.url
-      assert_match @attachment.to_s(:small), @attachment.url(:small)
+    it "has matching to_s and url methods" do
+      assert_equal @attachment.to_s, @attachment.url
+      assert_equal @attachment.to_s(:small), @attachment.url(:small)
+    end
+
+    it "has matching expiring_url and url methods when using the filesystem storage" do
+      assert_equal @attachment.expiring_url, @attachment.url
     end
   end
 
   context "An attachment" do
-    setup do
+    before do
       @old_defaults = Paperclip::Attachment.default_options.dup
       Paperclip::Attachment.default_options.merge!({
-        :path => ":rails_root/:attachment/:class/:style/:id/:basename.:extension"
+        path: ":rails_root/:attachment/:class/:style/:id/:basename.:extension"
       })
       FileUtils.rm_rf("tmp")
       rebuild_model
       @instance = Dummy.new
       @instance.stubs(:id).returns 123
-      @attachment = Paperclip::Attachment.new(:avatar, @instance)
+      # @attachment = Paperclip::Attachment.new(:avatar, @instance)
+      @attachment = @instance.avatar
       @file = File.new(fixture_file("5k.png"), 'rb')
     end
 
-    teardown do
+    after do
       @file.close
       Paperclip::Attachment.default_options.merge!(@old_defaults)
     end
 
-    should "raise if there are not the correct columns when you try to assign" do
+    it "raises if there are not the correct columns when you try to assign" do
       @other_attachment = Paperclip::Attachment.new(:not_here, @instance)
       assert_raises(Paperclip::Error) do
         @other_attachment.assign(@file)
       end
     end
 
-    should "return nil as path when no file assigned" do
+    it 'clears out the previous assignment when assigned nil' do
+      @attachment.assign(@file)
+      @attachment.queued_for_write[:original]
+      @attachment.assign(nil)
+      assert_nil @attachment.queued_for_write[:original]
+    end
+
+    it 'does not do anything when it is assigned an empty string' do
+      @attachment.assign(@file)
+      original_file = @attachment.queued_for_write[:original]
+      @attachment.assign("")
+      assert_equal original_file, @attachment.queued_for_write[:original]
+    end
+
+    it "returns nil as path when no file assigned" do
       assert_equal nil, @attachment.path
       assert_equal nil, @attachment.path(:blah)
     end
 
     context "with a file assigned but not saved yet" do
-      should "clear out any attached files" do
+      it "clears out any attached files" do
         @attachment.assign(@file)
-        assert !@attachment.queued_for_write.blank?
+        assert @attachment.queued_for_write.present?
         @attachment.clear
         assert @attachment.queued_for_write.blank?
       end
     end
 
     context "with a file assigned in the database" do
-      setup do
+      before do
         @attachment.stubs(:instance_read).with(:file_name).returns("5k.png")
         @attachment.stubs(:instance_read).with(:content_type).returns("image/png")
         @attachment.stubs(:instance_read).with(:file_size).returns(12345)
@@ -1006,54 +1154,57 @@ class AttachmentTest < Test::Unit::TestCase
         @attachment.stubs(:instance_read).with(:updated_at).returns(dtnow)
       end
 
-      should "return the proper path when filename has a single .'s" do
+      it "returns the proper path when filename has a single .'s" do
         assert_equal File.expand_path("tmp/avatars/dummies/original/#{@instance.id}/5k.png"), File.expand_path(@attachment.path)
       end
 
-      should "return the proper path when filename has multiple .'s" do
+      it "returns the proper path when filename has multiple .'s" do
         @attachment.stubs(:instance_read).with(:file_name).returns("5k.old.png")
         assert_equal File.expand_path("tmp/avatars/dummies/original/#{@instance.id}/5k.old.png"), File.expand_path(@attachment.path)
       end
 
       context "when expecting three styles" do
-        setup do
-          styles = {:styles => { :large  => ["400x400", :png],
-                                 :medium => ["100x100", :gif],
-                                 :small => ["32x32#", :jpg]}}
-          @attachment = Paperclip::Attachment.new(:avatar,
-                                                  @instance,
-                                                  styles)
+        before do
+          rebuild_class styles: {
+            large: ["400x400", :png],
+            medium: ["100x100", :gif],
+            small: ["32x32#", :jpg]
+          }
+          @instance = Dummy.new
+          @instance.stubs(:id).returns 123
+          @file = File.new(fixture_file("5k.png"), 'rb')
+          @attachment = @instance.avatar
         end
 
         context "and assigned a file" do
-          setup do
+          before do
             now = Time.now
             Time.stubs(:now).returns(now)
             @attachment.assign(@file)
           end
 
-          should "be dirty" do
+          it "is dirty" do
             assert @attachment.dirty?
           end
 
           context "and saved" do
-            setup do
+            before do
               @attachment.save
             end
 
-            should "commit the files to disk" do
+            it "commits the files to disk" do
               [:large, :medium, :small].each do |style|
-                assert_file_exists(@attachment.path(style))
+                expect(@attachment.path(style)).to exist
               end
             end
 
-            should "save the files as the right formats and sizes" do
+            it "saves the files as the right formats and sizes" do
               [[:large, 400, 61, "PNG"],
                [:medium, 100, 15, "GIF"],
                [:small, 32, 32, "JPEG"]].each do |style|
                 cmd = %Q[identify -format "%w %h %b %m" "#{@attachment.path(style.first)}"]
                 out = `#{cmd}`
-                width, height, size, format = out.split(" ")
+                width, height, _size, format = out.split(" ")
                 assert_equal style[1].to_s, width.to_s
                 assert_equal style[2].to_s, height.to_s
                 assert_equal style[3].to_s, format.to_s
@@ -1061,13 +1212,13 @@ class AttachmentTest < Test::Unit::TestCase
             end
 
             context "and trying to delete" do
-              setup do
+              before do
                 @existing_names = @attachment.styles.keys.collect do |style|
                   @attachment.path(style)
                 end
               end
 
-              should "delete the files after assigning nil" do
+              it "deletes the files after assigning nil" do
                 @attachment.expects(:instance_write).with(:file_name, nil)
                 @attachment.expects(:instance_write).with(:content_type, nil)
                 @attachment.expects(:instance_write).with(:file_size, nil)
@@ -1078,7 +1229,7 @@ class AttachmentTest < Test::Unit::TestCase
                 @existing_names.each{|f| assert_file_not_exists(f) }
               end
 
-              should "delete the files when you call #clear and #save" do
+              it "deletes the files when you call #clear and #save" do
                 @attachment.expects(:instance_write).with(:file_name, nil)
                 @attachment.expects(:instance_write).with(:content_type, nil)
                 @attachment.expects(:instance_write).with(:file_size, nil)
@@ -1089,7 +1240,7 @@ class AttachmentTest < Test::Unit::TestCase
                 @existing_names.each{|f| assert_file_not_exists(f) }
               end
 
-              should "delete the files when you call #delete" do
+              it "deletes the files when you call #delete" do
                 @attachment.expects(:instance_write).with(:file_name, nil)
                 @attachment.expects(:instance_write).with(:content_type, nil)
                 @attachment.expects(:instance_write).with(:file_size, nil)
@@ -1100,11 +1251,11 @@ class AttachmentTest < Test::Unit::TestCase
               end
 
               context "when keeping old files" do
-                setup do
+                before do
                   @attachment.options[:keep_old_files] = true
                 end
 
-                should "keep the files after assigning nil" do
+                it "keeps the files after assigning nil" do
                   @attachment.expects(:instance_write).with(:file_name, nil)
                   @attachment.expects(:instance_write).with(:content_type, nil)
                   @attachment.expects(:instance_write).with(:file_size, nil)
@@ -1115,7 +1266,7 @@ class AttachmentTest < Test::Unit::TestCase
                   @existing_names.each{|f| assert_file_exists(f) }
                 end
 
-                should "keep the files when you call #clear and #save" do
+                it "keeps the files when you call #clear and #save" do
                   @attachment.expects(:instance_write).with(:file_name, nil)
                   @attachment.expects(:instance_write).with(:content_type, nil)
                   @attachment.expects(:instance_write).with(:file_size, nil)
@@ -1126,7 +1277,7 @@ class AttachmentTest < Test::Unit::TestCase
                   @existing_names.each{|f| assert_file_exists(f) }
                 end
 
-                should "keep the files when you call #delete" do
+                it "keeps the files when you call #delete" do
                   @attachment.expects(:instance_write).with(:file_name, nil)
                   @attachment.expects(:instance_write).with(:content_type, nil)
                   @attachment.expects(:instance_write).with(:file_size, nil)
@@ -1143,19 +1294,19 @@ class AttachmentTest < Test::Unit::TestCase
     end
 
     context "when trying a nonexistant storage type" do
-      setup do
-        rebuild_model :storage => :not_here
+      before do
+        rebuild_model storage: :not_here
       end
 
-      should "not be able to find the module" do
-        assert_raise(Paperclip::Errors::StorageMethodNotFound){ Dummy.new.avatar }
+      it "is not able to find the module" do
+        assert_raises(Paperclip::Errors::StorageMethodNotFound){ Dummy.new.avatar }
       end
     end
   end
 
   context "An attachment with only a avatar_file_name column" do
-    setup do
-      ActiveRecord::Base.connection.create_table :dummies, :force => true do |table|
+    before do
+      ActiveRecord::Base.connection.create_table :dummies, force: true do |table|
         table.column :avatar_file_name, :string
       end
       rebuild_class
@@ -1163,41 +1314,41 @@ class AttachmentTest < Test::Unit::TestCase
       @file = File.new(fixture_file("5k.png"), 'rb')
     end
 
-    teardown { @file.close }
+    after { @file.close }
 
-    should "not error when assigned an attachment" do
+    it "does not error when assigned an attachment" do
       assert_nothing_raised { @dummy.avatar = @file }
     end
 
-    should "not return the time when sent #avatar_updated_at" do
+    it "does not return the time when sent #avatar_updated_at" do
       @dummy.avatar = @file
       assert_nil @dummy.avatar.updated_at
     end
 
-    should "return the right value when sent #avatar_file_size" do
+    it "returns the right value when sent #avatar_file_size" do
       @dummy.avatar = @file
       assert_equal File.size(@file), @dummy.avatar.size
     end
 
     context "and avatar_created_at column" do
-      setup do
+      before do
         ActiveRecord::Base.connection.add_column :dummies, :avatar_created_at, :timestamp
         rebuild_class
         @dummy = Dummy.new
       end
 
-      should "not error when assigned an attachment" do
+      it "does not error when assigned an attachment" do
         assert_nothing_raised { @dummy.avatar = @file }
       end
 
-      should "return the creation time when sent #avatar_created_at" do
+      it "returns the creation time when sent #avatar_created_at" do
         now = Time.now
         Time.stubs(:now).returns(now)
         @dummy.avatar = @file
         assert_equal now.to_i, @dummy.avatar.created_at
       end
 
-      should "return the creation time when sent #avatar_created_at and the entry has been updated" do
+      it "returns the creation time when sent #avatar_created_at and the entry has been updated" do
         creation = 2.hours.ago
         now = Time.now
         Time.stubs(:now).returns(creation)
@@ -1207,20 +1358,27 @@ class AttachmentTest < Test::Unit::TestCase
         assert_equal creation.to_i, @dummy.avatar.created_at
         assert_not_equal now.to_i, @dummy.avatar.created_at
       end
+
+      it "sets changed? to true on attachment assignment" do
+        @dummy.avatar = @file
+        @dummy.save!
+        @dummy.avatar = @file
+        assert @dummy.changed?
+      end
     end
 
     context "and avatar_updated_at column" do
-      setup do
+      before do
         ActiveRecord::Base.connection.add_column :dummies, :avatar_updated_at, :timestamp
         rebuild_class
         @dummy = Dummy.new
       end
 
-      should "not error when assigned an attachment" do
+      it "does not error when assigned an attachment" do
         assert_nothing_raised { @dummy.avatar = @file }
       end
 
-      should "return the right value when sent #avatar_updated_at" do
+      it "returns the right value when sent #avatar_updated_at" do
         now = Time.now
         Time.stubs(:now).returns(now)
         @dummy.avatar = @file
@@ -1228,45 +1386,51 @@ class AttachmentTest < Test::Unit::TestCase
       end
     end
 
-    should "not calculate fingerprint" do
+    it "does not calculate fingerprint" do
+      Digest::MD5.stubs(:file)
+      @dummy.avatar = @file
+      expect(Digest::MD5).to have_received(:file).never
+    end
+
+    it "does not assign fingerprint" do
       @dummy.avatar = @file
       assert_nil @dummy.avatar.fingerprint
     end
 
     context "and avatar_content_type column" do
-      setup do
+      before do
         ActiveRecord::Base.connection.add_column :dummies, :avatar_content_type, :string
         rebuild_class
         @dummy = Dummy.new
       end
 
-      should "not error when assigned an attachment" do
+      it "does not error when assigned an attachment" do
         assert_nothing_raised { @dummy.avatar = @file }
       end
 
-      should "return the right value when sent #avatar_content_type" do
+      it "returns the right value when sent #avatar_content_type" do
         @dummy.avatar = @file
         assert_equal "image/png", @dummy.avatar.content_type
       end
     end
 
     context "and avatar_file_size column" do
-      setup do
-        ActiveRecord::Base.connection.add_column :dummies, :avatar_file_size, :integer
+      before do
+        ActiveRecord::Base.connection.add_column :dummies, :avatar_file_size, :bigint
         rebuild_class
         @dummy = Dummy.new
       end
 
-      should "not error when assigned an attachment" do
+      it "does not error when assigned an attachment" do
         assert_nothing_raised { @dummy.avatar = @file }
       end
 
-      should "return the right value when sent #avatar_file_size" do
+      it "returns the right value when sent #avatar_file_size" do
         @dummy.avatar = @file
         assert_equal File.size(@file), @dummy.avatar.size
       end
 
-      should "return the right value when saved, reloaded, and sent #avatar_file_size" do
+      it "returns the right value when saved, reloaded, and sent #avatar_file_size" do
         @dummy.avatar = @file
         @dummy.save
         @dummy = Dummy.find(@dummy.id)
@@ -1275,33 +1439,63 @@ class AttachmentTest < Test::Unit::TestCase
     end
 
     context "and avatar_fingerprint column" do
-      setup do
+      before do
         ActiveRecord::Base.connection.add_column :dummies, :avatar_fingerprint, :string
         rebuild_class
         @dummy = Dummy.new
       end
 
-      should "not error when assigned an attachment" do
+      it "does not error when assigned an attachment" do
         assert_nothing_raised { @dummy.avatar = @file }
       end
 
-      should "return the right value when sent #avatar_fingerprint" do
-        @dummy.avatar = @file
-        assert_equal 'aec488126c3b33c08a10c3fa303acf27', @dummy.avatar_fingerprint
+      context "with explicitly set digest" do
+        before do
+          rebuild_class adapter_options: { hash_digest: Digest::SHA256 }
+          @dummy = Dummy.new
+        end
+
+        it "returns the right value when sent #avatar_fingerprint" do
+          @dummy.avatar = @file
+          assert_equal "734016d801a497f5579cdd4ef2ae1d020088c1db754dc434482d76dd5486520a",
+                       @dummy.avatar_fingerprint
+        end
+
+        it "returns the right value when saved, reloaded, and sent #avatar_fingerprint" do
+          @dummy.avatar = @file
+          @dummy.save
+          @dummy = Dummy.find(@dummy.id)
+          assert_equal "734016d801a497f5579cdd4ef2ae1d020088c1db754dc434482d76dd5486520a",
+                       @dummy.avatar_fingerprint
+        end
       end
 
-      should "return the right value when saved, reloaded, and sent #avatar_fingerprint" do
-        @dummy.avatar = @file
-        @dummy.save
-        @dummy = Dummy.find(@dummy.id)
-        assert_equal 'aec488126c3b33c08a10c3fa303acf27', @dummy.avatar_fingerprint
+      context "with the default digest" do
+        before do
+          rebuild_class # MD5 is the default
+          @dummy = Dummy.new
+        end
+
+        it "returns the right value when sent #avatar_fingerprint" do
+          @dummy.avatar = @file
+          assert_equal "aec488126c3b33c08a10c3fa303acf27",
+                       @dummy.avatar_fingerprint
+        end
+
+        it "returns the right value when saved, reloaded, and sent #avatar_fingerprint" do
+          @dummy.avatar = @file
+          @dummy.save
+          @dummy = Dummy.find(@dummy.id)
+          assert_equal "aec488126c3b33c08a10c3fa303acf27",
+                       @dummy.avatar_fingerprint
+        end
       end
     end
   end
 
   context "an attachment with delete_file option set to false" do
-    setup do
-      rebuild_model :preserve_files => true
+    before do
+      rebuild_model preserve_files: true
       @dummy = Dummy.new
       @file = File.new(fixture_file("5k.png"), 'rb')
       @dummy.avatar = @file
@@ -1310,21 +1504,27 @@ class AttachmentTest < Test::Unit::TestCase
       @path = @attachment.path
     end
 
-    teardown { @file.close }
+    after { @file.close }
 
-    should "not delete the files from storage when attachment is destroyed" do
+    it "does not delete the files from storage when attachment is destroyed" do
       @attachment.destroy
       assert_file_exists(@path)
     end
 
-    should "not delete the file when model is destroyed" do
+    it "clears out attachment data when attachment is destroyed" do
+      @attachment.destroy
+      assert !@attachment.exists?
+      assert_nil @dummy.avatar_file_name
+    end
+
+    it "does not delete the file when model is destroyed" do
       @dummy.destroy
       assert_file_exists(@path)
     end
   end
 
   context "An attached file" do
-    setup do
+    before do
       rebuild_model
       @dummy = Dummy.new
       @file = File.new(fixture_file("5k.png"), 'rb')
@@ -1334,22 +1534,30 @@ class AttachmentTest < Test::Unit::TestCase
       @path = @attachment.path
     end
 
-    teardown { @file.close }
+    after { @file.close }
 
-    should "not be deleted when the model fails to destroy" do
+    it "is not deleted when the model fails to destroy" do
       @dummy.stubs(:destroy).raises(Exception)
 
-      assert_raise Exception do
+      assert_raises Exception do
         @dummy.destroy
       end
 
       assert_file_exists(@path)
     end
 
-    should "be deleted when the model is destroyed" do
+    it "is deleted when the model is destroyed" do
       @dummy.destroy
       assert_file_not_exists(@path)
     end
-  end
 
+    it "is not deleted when transaction rollbacks after model is destroyed" do
+      ActiveRecord::Base.transaction do
+        @dummy.destroy
+        raise ActiveRecord::Rollback
+      end
+
+      assert_file_exists(@path)
+    end
+  end
 end