paperclip 4.2.4 → 5.2.0

data/spec/paperclip/has_attached_file_spec.rb

@@ -38,6 +38,15 @@ describe Paperclip::HasAttachedFile do
       assert_adding_attachment('avatar').defines_callback('after_commit')
     end
 
+    context 'when the class does not allow after_commit callbacks' do
+      it 'defines an after_destroy callback' do
+        assert_adding_attachment(
+          'avatar',
+          unstub_methods: [:after_commit]
+        ).defines_callback('after_destroy')
+      end
+    end
+
     it 'defines the Paperclip-specific callbacks' do
       assert_adding_attachment('avatar').defines_callback('define_paperclip_callbacks')
     end
@@ -53,20 +62,26 @@ describe Paperclip::HasAttachedFile do
 
   private
 
-  def assert_adding_attachment(attachment_name)
-    AttachmentAdder.new(attachment_name)
+  def assert_adding_attachment(attachment_name, options={})
+    AttachmentAdder.new(attachment_name, options)
   end
 
   class AttachmentAdder
     include Mocha::API
     include RSpec::Matchers
 
-    def initialize(attachment_name)
+    def initialize(attachment_name, options = {})
       @attachment_name = attachment_name
+      @stubbed_class = stub_class
+      if options.present?
+        options[:unstub_methods].each do |method|
+          @stubbed_class.unstub(method)
+        end
+      end
     end
 
     def defines_method(method_name)
-      a_class = stub_class
+      a_class = @stubbed_class
 
       Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, {})
 
@@ -74,7 +89,7 @@ describe Paperclip::HasAttachedFile do
     end
 
     def defines_class_method(method_name)
-      a_class = stub_class
+      a_class = @stubbed_class
       a_class.class.stubs(:define_method)
 
       Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, {})
@@ -83,7 +98,7 @@ describe Paperclip::HasAttachedFile do
     end
 
     def defines_validation
-      a_class = stub_class
+      a_class = @stubbed_class
 
       Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, {})
 
@@ -91,7 +106,7 @@ describe Paperclip::HasAttachedFile do
     end
 
     def registers_attachment
-      a_class = stub_class
+      a_class = @stubbed_class
       Paperclip::AttachmentRegistry.stubs(:register)
 
       Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, {size: 1})
@@ -100,7 +115,7 @@ describe Paperclip::HasAttachedFile do
     end
 
     def defines_callback(callback_name)
-      a_class = stub_class
+      a_class = @stubbed_class
 
       Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, {})
 
@@ -132,6 +147,7 @@ describe Paperclip::HasAttachedFile do
            after_save: nil,
            before_destroy: nil,
            after_commit: nil,
+           after_destroy: nil,
            define_paperclip_callbacks: nil,
            extend: nil,
            name: 'Billy',

data/spec/paperclip/integration_spec.rb

@@ -7,9 +7,10 @@ describe 'Paperclip' do
     before do
       rebuild_model
       @file = File.new(fixture_file("5k.png"), 'rb')
-      300.times do |i|
-        Dummy.create! avatar: @file
-      end
+      # Deals with `Too many open files` error
+      Dummy.import 100.times.map { Dummy.new avatar: @file }
+      Dummy.import 100.times.map { Dummy.new avatar: @file }
+      Dummy.import 100.times.map { Dummy.new avatar: @file }
     end
 
     after { @file.close }

data/spec/paperclip/interpolations_spec.rb

@@ -24,15 +24,16 @@ describe Paperclip::Interpolations do
   end
 
   it "returns the class of the instance" do
+    class Thing ; end
     attachment = mock
     attachment.expects(:instance).returns(attachment)
-    attachment.expects(:class).returns("Thing")
+    attachment.expects(:class).returns(Thing)
     assert_equal "things", Paperclip::Interpolations.class(attachment, :style)
   end
 
   it "returns the basename of the file" do
     attachment = mock
-    attachment.expects(:original_filename).returns("one.jpg").times(2)
+    attachment.expects(:original_filename).returns("one.jpg").times(1)
     assert_equal "one", Paperclip::Interpolations.basename(attachment, :style)
   end
 
@@ -138,14 +139,7 @@ describe Paperclip::Interpolations do
     assert_equal "000/000/023", Paperclip::Interpolations.id_partition(attachment, :style)
   end
 
-  it "returns the partitioned id of the attachment when the id is a short string" do
-    attachment = mock
-    attachment.expects(:id).returns("fnj23")
-    attachment.expects(:instance).returns(attachment)
-    assert_equal "000/0fn/j23", Paperclip::Interpolations.id_partition(attachment, :style)
-  end
-
-  it "returns the partitioned id of the attachment when the id is a long string" do
+  it "returns the partitioned id of the attachment when the id is a string" do
     attachment = mock
     attachment.expects(:id).returns("32fnj23oio2f")
     attachment.expects(:instance).returns(attachment)
@@ -194,14 +188,14 @@ describe Paperclip::Interpolations do
   it "returns the filename as basename.extension" do
     attachment = mock
     attachment.expects(:styles).returns({})
-    attachment.expects(:original_filename).returns("one.jpg").times(3)
+    attachment.expects(:original_filename).returns("one.jpg").times(2)
     assert_equal "one.jpg", Paperclip::Interpolations.filename(attachment, :style)
   end
 
   it "returns the filename as basename.extension when format supplied" do
     attachment = mock
     attachment.expects(:styles).returns({style: {format: :png}})
-    attachment.expects(:original_filename).returns("one.jpg").times(2)
+    attachment.expects(:original_filename).returns("one.jpg").times(1)
     assert_equal "one.png", Paperclip::Interpolations.filename(attachment, :style)
   end
 
@@ -211,7 +205,7 @@ describe Paperclip::Interpolations do
     attachment.stubs(:original_filename).returns("one")
     assert_equal "one", Paperclip::Interpolations.filename(attachment, :style)
   end
-
+  
   it "returns the basename when the extension contains regexp special characters" do
     attachment = mock
     attachment.stubs(:styles).returns({})
@@ -256,4 +250,13 @@ describe Paperclip::Interpolations do
     value = Paperclip::Interpolations.interpolate(":notreal/:id/:attachment", :attachment, :style)
     assert_equal ":notreal/1234/attachments", value
   end
+
+  it "handles question marks" do
+    Paperclip.interpolates :foo? do
+      "bar"
+    end
+    Paperclip::Interpolations.expects(:fool).never
+    value = Paperclip::Interpolations.interpolate(":fo/:foo?")
+    assert_equal ":fo/bar", value
+  end
 end

data/spec/paperclip/io_adapters/abstract_adapter_spec.rb

@@ -9,69 +9,93 @@ describe Paperclip::AbstractAdapter do
     end
   end
 
-  context "content type from file command" do
+  subject { TestAdapter.new(nil) }
+
+  context "content type from file contents" do
     before do
-      @adapter = TestAdapter.new
-      @adapter.stubs(:path).returns("image.png")
+      subject.stubs(:path).returns("image.png")
       Paperclip.stubs(:run).returns("image/png\n")
+      Paperclip::ContentTypeDetector.any_instance.stubs(:type_from_mime_magic).returns("image/png")
     end
 
     it "returns the content type without newline" do
-      assert_equal "image/png", @adapter.content_type
+      assert_equal "image/png", subject.content_type
     end
   end
 
   context "nil?" do
     it "returns false" do
-      assert !TestAdapter.new.nil?
+      assert !subject.nil?
     end
   end
 
   context "delegation" do
     before do
-      @adapter = TestAdapter.new
-      @adapter.tempfile = stub("Tempfile")
+      subject.tempfile = stub("Tempfile")
     end
 
-    [:binmode, :binmode?, :close, :close!, :closed?, :eof?, :path, :rewind, :unlink].each do |method|
+    [:binmode, :binmode?, :close, :close!, :closed?, :eof?, :path, :readbyte, :rewind, :unlink].each do |method|
       it "delegates #{method} to @tempfile" do
-        @adapter.tempfile.stubs(method)
-        @adapter.public_send(method)
-        assert_received @adapter.tempfile, method
+        subject.tempfile.stubs(method)
+        subject.public_send(method)
+        assert_received subject.tempfile, method
       end
     end
   end
 
   it 'gets rid of slashes and colons in filenames' do
-    @adapter = TestAdapter.new
-    @adapter.original_filename = "awesome/file:name.png"
+    subject.original_filename = "awesome/file:name.png"
 
-    assert_equal "awesome_file_name.png", @adapter.original_filename
+    assert_equal "awesome_file_name.png", subject.original_filename
   end
 
   it 'is an assignment' do
-    assert TestAdapter.new.assignment?
+    assert subject.assignment?
   end
 
   it 'is not nil' do
-    assert !TestAdapter.new.nil?
+    assert !subject.nil?
   end
 
   it "generates a destination filename with no original filename" do
-    @adapter = TestAdapter.new
-    expect(@adapter.send(:destination).path).to_not be_nil
+    expect(subject.send(:destination).path).to_not be_nil
   end
 
   it 'uses the original filename to generate the tempfile' do
-    @adapter = TestAdapter.new
-    @adapter.original_filename = "file.png"
-    expect(@adapter.send(:destination).path).to end_with(".png")
+    subject.original_filename = "file.png"
+    expect(subject.send(:destination).path).to end_with(".png")
+  end
+
+  context "generates a fingerprint" do
+    subject { TestAdapter.new(nil, options) }
+
+    before do
+      subject.stubs(:path).returns(fixture_file("50x50.png"))
+    end
+
+    context "MD5" do
+      let(:options) { { hash_digest: Digest::MD5 } }
+
+      it "returns a fingerprint" do
+        expect(subject.fingerprint).to be_a String
+        expect(subject.fingerprint).to eq "a790b00c9b5d58a8fd17a1ec5a187129"
+      end
+    end
+
+    context "SHA256" do
+      let(:options) { { hash_digest: Digest::SHA256 } }
+
+      it "returns a fingerprint" do
+        expect(subject.fingerprint).to be_a String
+        expect(subject.fingerprint).
+          to eq "243d7ce1099719df25f600f1c369c629fb979f88d5a01dbe7d0d48c8e6715bb1"
+      end
+    end
   end
 
   context "#original_filename=" do
     it "should not fail with a nil original filename" do
-      adapter = TestAdapter.new
-      expect{ adapter.original_filename = nil }.not_to raise_error
+      expect { subject.original_filename = nil }.not_to raise_error
     end
   end
 end

data/spec/paperclip/io_adapters/attachment_adapter_spec.rb

@@ -13,7 +13,8 @@ describe Paperclip::AttachmentAdapter do
 
       @attachment.assign(@file)
       @attachment.save
-      @subject = Paperclip.io_adapters.for(@attachment)
+      @subject = Paperclip.io_adapters.for(@attachment,
+                                           hash_digest: Digest::MD5)
     end
 
     after do
@@ -65,7 +66,8 @@ describe Paperclip::AttachmentAdapter do
 
       @attachment.assign(@file)
       @attachment.save
-      @subject = Paperclip.io_adapters.for(@attachment)
+      @subject = Paperclip.io_adapters.for(@attachment,
+                                           hash_digest: Digest::MD5)
     end
 
     after do
@@ -92,7 +94,8 @@ describe Paperclip::AttachmentAdapter do
       FileUtils.cp @attachment.queued_for_write[:thumb].path, @thumb.path
 
       @attachment.save
-      @subject = Paperclip.io_adapters.for(@attachment.styles[:thumb])
+      @subject = Paperclip.io_adapters.for(@attachment.styles[:thumb],
+                                           hash_digest: Digest::MD5)
     end
 
     after do

data/spec/paperclip/io_adapters/data_uri_adapter_spec.rb

@@ -1,7 +1,13 @@
 require 'spec_helper'
 
 describe Paperclip::DataUriAdapter do
+  before do
+    Paperclip::DataUriAdapter.register
+  end
+
   after do
+    Paperclip.io_adapters.unregister(described_class)
+
     if @subject
       @subject.close
     end
@@ -20,7 +26,7 @@ describe Paperclip::DataUriAdapter do
   context "a new instance" do
     before do
       @contents = "data:image/png;base64,#{original_base64_content}"
-      @subject = Paperclip.io_adapters.for(@contents)
+      @subject = Paperclip.io_adapters.for(@contents, hash_digest: Digest::MD5)
     end
 
     it "returns a nondescript file name" do

data/spec/paperclip/io_adapters/file_adapter_spec.rb

@@ -15,7 +15,7 @@ describe Paperclip::FileAdapter do
 
       context 'doing normal things' do
         before do
-          @subject = Paperclip.io_adapters.for(@file)
+          @subject = Paperclip.io_adapters.for(@file, hash_digest: Digest::MD5)
         end
 
         it 'uses the original filename to generate the tempfile' do
@@ -61,7 +61,7 @@ describe Paperclip::FileAdapter do
       context "file with multiple possible content type" do
         before do
           MIME::Types.stubs(:type_for).returns([MIME::Type.new('image/x-png'), MIME::Type.new('image/png')])
-          @subject = Paperclip.io_adapters.for(@file)
+          @subject = Paperclip.io_adapters.for(@file, hash_digest: Digest::MD5)
         end
 
         it "prefers officially registered mime type" do
@@ -73,10 +73,13 @@ describe Paperclip::FileAdapter do
         end
       end
 
-      context "file with content type derived from file command on *nix" do
+      context "file with content type derived from file contents on *nix" do
         before do
           MIME::Types.stubs(:type_for).returns([])
           Paperclip.stubs(:run).returns("application/vnd.ms-office\n")
+          Paperclip::ContentTypeDetector.any_instance
+            .stubs(:type_from_mime_magic).returns("application/vnd.ms-office")
+
           @subject = Paperclip.io_adapters.for(@file)
         end
 

data/spec/paperclip/io_adapters/http_url_proxy_adapter_spec.rb

@@ -1,13 +1,23 @@
 require 'spec_helper'
 
 describe Paperclip::HttpUrlProxyAdapter do
+  before do
+    @open_return = StringIO.new("xxx")
+    @open_return.stubs(:content_type).returns("image/png")
+    @open_return.stubs(:meta).returns({})
+    Paperclip::HttpUrlProxyAdapter.any_instance.
+      stubs(:download_content).returns(@open_return)
+    Paperclip::HttpUrlProxyAdapter.register
+  end
+
+  after do
+    Paperclip.io_adapters.unregister(described_class)
+  end
+
   context "a new instance" do
     before do
-      @open_return = StringIO.new("xxx")
-      @open_return.stubs(:content_type).returns("image/png")
-      Paperclip::HttpUrlProxyAdapter.any_instance.stubs(:download_content).returns(@open_return)
       @url = "http://thoughtbot.com/images/thoughtbot-logo.png"
-      @subject = Paperclip.io_adapters.for(@url)
+      @subject = Paperclip.io_adapters.for(@url, hash_digest: Digest::MD5)
     end
 
     after do
@@ -60,7 +70,6 @@ describe Paperclip::HttpUrlProxyAdapter do
 
   context "a url with query params" do
     before do
-      Paperclip::HttpUrlProxyAdapter.any_instance.stubs(:download_content).returns(StringIO.new("x"))
       @url = "https://github.com/thoughtbot/paperclip?file=test"
       @subject = Paperclip.io_adapters.for(@url)
     end
@@ -76,7 +85,6 @@ describe Paperclip::HttpUrlProxyAdapter do
 
   context "a url with restricted characters in the filename" do
     before do
-      Paperclip::HttpUrlProxyAdapter.any_instance.stubs(:download_content).returns(StringIO.new("x"))
       @url = "https://github.com/thoughtbot/paper:clip.jpg"
       @subject = Paperclip.io_adapters.for(@url)
     end
@@ -98,4 +106,16 @@ describe Paperclip::HttpUrlProxyAdapter do
     end
   end
 
+  context "a url with special characters in the filename" do
+    it "returns a encoded filename" do
+      Paperclip::HttpUrlProxyAdapter.any_instance.stubs(:download_content).
+        returns(@open_return)
+      url = "https://github.com/thoughtbot/paperclip-öäü字´½♥زÈ.png"
+      subject = Paperclip.io_adapters.for(url)
+      filename = "paperclip-%C3%B6%C3%A4%C3%BC%E5%AD%97%C2%B4%C2%BD%E2%99%A5"\
+        "%C3%98%C2%B2%C3%88.png"
+
+      assert_equal filename, subject.original_filename
+    end
+  end
 end

data/spec/paperclip/io_adapters/identity_adapter_spec.rb

@@ -3,6 +3,6 @@ require 'spec_helper'
 describe Paperclip::IdentityAdapter do
   it "responds to #new by returning the argument" do
     adapter = Paperclip::IdentityAdapter.new
-    assert_equal :target, adapter.new(:target)
+    assert_equal :target, adapter.new(:target, nil)
   end
 end

data/spec/paperclip/io_adapters/registry_spec.rb

@@ -4,7 +4,7 @@ describe Paperclip::AttachmentRegistry do
   context "for" do
     before do
       class AdapterTest
-        def initialize(target); end
+        def initialize(_target, _ = {}); end
       end
       @subject = Paperclip::AdapterRegistry.new
       @subject.register(AdapterTest){|t| Symbol === t }
@@ -18,7 +18,7 @@ describe Paperclip::AttachmentRegistry do
   context "registered?" do
     before do
       class AdapterTest
-        def initialize(target); end
+        def initialize(_target, _ = {}); end
       end
       @subject = Paperclip::AdapterRegistry.new
       @subject.register(AdapterTest){|t| Symbol === t }

data/spec/paperclip/io_adapters/stringio_adapter_spec.rb

@@ -5,7 +5,7 @@ describe Paperclip::StringioAdapter do
     before do
       @contents = "abc123"
       @stringio = StringIO.new(@contents)
-      @subject = Paperclip.io_adapters.for(@stringio)
+      @subject = Paperclip.io_adapters.for(@stringio, hash_digest: Digest::MD5)
     end
 
     it "returns a file name" do
@@ -20,6 +20,10 @@ describe Paperclip::StringioAdapter do
       assert_equal 6, @subject.size
     end
 
+    it "returns the length of the data" do
+      assert_equal 6, @subject.length
+    end
+
     it "generates an MD5 hash of the contents" do
       assert_equal Digest::MD5.hexdigest(@contents), @subject.fingerprint
     end

data/spec/paperclip/io_adapters/uploaded_file_adapter_spec.rb

@@ -17,7 +17,7 @@ describe Paperclip::UploadedFileAdapter do
           tempfile: tempfile,
           path: tempfile.path
         )
-        @subject = Paperclip.io_adapters.for(@file)
+        @subject = Paperclip.io_adapters.for(@file, hash_digest: Digest::MD5)
       end
 
       it "gets the right filename" do
@@ -29,7 +29,7 @@ describe Paperclip::UploadedFileAdapter do
       end
 
       it "gets the content type" do
-        assert_equal "image/x-png-by-browser", @subject.content_type
+        assert_equal "image/png", @subject.content_type
       end
 
       it "gets the file's size" do
@@ -63,7 +63,7 @@ describe Paperclip::UploadedFileAdapter do
           head: "",
           path: fixture_file("5k.png")
         )
-        @subject = Paperclip.io_adapters.for(@file)
+        @subject = Paperclip.io_adapters.for(@file, hash_digest: Digest::MD5)
       end
 
       it "does not generate paths that include restricted characters" do
@@ -86,7 +86,7 @@ describe Paperclip::UploadedFileAdapter do
           head: "",
           path: fixture_file("5k.png")
         )
-        @subject = Paperclip.io_adapters.for(@file)
+        @subject = Paperclip.io_adapters.for(@file, hash_digest: Digest::MD5)
       end
 
       it "gets the right filename" do
@@ -98,7 +98,7 @@ describe Paperclip::UploadedFileAdapter do
       end
 
       it "gets the content type" do
-        assert_equal "image/x-png-by-browser", @subject.content_type
+        assert_equal "image/png", @subject.content_type
       end
 
       it "gets the file's size" do

data/spec/paperclip/io_adapters/uri_adapter_spec.rb

@@ -1,13 +1,27 @@
 require 'spec_helper'
 
 describe Paperclip::UriAdapter do
+  let(:content_type) { "image/png" }
+  let(:meta) { {} }
+
+  before do
+    @open_return = StringIO.new("xxx")
+    @open_return.stubs(:content_type).returns(content_type)
+    @open_return.stubs(:meta).returns(meta)
+    Paperclip::UriAdapter.register
+  end
+
+  after do
+    Paperclip.io_adapters.unregister(described_class)
+  end
+
   context "a new instance" do
     before do
-      @open_return = StringIO.new("xxx")
-      @open_return.stubs(:content_type).returns("image/png")
-      Paperclip::UriAdapter.any_instance.stubs(:download_content).returns(@open_return)
+      Paperclip::UriAdapter.any_instance.
+        stubs(:download_content).returns(@open_return)
+
       @uri = URI.parse("http://thoughtbot.com/images/thoughtbot-logo.png")
-      @subject = Paperclip.io_adapters.for(@uri)
+      @subject = Paperclip.io_adapters.for(@uri, hash_digest: Digest::MD5)
     end
 
     it "returns a file name" do
@@ -56,8 +70,12 @@ describe Paperclip::UriAdapter do
   end
 
   context "a directory index url" do
+    let(:content_type) { "text/html" }
+
     before do
-      Paperclip::UriAdapter.any_instance.stubs(:download_content).returns(StringIO.new("xxx"))
+      Paperclip::UriAdapter.any_instance.
+        stubs(:download_content).returns(@open_return)
+
       @uri = URI.parse("http://thoughtbot.com")
       @subject = Paperclip.io_adapters.for(@uri)
     end
@@ -73,7 +91,9 @@ describe Paperclip::UriAdapter do
 
   context "a url with query params" do
     before do
-      Paperclip::UriAdapter.any_instance.stubs(:download_content).returns(StringIO.new("xxx"))
+      Paperclip::UriAdapter.any_instance.
+        stubs(:download_content).returns(@open_return)
+
       @uri = URI.parse("https://github.com/thoughtbot/paperclip?file=test")
       @subject = Paperclip.io_adapters.for(@uri)
     end
@@ -83,9 +103,32 @@ describe Paperclip::UriAdapter do
     end
   end
 
+  context "a url with content disposition headers" do
+    let(:file_name) { "test_document.pdf" }
+    let(:meta) do
+      {
+        "content-disposition" => "attachment; filename=\"#{file_name}\";",
+      }
+    end
+
+    before do
+      Paperclip::UriAdapter.any_instance.
+        stubs(:download_content).returns(@open_return)
+
+      @uri = URI.parse("https://github.com/thoughtbot/paperclip?file=test")
+      @subject = Paperclip.io_adapters.for(@uri)
+    end
+
+    it "returns a file name" do
+      assert_equal file_name, @subject.original_filename
+    end
+  end
+
   context "a url with restricted characters in the filename" do
     before do
-      Paperclip::UriAdapter.any_instance.stubs(:download_content).returns(StringIO.new("xxx"))
+      Paperclip::UriAdapter.any_instance.
+        stubs(:download_content).returns(@open_return)
+
       @uri = URI.parse("https://github.com/thoughtbot/paper:clip.jpg")
       @subject = Paperclip.io_adapters.for(@uri)
     end
@@ -99,4 +142,31 @@ describe Paperclip::UriAdapter do
     end
   end
 
+  describe "#download_content" do
+    before do
+      Paperclip::UriAdapter.any_instance.stubs(:open).returns(@open_return)
+      @uri = URI.parse("https://github.com/thoughtbot/paper:clip.jpg")
+      @subject = Paperclip.io_adapters.for(@uri)
+    end
+
+    after do
+      @subject.send(:download_content)
+    end
+
+    context "with default read_timeout" do
+      it "calls open without options" do
+        @subject.expects(:open).with(@uri, {}).at_least_once
+      end
+    end
+
+    context "with custom read_timeout" do
+      before do
+        Paperclip.options[:read_timeout] = 120
+      end
+
+      it "calls open with read_timeout option" do
+        @subject.expects(:open).with(@uri, read_timeout: 120).at_least_once
+      end
+    end
+  end
 end