paperclip 4.3.7 → 6.1.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/filename_cleaner_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'spec_helper'
 
 describe Paperclip::FilenameCleaner do

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

@@ -1,15 +1,33 @@
-# encoding: utf-8
 require 'spec_helper'
 require 'open-uri'
 
 describe 'Paperclip' do
+  around do |example|
+    files_before = ObjectSpace.each_object(Tempfile).select do |file|
+      file.path && File.file?(file.path)
+    end
+
+    example.run
+
+    files_after = ObjectSpace.each_object(Tempfile).select do |file|
+      file.path && File.file?(file.path)
+    end
+
+    diff = files_after - files_before
+    expect(diff).to eq([]), "Leaked tempfiles: #{diff.inspect}"
+  end
+
   context "Many models at once" 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
+      dummies = Array.new(300) { Dummy.new avatar: @file }
+      Dummy.import dummies
+      # save attachment instances to run after hooks including tempfile cleanup
+      # since activerecord-import does not use our usually hooked-in hooks
+      # (such as after_save)
+      dummies.each { |dummy| dummy.avatar.save }
     end
 
     after { @file.close }
@@ -134,6 +152,14 @@ describe 'Paperclip' do
     end
 
     it "allows us to selectively create each thumbnail" do
+      skip <<-EXPLANATION
+	#reprocess! calls #assign which calls Paperclip.io_adapters.for 
+	which creates the tempfile. #assign then calls #post_process_file which
+	calls MediaTypeSpoofDetectionValidator#validate_each which calls 
+	Paperclip.io_adapters.for, which creates another tempfile. That first
+	tempfile is the one that leaks.
+      EXPLANATION
+
       assert_file_not_exists(@thumb_small_path)
       assert_file_not_exists(@thumb_large_path)
 
@@ -158,7 +184,11 @@ describe 'Paperclip' do
       assert_not_equal File.size(@file.path), @dummy.avatar.size
     end
 
-    after { @file.close }
+    after do
+      @file.close
+      # save attachment instance to run after hooks (including tempfile cleanup)
+      @dummy.avatar.save
+    end
   end
 
   context "A model with attachments scoped under an id" do
@@ -346,6 +376,8 @@ describe 'Paperclip' do
     it "is not ok with bad files" do
       @dummy.avatar = @bad_file
       assert ! @dummy.valid?
+      # save attachment instance to run after hooks (including tempfile cleanup)
+      @dummy.avatar.save
     end
 
     it "knows the difference between good files, bad files, and not files when validating" do
@@ -353,8 +385,13 @@ describe 'Paperclip' do
       @d2 = Dummy.find(@dummy.id)
       @d2.avatar = @file
       assert  @d2.valid?, @d2.errors.full_messages.inspect
+      # save attachment instance to run after hooks (including tempfile cleanup)
+      @d2.avatar.save
+
       @d2.avatar = @bad_file
       assert ! @d2.valid?
+      # save attachment instance to run after hooks (including tempfile cleanup)
+      @d2.avatar.save
     end
 
     it "is able to reload without saving and not have the file disappear" do

data/spec/paperclip/interpolations_spec.rb

@@ -139,6 +139,15 @@ describe Paperclip::Interpolations do
     assert_equal "000/000/023", Paperclip::Interpolations.id_partition(attachment, :style)
   end
 
+  it "returns the partitioned id when the id is above 999_999_999" do
+    attachment = mock
+    attachment.expects(:id).
+      returns(Paperclip::Interpolations::ID_PARTITION_LIMIT)
+    attachment.expects(:instance).returns(attachment)
+    assert_equal "001/000/000/000",
+      Paperclip::Interpolations.id_partition(attachment, :style)
+  end
+
   it "returns the partitioned id of the attachment when the id is a string" do
     attachment = mock
     attachment.expects(:id).returns("32fnj23oio2f")

data/spec/paperclip/io_adapters/abstract_adapter_spec.rb

@@ -9,70 +9,152 @@ describe Paperclip::AbstractAdapter do
     end
   end
 
+  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 "#copy_to_tempfile" do
+    around do |example|
+      FileUtils.module_eval do
+        class << self
+          alias paperclip_ln ln
+
+          def ln(*)
+            raise Errno::EXDEV
+          end
+        end
+      end
+
+      example.run
+
+      FileUtils.module_eval do
+        class << self
+          alias ln paperclip_ln
+          undef paperclip_ln
+        end
+      end
+    end
+
+    it "should return a readable file even when linking fails" do
+      src = open(fixture_file("5k.png"), "rb")
+      expect(subject.send(:copy_to_tempfile, src).read).to eq src.read
+    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
+
+  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/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