paperclip 6.0.0 → 6.1.0

data/spec/paperclip/attachment_processing_spec.rb

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

data/spec/paperclip/attachment_spec.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 require 'spec_helper'
 
 describe Paperclip::Attachment do
@@ -54,6 +53,22 @@ describe Paperclip::Attachment do
     expect(dummy.avatar.path(:original)).to exist
   end
 
+  it "reprocess works with virtual content_type attribute" do
+    rebuild_class styles: { small: "100x>" }
+    modify_table { |t| t.remove :avatar_content_type }
+    Dummy.send :attr_accessor, :avatar_content_type
+    Dummy.validates_attachment_content_type(
+      :avatar,
+      content_type: %w(image/jpeg image/png)
+    )
+    Dummy.create!(avatar: File.new(fixture_file("50x50.png"), "rb"))
+
+    dummy = Dummy.first
+    dummy.avatar.reprocess!(:small)
+
+    expect(dummy.avatar.path(:small)).to exist
+  end
+
   context "having a not empty hash as a default option" do
     before do
       @old_default_options = Paperclip::Attachment.default_options.dup
@@ -1401,7 +1416,7 @@ describe Paperclip::Attachment do
 
     context "and avatar_file_size column" do
       before do
-        ActiveRecord::Base.connection.add_column :dummies, :avatar_file_size, :integer
+        ActiveRecord::Base.connection.add_column :dummies, :avatar_file_size, :bigint
         rebuild_class
         @dummy = Dummy.new
       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/integration_spec.rb

@@ -1,16 +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')
       # 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 }
+      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 }
@@ -135,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)
 
@@ -159,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
@@ -347,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
@@ -354,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

@@ -93,6 +93,34 @@ describe Paperclip::AbstractAdapter do
     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
       expect { subject.original_filename = nil }.not_to raise_error

data/spec/paperclip/io_adapters/http_url_proxy_adapter_spec.rb

@@ -3,10 +3,9 @@ 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)
+    @open_return.stubs(:meta).returns("content-type" => "image/png")
+    Paperclip::HttpUrlProxyAdapter.any_instance.stubs(:download_content).
+      returns(@open_return)
     Paperclip::HttpUrlProxyAdapter.register
   end
 
@@ -69,17 +68,18 @@ describe Paperclip::HttpUrlProxyAdapter do
   end
 
   context "a url with query params" do
-    before do
-      @url = "https://github.com/thoughtbot/paperclip?file=test"
-      @subject = Paperclip.io_adapters.for(@url)
-    end
+    subject { Paperclip.io_adapters.for(url) }
 
-    after do
-      @subject.close
-    end
+    after { subject.close }
+
+    let(:url) { "https://github.com/thoughtbot/paperclip?file=test" }
 
     it "returns a file name" do
-      assert_equal "paperclip", @subject.original_filename
+      assert_equal "paperclip", subject.original_filename
+    end
+
+    it "preserves params" do
+      assert_equal url, subject.instance_variable_get(:@target).to_s
     end
   end
 
@@ -107,15 +107,32 @@ describe Paperclip::HttpUrlProxyAdapter do
   end
 
   context "a url with special characters in the filename" do
-    it "returns a encoded filename" do
+    before 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"\
+    end
+
+    let(:filename) do
+      "paperclip-%C3%B6%C3%A4%C3%BC%E5%AD%97%C2%B4%C2%BD%E2%99%A5"\
         "%C3%98%C2%B2%C3%88.png"
+    end
+    let(:url) { "https://github.com/thoughtbot/paperclip-öäü字´½♥زÈ.png" }
 
+    subject { Paperclip.io_adapters.for(url) }
+
+    it "returns a encoded filename" do
       assert_equal filename, subject.original_filename
     end
+
+    context "when already URI encoded" do
+      let(:url) do
+        "https://github.com/thoughtbot/paperclip-%C3%B6%C3%A4%C3%BC%E5%AD%97"\
+        "%C2%B4%C2%BD%E2%99%A5%C3%98%C2%B2%C3%88.png"
+      end
+
+      it "returns a encoded filename" do
+        assert_equal filename, subject.original_filename
+      end
+    end
   end
 end

data/spec/paperclip/io_adapters/uri_adapter_spec.rb

@@ -16,6 +16,8 @@ describe Paperclip::UriAdapter do
   end
 
   context "a new instance" do
+    let(:meta) { { "content-type" => "image/png" } }
+
     before do
       Paperclip::UriAdapter.any_instance.
         stubs(:download_content).returns(@open_return)
@@ -62,7 +64,7 @@ describe Paperclip::UriAdapter do
       assert_equal 'image/png', @subject.content_type
     end
 
-    it 'accepts an orgiginal_filename' do
+    it "accepts an original_filename" do
       @subject.original_filename = 'image.png'
       assert_equal 'image.png', @subject.original_filename
     end
@@ -71,6 +73,7 @@ describe Paperclip::UriAdapter do
 
   context "a directory index url" do
     let(:content_type) { "text/html" }
+    let(:meta) { { "content-type" => "text/html" } }
 
     before do
       Paperclip::UriAdapter.any_instance.
@@ -105,23 +108,68 @@ describe Paperclip::UriAdapter do
 
   context "a url with content disposition headers" do
     let(:file_name) { "test_document.pdf" }
-    let(:meta) do
-      {
-        "content-disposition" => "attachment; filename=\"#{file_name}\";",
-      }
-    end
+    let(:filename_from_path) { "paperclip" }
 
     before do
       Paperclip::UriAdapter.any_instance.
         stubs(:download_content).returns(@open_return)
 
-      @uri = URI.parse("https://github.com/thoughtbot/paperclip?file=test")
+      @uri = URI.parse(
+        "https://github.com/thoughtbot/#{filename_from_path}?file=test")
+    end
+
+    it "returns file name from path" do
+      meta["content-disposition"] = "inline;"
+
       @subject = Paperclip.io_adapters.for(@uri)
+
+      assert_equal filename_from_path, @subject.original_filename
     end
 
-    it "returns a file name" do
+    it "returns a file name enclosed in double quotes" do
+      file_name = "john's test document.pdf"
+      meta["content-disposition"] = "attachment; filename=\"#{file_name}\";"
+
+      @subject = Paperclip.io_adapters.for(@uri)
+
+      assert_equal file_name, @subject.original_filename
+    end
+
+    it "returns a file name not enclosed in double quotes" do
+      meta["content-disposition"] = "ATTACHMENT; FILENAME=#{file_name};"
+
+      @subject = Paperclip.io_adapters.for(@uri)
+
+      assert_equal file_name, @subject.original_filename
+    end
+
+    it "does not crash when an empty filename is given" do
+      meta["content-disposition"] = "ATTACHMENT; FILENAME=\"\";"
+
+      @subject = Paperclip.io_adapters.for(@uri)
+
+      assert_equal "", @subject.original_filename
+    end
+
+    it "returns a file name ignoring RFC 5987 encoding" do
+      meta["content-disposition"] =
+        "attachment; filename=#{file_name}; filename* = utf-8''%e2%82%ac%20rates"
+
+      @subject = Paperclip.io_adapters.for(@uri)
+
       assert_equal file_name, @subject.original_filename
     end
+
+    context "when file name has consecutive periods" do
+      let(:file_name) { "test_document..pdf" }
+
+      it "returns a file name" do
+        @uri = URI.parse(
+          "https://github.com/thoughtbot/#{file_name}?file=test")
+        @subject = Paperclip.io_adapters.for(@uri)
+        assert_equal file_name, @subject.original_filename
+      end
+    end
   end
 
   context "a url with restricted characters in the filename" do

data/spec/paperclip/matchers/validate_attachment_size_matcher_spec.rb

@@ -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

data/spec/paperclip/media_type_spoof_detector_spec.rb

@@ -58,6 +58,32 @@ describe Paperclip::MediaTypeSpoofDetector do
     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?

data/spec/paperclip/schema_spec.rb

@@ -25,12 +25,12 @@ describe Paperclip::Schema do
           end
         end
 
-        columns = Dummy.columns.map{ |column| [column.name, column.type] }
+        columns = Dummy.columns.map{ |column| [column.name, column.sql_type] }
 
-        expect(columns).to include(['avatar_file_name', :string])
-        expect(columns).to include(['avatar_content_type', :string])
-        expect(columns).to include(['avatar_file_size', :integer])
-        expect(columns).to include(['avatar_updated_at', :datetime])
+        expect(columns).to include(['avatar_file_name', "varchar"])
+        expect(columns).to include(['avatar_content_type', "varchar"])
+        expect(columns).to include(['avatar_file_size', "bigint"])
+        expect(columns).to include(['avatar_updated_at', "datetime"])
       end
 
       it "displays deprecation warning" do
@@ -50,12 +50,12 @@ describe Paperclip::Schema do
       end
 
       it "creates attachment columns" do
-        columns = Dummy.columns.map{ |column| [column.name, column.type] }
+        columns = Dummy.columns.map{ |column| [column.name, column.sql_type] }
 
-        expect(columns).to include(['avatar_file_name', :string])
-        expect(columns).to include(['avatar_content_type', :string])
-        expect(columns).to include(['avatar_file_size', :integer])
-        expect(columns).to include(['avatar_updated_at', :datetime])
+        expect(columns).to include(['avatar_file_name', "varchar"])
+        expect(columns).to include(['avatar_content_type', "varchar"])
+        expect(columns).to include(['avatar_file_size', "bigint"])
+        expect(columns).to include(['avatar_updated_at', "datetime"])
       end
     end
 
@@ -89,12 +89,12 @@ describe Paperclip::Schema do
         end
 
         it "creates attachment columns" do
-          columns = Dummy.columns.map{ |column| [column.name, column.type] }
+          columns = Dummy.columns.map{ |column| [column.name, column.sql_type] }
 
-          expect(columns).to include(['avatar_file_name', :string])
-          expect(columns).to include(['avatar_content_type', :string])
-          expect(columns).to include(['avatar_file_size', :integer])
-          expect(columns).to include(['avatar_updated_at', :datetime])
+          expect(columns).to include(['avatar_file_name', "varchar"])
+          expect(columns).to include(['avatar_content_type', "varchar"])
+          expect(columns).to include(['avatar_file_size', "bigint"])
+          expect(columns).to include(['avatar_updated_at', "datetime"])
         end
       end
 
@@ -119,16 +119,16 @@ describe Paperclip::Schema do
         end
 
         it "creates attachment columns" do
-          columns = Dummy.columns.map{ |column| [column.name, column.type] }
+          columns = Dummy.columns.map{ |column| [column.name, column.sql_type] }
 
-          expect(columns).to include(['avatar_file_name', :string])
-          expect(columns).to include(['avatar_content_type', :string])
-          expect(columns).to include(['avatar_file_size', :integer])
-          expect(columns).to include(['avatar_updated_at', :datetime])
-          expect(columns).to include(['photo_file_name', :string])
-          expect(columns).to include(['photo_content_type', :string])
-          expect(columns).to include(['photo_file_size', :integer])
-          expect(columns).to include(['photo_updated_at', :datetime])
+          expect(columns).to include(['avatar_file_name', "varchar"])
+          expect(columns).to include(['avatar_content_type', "varchar"])
+          expect(columns).to include(['avatar_file_size', "bigint"])
+          expect(columns).to include(['avatar_updated_at', "datetime"])
+          expect(columns).to include(['photo_file_name', "varchar"])
+          expect(columns).to include(['photo_content_type', "varchar"])
+          expect(columns).to include(['photo_file_size', "bigint"])
+          expect(columns).to include(['photo_updated_at', "datetime"])
         end
       end
 
@@ -164,7 +164,7 @@ describe Paperclip::Schema do
         Dummy.connection.change_table :dummies do |t|
           t.column :avatar_file_name, :string
           t.column :avatar_content_type, :string
-          t.column :avatar_file_size, :integer
+          t.column :avatar_file_size, :bigint
           t.column :avatar_updated_at, :datetime
         end
       end
@@ -178,12 +178,12 @@ describe Paperclip::Schema do
             Dummy.connection.drop_attached_file :dummies, :avatar
           end
 
-          columns = Dummy.columns.map{ |column| [column.name, column.type] }
+          columns = Dummy.columns.map{ |column| [column.name, column.sql_type] }
 
-          expect(columns).to_not include(['avatar_file_name', :string])
-          expect(columns).to_not include(['avatar_content_type', :string])
-          expect(columns).to_not include(['avatar_file_size', :integer])
-          expect(columns).to_not include(['avatar_updated_at', :datetime])
+          expect(columns).to_not include(['avatar_file_name', "varchar"])
+          expect(columns).to_not include(['avatar_content_type', "varchar"])
+          expect(columns).to_not include(['avatar_file_size', "bigint"])
+          expect(columns).to_not include(['avatar_updated_at', "datetime"])
         end
 
         it "displays a deprecation warning" do
@@ -200,12 +200,12 @@ describe Paperclip::Schema do
           end
 
           it "removes the attachment columns" do
-            columns = Dummy.columns.map{ |column| [column.name, column.type] }
+            columns = Dummy.columns.map{ |column| [column.name, column.sql_type] }
 
-            expect(columns).to_not include(['avatar_file_name', :string])
-            expect(columns).to_not include(['avatar_content_type', :string])
-            expect(columns).to_not include(['avatar_file_size', :integer])
-            expect(columns).to_not include(['avatar_updated_at', :datetime])
+            expect(columns).to_not include(['avatar_file_name', "varchar"])
+            expect(columns).to_not include(['avatar_content_type', "varchar"])
+            expect(columns).to_not include(['avatar_file_size', "bigint"])
+            expect(columns).to_not include(['avatar_updated_at', "datetime"])
           end
         end
 
@@ -214,7 +214,7 @@ describe Paperclip::Schema do
             Dummy.connection.change_table :dummies do |t|
               t.column :photo_file_name, :string
               t.column :photo_content_type, :string
-              t.column :photo_file_size, :integer
+              t.column :photo_file_size, :bigint
               t.column :photo_updated_at, :datetime
             end
 
@@ -222,16 +222,16 @@ describe Paperclip::Schema do
           end
 
           it "removes the attachment columns" do
-            columns = Dummy.columns.map{ |column| [column.name, column.type] }
-
-            expect(columns).to_not include(['avatar_file_name', :string])
-            expect(columns).to_not include(['avatar_content_type', :string])
-            expect(columns).to_not include(['avatar_file_size', :integer])
-            expect(columns).to_not include(['avatar_updated_at', :datetime])
-            expect(columns).to_not include(['photo_file_name', :string])
-            expect(columns).to_not include(['photo_content_type', :string])
-            expect(columns).to_not include(['photo_file_size', :integer])
-            expect(columns).to_not include(['photo_updated_at', :datetime])
+            columns = Dummy.columns.map{ |column| [column.name, column.sql_type] }
+
+            expect(columns).to_not include(['avatar_file_name', "varchar"])
+            expect(columns).to_not include(['avatar_content_type', "varchar"])
+            expect(columns).to_not include(['avatar_file_size', "bigint"])
+            expect(columns).to_not include(['avatar_updated_at', "datetime"])
+            expect(columns).to_not include(['photo_file_name', "varchar"])
+            expect(columns).to_not include(['photo_content_type', "varchar"])
+            expect(columns).to_not include(['photo_file_size', "bigint"])
+            expect(columns).to_not include(['photo_updated_at', "datetime"])
           end
         end