paperclip 4.1.1 → 4.2.0

data/spec/paperclip/style_spec.rb

@@ -0,0 +1,255 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe Paperclip::Style do
+  context "A style rule" do
+    before do
+      @attachment = attachment path: ":basename.:extension",
+                               styles: { foo: {geometry: "100x100#", format: :png} },
+                               whiny: true
+      @style = @attachment.styles[:foo]
+    end
+
+    it "is held as a Style object" do
+      expect(@style).to be_a Paperclip::Style
+    end
+
+    it "gets processors from the attachment definition" do
+      assert_equal [:thumbnail], @style.processors
+    end
+
+    it "has the right geometry" do
+      assert_equal "100x100#", @style.geometry
+    end
+
+    it "is whiny if the attachment is" do
+      assert @style.whiny?
+    end
+
+    it "responds to hash notation" do
+      assert_equal [:thumbnail], @style[:processors]
+      assert_equal "100x100#", @style[:geometry]
+    end
+
+    it "returns the name of the style in processor options" do
+      assert_equal :foo, @style.processor_options[:style]
+    end
+  end
+
+  context "A style rule with properties supplied as procs" do
+    before do
+      @attachment = attachment path: ":basename.:extension",
+                               whiny_thumbnails: true,
+                               processors: lambda {|a| [:test]},
+                               styles: {
+                                 foo: lambda{|a| "300x300#"},
+                                 bar: {
+                                   geometry: lambda{|a| "300x300#"},
+                                   convert_options: lambda{|a| "-do_stuff"},
+                                   source_file_options: lambda{|a| "-do_extra_stuff"}
+                                 }
+                               }
+    end
+
+    it "calls procs when they are needed" do
+      assert_equal "300x300#", @attachment.styles[:foo].geometry
+      assert_equal "300x300#", @attachment.styles[:bar].geometry
+      assert_equal [:test], @attachment.styles[:foo].processors
+      assert_equal [:test], @attachment.styles[:bar].processors
+      assert_equal "-do_stuff", @attachment.styles[:bar].convert_options
+      assert_equal "-do_extra_stuff", @attachment.styles[:bar].source_file_options
+    end
+  end
+
+  context "An attachment with style rules in various forms" do
+    before do
+      styles = {}
+      styles[:aslist] = ["100x100", :png]
+      styles[:ashash] = {geometry: "100x100", format: :png}
+      styles[:asstring] = "100x100"
+      @attachment = attachment path: ":basename.:extension",
+                               styles: styles
+    end
+
+    it "has the right number of styles" do
+      expect(@attachment.styles).to be_a Hash
+      assert_equal 3, @attachment.styles.size
+    end
+
+    it "has styles as Style objects" do
+      [:aslist, :ashash, :aslist].each do |s|
+        expect(@attachment.styles[s]).to be_a Paperclip::Style
+      end
+    end
+
+    it "has the right geometries" do
+      [:aslist, :ashash, :aslist].each do |s|
+        assert_equal @attachment.styles[s].geometry, "100x100"
+      end
+    end
+
+    it "has the right formats" do
+      assert_equal @attachment.styles[:aslist].format, :png
+      assert_equal @attachment.styles[:ashash].format, :png
+      assert_nil @attachment.styles[:asstring].format
+    end
+
+    it "retains order" do
+      assert_equal [:aslist, :ashash, :asstring], @attachment.styles.keys
+    end
+  end
+
+  context "An attachment with :convert_options" do
+    it "does not have called extra_options_for(:thumb/:large) on initialization" do
+      @attachment = attachment path: ":basename.:extension",
+                               styles: {thumb: "100x100", large: "400x400"},
+                               convert_options: {all: "-do_stuff", thumb: "-thumbnailize"}
+      @attachment.expects(:extra_options_for).never
+      @style = @attachment.styles[:thumb]
+    end
+
+    it "calls extra_options_for(:thumb/:large) when convert options are requested" do
+      @attachment = attachment path: ":basename.:extension",
+                               styles: {thumb: "100x100", large: "400x400"},
+                               convert_options: {all: "-do_stuff", thumb: "-thumbnailize"}
+      @style = @attachment.styles[:thumb]
+      @file = StringIO.new("...")
+      @file.stubs(:original_filename).returns("file.jpg")
+
+      @attachment.expects(:extra_options_for).with(:thumb)
+      @attachment.styles[:thumb].convert_options
+    end
+  end
+
+  context "An attachment with :source_file_options" do
+    it "does not have called extra_source_file_options_for(:thumb/:large) on initialization" do
+      @attachment = attachment path: ":basename.:extension",
+                               styles: {thumb: "100x100", large: "400x400"},
+                               source_file_options: {all: "-density 400", thumb: "-depth 8"}
+      @attachment.expects(:extra_source_file_options_for).never
+      @style = @attachment.styles[:thumb]
+    end
+
+    it "calls extra_options_for(:thumb/:large) when convert options are requested" do
+      @attachment = attachment path: ":basename.:extension",
+                               styles: {thumb: "100x100", large: "400x400"},
+                               source_file_options: {all: "-density 400", thumb: "-depth 8"}
+      @style = @attachment.styles[:thumb]
+      @file = StringIO.new("...")
+      @file.stubs(:original_filename).returns("file.jpg")
+
+      @attachment.expects(:extra_source_file_options_for).with(:thumb)
+      @attachment.styles[:thumb].source_file_options
+    end
+  end
+
+  context "A style rule with its own :processors" do
+    before do
+      @attachment = attachment path: ":basename.:extension",
+                               styles: {
+                                 foo: {
+                                   geometry: "100x100#",
+                                   format: :png,
+                                   processors: [:test]
+                                  }
+                                },
+                               processors: [:thumbnail]
+      @style = @attachment.styles[:foo]
+    end
+
+    it "does not get processors from the attachment" do
+      @attachment.expects(:processors).never
+      assert_not_equal [:thumbnail], @style.processors
+    end
+
+    it "reports its own processors" do
+      assert_equal [:test], @style.processors
+    end
+
+  end
+
+  context "A style rule with :processors supplied as procs" do
+    before do
+      @attachment = attachment path: ":basename.:extension",
+                               styles: {
+                                 foo: {
+                                   geometry: "100x100#",
+                                   format: :png,
+                                   processors: lambda{|a| [:test]}
+                                  }
+                                },
+                               processors: [:thumbnail]
+    end
+
+    it "defers processing of procs until they are needed" do
+      expect(@attachment.styles[:foo].instance_variable_get("@processors")).to be_a Proc
+    end
+
+    it "calls procs when they are needed" do
+      assert_equal [:test], @attachment.styles[:foo].processors
+    end
+  end
+
+  context "An attachment with :convert_options and :source_file_options in :styles" do
+    before do
+      @attachment = attachment path: ":basename.:extension",
+                               styles: {
+                                 thumb: "100x100",
+                                 large: {geometry: "400x400",
+                                            convert_options: "-do_stuff",
+                                            source_file_options: "-do_extra_stuff"
+                                 }
+                               }
+      @file = StringIO.new("...")
+      @file.stubs(:original_filename).returns("file.jpg")
+    end
+
+    it "has empty options for :thumb style" do
+      assert_equal "", @attachment.styles[:thumb].processor_options[:convert_options]
+      assert_equal "", @attachment.styles[:thumb].processor_options[:source_file_options]
+    end
+
+    it "has the right options for :large style" do
+      assert_equal "-do_stuff", @attachment.styles[:large].processor_options[:convert_options]
+      assert_equal "-do_extra_stuff", @attachment.styles[:large].processor_options[:source_file_options]
+    end
+  end
+
+  context "A style rule supplied with default format" do
+     before do
+       @attachment = attachment default_format: :png,
+                                styles: {
+                                  asstring: "300x300#",
+                                  aslist: ["300x300#", :jpg],
+                                  ashash: {
+                                    geometry: "300x300#",
+                                    convert_options: "-do_stuff"
+                                  }
+                                }
+     end
+
+     it "has the right number of styles" do
+       expect(@attachment.styles).to be_a Hash
+       assert_equal 3, @attachment.styles.size
+     end
+
+     it "has styles as Style objects" do
+       [:aslist, :ashash, :aslist].each do |s|
+         expect(@attachment.styles[s]).to be_a Paperclip::Style
+       end
+     end
+
+     it "has the right geometries" do
+       [:aslist, :ashash, :aslist].each do |s|
+         assert_equal @attachment.styles[s].geometry, "300x300#"
+       end
+     end
+
+     it "has the right formats" do
+       assert_equal @attachment.styles[:aslist].format,    :jpg
+       assert_equal @attachment.styles[:ashash].format,    :png
+       assert_equal @attachment.styles[:asstring].format,  :png
+     end
+
+   end
+end

data/spec/paperclip/tempfile_factory_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe Paperclip::TempfileFactory do
+  it "is able to generate a tempfile with the right name" do
+    file = subject.generate("omg.png")
+    assert File.extname(file.path), "png"
+  end
+
+  it "is able to generate a tempfile with the right name with a tilde at the beginning" do
+    file = subject.generate("~omg.png")
+    assert File.extname(file.path), "png"
+  end
+
+  it "is able to generate a tempfile with the right name with a tilde at the end" do
+    file = subject.generate("omg.png~")
+    assert File.extname(file.path), "png"
+  end
+
+  it "is able to generate a tempfile from a file with a really long name" do
+    filename = "#{"longfilename" * 100}.png"
+    file = subject.generate(filename)
+    assert File.extname(file.path), "png"
+  end
+
+  it 'is able to take nothing as a parameter and not error' do
+   file = subject.generate
+   assert File.exist?(file.path)
+  end
+end

data/{test/thumbnail_test.rb → spec/paperclip/thumbnail_spec.rb}

@@ -1,70 +1,70 @@
-require './test/helper'
-
-class ThumbnailTest < Test::Unit::TestCase
+require 'spec_helper'
 
+describe Paperclip::Thumbnail do
   context "A Paperclip Tempfile" do
-    setup do
+    before do
       @tempfile = Paperclip::Tempfile.new(["file", ".jpg"])
     end
 
-    teardown { @tempfile.close }
+    after { @tempfile.close }
 
-    should "have its path contain a real extension" do
+    it "has its path contain a real extension" do
       assert_equal ".jpg", File.extname(@tempfile.path)
     end
 
-    should "be a real Tempfile" do
+    it "is a real Tempfile" do
       assert @tempfile.is_a?(::Tempfile)
     end
   end
 
   context "Another Paperclip Tempfile" do
-    setup do
+    before do
       @tempfile = Paperclip::Tempfile.new("file")
     end
 
-    teardown { @tempfile.close }
+    after { @tempfile.close }
 
-    should "not have an extension if not given one" do
+    it "does not have an extension if not given one" do
       assert_equal "", File.extname(@tempfile.path)
     end
 
-    should "still be a real Tempfile" do
+    it "is a real Tempfile" do
       assert @tempfile.is_a?(::Tempfile)
     end
   end
 
   context "An image" do
-    setup do
+    before do
       @file = File.new(fixture_file("5k.png"), 'rb')
     end
 
-    teardown { @file.close }
+    after { @file.close }
 
     [["600x600>", "434x66"],
      ["400x400>", "400x61"],
-     ["32x32<", "434x66"]
+     ["32x32<", "434x66"],
+     [nil, "434x66"]
     ].each do |args|
       context "being thumbnailed with a geometry of #{args[0]}" do
-        setup do
-          @thumb = Paperclip::Thumbnail.new(@file, :geometry => args[0])
+        before do
+          @thumb = Paperclip::Thumbnail.new(@file, geometry: args[0])
         end
 
-        should "start with dimensions of 434x66" do
+        it "starts with dimensions of 434x66" do
           cmd = %Q[identify -format "%wx%h" "#{@file.path}"]
           assert_equal "434x66", `#{cmd}`.chomp
         end
 
-        should "report the correct target geometry" do
-          assert_equal args[0], @thumb.target_geometry.to_s
+        it "reports the correct target geometry" do
+          assert_equal args[0].to_s, @thumb.target_geometry.to_s
         end
 
         context "when made" do
-          setup do
+          before do
             @thumb_result = @thumb.make
           end
 
-          should "be the size we expect it to be" do
+          it "is the size we expect it to be" do
             cmd = %Q[identify -format "%wx%h" "#{@thumb_result.path}"]
             assert_equal args[1], `#{cmd}`.chomp
           end
@@ -73,11 +73,11 @@ class ThumbnailTest < Test::Unit::TestCase
     end
 
     context "being thumbnailed at 100x50 with cropping" do
-      setup do
-        @thumb = Paperclip::Thumbnail.new(@file, :geometry => "100x50#")
+      before do
+        @thumb = Paperclip::Thumbnail.new(@file, geometry: "100x50#")
       end
 
-      should "let us know when a command isn't found versus a processing error" do
+      it "lets us know when a command isn't found versus a processing error" do
         old_path = ENV['PATH']
         begin
           Cocaine::CommandLine.path = ''
@@ -93,28 +93,28 @@ class ThumbnailTest < Test::Unit::TestCase
         end
       end
 
-      should "report its correct current and target geometries" do
+      it "reports its correct current and target geometries" do
         assert_equal "100x50#", @thumb.target_geometry.to_s
         assert_equal "434x66", @thumb.current_geometry.to_s
       end
 
-      should "report its correct format" do
+      it "reports its correct format" do
         assert_nil @thumb.format
       end
 
-      should "have whiny turned on by default" do
+      it "has whiny turned on by default" do
         assert @thumb.whiny
       end
 
-      should "have convert_options set to nil by default" do
+      it "has convert_options set to nil by default" do
         assert_equal nil, @thumb.convert_options
       end
 
-      should "have source_file_options set to nil by default" do
+      it "has source_file_options set to nil by default" do
         assert_equal nil, @thumb.source_file_options
       end
 
-      should "send the right command to convert when sent #make" do
+      it "sends the right command to convert when sent #make" do
         @thumb.expects(:convert).with do |*arg|
           arg[0] == ':source -auto-orient -resize "x50" -crop "100x50+114+0" +repage :dest' &&
           arg[1][:source] == "#{File.expand_path(@thumb.file.path)}[0]"
@@ -122,34 +122,34 @@ class ThumbnailTest < Test::Unit::TestCase
         @thumb.make
       end
 
-      should "create the thumbnail when sent #make" do
+      it "creates the thumbnail when sent #make" do
         dst = @thumb.make
         assert_match /100x50/, `identify "#{dst.path}"`
       end
     end
 
-    should 'properly crop a EXIF-rotated image' do
+    it 'crops a EXIF-rotated image properly' do
       file = File.new(fixture_file('rotated.jpg'))
-      thumb = Paperclip::Thumbnail.new(file, :geometry => "50x50#")
+      thumb = Paperclip::Thumbnail.new(file, geometry: "50x50#")
 
       output_file = thumb.make
 
       command = Cocaine::CommandLine.new("identify", "-format %wx%h :file")
-      assert_equal "50x50", command.run(:file => output_file.path).strip
+      assert_equal "50x50", command.run(file: output_file.path).strip
     end
 
     context "being thumbnailed with source file options set" do
-      setup do
+      before do
         @thumb = Paperclip::Thumbnail.new(@file,
-                                          :geometry            => "100x50#",
-                                          :source_file_options => "-strip")
+                                          geometry: "100x50#",
+                                          source_file_options: "-strip")
       end
 
-      should "have source_file_options value set" do
+      it "has source_file_options value set" do
         assert_equal ["-strip"], @thumb.source_file_options
       end
 
-      should "send the right command to convert when sent #make" do
+      it "sends the right command to convert when sent #make" do
         @thumb.expects(:convert).with do |*arg|
           arg[0] == '-strip :source -auto-orient -resize "x50" -crop "100x50+114+0" +repage :dest' &&
           arg[1][:source] == "#{File.expand_path(@thumb.file.path)}[0]"
@@ -157,19 +157,19 @@ class ThumbnailTest < Test::Unit::TestCase
         @thumb.make
       end
 
-      should "create the thumbnail when sent #make" do
+      it "creates the thumbnail when sent #make" do
         dst = @thumb.make
         assert_match /100x50/, `identify "#{dst.path}"`
       end
 
       context "redefined to have bad source_file_options setting" do
-        setup do
+        before do
           @thumb = Paperclip::Thumbnail.new(@file,
-                                            :geometry => "100x50#",
-                                            :source_file_options => "-this-aint-no-option")
+                                            geometry: "100x50#",
+                                            source_file_options: "-this-aint-no-option")
         end
 
-        should "error when trying to create the thumbnail" do
+        it "errors when trying to create the thumbnail" do
           assert_raises(Paperclip::Error) do
             silence_stream(STDERR) do
               @thumb.make
@@ -180,17 +180,17 @@ class ThumbnailTest < Test::Unit::TestCase
     end
 
     context "being thumbnailed with convert options set" do
-      setup do
+      before do
         @thumb = Paperclip::Thumbnail.new(@file,
-                                          :geometry        => "100x50#",
-                                          :convert_options => "-strip -depth 8")
+                                          geometry: "100x50#",
+                                          convert_options: "-strip -depth 8")
       end
 
-      should "have convert_options value set" do
+      it "has convert_options value set" do
         assert_equal %w"-strip -depth 8", @thumb.convert_options
       end
 
-      should "send the right command to convert when sent #make" do
+      it "sends the right command to convert when sent #make" do
         @thumb.expects(:convert).with do |*arg|
           arg[0] == ':source -auto-orient -resize "x50" -crop "100x50+114+0" +repage -strip -depth 8 :dest' &&
           arg[1][:source] == "#{File.expand_path(@thumb.file.path)}[0]"
@@ -198,19 +198,19 @@ class ThumbnailTest < Test::Unit::TestCase
         @thumb.make
       end
 
-      should "create the thumbnail when sent #make" do
+      it "creates the thumbnail when sent #make" do
         dst = @thumb.make
         assert_match /100x50/, `identify "#{dst.path}"`
       end
 
       context "redefined to have bad convert_options setting" do
-        setup do
+        before do
           @thumb = Paperclip::Thumbnail.new(@file,
-                                            :geometry => "100x50#",
-                                            :convert_options => "-this-aint-no-option")
+                                            geometry: "100x50#",
+                                            convert_options: "-this-aint-no-option")
         end
 
-        should "error when trying to create the thumbnail" do
+        it "errors when trying to create the thumbnail" do
           assert_raises(Paperclip::Error) do
             silence_stream(STDERR) do
               @thumb.make
@@ -218,7 +218,7 @@ class ThumbnailTest < Test::Unit::TestCase
           end
         end
 
-        should "let us know when a command isn't found versus a processing error" do
+        it "lets us know when a command isn't found versus a processing error" do
           old_path = ENV['PATH']
           begin
             Cocaine::CommandLine.path = ''
@@ -237,20 +237,20 @@ class ThumbnailTest < Test::Unit::TestCase
     end
 
     context "being thumbnailed with a blank geometry string" do
-      setup do
+      before do
         @thumb = Paperclip::Thumbnail.new(@file,
-                                          :geometry        => "",
-                                          :convert_options => "-gravity center -crop \"300x300+0-0\"")
+                                          geometry: "",
+                                          convert_options: "-gravity center -crop \"300x300+0-0\"")
       end
 
-      should "not get resized by default" do
+      it "does not get resized by default" do
         assert !@thumb.transformation_command.include?("-resize")
       end
     end
 
     context "being thumbnailed with default animated option (true)" do
-      should "call identify to check for animated images when sent #make" do
-        thumb = Paperclip::Thumbnail.new(@file, :geometry => "100x50#")
+      it "calls identify to check for animated images when sent #make" do
+        thumb = Paperclip::Thumbnail.new(@file, geometry: "100x50#")
         thumb.expects(:identify).at_least_once.with do |*arg|
           arg[0] == '-format %m :file' &&
           arg[1][:file] == "#{File.expand_path(thumb.file.path)}[0]"
@@ -260,11 +260,11 @@ class ThumbnailTest < Test::Unit::TestCase
     end
 
     context "passing a custom file geometry parser" do
-      teardown do
-        self.class.send(:remove_const, :GeoParser)
+      after do
+        Object.send(:remove_const, :GeoParser) if Object.const_defined?(:GeoParser)
       end
 
-      should "produce the appropriate transformation_command" do
+      it "produces the appropriate transformation_command" do
         GeoParser = Class.new do
           def self.from_file(file)
             new
@@ -275,7 +275,7 @@ class ThumbnailTest < Test::Unit::TestCase
           end
         end
 
-        thumb = Paperclip::Thumbnail.new(@file, :geometry => '50x50', :file_geometry_parser => GeoParser)
+        thumb = Paperclip::Thumbnail.new(@file, geometry: '50x50', file_geometry_parser: ::GeoParser)
 
         transformation_command = thumb.transformation_command
 
@@ -291,11 +291,11 @@ class ThumbnailTest < Test::Unit::TestCase
     end
 
     context "passing a custom geometry string parser" do
-      teardown do
-        self.class.send(:remove_const, :GeoParser)
+      after do
+        Object.send(:remove_const, :GeoParser) if Object.const_defined?(:GeoParser)
       end
 
-      should "produce the appropriate transformation_command" do
+      it "produces the appropriate transformation_command" do
         GeoParser = Class.new do
           def self.parse(s)
             new
@@ -306,7 +306,7 @@ class ThumbnailTest < Test::Unit::TestCase
           end
         end
 
-        thumb = Paperclip::Thumbnail.new(@file, :geometry => '50x50', :string_geometry_parser => GeoParser)
+        thumb = Paperclip::Thumbnail.new(@file, geometry: '50x50', string_geometry_parser: ::GeoParser)
 
         transformation_command = thumb.transformation_command
 
@@ -317,32 +317,32 @@ class ThumbnailTest < Test::Unit::TestCase
   end
 
   context "A multipage PDF" do
-    setup do
+    before do
       @file = File.new(fixture_file("twopage.pdf"), 'rb')
     end
 
-    teardown { @file.close }
+    after { @file.close }
 
-    should "start with two pages with dimensions 612x792" do
+    it "starts with two pages with dimensions 612x792" do
       cmd = %Q[identify -format "%wx%h" "#{@file.path}"]
       assert_equal "612x792"*2, `#{cmd}`.chomp
     end
 
     context "being thumbnailed at 100x100 with cropping" do
-      setup do
-        @thumb = Paperclip::Thumbnail.new(@file, :geometry => "100x100#", :format => :png)
+      before do
+        @thumb = Paperclip::Thumbnail.new(@file, geometry: "100x100#", format: :png)
       end
 
-      should "report its correct current and target geometries" do
+      it "reports its correct current and target geometries" do
         assert_equal "100x100#", @thumb.target_geometry.to_s
         assert_equal "612x792", @thumb.current_geometry.to_s
       end
 
-      should "report its correct format" do
+      it "reports its correct format" do
         assert_equal :png, @thumb.format
       end
 
-      should "create the thumbnail when sent #make" do
+      it "creates the thumbnail when sent #make" do
         dst = @thumb.make
         assert_match /100x100/, `identify "#{dst.path}"`
       end
@@ -350,23 +350,23 @@ class ThumbnailTest < Test::Unit::TestCase
   end
 
   context "An animated gif" do
-    setup do
+    before do
       @file = File.new(fixture_file("animated.gif"), 'rb')
     end
 
-    teardown { @file.close }
+    after { @file.close }
 
-    should "start with 12 frames with size 100x100" do
+    it "starts with 12 frames with size 100x100" do
       cmd = %Q[identify -format "%wx%h" "#{@file.path}"]
       assert_equal "100x100"*12, `#{cmd}`.chomp
     end
 
     context "with static output" do
-      setup do
-       @thumb = Paperclip::Thumbnail.new(@file, :geometry => "50x50", :format => :jpg)
+      before do
+       @thumb = Paperclip::Thumbnail.new(@file, geometry: "50x50", format: :jpg)
       end
 
-      should "create the single frame thumbnail when sent #make" do
+      it "creates the single frame thumbnail when sent #make" do
         dst = @thumb.make
         cmd = %Q[identify -format "%wx%h" "#{dst.path}"]
         assert_equal "50x50", `#{cmd}`.chomp
@@ -374,11 +374,11 @@ class ThumbnailTest < Test::Unit::TestCase
     end
 
     context "with animated output format" do
-      setup do
-       @thumb = Paperclip::Thumbnail.new(@file, :geometry => "50x50", :format => :gif)
+      before do
+       @thumb = Paperclip::Thumbnail.new(@file, geometry: "50x50", format: :gif)
       end
 
-      should "create the 12 frames thumbnail when sent #make" do
+      it "creates the 12 frames thumbnail when sent #make" do
         dst = @thumb.make
         cmd = %Q[identify -format "%wx%h," "#{dst.path}"]
         frames = `#{cmd}`.chomp.split(',')
@@ -386,21 +386,21 @@ class ThumbnailTest < Test::Unit::TestCase
         assert_frame_dimensions (45..50), frames
       end
 
-      should "use the -coalesce option" do
+      it "uses the -coalesce option" do
         assert_equal @thumb.transformation_command.first, "-coalesce"
       end
 
-      should "use the -layers 'optimize' option" do
+      it "uses the -layers 'optimize' option" do
         assert_equal @thumb.transformation_command.last, '-layers "optimize"'
       end
     end
 
     context "with omitted output format" do
-      setup do
-       @thumb = Paperclip::Thumbnail.new(@file, :geometry => "50x50")
+      before do
+       @thumb = Paperclip::Thumbnail.new(@file, geometry: "50x50")
       end
 
-      should "create the 12 frames thumbnail when sent #make" do
+      it "creates the 12 frames thumbnail when sent #make" do
         dst = @thumb.make
         cmd = %Q[identify -format "%wx%h," "#{dst.path}"]
         frames = `#{cmd}`.chomp.split(',')
@@ -408,22 +408,22 @@ class ThumbnailTest < Test::Unit::TestCase
         assert_frame_dimensions (45..50), frames
       end
 
-      should "use the -coalesce option" do
+      it "uses the -coalesce option" do
         assert_equal @thumb.transformation_command.first, "-coalesce"
       end
 
-      should "use the -layers 'optimize' option" do
+      it "uses the -layers 'optimize' option" do
         assert_equal @thumb.transformation_command.last, '-layers "optimize"'
       end
     end
 
     context "with unidentified source format" do
-      setup do
+      before do
         @unidentified_file = File.new(fixture_file("animated.unknown"), 'rb')
-        @thumb = Paperclip::Thumbnail.new(@file, :geometry => "60x60")
+        @thumb = Paperclip::Thumbnail.new(@file, geometry: "60x60")
       end
 
-      should "create the 12 frames thumbnail when sent #make" do
+      it "creates the 12 frames thumbnail when sent #make" do
         dst = @thumb.make
         cmd = %Q[identify -format "%wx%h," "#{dst.path}"]
         frames = `#{cmd}`.chomp.split(',')
@@ -431,22 +431,22 @@ class ThumbnailTest < Test::Unit::TestCase
         assert_frame_dimensions (55..60), frames
       end
 
-      should "use the -coalesce option" do
+      it "uses the -coalesce option" do
         assert_equal @thumb.transformation_command.first, "-coalesce"
       end
 
-      should "use the -layers 'optimize' option" do
+      it "uses the -layers 'optimize' option" do
         assert_equal @thumb.transformation_command.last, '-layers "optimize"'
       end
     end
 
     context "with no source format" do
-      setup do
+      before do
         @unidentified_file = File.new(fixture_file("animated"), 'rb')
-        @thumb = Paperclip::Thumbnail.new(@file, :geometry => "70x70")
+        @thumb = Paperclip::Thumbnail.new(@file, geometry: "70x70")
       end
 
-      should "create the 12 frames thumbnail when sent #make" do
+      it "creates the 12 frames thumbnail when sent #make" do
         dst = @thumb.make
         cmd = %Q[identify -format "%wx%h," "#{dst.path}"]
         frames = `#{cmd}`.chomp.split(',')
@@ -454,27 +454,27 @@ class ThumbnailTest < Test::Unit::TestCase
         assert_frame_dimensions (60..70), frames
       end
 
-      should "use the -coalesce option" do
+      it "uses the -coalesce option" do
         assert_equal @thumb.transformation_command.first, "-coalesce"
       end
 
-      should "use the -layers 'optimize' option" do
+      it "uses the -layers 'optimize' option" do
         assert_equal @thumb.transformation_command.last, '-layers "optimize"'
       end
     end
 
     context "with animated option set to false" do
-      setup do
-       @thumb = Paperclip::Thumbnail.new(@file, :geometry => "50x50", :animated => false)
+      before do
+       @thumb = Paperclip::Thumbnail.new(@file, geometry: "50x50", animated: false)
       end
 
-      should "output the gif format" do
+      it "outputs the gif format" do
         dst = @thumb.make
         cmd = %Q[identify "#{dst.path}"]
         assert_match /GIF/, `#{cmd}`.chomp
       end
 
-      should "create the single frame thumbnail when sent #make" do
+      it "creates the single frame thumbnail when sent #make" do
         dst = @thumb.make
         cmd = %Q[identify -format "%wx%h" "#{dst.path}"]
         assert_equal "50x50", `#{cmd}`.chomp