paperclip 4.1.1 → 4.2.0

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

@@ -1,61 +1,60 @@
-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)
     end
 
-    should "return a file name" do
-      assert_equal "data.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 "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)
       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
+      it "gets the content type" do
         assert_equal "image/x-png-by-browser", @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)
       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)
       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
+      it "gets the content type" do
         assert_equal "image/x-png-by-browser", @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

data/{test/io_adapters/uri_adapter_test.rb → spec/paperclip/io_adapters/uri_adapter_spec.rb}

@@ -1,8 +1,8 @@
-require './test/helper'
+require 'spec_helper'
 
-class UriProxyTest < Test::Unit::TestCase
+describe Paperclip::UriAdapter do
   context "a new instance" do
-    setup do
+    before do
       @open_return = StringIO.new("xxx")
       @open_return.stubs(:content_type).returns("image/png")
       Paperclip::UriAdapter.any_instance.stubs(:download_content).returns(@open_return)
@@ -10,45 +10,45 @@ class UriProxyTest < Test::Unit::TestCase
       @subject = Paperclip.io_adapters.for(@uri)
     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 orgiginal_filename' do
+    it 'accepts an orgiginal_filename' do
       @subject.original_filename = 'image.png'
       assert_equal 'image.png', @subject.original_filename
     end
@@ -56,46 +56,46 @@ class UriProxyTest < Test::Unit::TestCase
   end
 
   context "a directory index url" do
-    setup do
+    before do
       Paperclip::UriAdapter.any_instance.stubs(:download_content).returns(StringIO.new("xxx"))
       @uri = URI.parse("http://thoughtbot.com")
       @subject = Paperclip.io_adapters.for(@uri)
     end
 
-    should "return a file name" do
+    it "returns a file name" do
       assert_equal "index.html", @subject.original_filename
     end
 
-    should "return a content type" do
+    it "returns a content type" do
       assert_equal "text/html", @subject.content_type
     end
   end
 
   context "a url with query params" do
-    setup do
+    before do
       Paperclip::UriAdapter.any_instance.stubs(:download_content).returns(StringIO.new("xxx"))
       @uri = URI.parse("https://github.com/thoughtbot/paperclip?file=test")
       @subject = Paperclip.io_adapters.for(@uri)
     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::UriAdapter.any_instance.stubs(:download_content).returns(StringIO.new("xxx"))
       @uri = URI.parse("https://github.com/thoughtbot/paper:clip.jpg")
       @subject = Paperclip.io_adapters.for(@uri)
     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/matchers/have_attached_file_matcher_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+require 'paperclip/matchers'
+
+describe Paperclip::Shoulda::Matchers::HaveAttachedFileMatcher do
+  extend Paperclip::Shoulda::Matchers
+
+  it "rejects the dummy class if it has no attachment" do
+    reset_table "dummies"
+    reset_class "Dummy"
+    matcher = self.class.have_attached_file(:avatar)
+    expect(matcher).to_not accept(Dummy)
+  end
+
+  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)
+  end
+end

data/spec/paperclip/matchers/validate_attachment_content_type_matcher_spec.rb

@@ -0,0 +1,99 @@
+require 'spec_helper'
+require 'paperclip/matchers'
+
+describe Paperclip::Shoulda::Matchers::ValidateAttachmentContentTypeMatcher do
+  extend Paperclip::Shoulda::Matchers
+
+  before do
+    reset_table("dummies") do |d|
+      d.string :title
+      d.string :avatar_file_name
+      d.string :avatar_content_type
+    end
+    reset_class "Dummy"
+    Dummy.do_not_validate_attachment_file_type :avatar
+    Dummy.has_attached_file :avatar
+  end
+
+  it "rejects a class with no validation" do
+    expect(matcher).to_not accept(Dummy)
+  end
+
+  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)
+  end
+
+  it "accepts a class with a matching validation" do
+    Dummy.validates_attachment_content_type :avatar, content_type: %r{image/.*}
+    expect(matcher).to accept(Dummy)
+  end
+
+  it "accepts a class with other validations but matching types" do
+    Dummy.validates_presence_of :title
+    Dummy.validates_attachment_content_type :avatar, content_type: %r{image/.*}
+    expect(matcher).to accept(Dummy)
+  end
+
+  it "accepts a class that matches and a matcher that only specifies 'allowing'" do
+    Dummy.validates_attachment_content_type :avatar, content_type: %r{image/.*}
+    matcher = plain_matcher.allowing(%w(image/png image/jpeg))
+
+    expect(matcher).to accept(Dummy)
+  end
+
+  it "rejects a class that does not match and a matcher that only specifies 'allowing'" do
+    Dummy.validates_attachment_content_type :avatar, content_type: %r{audio/.*}
+    matcher = plain_matcher.allowing(%w(image/png image/jpeg))
+
+    expect(matcher).to_not accept(Dummy)
+  end
+
+  it "accepts a class that matches and a matcher that only specifies 'rejecting'" do
+    Dummy.validates_attachment_content_type :avatar, content_type: %r{image/.*}
+    matcher = plain_matcher.rejecting(%w(audio/mp3 application/octet-stream))
+
+    expect(matcher).to accept(Dummy)
+  end
+
+  it "rejects a class that does not match and a matcher that only specifies 'rejecting'" do
+    Dummy.validates_attachment_content_type :avatar, content_type: %r{audio/.*}
+    matcher = plain_matcher.rejecting(%w(audio/mp3 application/octet-stream))
+
+    expect(matcher).to_not accept(Dummy)
+  end
+
+  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
+        attr_accessor :go
+      end
+    end
+
+    it "runs the validation if the control is true" do
+      dummy = Dummy.new
+      dummy.go = true
+      expect(matcher).to accept(dummy)
+    end
+
+    it "does not run the validation if the control is false" do
+      dummy = Dummy.new
+      dummy.go = false
+      expect(matcher).to_not accept(dummy)
+    end
+  end
+
+  private
+
+  def plain_matcher
+    self.class.validate_attachment_content_type(:avatar)
+  end
+
+  def matcher
+    plain_matcher.
+      allowing(%w(image/png image/jpeg)).
+      rejecting(%w(audio/mp3 application/octet-stream))
+  end
+
+end