paperclip 3.5.2 → 5.2.1

data/spec/paperclip/io_adapters/file_adapter_spec.rb

@@ -0,0 +1,131 @@
+require 'spec_helper'
+
+describe Paperclip::FileAdapter do
+  context "a new instance" do
+    context "with normal file" do
+      before do
+        @file = File.new(fixture_file("5k.png"))
+        @file.binmode
+      end
+
+      after do
+        @file.close
+        @subject.close if @subject
+      end
+
+      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
+          assert @subject.path.ends_with?(".png")
+        end
+
+        it "gets the right filename" do
+          assert_equal "5k.png", @subject.original_filename
+        end
+
+        it "forces binmode on tempfile" do
+          assert @subject.instance_variable_get("@tempfile").binmode?
+        end
+
+        it "gets the content type" do
+          assert_equal "image/png", @subject.content_type
+        end
+
+        it "returns content type as a string" do
+          expect(@subject.content_type).to be_a String
+        end
+
+        it "gets the file's size" do
+          assert_equal 4456, @subject.size
+        end
+
+        it "returns false for a call to nil?" do
+          assert ! @subject.nil?
+        end
+
+        it "generates a MD5 hash of the contents" do
+          expected = Digest::MD5.file(@file.path).to_s
+          assert_equal expected, @subject.fingerprint
+        end
+
+        it "reads the contents of the file" do
+          expected = @file.read
+          assert expected.length > 0
+          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')])
+          @subject = Paperclip.io_adapters.for(@file, hash_digest: Digest::MD5)
+        end
+
+        it "prefers officially registered mime type" do
+          assert_equal "image/png", @subject.content_type
+        end
+
+        it "returns content type as a string" do
+          expect(@subject.content_type).to be_a String
+        end
+      end
+
+      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
+
+        it "returns content type without newline character" do
+          assert_equal "application/vnd.ms-office", @subject.content_type
+        end
+      end
+    end
+
+    context "filename with restricted characters" do
+      before do
+        @file = File.open(fixture_file("animated.gif")) do |file|
+          StringIO.new(file.read)
+        end
+        @file.stubs(:original_filename).returns('image:restricted.gif')
+        @subject = Paperclip.io_adapters.for(@file)
+      end
+
+      after do
+        @file.close
+        @subject.close
+      end
+
+      it "does not generate filenames that include restricted characters" do
+        assert_equal 'image_restricted.gif', @subject.original_filename
+      end
+
+      it "does not generate paths that include restricted characters" do
+        expect(@subject.path).to_not match(/:/)
+      end
+    end
+
+    context "empty file" do
+      before do
+        @file = Tempfile.new("file_adapter_test")
+        @subject = Paperclip.io_adapters.for(@file)
+      end
+
+      after do
+        @file.close
+        @subject.close
+      end
+
+      it "provides correct mime-type" do
+        assert_match %r{.*/x-empty}, @subject.content_type
+      end
+    end
+  end
+end

data/spec/paperclip/io_adapters/http_url_proxy_adapter_spec.rb

@@ -0,0 +1,121 @@
+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
+      @url = "http://thoughtbot.com/images/thoughtbot-logo.png"
+      @subject = Paperclip.io_adapters.for(@url, hash_digest: Digest::MD5)
+    end
+
+    after do
+      @subject.close
+    end
+
+    it "returns a file name" do
+      assert_equal "thoughtbot-logo.png", @subject.original_filename
+    end
+
+    it 'closes open handle after reading' do
+      assert_equal true, @open_return.closed?
+    end
+
+    it "returns a content type" do
+      assert_equal "image/png", @subject.content_type
+    end
+
+    it "returns the size of the data" do
+      assert_equal @open_return.size, @subject.size
+    end
+
+    it "generates an MD5 hash of the contents" do
+      assert_equal Digest::MD5.hexdigest("xxx"), @subject.fingerprint
+    end
+
+    it "generates correct fingerprint after read" do
+      fingerprint = Digest::MD5.hexdigest(@subject.read)
+      assert_equal fingerprint, @subject.fingerprint
+    end
+
+    it "generates same fingerprint" do
+      assert_equal @subject.fingerprint, @subject.fingerprint
+    end
+
+    it "returns the data contained in the StringIO" 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
+    end
+
+    it 'accepts an original_filename' do
+      @subject.original_filename = 'image.png'
+      assert_equal 'image.png', @subject.original_filename
+    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
+
+    after do
+      @subject.close
+    end
+
+    it "returns a file name" do
+      assert_equal "paperclip", @subject.original_filename
+    end
+  end
+
+  context "a url with restricted characters in the filename" do
+    before do
+      @url = "https://github.com/thoughtbot/paper:clip.jpg"
+      @subject = Paperclip.io_adapters.for(@url)
+    end
+
+    after do
+      begin
+        @subject.close
+      rescue Exception
+        true
+      end
+    end
+
+    it "does not generate filenames that include restricted characters" do
+      assert_equal "paper_clip.jpg", @subject.original_filename
+    end
+
+    it "does not generate paths that include restricted characters" do
+      expect(@subject.path).to_not match(/:/)
+    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

@@ -0,0 +1,8 @@
+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, nil)
+  end
+end

data/{test/io_adapters/nil_adapter_test.rb → spec/paperclip/io_adapters/nil_adapter_spec.rb}

@@ -1,24 +1,24 @@
-require './test/helper'
+require 'spec_helper'
 
-class NilAdapterTest < Test::Unit::TestCase
+describe Paperclip::NilAdapter do
   context 'a new instance' do
-    setup do
+    before do
       @subject = Paperclip.io_adapters.for(nil)
     end
 
-    should "get the right filename" do
+    it "gets the right filename" do
       assert_equal "", @subject.original_filename
     end
 
-    should "get the content type" do
+    it "gets the content type" do
       assert_equal "", @subject.content_type
     end
 
-    should "get the file's size" do
+    it "gets the file's size" do
       assert_equal 0, @subject.size
     end
 
-    should "return true for a call to nil?" do
+    it "returns true for a call to nil?" do
       assert @subject.nil?
     end
   end

data/{test/io_adapters/registry_test.rb → spec/paperclip/io_adapters/registry_spec.rb}

@@ -1,31 +1,34 @@
-require './test/helper'
+require 'spec_helper'
 
-class AdapterRegistryTest < Test::Unit::TestCase
+describe Paperclip::AttachmentRegistry do
   context "for" do
-    setup do
+    before do
       class AdapterTest
-        def initialize(target); end
+        def initialize(_target, _ = {}); end
       end
       @subject = Paperclip::AdapterRegistry.new
       @subject.register(AdapterTest){|t| Symbol === t }
     end
-    should "return the class registered for the adapted type" do
+
+    it "returns the class registered for the adapted type" do
       assert_equal AdapterTest, @subject.for(:target).class
     end
   end
 
   context "registered?" do
-    setup do
+    before do
       class AdapterTest
-        def initialize(target); end
+        def initialize(_target, _ = {}); end
       end
       @subject = Paperclip::AdapterRegistry.new
       @subject.register(AdapterTest){|t| Symbol === t }
     end
-    should "return true when the class of this adapter has been registered" do
+
+    it "returns true when the class of this adapter has been registered" do
       assert @subject.registered?(AdapterTest.new(:target))
     end
-    should "return false when the adapter has not been registered" do
+
+    it "returns false when the adapter has not been registered" do
       assert ! @subject.registered?(Object)
     end
   end

data/{test/io_adapters/stringio_adapter_test.rb → spec/paperclip/io_adapters/stringio_adapter_spec.rb}

@@ -1,61 +1,64 @@
-require './test/helper'
+require 'spec_helper'
 
-class StringioFileProxyTest < Test::Unit::TestCase
+describe Paperclip::StringioAdapter do
   context "a new instance" do
-    setup 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
 
-    should "return a file name" do
-      assert_equal "stringio.txt", @subject.original_filename
+    it "returns a file name" do
+      assert_equal "data", @subject.original_filename
     end
 
-    should "return a content type" do
+    it "returns a content type" do
       assert_equal "text/plain", @subject.content_type
     end
 
-    should "return the size of the data" do
+    it "returns the size of the data" do
       assert_equal 6, @subject.size
     end
 
-    should "generate an MD5 hash of the contents" do
+    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
 
-    should "generate correct fingerprint after read" do
+    it "generates correct fingerprint after read" do
       fingerprint = Digest::MD5.hexdigest(@subject.read)
       assert_equal fingerprint, @subject.fingerprint
     end
 
-    should "generate same fingerprint" do
+    it "generates same fingerprint" do
       assert_equal @subject.fingerprint, @subject.fingerprint
     end
 
-    should "return the data contained in the StringIO" do
+    it "returns the data contained in the StringIO" do
       assert_equal "abc123", @subject.read
     end
 
-    should 'accept a content_type' do
+    it 'accepts a content_type' do
       @subject.content_type = 'image/png'
       assert_equal 'image/png', @subject.content_type
     end
 
-    should 'accept an original_filename' do
+    it 'accepts an original_filename' do
       @subject.original_filename = 'image.png'
       assert_equal 'image.png', @subject.original_filename
     end
 
-    should "not generate filenames that include restricted characters" do
+    it "does not generate filenames that include restricted characters" do
       @subject.original_filename = 'image:restricted.png'
       assert_equal 'image_restricted.png', @subject.original_filename
     end
 
-    should "not generate paths that include restricted characters" do
+    it "does not generate paths that include restricted characters" do
       @subject.original_filename = 'image:restricted.png'
-      assert_no_match /:/, @subject.path
+      expect(@subject.path).to_not match(/:/)
     end
-
   end
 end

data/{test/io_adapters/uploaded_file_adapter_test.rb → spec/paperclip/io_adapters/uploaded_file_adapter_spec.rb}

@@ -1,9 +1,9 @@
-require './test/helper'
+require 'spec_helper'
 
-class UploadedFileAdapterTest < Test::Unit::TestCase
+describe Paperclip::UploadedFileAdapter do
   context "a new instance" do
     context "with UploadedFile responding to #tempfile" do
-      setup do
+      before do
         Paperclip::UploadedFileAdapter.content_type_detector = nil
 
         class UploadedFile < OpenStruct; end
@@ -11,41 +11,41 @@ class UploadedFileAdapterTest < Test::Unit::TestCase
         tempfile.binmode
 
         @file = UploadedFile.new(
-          :original_filename => "5k.png",
-          :content_type => "image/x-png-by-browser\r",
-          :head => "",
-          :tempfile => tempfile,
-          :path => tempfile.path
+          original_filename: "5k.png",
+          content_type: "image/x-png-by-browser\r",
+          head: "",
+          tempfile: tempfile,
+          path: tempfile.path
         )
-        @subject = Paperclip.io_adapters.for(@file)
+        @subject = Paperclip.io_adapters.for(@file, hash_digest: Digest::MD5)
       end
 
-      should "get the right filename" do
+      it "gets the right filename" do
         assert_equal "5k.png", @subject.original_filename
       end
 
-      should "force binmode on tempfile" do
+      it "forces binmode on tempfile" do
         assert @subject.instance_variable_get("@tempfile").binmode?
       end
 
-      should "get the content type" do
-        assert_equal "image/x-png-by-browser", @subject.content_type
+      it "gets the content type" do
+        assert_equal "image/png", @subject.content_type
       end
 
-      should "get the file's size" do
+      it "gets the file's size" do
         assert_equal 4456, @subject.size
       end
 
-      should "return false for a call to nil?" do
+      it "returns false for a call to nil?" do
         assert ! @subject.nil?
       end
 
-      should "generate a MD5 hash of the contents" do
+      it "generates a MD5 hash of the contents" do
         expected = Digest::MD5.file(@file.tempfile.path).to_s
         assert_equal expected, @subject.fingerprint
       end
 
-      should "read the contents of the file" do
+      it "reads the contents of the file" do
         expected = @file.tempfile.read
         assert expected.length > 0
         assert_equal expected, @subject.read
@@ -53,68 +53,68 @@ class UploadedFileAdapterTest < Test::Unit::TestCase
     end
 
     context "with UploadedFile that has restricted characters" do
-      setup do
+      before do
         Paperclip::UploadedFileAdapter.content_type_detector = nil
 
         class UploadedFile < OpenStruct; end
         @file = UploadedFile.new(
-          :original_filename => "image:restricted.gif",
-          :content_type => "image/x-png-by-browser",
-          :head => "",
-          :path => fixture_file("5k.png")
+          original_filename: "image:restricted.gif",
+          content_type: "image/x-png-by-browser",
+          head: "",
+          path: fixture_file("5k.png")
         )
-        @subject = Paperclip.io_adapters.for(@file)
+        @subject = Paperclip.io_adapters.for(@file, hash_digest: Digest::MD5)
       end
 
-      should "not generate paths that include restricted characters" do
-        assert_no_match /:/, @subject.path
+      it "does not generate paths that include restricted characters" do
+        expect(@subject.path).to_not match(/:/)
       end
 
-      should "not generate filenames that include restricted characters" do
+      it "does not generate filenames that include restricted characters" do
         assert_equal 'image_restricted.gif', @subject.original_filename
       end
     end
 
     context "with UploadFile responding to #path" do
-      setup do
+      before do
         Paperclip::UploadedFileAdapter.content_type_detector = nil
 
         class UploadedFile < OpenStruct; end
         @file = UploadedFile.new(
-          :original_filename => "5k.png",
-          :content_type => "image/x-png-by-browser",
-          :head => "",
-          :path => fixture_file("5k.png")
+          original_filename: "5k.png",
+          content_type: "image/x-png-by-browser",
+          head: "",
+          path: fixture_file("5k.png")
         )
-        @subject = Paperclip.io_adapters.for(@file)
+        @subject = Paperclip.io_adapters.for(@file, hash_digest: Digest::MD5)
       end
 
-      should "get the right filename" do
+      it "gets the right filename" do
         assert_equal "5k.png", @subject.original_filename
       end
 
-      should "force binmode on tempfile" do
+      it "forces binmode on tempfile" do
         assert @subject.instance_variable_get("@tempfile").binmode?
       end
 
-      should "get the content type" do
-        assert_equal "image/x-png-by-browser", @subject.content_type
+      it "gets the content type" do
+        assert_equal "image/png", @subject.content_type
       end
 
-      should "get the file's size" do
+      it "gets the file's size" do
         assert_equal 4456, @subject.size
       end
 
-      should "return false for a call to nil?" do
+      it "returns false for a call to nil?" do
         assert ! @subject.nil?
       end
 
-      should "generate a MD5 hash of the contents" do
+      it "generates a MD5 hash of the contents" do
         expected = Digest::MD5.file(@file.path).to_s
         assert_equal expected, @subject.fingerprint
       end
 
-      should "read the contents of the file" do
+      it "reads the contents of the file" do
         expected_file = File.new(@file.path)
         expected_file.binmode
         expected = expected_file.read
@@ -123,21 +123,21 @@ class UploadedFileAdapterTest < Test::Unit::TestCase
       end
 
       context "don't trust client-given MIME type" do
-        setup do
+        before do
           Paperclip::UploadedFileAdapter.content_type_detector =
             Paperclip::FileCommandContentTypeDetector
 
           class UploadedFile < OpenStruct; end
           @file = UploadedFile.new(
-            :original_filename => "5k.png",
-            :content_type => "image/x-png-by-browser",
-            :head => "",
-            :path => fixture_file("5k.png")
+            original_filename: "5k.png",
+            content_type: "image/x-png-by-browser",
+            head: "",
+            path: fixture_file("5k.png")
           )
           @subject = Paperclip.io_adapters.for(@file)
         end
 
-        should "get the content type" do
+        it "gets the content type" do
           assert_equal "image/png", @subject.content_type
         end
       end