kt-paperclip 5.4.0 → 7.1.1

data/spec/paperclip/io_adapters/file_adapter_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Paperclip::FileAdapter do
   context "a new instance" do
@@ -13,12 +13,12 @@ describe Paperclip::FileAdapter do
         @subject.close if @subject
       end
 
-      context 'doing normal things' do
+      context "doing normal things" do
         before do
           @subject = Paperclip.io_adapters.for(@file, hash_digest: Digest::MD5)
         end
 
-        it 'uses the original filename to generate the tempfile' do
+        it "uses the original filename to generate the tempfile" do
           assert @subject.path.ends_with?(".png")
         end
 
@@ -43,7 +43,7 @@ describe Paperclip::FileAdapter do
         end
 
         it "returns false for a call to nil?" do
-          assert ! @subject.nil?
+          assert !@subject.nil?
         end
 
         it "generates a MD5 hash of the contents" do
@@ -53,14 +53,14 @@ describe Paperclip::FileAdapter do
 
         it "reads the contents of the file" do
           expected = @file.read
-          assert expected.length > 0
+          assert !expected.empty?
           assert_equal expected, @subject.read
         end
       end
 
       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')])
+          allow(MIME::Types).to receive(:type_for).and_return([MIME::Type.new("image/x-png"), MIME::Type.new("image/png")])
           @subject = Paperclip.io_adapters.for(@file, hash_digest: Digest::MD5)
         end
 
@@ -75,10 +75,10 @@ describe Paperclip::FileAdapter 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")
+          allow(MIME::Types).to receive(:type_for).and_return([])
+          allow(Paperclip).to receive(:run).and_return("application/vnd.ms-office\n")
+          allow_any_instance_of(Paperclip::ContentTypeDetector).
+            to receive(:type_from_marcel).and_return("application/vnd.ms-office")
 
           @subject = Paperclip.io_adapters.for(@file)
         end
@@ -94,7 +94,7 @@ describe Paperclip::FileAdapter do
         @file = File.open(fixture_file("animated.gif")) do |file|
           StringIO.new(file.read)
         end
-        @file.stubs(:original_filename).returns('image:restricted.gif')
+        allow(@file).to receive(:original_filename).and_return("image:restricted.gif")
         @subject = Paperclip.io_adapters.for(@file)
       end
 
@@ -104,7 +104,7 @@ describe Paperclip::FileAdapter do
       end
 
       it "does not generate filenames that include restricted characters" do
-        assert_equal 'image_restricted.gif', @subject.original_filename
+        assert_equal "image_restricted.gif", @subject.original_filename
       end
 
       it "does not generate paths that include restricted characters" do

data/spec/paperclip/io_adapters/http_url_proxy_adapter_spec.rb

@@ -1,12 +1,11 @@
-require 'spec_helper'
+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)
+    allow(@open_return).to receive(:meta).and_return("content-type" => "image/png")
+    allow_any_instance_of(Paperclip::HttpUrlProxyAdapter).to receive(:download_content).
+      and_return(@open_return)
     Paperclip::HttpUrlProxyAdapter.register
   end
 
@@ -17,69 +16,75 @@ describe Paperclip::HttpUrlProxyAdapter do
   context "a new instance" do
     before do
       @url = "http://thoughtbot.com/images/thoughtbot-logo.png"
-      @subject = Paperclip.io_adapters.for(@url, hash_digest: Digest::MD5)
     end
 
+    subject { Paperclip.io_adapters.for(@url, hash_digest: Digest::MD5) }
+
     after do
-      @subject.close
+      subject.close
     end
 
     it "returns a file name" do
-      assert_equal "thoughtbot-logo.png", @subject.original_filename
+      expect(subject.original_filename).to(eq("thoughtbot-logo.png"))
     end
 
-    it 'closes open handle after reading' do
-      assert_equal true, @open_return.closed?
+    it "closes open handle after reading" do
+      expect { subject }.to(change { @open_return.closed? }.from(false).to(true))
     end
 
     it "returns a content type" do
-      assert_equal "image/png", @subject.content_type
+      expect(subject.content_type).to(eq("image/png"))
     end
 
     it "returns the size of the data" do
-      assert_equal @open_return.size, @subject.size
+      expect(subject.size).to(eq(@open_return.size))
     end
 
     it "generates an MD5 hash of the contents" do
-      assert_equal Digest::MD5.hexdigest("xxx"), @subject.fingerprint
+      expect(subject.fingerprint).to(eq(Digest::MD5.hexdigest("xxx")))
     end
 
     it "generates correct fingerprint after read" do
-      fingerprint = Digest::MD5.hexdigest(@subject.read)
-      assert_equal fingerprint, @subject.fingerprint
+      fingerprint = Digest::MD5.hexdigest(subject.read)
+      expect(subject.fingerprint).to(eq(fingerprint))
     end
 
     it "generates same fingerprint" do
-      assert_equal @subject.fingerprint, @subject.fingerprint
+      expect(subject.fingerprint).to(eq(subject.fingerprint))
     end
 
     it "returns the data contained in the StringIO" do
-      assert_equal "xxx", @subject.read
+      expect(subject.read).to(eq("xxx"))
+    end
+
+    it "accepts a content_type" do
+      subject.content_type = "image/png"
+      expect(subject.content_type).to(eq("image/png"))
     end
 
-    it 'accepts a content_type' do
-      @subject.content_type = 'image/png'
-      assert_equal 'image/png', @subject.content_type
+    it "accepts an original_filename" do
+      subject.original_filename = "image.png"
+      expect(subject.original_filename).to(eq("image.png"))
     end
 
-    it 'accepts an original_filename' do
-      @subject.original_filename = 'image.png'
-      assert_equal 'image.png', @subject.original_filename
+    it "doesn't emit deprecation warnings" do
+      expect { subject }.to_not(output(/URI\.(un)?escape is obsolete/).to_stderr)
     end
   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 +112,31 @@ describe Paperclip::HttpUrlProxyAdapter do
   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"\
+    before do
+      allow_any_instance_of(Paperclip::HttpUrlProxyAdapter).to receive(:download_content).and_return(@open_return)
+    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/identity_adapter_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Paperclip::IdentityAdapter do
   it "responds to #new by returning the argument" do

data/spec/paperclip/io_adapters/nil_adapter_spec.rb

@@ -1,7 +1,7 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Paperclip::NilAdapter do
-  context 'a new instance' do
+  context "a new instance" do
     before do
       @subject = Paperclip.io_adapters.for(nil)
     end

data/spec/paperclip/io_adapters/registry_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Paperclip::AttachmentRegistry do
   context "for" do
@@ -7,7 +7,7 @@ describe Paperclip::AttachmentRegistry do
         def initialize(_target, _ = {}); end
       end
       @subject = Paperclip::AdapterRegistry.new
-      @subject.register(AdapterTest){|t| Symbol === t }
+      @subject.register(AdapterTest) { |t| Symbol === t }
     end
 
     it "returns the class registered for the adapted type" do
@@ -21,7 +21,7 @@ describe Paperclip::AttachmentRegistry do
         def initialize(_target, _ = {}); end
       end
       @subject = Paperclip::AdapterRegistry.new
-      @subject.register(AdapterTest){|t| Symbol === t }
+      @subject.register(AdapterTest) { |t| Symbol === t }
     end
 
     it "returns true when the class of this adapter has been registered" do
@@ -29,7 +29,7 @@ describe Paperclip::AttachmentRegistry do
     end
 
     it "returns false when the adapter has not been registered" do
-      assert ! @subject.registered?(Object)
+      assert !@subject.registered?(Object)
     end
   end
 end

data/spec/paperclip/io_adapters/stringio_adapter_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Paperclip::StringioAdapter do
   context "a new instance" do
@@ -41,23 +41,23 @@ describe Paperclip::StringioAdapter do
       assert_equal "abc123", @subject.read
     end
 
-    it 'accepts a content_type' do
-      @subject.content_type = 'image/png'
-      assert_equal 'image/png', @subject.content_type
+    it "accepts a content_type" do
+      @subject.content_type = "image/png"
+      assert_equal "image/png", @subject.content_type
     end
 
-    it 'accepts an original_filename' do
-      @subject.original_filename = 'image.png'
-      assert_equal 'image.png', @subject.original_filename
+    it "accepts an original_filename" do
+      @subject.original_filename = "image.png"
+      assert_equal "image.png", @subject.original_filename
     end
 
     it "does not generate filenames that include restricted characters" do
-      @subject.original_filename = 'image:restricted.png'
-      assert_equal 'image_restricted.png', @subject.original_filename
+      @subject.original_filename = "image:restricted.png"
+      assert_equal "image_restricted.png", @subject.original_filename
     end
 
     it "does not generate paths that include restricted characters" do
-      @subject.original_filename = 'image:restricted.png'
+      @subject.original_filename = "image:restricted.png"
       expect(@subject.path).to_not match(/:/)
     end
   end

data/spec/paperclip/io_adapters/uploaded_file_adapter_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Paperclip::UploadedFileAdapter do
   context "a new instance" do
@@ -37,7 +37,7 @@ describe Paperclip::UploadedFileAdapter do
       end
 
       it "returns false for a call to nil?" do
-        assert ! @subject.nil?
+        assert !@subject.nil?
       end
 
       it "generates a MD5 hash of the contents" do
@@ -47,7 +47,7 @@ describe Paperclip::UploadedFileAdapter do
 
       it "reads the contents of the file" do
         expected = @file.tempfile.read
-        assert expected.length > 0
+        assert !expected.empty?
         assert_equal expected, @subject.read
       end
     end
@@ -71,7 +71,7 @@ describe Paperclip::UploadedFileAdapter do
       end
 
       it "does not generate filenames that include restricted characters" do
-        assert_equal 'image_restricted.gif', @subject.original_filename
+        assert_equal "image_restricted.gif", @subject.original_filename
       end
     end
 
@@ -106,7 +106,7 @@ describe Paperclip::UploadedFileAdapter do
       end
 
       it "returns false for a call to nil?" do
-        assert ! @subject.nil?
+        assert !@subject.nil?
       end
 
       it "generates a MD5 hash of the contents" do
@@ -118,7 +118,7 @@ describe Paperclip::UploadedFileAdapter do
         expected_file = File.new(@file.path)
         expected_file.binmode
         expected = expected_file.read
-        assert expected.length > 0
+        assert !expected.empty?
         assert_equal expected, @subject.read
       end
 

data/spec/paperclip/io_adapters/uri_adapter_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Paperclip::UriAdapter do
   let(:content_type) { "image/png" }
@@ -6,8 +6,8 @@ describe Paperclip::UriAdapter do
 
   before do
     @open_return = StringIO.new("xxx")
-    @open_return.stubs(:content_type).returns(content_type)
-    @open_return.stubs(:meta).returns(meta)
+    allow(@open_return).to receive(:content_type).and_return(content_type)
+    allow(@open_return).to receive(:meta).and_return(meta)
     Paperclip::UriAdapter.register
   end
 
@@ -16,9 +16,11 @@ 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)
+      allow_any_instance_of(Paperclip::UriAdapter).
+        to receive(:download_content).and_return(@open_return)
 
       @uri = URI.parse("http://thoughtbot.com/images/thoughtbot-logo.png")
       @subject = Paperclip.io_adapters.for(@uri, hash_digest: Digest::MD5)
@@ -28,7 +30,7 @@ describe Paperclip::UriAdapter do
       assert_equal "thoughtbot-logo.png", @subject.original_filename
     end
 
-    it 'closes open handle after reading' do
+    it "closes open handle after reading" do
       assert_equal true, @open_return.closed?
     end
 
@@ -57,24 +59,24 @@ describe Paperclip::UriAdapter do
       assert_equal "xxx", @subject.read
     end
 
-    it 'accepts a content_type' do
-      @subject.content_type = 'image/png'
-      assert_equal 'image/png', @subject.content_type
+    it "accepts a content_type" do
+      @subject.content_type = "image/png"
+      assert_equal "image/png", @subject.content_type
     end
 
-    it 'accepts an orgiginal_filename' do
-      @subject.original_filename = 'image.png'
-      assert_equal 'image.png', @subject.original_filename
+    it "accepts an original_filename" do
+      @subject.original_filename = "image.png"
+      assert_equal "image.png", @subject.original_filename
     end
-
   end
 
   context "a directory index url" do
     let(:content_type) { "text/html" }
+    let(:meta) { { "content-type" => "text/html" } }
 
     before do
-      Paperclip::UriAdapter.any_instance.
-        stubs(:download_content).returns(@open_return)
+      allow_any_instance_of(Paperclip::UriAdapter).
+        to receive(:download_content).and_return(@open_return)
 
       @uri = URI.parse("http://thoughtbot.com")
       @subject = Paperclip.io_adapters.for(@uri)
@@ -91,8 +93,8 @@ describe Paperclip::UriAdapter do
 
   context "a url with query params" do
     before do
-      Paperclip::UriAdapter.any_instance.
-        stubs(:download_content).returns(@open_return)
+      allow_any_instance_of(Paperclip::UriAdapter).
+        to receive(:download_content).and_return(@open_return)
 
       @uri = URI.parse("https://github.com/thoughtbot/paperclip?file=test")
       @subject = Paperclip.io_adapters.for(@uri)
@@ -105,29 +107,76 @@ 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)
+      allow_any_instance_of(Paperclip::UriAdapter).
+        to receive(:download_content).and_return(@open_return)
+
+      @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 enclosed in double quotes" do
+      file_name = "john's test document.pdf"
+      meta["content-disposition"] = "attachment; filename=\"#{file_name}\";"
 
-      @uri = URI.parse("https://github.com/thoughtbot/paperclip?file=test")
       @subject = Paperclip.io_adapters.for(@uri)
+
+      assert_equal file_name, @subject.original_filename
     end
 
-    it "returns a file name" do
+    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
     before do
-      Paperclip::UriAdapter.any_instance.
-        stubs(:download_content).returns(@open_return)
+      allow_any_instance_of(Paperclip::UriAdapter).
+        to receive(:download_content).and_return(@open_return)
 
       @uri = URI.parse("https://github.com/thoughtbot/paper:clip.jpg")
       @subject = Paperclip.io_adapters.for(@uri)
@@ -144,9 +193,18 @@ describe Paperclip::UriAdapter do
 
   describe "#download_content" do
     before do
-      Paperclip::UriAdapter.any_instance.stubs(:open).returns(@open_return)
+      allowed_mock =
+        if RUBY_VERSION < '2.5'
+          allow_any_instance_of(Paperclip::UriAdapter)
+        else
+          allow(URI)
+        end
+
+      allowed_mock.to receive(:open).and_return(@open_return)
+
       @uri = URI.parse("https://github.com/thoughtbot/paper:clip.jpg")
       @subject = Paperclip.io_adapters.for(@uri)
+      @uri_opener = RUBY_VERSION < '2.5' ? @subject : URI
     end
 
     after do
@@ -155,7 +213,7 @@ describe Paperclip::UriAdapter do
 
     context "with default read_timeout" do
       it "calls open without options" do
-        @subject.expects(:open).with(@uri, {}).at_least_once
+        expect(@uri_opener).to receive(:open).with(@uri, {}).at_least(1).times
       end
     end
 
@@ -165,7 +223,8 @@ describe Paperclip::UriAdapter do
       end
 
       it "calls open with read_timeout option" do
-        @subject.expects(:open).with(@uri, read_timeout: 120).at_least_once
+        expect(@uri_opener)
+          .to receive(:open).with(@uri, read_timeout: 120).at_least(1).times
       end
     end
   end

data/spec/paperclip/matchers/have_attached_file_matcher_spec.rb

@@ -1,5 +1,5 @@
-require 'spec_helper'
-require 'paperclip/matchers'
+require "spec_helper"
+require "paperclip/matchers"
 
 describe Paperclip::Shoulda::Matchers::HaveAttachedFileMatcher do
   extend Paperclip::Shoulda::Matchers
@@ -11,7 +11,7 @@ describe Paperclip::Shoulda::Matchers::HaveAttachedFileMatcher do
     expect(matcher).to_not accept(Dummy)
   end
 
-  it 'accepts the dummy class if it has an attachment' do
+  it "accepts the dummy class if it has an attachment" do
     rebuild_model
     matcher = self.class.have_attached_file(:avatar)
     expect(matcher).to accept(Dummy)

data/spec/paperclip/matchers/validate_attachment_content_type_matcher_spec.rb

@@ -1,5 +1,5 @@
-require 'spec_helper'
-require 'paperclip/matchers'
+require "spec_helper"
+require "paperclip/matchers"
 
 describe Paperclip::Shoulda::Matchers::ValidateAttachmentContentTypeMatcher do
   extend Paperclip::Shoulda::Matchers
@@ -20,7 +20,7 @@ describe Paperclip::Shoulda::Matchers::ValidateAttachmentContentTypeMatcher do
     expect { matcher.failure_message }.to_not raise_error
   end
 
-  it 'rejects a class when the validation fails' do
+  it "rejects a class when the validation fails" do
     Dummy.validates_attachment_content_type :avatar, content_type: %r{audio/.*}
     expect(matcher).to_not accept(Dummy)
     expect { matcher.failure_message }.to_not raise_error
@@ -74,7 +74,7 @@ describe Paperclip::Shoulda::Matchers::ValidateAttachmentContentTypeMatcher do
   context "using an :if to control the validation" do
     before do
       Dummy.class_eval do
-        validates_attachment_content_type :avatar, content_type: %r{image/*} , if: :go
+        validates_attachment_content_type :avatar, content_type: %r{image/*}, if: :go
         attr_accessor :go
       end
     end
@@ -105,5 +105,4 @@ describe Paperclip::Shoulda::Matchers::ValidateAttachmentContentTypeMatcher do
       allowing(%w(image/png image/jpeg)).
       rejecting(%w(audio/mp3 application/octet-stream))
   end
-
 end

data/spec/paperclip/matchers/validate_attachment_presence_matcher_spec.rb

@@ -1,5 +1,5 @@
-require 'spec_helper'
-require 'paperclip/matchers'
+require "spec_helper"
+require "paperclip/matchers"
 
 describe Paperclip::Shoulda::Matchers::ValidateAttachmentPresenceMatcher do
   extend Paperclip::Shoulda::Matchers
@@ -29,11 +29,11 @@ describe Paperclip::Shoulda::Matchers::ValidateAttachmentPresenceMatcher do
     end
     Dummy.class_eval do
       validates_attachment_presence :avatar
-      validates_attachment_content_type :avatar, content_type: 'image/gif'
+      validates_attachment_content_type :avatar, content_type: "image/gif"
     end
     dummy = Dummy.new
 
-    dummy.avatar = File.new fixture_file('5k.png')
+    dummy.avatar = File.new fixture_file("5k.png")
 
     expect(matcher).to accept(dummy)
   end