kt-paperclip 5.4.0 → 7.1.1

data/spec/paperclip/matchers/validate_attachment_size_matcher_spec.rb

@@ -1,5 +1,5 @@
-require 'spec_helper'
-require 'paperclip/matchers'
+require "spec_helper"
+require "paperclip/matchers"
 
 describe Paperclip::Shoulda::Matchers::ValidateAttachmentSizeMatcher do
   extend Paperclip::Shoulda::Matchers
@@ -7,7 +7,7 @@ describe Paperclip::Shoulda::Matchers::ValidateAttachmentSizeMatcher do
   before do
     reset_table("dummies") do |d|
       d.string :avatar_file_name
-      d.integer :avatar_file_size
+      d.bigint :avatar_file_size
     end
     reset_class "Dummy"
     Dummy.do_not_validate_attachment_file_type :avatar
@@ -75,7 +75,7 @@ describe Paperclip::Shoulda::Matchers::ValidateAttachmentSizeMatcher do
 
     it "be skipped" do
       dummy = Dummy.new
-      dummy.avatar.expects(:post_process).never
+      expect(dummy.avatar).to_not receive(:post_process)
       expect(matcher.greater_than(1024)).to accept(dummy)
     end
   end

data/spec/paperclip/media_type_spoof_detector_spec.rb

@@ -1,44 +1,44 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Paperclip::MediaTypeSpoofDetector do
-  it 'rejects a file that is named .html and identifies as PNG' do
+  it "rejects a file that is named .html and identifies as PNG" do
     file = File.open(fixture_file("5k.png"))
     assert Paperclip::MediaTypeSpoofDetector.using(file, "5k.html", "image/png").spoofed?
   end
 
-  it 'does not reject a file that is named .jpg and identifies as PNG' do
+  it "does not reject a file that is named .jpg and identifies as PNG" do
     file = File.open(fixture_file("5k.png"))
-    assert ! Paperclip::MediaTypeSpoofDetector.using(file, "5k.jpg", "image/png").spoofed?
+    assert !Paperclip::MediaTypeSpoofDetector.using(file, "5k.jpg", "image/png").spoofed?
   end
 
-  it 'does not reject a file that is named .html and identifies as HTML' do
+  it "does not reject a file that is named .html and identifies as HTML" do
     file = File.open(fixture_file("empty.html"))
-    assert ! Paperclip::MediaTypeSpoofDetector.using(file, "empty.html", "text/html").spoofed?
+    assert !Paperclip::MediaTypeSpoofDetector.using(file, "empty.html", "text/html").spoofed?
   end
 
-  it 'does not reject a file that does not have a name' do
+  it "does not reject a file that does not have a name" do
     file = File.open(fixture_file("empty.html"))
-    assert ! Paperclip::MediaTypeSpoofDetector.using(file, "", "text/html").spoofed?
+    assert !Paperclip::MediaTypeSpoofDetector.using(file, "", "text/html").spoofed?
   end
 
-  it 'does not reject a file that does have an extension' do
+  it "does not reject a file that does have an extension" do
     file = File.open(fixture_file("empty.html"))
-    assert ! Paperclip::MediaTypeSpoofDetector.using(file, "data", "text/html").spoofed?
+    assert !Paperclip::MediaTypeSpoofDetector.using(file, "data", "text/html").spoofed?
   end
 
-  it 'does not reject when the supplied file is an IOAdapter' do
+  it "does not reject when the supplied file is an IOAdapter" do
     adapter = Paperclip.io_adapters.for(File.new(fixture_file("5k.png")))
-    assert ! Paperclip::MediaTypeSpoofDetector.using(adapter, adapter.original_filename, adapter.content_type).spoofed?
+    assert !Paperclip::MediaTypeSpoofDetector.using(adapter, adapter.original_filename, adapter.content_type).spoofed?
   end
 
-  it 'does not reject when the extension => content_type is in :content_type_mappings' do
+  it "does not reject when the extension => content_type is in :content_type_mappings" do
     begin
       Paperclip.options[:content_type_mappings] = { pem: "text/plain" }
       file = Tempfile.open(["test", ".PEM"])
       file.puts "Certificate!"
       file.close
-      adapter = Paperclip.io_adapters.for(File.new(file.path));
-      assert ! Paperclip::MediaTypeSpoofDetector.using(adapter, adapter.original_filename, adapter.content_type).spoofed?
+      adapter = Paperclip.io_adapters.for(File.new(file.path))
+      assert !Paperclip::MediaTypeSpoofDetector.using(adapter, adapter.original_filename, adapter.content_type).spoofed?
     ensure
       Paperclip.options[:content_type_mappings] = {}
     end
@@ -53,24 +53,50 @@ describe Paperclip::MediaTypeSpoofDetector do
     end
 
     it "logs info about the detected spoof" do
-      Paperclip.expects(:log).with('Content Type Spoof: Filename empty.html (image/jpg from Headers, ["text/html"] from Extension), content type discovered from file command: text/html. See documentation to allow this combination.')
+      expect(Paperclip).to receive(:log).with('Content Type Spoof: Filename empty.html (image/jpg from Headers, ["text/html"] from Extension), content type discovered from file command: text/html. See documentation to allow this combination.')
       spoofed?
     end
   end
 
+  context "GIF file named without extension, but we're told GIF" do
+    let(:file) { File.open(fixture_file("animated")) }
+    let(:spoofed?) do
+      Paperclip::MediaTypeSpoofDetector.
+        using(file, "animated", "image/gif").
+        spoofed?
+    end
+
+    it "accepts the file" do
+      assert !spoofed?
+    end
+  end
+
+  context "GIF file named without extension, but we're told HTML" do
+    let(:file) { File.open(fixture_file("animated")) }
+    let(:spoofed?) do
+      Paperclip::MediaTypeSpoofDetector.
+        using(file, "animated", "text/html").
+        spoofed?
+    end
+
+    it "rejects the file" do
+      assert spoofed?
+    end
+  end
+
   it "does not reject if content_type is empty but otherwise checks out" do
     file = File.open(fixture_file("empty.html"))
-    assert ! Paperclip::MediaTypeSpoofDetector.using(file, "empty.html", "").spoofed?
+    assert !Paperclip::MediaTypeSpoofDetector.using(file, "empty.html", "").spoofed?
   end
 
-  it 'does allow array as :content_type_mappings' do
+  it "does allow array as :content_type_mappings" do
     begin
       Paperclip.options[:content_type_mappings] = {
-        html: ['binary', 'text/html']
+        html: ["binary", "text/html"]
       }
-      file = File.open(fixture_file('empty.html'))
-      spoofed = Paperclip::MediaTypeSpoofDetector
-                .using(file, "empty.html", "text/html").spoofed?
+      file = File.open(fixture_file("empty.html"))
+      spoofed = Paperclip::MediaTypeSpoofDetector.
+                using(file, "empty.html", "text/html").spoofed?
       assert !spoofed
     ensure
       Paperclip.options[:content_type_mappings] = {}
@@ -82,12 +108,12 @@ describe Paperclip::MediaTypeSpoofDetector do
     let(:detector) { Paperclip::MediaTypeSpoofDetector.new(file, "html", "") }
 
     it "does work with the output of old versions of file" do
-      Paperclip.stubs(:run).returns("text/html charset=us-ascii")
+      allow(Paperclip).to receive(:run).and_return("text/html charset=us-ascii")
       expect(detector.send(:type_from_file_command)).to eq("text/html")
     end
 
     it "does work with the output of new versions of file" do
-      Paperclip.stubs(:run).returns("text/html; charset=us-ascii")
+      allow(Paperclip).to receive(:run).and_return("text/html; charset=us-ascii")
       expect(detector.send(:type_from_file_command)).to eq("text/html")
     end
   end

data/spec/paperclip/meta_class_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require "spec_helper"
 
-describe 'Metaclasses' do
+describe "Metaclasses" do
   context "A meta-class of dummy" do
     if active_support_version >= "4.1" || ruby_version < "2.1"
       before do
@@ -21,7 +21,7 @@ describe 'Metaclasses' do
         rebuild_meta_class_of(@dummy)
 
         assert_nothing_raised do
-          @dummy.avatar = File.new(fixture_file("5k.png"), 'rb')
+          @dummy.avatar = File.new(fixture_file("5k.png"), "rb")
         end
         assert @dummy.save
       end

data/spec/paperclip/paperclip_missing_attachment_styles_spec.rb

@@ -1,59 +1,63 @@
-require 'spec_helper'
+require "spec_helper"
 
-describe 'Missing Attachment Styles' do
+describe "Missing Attachment Styles" do
   before do
     Paperclip::AttachmentRegistry.clear
   end
 
   after do
-    File.unlink(Paperclip.registered_attachments_styles_path) rescue nil
+    begin
+      File.unlink(Paperclip.registered_attachments_styles_path)
+    rescue StandardError
+      nil
+    end
   end
 
   it "enables to get and set path to registered styles file" do
-    assert_equal ROOT.join('tmp/public/system/paperclip_attachments.yml').to_s, Paperclip.registered_attachments_styles_path
-    Paperclip.registered_attachments_styles_path = '/tmp/config/paperclip_attachments.yml'
-    assert_equal '/tmp/config/paperclip_attachments.yml', Paperclip.registered_attachments_styles_path
+    assert_equal ROOT.join("tmp/public/system/paperclip_attachments.yml").to_s, Paperclip.registered_attachments_styles_path
+    Paperclip.registered_attachments_styles_path = "/tmp/config/paperclip_attachments.yml"
+    assert_equal "/tmp/config/paperclip_attachments.yml", Paperclip.registered_attachments_styles_path
     Paperclip.registered_attachments_styles_path = nil
-    assert_equal ROOT.join('tmp/public/system/paperclip_attachments.yml').to_s, Paperclip.registered_attachments_styles_path
+    assert_equal ROOT.join("tmp/public/system/paperclip_attachments.yml").to_s, Paperclip.registered_attachments_styles_path
   end
 
   it "is able to get current attachment styles" do
     assert_equal Hash.new, Paperclip.send(:current_attachments_styles)
-    rebuild_model styles: {croppable: '600x600>', big: '1000x1000>'}
-    expected_hash = { Dummy: {avatar: [:big, :croppable]}}
+    rebuild_model styles: { croppable: "600x600>", big: "1000x1000>" }
+    expected_hash = { Dummy: { avatar: [:big, :croppable] } }
     assert_equal expected_hash, Paperclip.send(:current_attachments_styles)
   end
 
   it "is able to save current attachment styles for further comparison" do
-    rebuild_model styles: {croppable: '600x600>', big: '1000x1000>'}
+    rebuild_model styles: { croppable: "600x600>", big: "1000x1000>" }
     Paperclip.save_current_attachments_styles!
-    expected_hash = { Dummy: {avatar: [:big, :croppable]}}
+    expected_hash = { Dummy: { avatar: [:big, :croppable] } }
     assert_equal expected_hash, YAML.load_file(Paperclip.registered_attachments_styles_path)
   end
 
   it "is able to read registered attachment styles from file" do
-    rebuild_model styles: {croppable: '600x600>', big: '1000x1000>'}
+    rebuild_model styles: { croppable: "600x600>", big: "1000x1000>" }
     Paperclip.save_current_attachments_styles!
-    expected_hash = { Dummy: {avatar: [:big, :croppable]}}
+    expected_hash = { Dummy: { avatar: [:big, :croppable] } }
     assert_equal expected_hash, Paperclip.send(:get_registered_attachments_styles)
   end
 
   it "is able to calculate differences between registered styles and current styles" do
-    rebuild_model styles: {croppable: '600x600>', big: '1000x1000>'}
+    rebuild_model styles: { croppable: "600x600>", big: "1000x1000>" }
     Paperclip.save_current_attachments_styles!
-    rebuild_model styles: {thumb: 'x100', export: 'x400>', croppable: '600x600>', big: '1000x1000>'}
-    expected_hash = { Dummy: {avatar: [:export, :thumb]} }
+    rebuild_model styles: { thumb: "x100", export: "x400>", croppable: "600x600>", big: "1000x1000>" }
+    expected_hash = { Dummy: { avatar: [:export, :thumb] } }
     assert_equal expected_hash, Paperclip.missing_attachments_styles
 
     ActiveRecord::Base.connection.create_table :books, force: true
     class ::Book < ActiveRecord::Base
-      has_attached_file :cover, styles: {small: 'x100', large: '1000x1000>'}
-      has_attached_file :sample, styles: {thumb: 'x100'}
+      has_attached_file :cover, styles: { small: "x100", large: "1000x1000>" }
+      has_attached_file :sample, styles: { thumb: "x100" }
     end
 
     expected_hash = {
-      Dummy: {avatar: [:export, :thumb]},
-      Book: {sample: [:thumb], cover: [:large, :small]}
+      Dummy: { avatar: [:export, :thumb] },
+      Book: { sample: [:thumb], cover: [:large, :small] }
     }
     assert_equal expected_hash, Paperclip.missing_attachments_styles
     Paperclip.save_current_attachments_styles!
@@ -61,15 +65,15 @@ describe 'Missing Attachment Styles' do
   end
 
   it "is able to calculate differences when a new attachment is added to a model" do
-    rebuild_model styles: {croppable: '600x600>', big: '1000x1000>'}
+    rebuild_model styles: { croppable: "600x600>", big: "1000x1000>" }
     Paperclip.save_current_attachments_styles!
 
     class ::Dummy
-      has_attached_file :photo, styles: {small: 'x100', large: '1000x1000>'}
+      has_attached_file :photo, styles: { small: "x100", large: "1000x1000>" }
     end
 
     expected_hash = {
-      Dummy: {photo: [:large, :small]}
+      Dummy: { photo: [:large, :small] }
     }
     assert_equal expected_hash, Paperclip.missing_attachments_styles
     Paperclip.save_current_attachments_styles!
@@ -78,7 +82,7 @@ describe 'Missing Attachment Styles' do
 
   # It's impossible to build styles hash without loading from database whole bunch of records
   it "skips lambda-styles" do
-    rebuild_model styles: lambda{ |attachment| attachment.instance.other == 'a' ? {thumb: "50x50#"} : {large: "400x400"} }
+    rebuild_model styles: lambda { |attachment| attachment.instance.other == "a" ? { thumb: "50x50#" } : { large: "400x400" } }
     assert_equal Hash.new, Paperclip.send(:current_attachments_styles)
   end
 end

data/spec/paperclip/paperclip_spec.rb

@@ -1,10 +1,10 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Paperclip do
   context ".run" do
     before do
       Paperclip.options[:log_command] = false
-      Terrapin::CommandLine.expects(:new).with("convert", "stuff", {}).returns(stub(:run))
+      expect(Terrapin::CommandLine).to receive(:new).with("convert", "stuff", {}).and_return(double(run: nil))
       @original_command_line_path = Terrapin::CommandLine.path
     end
 
@@ -24,7 +24,7 @@ describe Paperclip do
     end
 
     it "does not duplicate Terrapin::CommandLine.path on multiple runs" do
-      Terrapin::CommandLine.expects(:new).with("convert", "more_stuff", {}).returns(stub(:run))
+      expect(Terrapin::CommandLine).to receive(:new).with("convert", "more_stuff", {}).and_return(double(run: nil))
       Terrapin::CommandLine.path = nil
       Paperclip.options[:command_path] = "/opt/my_app/bin"
       Paperclip.run("convert", "stuff")
@@ -35,7 +35,7 @@ describe Paperclip do
     end
   end
 
-  it 'does not raise errors when doing a lot of running' do
+  it "does not raise errors when doing a lot of running" do
     Paperclip.options[:command_path] = ["/usr/local/bin"] * 1024
     Terrapin::CommandLine.path = "/something/else"
     100.times do |x|
@@ -56,21 +56,21 @@ describe Paperclip do
 
     it "does not raise an error when log is called" do
       silence_stream(STDOUT) do
-        Paperclip.log('something')
+        Paperclip.log("something")
       end
     end
   end
   context "Calling Paperclip.run with a logger" do
     it "passes the defined logger if :log_command is set" do
       Paperclip.options[:log_command] = true
-      Terrapin::CommandLine.expects(:new).with("convert", "stuff", logger: Paperclip.logger).returns(stub(:run))
+      expect(Terrapin::CommandLine).to receive(:new).with("convert", "stuff", logger: Paperclip.logger).and_return(double(run: nil))
       Paperclip.run("convert", "stuff")
     end
   end
 
   context "Paperclip.each_instance_with_attachment" do
     before do
-      @file = File.new(fixture_file("5k.png"), 'rb')
+      @file = File.new(fixture_file("5k.png"), "rb")
       d1 = Dummy.create(avatar: @file)
       d2 = Dummy.create
       d3 = Dummy.create(avatar: @file)
@@ -89,7 +89,7 @@ describe Paperclip do
   end
 
   it "raises when sent #processor and the name of a class that doesn't exist" do
-    assert_raises(LoadError){ Paperclip.processor(:boogey_man) }
+    assert_raises(LoadError) { Paperclip.processor(:boogey_man) }
   end
 
   it "returns a class when sent #processor and the name of a class under Paperclip" do
@@ -112,7 +112,7 @@ describe Paperclip do
   context "An ActiveRecord model with an 'avatar' attachment" do
     before do
       rebuild_model path: "tmp/:class/omg/:style.:extension"
-      @file = File.new(fixture_file("5k.png"), 'rb')
+      @file = File.new(fixture_file("5k.png"), "rb")
     end
 
     after { @file.close }
@@ -138,7 +138,11 @@ describe Paperclip do
 
       after do
         SubDummy.delete_all
-        Object.send(:remove_const, "SubDummy") rescue nil
+        begin
+          Object.send(:remove_const, "SubDummy")
+        rescue StandardError
+          nil
+        end
       end
     end
 
@@ -171,7 +175,7 @@ describe Paperclip do
   context "configuring a custom processor" do
     before do
       @freedom_processor = Class.new do
-        def make(file, options = {}, attachment = nil)
+        def make(file, _options = {}, _attachment = nil)
           file
         end
       end.new

data/spec/paperclip/plural_cache_spec.rb

@@ -1,7 +1,7 @@
-require 'spec_helper'
+require "spec_helper"
 
-describe 'Plural cache' do
-  it 'caches pluralizations' do
+describe "Plural cache" do
+  it "caches pluralizations" do
     cache = Paperclip::Interpolations::PluralCache.new
     symbol = :box
 
@@ -10,8 +10,8 @@ describe 'Plural cache' do
     expect(first).to equal(second)
   end
 
-  it 'caches pluralizations and underscores' do
-    class BigBox ; end
+  it "caches pluralizations and underscores" do
+    class BigBox; end
     cache = Paperclip::Interpolations::PluralCache.new
     klass = BigBox
 
@@ -20,15 +20,15 @@ describe 'Plural cache' do
     expect(first).to equal(second)
   end
 
-  it 'pluralizes words' do
+  it "pluralizes words" do
     cache = Paperclip::Interpolations::PluralCache.new
     symbol = :box
 
     expect(cache.pluralize_symbol(symbol)).to eq("boxes")
   end
 
-  it 'pluralizes and underscore class names' do
-    class BigBox ; end
+  it "pluralizes and underscore class names" do
+    class BigBox; end
     cache = Paperclip::Interpolations::PluralCache.new
     klass = BigBox
 

data/spec/paperclip/processor_helpers_spec.rb

@@ -1,54 +1,54 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Paperclip::ProcessorHelpers do
-  describe '.load_processor' do
-    context 'when the file exists in lib/paperclip' do
-      it 'loads it correctly' do
-        pathname = Pathname.new('my_app')
-        main_path = 'main_path'
-        alternate_path = 'alternate_path'
+  describe ".load_processor" do
+    context "when the file exists in lib/paperclip" do
+      it "loads it correctly" do
+        pathname = Pathname.new("my_app")
+        main_path = "main_path"
+        alternate_path = "alternate_path"
 
-        Rails.stubs(:root).returns(pathname)
-        File.expects(:expand_path).with(pathname.join('lib/paperclip', 'custom.rb')).returns(main_path)
-        File.expects(:expand_path).with(pathname.join('lib/paperclip_processors', 'custom.rb')).returns(alternate_path)
-        File.expects(:exist?).with(main_path).returns(true)
-        File.expects(:exist?).with(alternate_path).returns(false)
+        allow(Rails).to receive(:root).and_return(pathname)
+        expect(File).to receive(:expand_path).with(pathname.join("lib/paperclip", "custom.rb")).and_return(main_path)
+        expect(File).to receive(:expand_path).with(pathname.join("lib/paperclip_processors", "custom.rb")).and_return(alternate_path)
+        expect(File).to receive(:exist?).with(main_path).and_return(true)
+        expect(File).to receive(:exist?).with(alternate_path).and_return(false)
 
-        Paperclip.expects(:require).with(main_path)
+        expect(Paperclip).to receive(:require).with(main_path)
 
         Paperclip.load_processor(:custom)
       end
     end
 
-    context 'when the file exists in lib/paperclip_processors' do
-      it 'loads it correctly' do
-        pathname = Pathname.new('my_app')
-        main_path = 'main_path'
-        alternate_path = 'alternate_path'
+    context "when the file exists in lib/paperclip_processors" do
+      it "loads it correctly" do
+        pathname = Pathname.new("my_app")
+        main_path = "main_path"
+        alternate_path = "alternate_path"
 
-        Rails.stubs(:root).returns(pathname)
-        File.expects(:expand_path).with(pathname.join('lib/paperclip', 'custom.rb')).returns(main_path)
-        File.expects(:expand_path).with(pathname.join('lib/paperclip_processors', 'custom.rb')).returns(alternate_path)
-        File.expects(:exist?).with(main_path).returns(false)
-        File.expects(:exist?).with(alternate_path).returns(true)
+        allow(Rails).to receive(:root).and_return(pathname)
+        expect(File).to receive(:expand_path).with(pathname.join("lib/paperclip", "custom.rb")).and_return(main_path)
+        expect(File).to receive(:expand_path).with(pathname.join("lib/paperclip_processors", "custom.rb")).and_return(alternate_path)
+        expect(File).to receive(:exist?).with(main_path).and_return(false)
+        expect(File).to receive(:exist?).with(alternate_path).and_return(true)
 
-        Paperclip.expects(:require).with(alternate_path)
+        expect(Paperclip).to receive(:require).with(alternate_path)
 
         Paperclip.load_processor(:custom)
       end
     end
 
-    context 'when the file does not exist in lib/paperclip_processors' do
-      it 'raises an error' do
-        pathname = Pathname.new('my_app')
-        main_path = 'main_path'
-        alternate_path = 'alternate_path'
-
-        Rails.stubs(:root).returns(pathname)
-        File.stubs(:expand_path).with(pathname.join('lib/paperclip', 'custom.rb')).returns(main_path)
-        File.stubs(:expand_path).with(pathname.join('lib/paperclip_processors', 'custom.rb')).returns(alternate_path)
-        File.stubs(:exist?).with(main_path).returns(false)
-        File.stubs(:exist?).with(alternate_path).returns(false)
+    context "when the file does not exist in lib/paperclip_processors" do
+      it "raises an error" do
+        pathname = Pathname.new("my_app")
+        main_path = "main_path"
+        alternate_path = "alternate_path"
+
+        allow(Rails).to receive(:root).and_return(pathname)
+        allow(File).to receive(:expand_path).with(pathname.join("lib/paperclip", "custom.rb")).and_return(main_path)
+        allow(File).to receive(:expand_path).with(pathname.join("lib/paperclip_processors", "custom.rb")).and_return(alternate_path)
+        allow(File).to receive(:exist?).with(main_path).and_return(false)
+        allow(File).to receive(:exist?).with(alternate_path).and_return(false)
 
         assert_raises(LoadError) { Paperclip.processor(:custom) }
       end

data/spec/paperclip/processor_spec.rb

@@ -1,26 +1,26 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Paperclip::Processor do
   it "instantiates and call #make when sent #make to the class" do
-    processor = mock
-    processor.expects(:make).with()
-    Paperclip::Processor.expects(:new).with(:one, :two, :three).returns(processor)
+    processor = double
+    expect(processor).to receive(:make)
+    expect(Paperclip::Processor).to receive(:new).with(:one, :two, :three).and_return(processor)
     Paperclip::Processor.make(:one, :two, :three)
   end
 
   context "Calling #convert" do
     it "runs the convert command with Terrapin" do
       Paperclip.options[:log_command] = false
-      Terrapin::CommandLine.expects(:new).with("convert", "stuff", {}).returns(stub(:run))
-      Paperclip::Processor.new('filename').convert("stuff")
+      expect(Terrapin::CommandLine).to receive(:new).with("convert", "stuff", {}).and_return(double(run: nil))
+      Paperclip::Processor.new("filename").convert("stuff")
     end
   end
 
   context "Calling #identify" do
     it "runs the identify command with Terrapin" do
       Paperclip.options[:log_command] = false
-      Terrapin::CommandLine.expects(:new).with("identify", "stuff", {}).returns(stub(:run))
-      Paperclip::Processor.new('filename').identify("stuff")
+      expect(Terrapin::CommandLine).to receive(:new).with("identify", "stuff", {}).and_return(double(run: nil))
+      Paperclip::Processor.new("filename").identify("stuff")
     end
   end
 end

data/spec/paperclip/rails_environment_spec.rb

@@ -1,7 +1,6 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Paperclip::RailsEnvironment do
-
   it "returns nil when Rails isn't defined" do
     resetting_rails_to(nil) do
       expect(Paperclip::RailsEnvironment.get).to be_nil
@@ -21,13 +20,11 @@ describe Paperclip::RailsEnvironment do
   end
 
   def resetting_rails_to(new_value)
-    begin
-      previous_rails = Object.send(:remove_const, "Rails")
-      Object.const_set("Rails", new_value) unless new_value.nil?
-      yield
-    ensure
-      Object.send(:remove_const, "Rails") if Object.const_defined?("Rails")
-      Object.const_set("Rails", previous_rails)
-    end
+    previous_rails = Object.send(:remove_const, "Rails")
+    Object.const_set("Rails", new_value) unless new_value.nil?
+    yield
+  ensure
+    Object.send(:remove_const, "Rails") if Object.const_defined?("Rails")
+    Object.const_set("Rails", previous_rails)
   end
 end