paperclip 4.1.1 → 4.2.0

data/{test/io_adapters/data_uri_adapter_test.rb → spec/paperclip/io_adapters/data_uri_adapter_spec.rb}

@@ -1,70 +1,74 @@
-require './test/helper'
+require 'spec_helper'
 
-class DataUriAdapterTest < Test::Unit::TestCase
-
-  def teardown
+describe Paperclip::DataUriAdapter do
+  after do
     if @subject
       @subject.close
     end
   end
 
-  should 'allow a missing mime-type' do
+  it 'allows a missing mime-type' do
     adapter = Paperclip.io_adapters.for("data:;base64,#{original_base64_content}")
     assert_equal Paperclip::DataUriAdapter, adapter.class
   end
 
+  it 'alows mime type that has dot in it' do
+    adapter = Paperclip.io_adapters.for("data:image/vnd.microsoft.icon;base64,#{original_base64_content}")
+    assert_equal Paperclip::DataUriAdapter, adapter.class
+  end
+
   context "a new instance" do
-    setup do
+    before do
       @contents = "data:image/png;base64,#{original_base64_content}"
       @subject = Paperclip.io_adapters.for(@contents)
     end
 
-    should "returns a file name based on the content type" do
-      assert_equal "data.png", @subject.original_filename
+    it "returns a nondescript file name" do
+      assert_equal "data", @subject.original_filename
     end
 
-    should "return a content type" do
+    it "returns a content type" do
       assert_equal "image/png", @subject.content_type
     end
 
-    should "return the size of the data" do
+    it "returns the size of the data" do
       assert_equal 4456, @subject.size
     end
 
-    should "generate a correct MD5 hash of the contents" do
+    it "generates a correct MD5 hash of the contents" do
       assert_equal(
         Digest::MD5.hexdigest(Base64.decode64(original_base64_content)),
         @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 '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

data/spec/paperclip/io_adapters/empty_string_adapter_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe Paperclip::EmptyStringAdapter do
+  context 'a new instance' do
+    before do
+      @subject = Paperclip.io_adapters.for('')
+    end
+
+    it "returns false for a call to nil?" do
+      assert !@subject.nil?
+    end
+
+    it 'returns false for a call to assignment?' do
+      assert !@subject.assignment?
+    end
+  end
+end

data/{test/io_adapters/file_adapter_test.rb → spec/paperclip/io_adapters/file_adapter_spec.rb}

@@ -1,53 +1,57 @@
-require './test/helper'
+require 'spec_helper'
 
-class FileAdapterTest < Test::Unit::TestCase
+describe Paperclip::FileAdapter do
   context "a new instance" do
     context "with normal file" do
-      setup do
+      before do
         @file = File.new(fixture_file("5k.png"))
         @file.binmode
       end
 
-      teardown do
+      after do
         @file.close
         @subject.close if @subject
       end
 
       context 'doing normal things' do
-        setup do
+        before do
           @subject = Paperclip.io_adapters.for(@file)
         end
 
-        should "get the right filename" do
+        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
 
-        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
+        it "gets the content type" do
           assert_equal "image/png", @subject.content_type
         end
 
-        should "return content type as a string" do
-          assert_kind_of String, @subject.content_type
+        it "returns content type as a string" do
+          expect(@subject.content_type).to be_a String
         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.read
           assert expected.length > 0
           assert_equal expected, @subject.read
@@ -55,35 +59,35 @@ class FileAdapterTest < Test::Unit::TestCase
       end
 
       context "file with multiple possible content type" do
-        setup 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)
         end
 
-        should "prefer officially registered mime type" do
+        it "prefers officially registered mime type" do
           assert_equal "image/png", @subject.content_type
         end
 
-        should "return content type as a string" do
-          assert_kind_of String, @subject.content_type
+        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 command on *nix" do
-        setup do
+        before do
           MIME::Types.stubs(:type_for).returns([])
           Paperclip.stubs(:run).returns("application/vnd.ms-office\n")
           @subject = Paperclip.io_adapters.for(@file)
         end
 
-        should "return content type without newline character" do
+        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
-      setup do
+      before do
         @file = File.open(fixture_file("animated.gif")) do |file|
           StringIO.new(file.read)
         end
@@ -91,32 +95,32 @@ class FileAdapterTest < Test::Unit::TestCase
         @subject = Paperclip.io_adapters.for(@file)
       end
 
-      teardown do
+      after do
         @file.close
         @subject.close
       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
 
-      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
     end
 
     context "empty file" do
-      setup do
+      before do
         @file = Tempfile.new("file_adapter_test")
         @subject = Paperclip.io_adapters.for(@file)
       end
 
-      teardown do
+      after do
         @file.close
         @subject.close
       end
 
-      should "provide correct mime-type" do
+      it "provides correct mime-type" do
         assert_match %r{.*/x-empty}, @subject.content_type
       end
     end

data/{test/io_adapters/http_url_proxy_adapter_test.rb → spec/paperclip/io_adapters/http_url_proxy_adapter_spec.rb}

@@ -1,8 +1,8 @@
-require './test/helper'
+require 'spec_helper'
 
-class HttpUrlProxyAdapterTest < Test::Unit::TestCase
+describe Paperclip::HttpUrlProxyAdapter do
   context "a new instance" do
-    setup 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)
@@ -10,78 +10,78 @@ class HttpUrlProxyAdapterTest < Test::Unit::TestCase
       @subject = Paperclip.io_adapters.for(@url)
     end
 
-    teardown do
+    after do
       @subject.close
     end
 
-    should "return a file name" do
+    it "returns a file name" do
       assert_equal "thoughtbot-logo.png", @subject.original_filename
     end
 
-    should 'close open handle after reading' do
+    it 'closes open handle after reading' do
       assert_equal true, @open_return.closed?
     end
 
-    should "return a content type" do
+    it "returns a content type" do
       assert_equal "image/png", @subject.content_type
     end
 
-    should "return the size of the data" do
+    it "returns the size of the data" do
       assert_equal @open_return.size, @subject.size
     end
 
-    should "generate an MD5 hash of the contents" do
+    it "generates an MD5 hash of the contents" do
       assert_equal Digest::MD5.hexdigest("xxx"), @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 "xxx", @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
   end
 
   context "a url with query params" do
-    setup 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
 
-    teardown do
+    after do
       @subject.close
     end
 
-    should "return a file name" do
+    it "returns a file name" do
       assert_equal "paperclip", @subject.original_filename
     end
   end
 
   context "a url with restricted characters in the filename" do
-    setup 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
 
-    teardown do
+    after do
       begin
         @subject.close
       rescue Exception
@@ -89,12 +89,12 @@ class HttpUrlProxyAdapterTest < Test::Unit::TestCase
       end
     end
 
-    should "not generate filenames that include restricted characters" do
+    it "does not generate filenames that include restricted characters" do
       assert_equal "paper_clip.jpg", @subject.original_filename
     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
   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)
+  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
       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
       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