paperclip 5.2.1 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ebdb8da166672a655196d2eb60fbe6e399174db
-  data.tar.gz: 5182c61f74ed23c5f51ed7bb4fce43d50bf4a979
+  metadata.gz: 823fa4ed80655c6ae50b1d241142e5afb3ed9e22
+  data.tar.gz: bb9ceacd62b0e1f6167f6d0c6392a696b788ca73
 SHA512:
-  metadata.gz: eff0177912c71bb236706f5776ab3bd3ec47f33d5c62f1b2bee5e455c64ddc46b7e16dd4e26a1026d34b570a43dc3c09d337104991e34d3b9eb82f37cb278834
-  data.tar.gz: 3713cc0cd0c873bd3c4bb6f32845d9cfa9242545e417ed52cdb50a1ca99e425d5dfd49324e4f40560626fa787f8abfff1b450707ce1b82638661e3d58335b122
+  metadata.gz: 4e5b7a64e9db33be68a6a5b8467a8df6c074d16990e51c93bea5a070896b2ce3905ccdc0cad6323148229f3a03209974791a90234d948bb65f7f85868cab35f2
+  data.tar.gz: 376768f292bdc225375aee8dce8c22b58e22904dabbf5044a7a2383b760b362e7a39830e9c63091e5ff1774b49ecd6f1dfbfdb293f198c66f80d3d8bb1fe1987

data/NEWS

@@ -1,3 +1,17 @@
+5.3.0 (2018-03-09):
+
+* Improvement: Use `FactoryBot` instead of `FactoryGirl` (https://github.com/thoughtbot/paperclip/pull/2501)
+* Improvement: README updates (https://github.com/thoughtbot/paperclip/pull/2411, https://github.com/thoughtbot/paperclip/pull/2433, https://github.com/thoughtbot/paperclip/pull/2374, https://github.com/thoughtbot/paperclip/pull/2417, https://github.com/thoughtbot/paperclip/pull/2536)
+* Improvement: Remove Ruby 2.4 deprecation warning (https://github.com/thoughtbot/paperclip/pull/2401)
+* Improvement: Rails 5 migration compatibility (https://github.com/thoughtbot/paperclip/pull/2470)
+* Improvement: Documentation around post processing (https://github.com/thoughtbot/paperclip/pull/2381)
+* Improvement: S3 hostname example documentation (https://github.com/thoughtbot/paperclip/pull/2379)
+* Bugfix: Allow paperclip to load in IRB (https://github.com/thoughtbot/paperclip/pull/2369)
+* Bugfix: MIME type detection (https://github.com/thoughtbot/paperclip/issues/2527)
+* Bugfix: Bad tempfile state after symlink failure (https://github.com/thoughtbot/paperclip/pull/2540)
+* Bugfix: Rewind file after Fog bucket creation (https://github.com/thoughtbot/paperclip/pull/2572)
+* Improvement: Use `Terrapin` instead of `Cocaine` (https://github.com/thoughtbot/paperclip/pull/2553)
+
 5.2.1 (2018-01-25):
 
 * Bugfix: Fix copying files on Windows. (#2532)
@@ -36,6 +50,7 @@
 * Improvement: S3 storage option `:s3_prefixes_in_alias`. (#2287)
 * Improvement: Fog option `:fog_public` can be a lambda. (#2302)
 * Improvement: One fewer warning on JRuby. (#2352)
+* Ruby 2.4.0 compatibility (doesn't use Fixnum anymore)
 
 5.1.0 (2016-08-19):
 

data/README.md

@@ -87,7 +87,7 @@ Requirements
 ### Ruby and Rails
 
 Paperclip now requires Ruby version **>= 2.1** and Rails version **>= 4.2**
-(only if you're going to use Paperclip with Ruby on Rails.)
+(only if you're going to use Paperclip with Ruby on Rails).
 
 ### Image Processor
 
@@ -105,7 +105,7 @@ In development mode, you might add this line to `config/environments/development
 Paperclip.options[:command_path] = "/usr/local/bin/"
 ```
 
-If you're on Mac OS X, you'll want to run the following with [Homebrew] (http://www.brew.sh):
+If you're on Mac OS X, you'll want to run the following with [Homebrew](http://www.brew.sh):
 
     brew install imagemagick
 
@@ -167,7 +167,7 @@ Paperclip is distributed as a gem, which is how it should be used in your app.
 Include the gem in your Gemfile:
 
 ```ruby
-gem "paperclip", "~> 5.0.0"
+gem "paperclip", "~> 5.2.1"
 ```
 
 Or, if you want to get the latest, you can get master from the main paperclip repository:
@@ -206,6 +206,8 @@ end
 
 ### Migrations
 
+
+Assuming you have a `users` table, add an `avatar` column to the `users` table:
 ```ruby
 class AddAvatarColumnsToUsers < ActiveRecord::Migration
   def up
@@ -221,10 +223,11 @@ end
 (Or you can use the Rails migration generator: `rails generate paperclip user avatar`)
 
 ### Edit and New Views
-
+Make sure you have corresponding methods in your controller:
 ```erb
 <%= form_for @user, url: users_path, html: { multipart: true } do |form| %>
   <%= form.file_field :avatar %>
+  <%= form.submit %>
 <% end %>
 ```
 
@@ -233,6 +236,7 @@ end
 ```erb
 <%= simple_form_for @user, url: users_path do |form| %>
   <%= form.input :avatar, as: :file %>
+  <%= form.submit %>
 <% end %>
 ```
 
@@ -240,7 +244,7 @@ end
 
 ```ruby
 def create
-  @user = User.create( user_params )
+  @user = User.create(user_params)
 end
 
 private
@@ -254,7 +258,7 @@ end
 ```
 
 ### View Helpers
-
+Add these to the view where you want your images displayed:
 ```erb
 <%= image_tag @user.avatar.url %>
 <%= image_tag @user.avatar.url(:medium) %>
@@ -347,7 +351,7 @@ called with valid attachments._
 
 ```ruby
 class Message < ActiveRecord::Base
-  has_attached_file :asset, styles: {thumb: "100x100#"}
+  has_attached_file :asset, styles: { thumb: "100x100#" }
 
   before_post_process :skip_for_audio
 
@@ -363,7 +367,7 @@ afterwards, then assign manually:
 
 ```ruby
 class Book < ActiveRecord::Base
-  has_attached_file :document, styles: {thumbnail: "60x60#"}
+  has_attached_file :document, styles: { thumbnail: "60x60#" }
   validates_attachment :document, content_type: { content_type: "application/pdf" }
   validates_something_else # Other validations that conflict with Paperclip's
 end
@@ -656,6 +660,14 @@ JPGs will remain JPGs). `Paperclip::Thumbnail` uses ImageMagick to process
 images; [ImageMagick's geometry documentation](http://www.imagemagick.org/script/command-line-processing.php#geometry)
 has more information on the accepted style formats.
 
+For more fine-grained control of the conversion process, `source_file_options` and `convert_options` can be used to pass flags and settings directly to ImageMagick's powerful Convert tool, [documented here](https://www.imagemagick.org/script/convert.php). For example:
+
+```ruby
+has_attached_file :image, styles: { regular: ['800x800>', :png]}, 
+    source_file_options: { regular: "-density 96 -depth 8 -quality 85" },
+    convert_options: { regular: "-posterize 3"}
+```
+
 ImageMagick supports a number of environment variables for controlling its resource limits. For example, you can enforce memory or execution time limits by setting the following variables in your application's process environment:
 
 * `MAGICK_MEMORY_LIMIT=128MiB`
@@ -738,7 +750,7 @@ called with valid attachments._
 
 ```ruby
 class Message < ActiveRecord::Base
-  has_attached_file :asset, styles: {thumb: "100x100#"}
+  has_attached_file :asset, styles: { thumb: "100x100#" }
 
   before_post_process :skip_for_audio
 
@@ -983,7 +995,7 @@ similar mechanism for whichever parallel testing library you use.
 
 **Integration Tests**
 
-Using integration tests with FactoryGirl may save multiple copies of
+Using integration tests with FactoryBot may save multiple copies of
 your test files within the app. To avoid this, specify a custom path in
 the `config/environments/test.rb` like so:
 
@@ -1000,11 +1012,11 @@ config.after(:suite) do
 end
 ```
 
-**Example of test configuration with Factory Girl**
+**Example of test configuration with Factory Bot**
 
 
 ```ruby
-FactoryGirl.define do
+FactoryBot.define do
   factory :user do
     avatar { File.new("#{Rails.root}/spec/support/fixtures/image.jpg") }
   end

data/lib/generators/paperclip/paperclip_generator.rb

@@ -13,7 +13,9 @@ class PaperclipGenerator < ActiveRecord::Generators::Base
   end
 
   def generate_migration
-    migration_template "paperclip_migration.rb.erb", "db/migrate/#{migration_file_name}"
+    migration_template("paperclip_migration.rb.erb",
+                       "db/migrate/#{migration_file_name}",
+                       migration_version: migration_version)
   end
 
   def migration_name
@@ -27,4 +29,10 @@ class PaperclipGenerator < ActiveRecord::Generators::Base
   def migration_class_name
     migration_name.camelize
   end
+
+  def migration_version
+    if Rails.version.start_with? "5"
+      "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
+    end
+  end
 end

data/lib/generators/paperclip/templates/paperclip_migration.rb.erb

@@ -1,4 +1,4 @@
-class <%= migration_class_name %> < ActiveRecord::Migration
+class <%= migration_class_name %> < ActiveRecord::Migration<%= migration_version %>
   def self.up
     change_table :<%= table_name %> do |t|
 <% attachment_names.each do |attachment| -%>

data/lib/paperclip.rb

@@ -67,7 +67,7 @@ end
 require 'mimemagic'
 require 'mimemagic/overlay'
 require 'logger'
-require 'cocaine'
+require 'terrapin'
 
 require 'paperclip/railtie' if defined?(Rails::Railtie)
 

data/lib/paperclip/file_command_content_type_detector.rb

@@ -16,7 +16,7 @@ module Paperclip
       # On BSDs, `file` doesn't give a result code of 1 if the file doesn't exist.
       type = begin
                Paperclip.run("file", "-b --mime :file", file: @filename)
-             rescue Cocaine::CommandLineError => e
+             rescue Terrapin::CommandLineError => e
                Paperclip.log("Error while determining content type: #{e}")
                SENSIBLE_DEFAULT
              end

data/lib/paperclip/geometry_detector_factory.rb

@@ -24,9 +24,9 @@ module Paperclip
             :swallow_stderr => true
           }
         )
-      rescue Cocaine::ExitStatusError
+      rescue Terrapin::ExitStatusError
         ""
-      rescue Cocaine::CommandNotFoundError => e
+      rescue Terrapin::CommandNotFoundError => e
         raise_because_imagemagick_missing
       end
     end

data/lib/paperclip/helpers.rb

@@ -27,12 +27,12 @@ module Paperclip
     #
     def run(cmd, arguments = "", interpolation_values = {}, local_options = {})
       command_path = options[:command_path]
-      cocaine_path_array = Cocaine::CommandLine.path.try(:split, Cocaine::OS.path_separator)
-      Cocaine::CommandLine.path = [cocaine_path_array, command_path].flatten.compact.uniq
+      terrapin_path_array = Terrapin::CommandLine.path.try(:split, Terrapin::OS.path_separator)
+      Terrapin::CommandLine.path = [terrapin_path_array, command_path].flatten.compact.uniq
       if logging? && (options[:log_command] || local_options[:log_command])
         local_options = local_options.merge(:logger => logger)
       end
-      Cocaine::CommandLine.new(cmd, arguments, local_options).run(interpolation_values)
+      Terrapin::CommandLine.new(cmd, arguments, local_options).run(interpolation_values)
     end
 
     # Find all instances of the given Active Record model +klass+ with attachment +name+.

data/lib/paperclip/io_adapters/abstract_adapter.rb

@@ -62,8 +62,12 @@ module Paperclip
       @destination.close
       @destination.open.binmode
     rescue Errno::EXDEV, Errno::EPERM, Errno::ENOENT, Errno::EEXIST => e
-      Paperclip.log("Link failed with #{e.message}; copying link #{src} to #{dest}")
+      Paperclip.log(
+        "Link failed with #{e.message}; copying link #{src} to #{dest}"
+      )
       FileUtils.cp(src, dest)
+      @destination.close
+      @destination.open.binmode
     end
   end
 end

data/lib/paperclip/media_type_spoof_detector.rb

@@ -72,8 +72,9 @@ module Paperclip
 
     def type_from_file_command
       begin
-        Paperclip.run("file", "-b --mime :file", :file => @file.path).split(/[:;]\s+/).first
-      rescue Cocaine::CommandLineError
+        Paperclip.run("file", "-b --mime :file", file: @file.path).
+          split(/[:;\s]+/).first
+      rescue Terrapin::CommandLineError
         ""
       end
     end

data/lib/paperclip/storage/fog.rb

@@ -117,6 +117,7 @@ module Paperclip
             raise if retried
             retried = true
             directory.save
+            file.rewind
             retry
           ensure
             file.rewind
@@ -184,7 +185,7 @@ module Paperclip
       private
 
       def convert_time(time)
-        if time.is_a?(Fixnum)
+        if time.is_a?(Integer)
           time = Time.now + time
         end
         time

data/lib/paperclip/storage/s3.rb

@@ -94,7 +94,8 @@ module Paperclip
     #   to interpolate. Keys should be unique, like filenames, and despite the fact that
     #   S3 (strictly speaking) does not support directories, you can still use a / to
     #   separate parts of your file name.
-    # * +s3_host_name+: If you are using your bucket in Tokyo region etc, write host_name.
+    # * +s3_host_name+: If you are using your bucket in Tokyo region
+    #   etc, write host_name (e.g., 's3-ap-northeast-1.amazonaws.com').
     # * +s3_region+: For aws-sdk v2, s3_region is required.
     # * +s3_metadata+: These key/value pairs will be stored with the
     #   object.  This option works by prefixing each key with

data/lib/paperclip/thumbnail.rb

@@ -84,9 +84,9 @@ module Paperclip
           source: "#{File.expand_path(src.path)}#{frame}",
           dest: File.expand_path(dst.path),
         )
-      rescue Cocaine::ExitStatusError => e
+      rescue Terrapin::ExitStatusError => e
         raise Paperclip::Error, "There was an error processing the thumbnail for #{@basename}" if @whiny
-      rescue Cocaine::CommandNotFoundError => e
+      rescue Terrapin::CommandNotFoundError => e
         raise Paperclip::Errors::CommandNotFoundError.new("Could not run the `convert` command. Please install ImageMagick.")
       end
 
@@ -122,9 +122,9 @@ module Paperclip
         @identified_as_animated = ANIMATED_FORMATS.include? identify("-format %m :file", :file => "#{@file.path}[0]").to_s.downcase.strip
       end
       @identified_as_animated
-    rescue Cocaine::ExitStatusError => e
+    rescue Terrapin::ExitStatusError => e
       raise Paperclip::Error, "There was an error running `identify` for #{@basename}" if @whiny
-    rescue Cocaine::CommandNotFoundError => e
+    rescue Terrapin::CommandNotFoundError => e
       raise Paperclip::Errors::CommandNotFoundError.new("Could not run the `identify` command. Please install ImageMagick.")
     end
   end

data/lib/paperclip/url_generator.rb

@@ -1,4 +1,5 @@
 require 'uri'
+require 'active_support/core_ext/module/delegation'
 
 module Paperclip
   class UrlGenerator

data/lib/paperclip/version.rb

@@ -1,5 +1,5 @@
 module Paperclip
   unless defined?(Paperclip::VERSION)
-    VERSION = "5.2.1".freeze
+    VERSION = "5.3.0".freeze
   end
 end

data/paperclip.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency('activemodel', '>= 4.2.0')
   s.add_dependency('activesupport', '>= 4.2.0')
-  s.add_dependency('cocaine', '~> 0.5.5')
+  s.add_dependency('terrapin', '~> 0.6.0')
   s.add_dependency('mime-types')
   s.add_dependency('mimemagic', '~> 0.3.0')
 

data/spec/paperclip/content_type_detector_spec.rb

@@ -41,7 +41,7 @@ describe Paperclip::ContentTypeDetector do
   end
 
   it 'returns a sensible default when the file command is missing' do
-    Paperclip.stubs(:run).raises(Cocaine::CommandLineError.new)
+    Paperclip.stubs(:run).raises(Terrapin::CommandLineError.new)
     @filename = "/path/to/something"
     assert_equal "application/octet-stream", Paperclip::ContentTypeDetector.new(@filename).detect
   end

data/spec/paperclip/file_command_content_type_detector_spec.rb

@@ -12,7 +12,7 @@ describe Paperclip::FileCommandContentTypeDetector do
   end
 
   it 'returns a sensible default when the file command is missing' do
-    Paperclip.stubs(:run).raises(Cocaine::CommandLineError.new)
+    Paperclip.stubs(:run).raises(Terrapin::CommandLineError.new)
     @filename = "/path/to/something"
     assert_equal "application/octet-stream",
       Paperclip::FileCommandContentTypeDetector.new(@filename).detect
@@ -23,4 +23,18 @@ describe Paperclip::FileCommandContentTypeDetector do
     assert_equal "application/octet-stream",
       Paperclip::FileCommandContentTypeDetector.new("windows").detect
   end
+
+  context "#type_from_file_command" do
+    let(:detector) { Paperclip::FileCommandContentTypeDetector.new("html") }
+
+    it "does work with the output of old versions of file" do
+      Paperclip.stubs(:run).returns("text/html charset=us-ascii")
+      expect(detector.detect).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")
+      expect(detector.detect).to eq("text/html")
+    end
+  end
 end

data/spec/paperclip/io_adapters/abstract_adapter_spec.rb

@@ -98,4 +98,35 @@ describe Paperclip::AbstractAdapter do
       expect { subject.original_filename = nil }.not_to raise_error
     end
   end
+
+  context "#link_or_copy_file" do
+    class TestLinkOrCopyAdapter < Paperclip::AbstractAdapter
+      public :copy_to_tempfile, :destination
+    end
+
+    subject { TestLinkOrCopyAdapter.new(nil) }
+    let(:body) { "body" }
+
+    let(:file) do
+      t = Tempfile.new("destination")
+      t.print(body)
+      t.rewind
+      t
+    end
+
+    after do
+      file.close
+      file.unlink
+    end
+
+    it "should be able to read the file" do
+      expect(subject.copy_to_tempfile(file).read).to eq(body)
+    end
+
+    it "should be able to reopen the file after symlink has failed" do
+      FileUtils.expects(:ln).raises(Errno::EXDEV)
+
+      expect(subject.copy_to_tempfile(file).read).to eq(body)
+    end
+  end
 end

data/spec/paperclip/media_type_spoof_detector_spec.rb

@@ -76,4 +76,19 @@ describe Paperclip::MediaTypeSpoofDetector do
       Paperclip.options[:content_type_mappings] = {}
     end
   end
+
+  context "#type_from_file_command" do
+    let(:file) { File.new(fixture_file("empty.html")) }
+    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")
+      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")
+      expect(detector.send(:type_from_file_command)).to eq("text/html")
+    end
+  end
 end

data/spec/paperclip/paperclip_spec.rb

@@ -4,40 +4,40 @@ describe Paperclip do
   context ".run" do
     before do
       Paperclip.options[:log_command] = false
-      Cocaine::CommandLine.expects(:new).with("convert", "stuff", {}).returns(stub(:run))
-      @original_command_line_path = Cocaine::CommandLine.path
+      Terrapin::CommandLine.expects(:new).with("convert", "stuff", {}).returns(stub(:run))
+      @original_command_line_path = Terrapin::CommandLine.path
     end
 
     after do
       Paperclip.options[:log_command] = true
-      Cocaine::CommandLine.path = @original_command_line_path
+      Terrapin::CommandLine.path = @original_command_line_path
     end
 
-    it "runs the command with Cocaine" do
+    it "runs the command with Terrapin" do
       Paperclip.run("convert", "stuff")
     end
 
-    it "saves Cocaine::CommandLine.path that set before" do
-      Cocaine::CommandLine.path = "/opt/my_app/bin"
+    it "saves Terrapin::CommandLine.path that set before" do
+      Terrapin::CommandLine.path = "/opt/my_app/bin"
       Paperclip.run("convert", "stuff")
-      expect(Cocaine::CommandLine.path).to match("/opt/my_app/bin")
+      expect(Terrapin::CommandLine.path).to match("/opt/my_app/bin")
     end
 
-    it "does not duplicate Cocaine::CommandLine.path on multiple runs" do
-      Cocaine::CommandLine.expects(:new).with("convert", "more_stuff", {}).returns(stub(:run))
-      Cocaine::CommandLine.path = nil
+    it "does not duplicate Terrapin::CommandLine.path on multiple runs" do
+      Terrapin::CommandLine.expects(:new).with("convert", "more_stuff", {}).returns(stub(:run))
+      Terrapin::CommandLine.path = nil
       Paperclip.options[:command_path] = "/opt/my_app/bin"
       Paperclip.run("convert", "stuff")
       Paperclip.run("convert", "more_stuff")
 
       cmd_path = Paperclip.options[:command_path]
-      assert_equal 1, Cocaine::CommandLine.path.scan(cmd_path).count
+      assert_equal 1, Terrapin::CommandLine.path.scan(cmd_path).count
     end
   end
 
   it 'does not raise errors when doing a lot of running' do
     Paperclip.options[:command_path] = ["/usr/local/bin"] * 1024
-    Cocaine::CommandLine.path = "/something/else"
+    Terrapin::CommandLine.path = "/something/else"
     100.times do |x|
       Paperclip.run("echo", x.to_s)
     end
@@ -63,7 +63,7 @@ describe Paperclip do
   context "Calling Paperclip.run with a logger" do
     it "passes the defined logger if :log_command is set" do
       Paperclip.options[:log_command] = true
-      Cocaine::CommandLine.expects(:new).with("convert", "stuff", logger: Paperclip.logger).returns(stub(:run))
+      Terrapin::CommandLine.expects(:new).with("convert", "stuff", logger: Paperclip.logger).returns(stub(:run))
       Paperclip.run("convert", "stuff")
     end
   end

data/spec/paperclip/processor_spec.rb

@@ -9,17 +9,17 @@ describe Paperclip::Processor do
   end
 
   context "Calling #convert" do
-    it "runs the convert command with Cocaine" do
+    it "runs the convert command with Terrapin" do
       Paperclip.options[:log_command] = false
-      Cocaine::CommandLine.expects(:new).with("convert", "stuff", {}).returns(stub(:run))
+      Terrapin::CommandLine.expects(:new).with("convert", "stuff", {}).returns(stub(:run))
       Paperclip::Processor.new('filename').convert("stuff")
     end
   end
 
   context "Calling #identify" do
-    it "runs the identify command with Cocaine" do
+    it "runs the identify command with Terrapin" do
       Paperclip.options[:log_command] = false
-      Cocaine::CommandLine.expects(:new).with("identify", "stuff", {}).returns(stub(:run))
+      Terrapin::CommandLine.expects(:new).with("identify", "stuff", {}).returns(stub(:run))
       Paperclip::Processor.new('filename').identify("stuff")
     end
   end

data/spec/paperclip/storage/fog_spec.rb

@@ -206,6 +206,11 @@ describe Paperclip::Storage::Fog do
           assert @dummy.save
           assert @connection.directories.get(@fog_directory)
         end
+
+        it "sucessfully rewinds the file during bucket creation" do
+          assert @dummy.save
+          expect(Paperclip.io_adapters.for(@dummy.avatar).read.length).to be > 0
+        end
       end
 
       context "with a bucket" do

data/spec/paperclip/thumbnail_spec.rb

@@ -48,7 +48,7 @@ describe Paperclip::Thumbnail do
       it "lets us know when a command isn't found versus a processing error" do
         old_path = ENV['PATH']
         begin
-          Cocaine::CommandLine.path = ''
+          Terrapin::CommandLine.path = ''
           Paperclip.options[:command_path] = ''
           ENV['PATH'] = ''
           assert_raises(Paperclip::Errors::CommandNotFoundError) do
@@ -102,7 +102,7 @@ describe Paperclip::Thumbnail do
 
       output_file = thumb.make
 
-      command = Cocaine::CommandLine.new("identify", "-format %wx%h :file")
+      command = Terrapin::CommandLine.new("identify", "-format %wx%h :file")
       assert_equal "50x50", command.run(file: output_file.path).strip
     end
 
@@ -189,7 +189,7 @@ describe Paperclip::Thumbnail do
         it "lets us know when a command isn't found versus a processing error" do
           old_path = ENV['PATH']
           begin
-            Cocaine::CommandLine.path = ''
+            Terrapin::CommandLine.path = ''
             Paperclip.options[:command_path] = ''
             ENV['PATH'] = ''
             assert_raises(Paperclip::Errors::CommandNotFoundError) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperclip
 version: !ruby/object:Gem::Version
-  version: 5.2.1
+  version: 5.3.0
 platform: ruby
 authors:
 - Jon Yurek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-25 00:00:00.000000000 Z
+date: 2018-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.2.0
 - !ruby/object:Gem::Dependency
-  name: cocaine
+  name: terrapin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -611,8 +611,113 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - ImageMagick
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: File attachments as attributes for ActiveRecord
-test_files: []
+test_files:
+- features/basic_integration.feature
+- features/migration.feature
+- features/rake_tasks.feature
+- features/step_definitions/attachment_steps.rb
+- features/step_definitions/html_steps.rb
+- features/step_definitions/rails_steps.rb
+- features/step_definitions/s3_steps.rb
+- features/step_definitions/web_steps.rb
+- features/support/env.rb
+- features/support/fakeweb.rb
+- features/support/file_helpers.rb
+- features/support/fixtures/boot_config.txt
+- features/support/fixtures/gemfile.txt
+- features/support/fixtures/preinitializer.txt
+- features/support/paths.rb
+- features/support/rails.rb
+- features/support/selectors.rb
+- spec/database.yml
+- spec/paperclip/attachment_definitions_spec.rb
+- spec/paperclip/attachment_processing_spec.rb
+- spec/paperclip/attachment_registry_spec.rb
+- spec/paperclip/attachment_spec.rb
+- spec/paperclip/content_type_detector_spec.rb
+- spec/paperclip/file_command_content_type_detector_spec.rb
+- spec/paperclip/filename_cleaner_spec.rb
+- spec/paperclip/geometry_detector_spec.rb
+- spec/paperclip/geometry_parser_spec.rb
+- spec/paperclip/geometry_spec.rb
+- spec/paperclip/glue_spec.rb
+- spec/paperclip/has_attached_file_spec.rb
+- spec/paperclip/integration_spec.rb
+- spec/paperclip/interpolations_spec.rb
+- spec/paperclip/io_adapters/abstract_adapter_spec.rb
+- spec/paperclip/io_adapters/attachment_adapter_spec.rb
+- spec/paperclip/io_adapters/data_uri_adapter_spec.rb
+- spec/paperclip/io_adapters/empty_string_adapter_spec.rb
+- spec/paperclip/io_adapters/file_adapter_spec.rb
+- spec/paperclip/io_adapters/http_url_proxy_adapter_spec.rb
+- spec/paperclip/io_adapters/identity_adapter_spec.rb
+- spec/paperclip/io_adapters/nil_adapter_spec.rb
+- spec/paperclip/io_adapters/registry_spec.rb
+- spec/paperclip/io_adapters/stringio_adapter_spec.rb
+- spec/paperclip/io_adapters/uploaded_file_adapter_spec.rb
+- spec/paperclip/io_adapters/uri_adapter_spec.rb
+- spec/paperclip/matchers/have_attached_file_matcher_spec.rb
+- spec/paperclip/matchers/validate_attachment_content_type_matcher_spec.rb
+- spec/paperclip/matchers/validate_attachment_presence_matcher_spec.rb
+- spec/paperclip/matchers/validate_attachment_size_matcher_spec.rb
+- spec/paperclip/media_type_spoof_detector_spec.rb
+- spec/paperclip/meta_class_spec.rb
+- spec/paperclip/paperclip_missing_attachment_styles_spec.rb
+- spec/paperclip/paperclip_spec.rb
+- spec/paperclip/plural_cache_spec.rb
+- spec/paperclip/processor_helpers_spec.rb
+- spec/paperclip/processor_spec.rb
+- spec/paperclip/rails_environment_spec.rb
+- spec/paperclip/rake_spec.rb
+- spec/paperclip/schema_spec.rb
+- spec/paperclip/storage/filesystem_spec.rb
+- spec/paperclip/storage/fog_spec.rb
+- spec/paperclip/storage/s3_live_spec.rb
+- spec/paperclip/storage/s3_spec.rb
+- spec/paperclip/style_spec.rb
+- spec/paperclip/tempfile_factory_spec.rb
+- spec/paperclip/tempfile_spec.rb
+- spec/paperclip/thumbnail_spec.rb
+- spec/paperclip/url_generator_spec.rb
+- spec/paperclip/validators/attachment_content_type_validator_spec.rb
+- spec/paperclip/validators/attachment_file_name_validator_spec.rb
+- spec/paperclip/validators/attachment_presence_validator_spec.rb
+- spec/paperclip/validators/attachment_size_validator_spec.rb
+- spec/paperclip/validators/media_type_spoof_detection_validator_spec.rb
+- spec/paperclip/validators_spec.rb
+- spec/spec_helper.rb
+- spec/support/assertions.rb
+- spec/support/conditional_filter_helper.rb
+- spec/support/fake_model.rb
+- spec/support/fake_rails.rb
+- spec/support/fixtures/12k.png
+- spec/support/fixtures/50x50.png
+- spec/support/fixtures/5k.png
+- spec/support/fixtures/animated
+- spec/support/fixtures/animated.gif
+- spec/support/fixtures/animated.unknown
+- spec/support/fixtures/bad.png
+- spec/support/fixtures/empty.html
+- spec/support/fixtures/empty.xlsx
+- spec/support/fixtures/fog.yml
+- spec/support/fixtures/rotated.jpg
+- spec/support/fixtures/s3.yml
+- spec/support/fixtures/spaced file.jpg
+- spec/support/fixtures/spaced file.png
+- spec/support/fixtures/text.txt
+- spec/support/fixtures/twopage.pdf
+- spec/support/fixtures/uppercase.PNG
+- spec/support/matchers/accept.rb
+- spec/support/matchers/exist.rb
+- spec/support/matchers/have_column.rb
+- spec/support/mock_attachment.rb
+- spec/support/mock_interpolator.rb
+- spec/support/mock_url_generator_builder.rb
+- spec/support/model_reconstruction.rb
+- spec/support/reporting.rb
+- spec/support/test_data.rb
+- spec/support/version_helper.rb