paperclip 3.5.4 → 4.0.0

data/test/tempfile_factory_test.rb

@@ -3,15 +3,27 @@ require './test/helper'
 class Paperclip::TempfileFactoryTest < Test::Unit::TestCase
   should "be able to generate a tempfile with the right name" do
     file = subject.generate("omg.png")
+    assert File.extname(file.path), "png"
   end
+
   should "be able to generate a tempfile with the right name with a tilde at the beginning" do
     file = subject.generate("~omg.png")
+    assert File.extname(file.path), "png"
   end
+
   should "be able to generate a tempfile with the right name with a tilde at the end" do
     file = subject.generate("omg.png~")
+    assert File.extname(file.path), "png"
   end
+
   should "be able to generate a tempfile from a file with a really long name" do
-    filename = "#{"longfilename" * 100}.txt"
+    filename = "#{"longfilename" * 100}.png"
     file = subject.generate(filename)
+    assert File.extname(file.path), "png"
+  end
+
+  should 'be able to take nothing as a parameter and not error' do
+   file = subject.generate
+   assert File.exists?(file.path)
   end
 end

data/test/validators/attachment_file_name_validator_test.rb

@@ -0,0 +1,162 @@
+require './test/helper'
+
+class AttachmentFileNameValidatorTest < Test::Unit::TestCase
+  def setup
+    rebuild_model
+    @dummy = Dummy.new
+    super
+  end
+
+  def build_validator(options)
+    @validator = Paperclip::Validators::AttachmentFileNameValidator.new(options.merge(
+      :attributes => :avatar
+    ))
+  end
+
+  context "with a failing validation" do
+    setup do
+      build_validator :matches => /.*\.png$/, :allow_nil => false
+      @dummy.stubs(:avatar_file_name => "data.txt")
+      @validator.validate(@dummy)
+    end
+
+    should "add error to the base object" do
+      assert @dummy.errors[:avatar].present?,
+        "Error not added to base attribute"
+    end
+
+    should "add error to base object as a string" do
+      assert_kind_of String, @dummy.errors[:avatar].first,
+        "Error added to base attribute as something other than a String"
+    end
+  end
+
+  should "not add error to the base object with a successful validation" do
+    build_validator :matches => /.*\.png$/, :allow_nil => false
+    @dummy.stubs(:avatar_file_name => "image.png")
+    @validator.validate(@dummy)
+
+    assert @dummy.errors[:avatar].blank?, "Error was added to base attribute"
+  end
+
+  context "whitelist format" do
+    context "with an allowed type" do
+      context "as a single regexp" do
+        setup do
+          build_validator :matches => /.*\.jpg$/
+          @dummy.stubs(:avatar_file_name => "image.jpg")
+          @validator.validate(@dummy)
+        end
+
+        should "not set an error message" do
+          assert @dummy.errors[:avatar_file_name].blank?
+        end
+      end
+
+      context "as a list" do
+        setup do
+          build_validator :matches => [/.*\.png$/, /.*\.jpe?g$/]
+          @dummy.stubs(:avatar_file_name => "image.jpg")
+          @validator.validate(@dummy)
+        end
+
+        should "not set an error message" do
+          assert @dummy.errors[:avatar_file_name].blank?
+        end
+      end
+    end
+
+    context "with a disallowed type" do
+      should "set a correct default error message" do
+        build_validator :matches => /^text\/.*/
+        @dummy.stubs(:avatar_file_name => "image.jpg")
+        @validator.validate(@dummy)
+
+        assert @dummy.errors[:avatar_file_name].present?
+        assert_includes @dummy.errors[:avatar_file_name], "is invalid"
+      end
+
+      should "set a correct custom error message" do
+        build_validator :matches => /.*\.png$/, :message => "should be a PNG image"
+        @dummy.stubs(:avatar_file_name => "image.jpg")
+        @validator.validate(@dummy)
+
+        assert_includes @dummy.errors[:avatar_file_name], "should be a PNG image"
+      end
+    end
+  end
+
+  context "blacklist format" do
+    context "with an allowed type" do
+      context "as a single regexp" do
+        setup do
+          build_validator :not => /^text\/.*/
+          @dummy.stubs(:avatar_file_name => "image.jpg")
+          @validator.validate(@dummy)
+        end
+
+        should "not set an error message" do
+          assert @dummy.errors[:avatar_file_name].blank?
+        end
+      end
+
+      context "as a list" do
+        setup do
+          build_validator :not => [/.*\.png$/, /.*\.jpe?g$/]
+          @dummy.stubs(:avatar_file_name => "image.gif")
+          @validator.validate(@dummy)
+        end
+
+        should "not set an error message" do
+          assert @dummy.errors[:avatar_file_name].blank?
+        end
+      end
+    end
+
+    context "with a disallowed type" do
+      should "set a correct default error message" do
+        build_validator :not => /data.*/
+        @dummy.stubs(:avatar_file_name => "data.txt")
+        @validator.validate(@dummy)
+
+        assert @dummy.errors[:avatar_file_name].present?
+        assert_includes @dummy.errors[:avatar_file_name], "is invalid"
+      end
+
+      should "set a correct custom error message" do
+        build_validator :not => /.*\.png$/, :message => "should not be a PNG image"
+        @dummy.stubs(:avatar_file_name => "image.png")
+        @validator.validate(@dummy)
+
+        assert_includes @dummy.errors[:avatar_file_name], "should not be a PNG image"
+      end
+    end
+  end
+
+  context "using the helper" do
+    setup do
+      Dummy.validates_attachment_file_name :avatar, :matches => /.*\.jpg$/
+    end
+
+    should "add the validator to the class" do
+      assert Dummy.validators_on(:avatar).any?{ |validator| validator.kind == :attachment_file_name }
+    end
+  end
+
+  context "given options" do
+    should "raise argument error if no required argument was given" do
+      assert_raises(ArgumentError) do
+        build_validator :message => "Some message"
+      end
+    end
+
+    should "not raise argument error if :matches was given" do
+      build_validator :matches => /.*\.jpg$/
+    end
+
+    should "not raise argument error if :not was given" do
+      build_validator :not => /.*\.jpg$/
+    end
+  end
+end
+

data/test/validators/attachment_presence_validator_test.rb

@@ -60,7 +60,7 @@ class AttachmentPresenceValidatorTest < Test::Unit::TestCase
   context "with attachment" do
     setup do
       build_validator
-      @dummy.avatar = StringIO.new('.')
+      @dummy.avatar = StringIO.new('.\n')
       @validator.validate(@dummy)
     end
 

data/test/validators/media_type_spoof_detection_validator_test.rb

@@ -0,0 +1,12 @@
+require './test/helper'
+
+class MediaTypeSpoofDetectionValidatorTest < Test::Unit::TestCase
+  def setup
+    rebuild_model
+    @dummy = Dummy.new
+  end
+
+  should "be on the attachment without being explicitly added" do
+    assert Dummy.validators_on(:avatar).any?{ |validator| validator.kind == :media_type_spoof_detection }
+  end
+end

data/test/validators_test.rb

@@ -1,6 +1,8 @@
 require './test/helper'
 
 class ValidatorsTest < Test::Unit::TestCase
+  include ActiveSupport::Testing::Deprecation
+
   def setup
     rebuild_model
   end
@@ -33,9 +35,9 @@ class ValidatorsTest < Test::Unit::TestCase
   context "using the helper with a conditional" do
     setup do
       Dummy.validates_attachment :avatar, :presence => true,
-                                 :content_type => { :content_type => "image/jpeg" },
-                                 :size => { :in => 0..10.kilobytes },
-                                 :if => :title_present?
+        :content_type => { :content_type => "image/jpeg" },
+        :size => { :in => 0..10.kilobytes },
+        :if => :title_present?
     end
 
     should "validate the attachment if title is present" do
@@ -58,4 +60,42 @@ class ValidatorsTest < Test::Unit::TestCase
       assert_equal [], dummy.errors.keys
     end
   end
+
+  context 'with no other validations on the Dummy#avatar attachment' do
+    setup do
+      reset_class("Dummy")
+      Dummy.has_attached_file :avatar
+      Paperclip.reset_duplicate_clash_check!
+    end
+
+    should 'raise an error when no content_type validation exists' do
+      assert_raises(Paperclip::Errors::MissingRequiredValidatorError) do
+        Dummy.new(:avatar => File.new(fixture_file("12k.png")))
+      end
+    end
+
+    should 'not raise an error when a content_type validation exists' do
+      Dummy.validates_attachment :avatar, :content_type => { :content_type => "image/jpeg" }
+
+      assert_nothing_raised(Paperclip::Errors::MissingRequiredValidatorError) do 
+        Dummy.new(:avatar => File.new(fixture_file("12k.png")))
+      end
+    end
+
+    should 'not raise an error when a file_name validation exists' do
+      Dummy.validates_attachment :avatar, :file_name => { :matches => /png$/ }
+
+      assert_nothing_raised(Paperclip::Errors::MissingRequiredValidatorError) do 
+        Dummy.new(:avatar => File.new(fixture_file("12k.png")))
+      end
+    end
+
+    should 'not raise an error when a the validation has been explicitly rejected' do
+      Dummy.validates_attachment :avatar, :file_type_ignorance => true
+
+      assert_nothing_raised(Paperclip::Errors::MissingRequiredValidatorError) do
+        Dummy.new(:avatar => File.new(fixture_file("12k.png")))
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperclip
 version: !ruby/object:Gem::Version
-  version: 3.5.4
+  version: 4.0.0
 platform: ruby
 authors:
 - Jon Yurek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-07 00:00:00.000000000 Z
+date: 2014-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -396,6 +396,7 @@ files:
 - lib/paperclip/matchers/validate_attachment_content_type_matcher.rb
 - lib/paperclip/matchers/validate_attachment_presence_matcher.rb
 - lib/paperclip/matchers/validate_attachment_size_matcher.rb
+- lib/paperclip/media_type_spoof_detector.rb
 - lib/paperclip/missing_attachment_styles.rb
 - lib/paperclip/processor.rb
 - lib/paperclip/railtie.rb
@@ -411,8 +412,11 @@ files:
 - lib/paperclip/url_generator.rb
 - lib/paperclip/validators.rb
 - lib/paperclip/validators/attachment_content_type_validator.rb
+- lib/paperclip/validators/attachment_file_name_validator.rb
+- lib/paperclip/validators/attachment_file_type_ignorance_validator.rb
 - lib/paperclip/validators/attachment_presence_validator.rb
 - lib/paperclip/validators/attachment_size_validator.rb
+- lib/paperclip/validators/media_type_spoof_detection_validator.rb
 - lib/paperclip/version.rb
 - lib/tasks/paperclip.rake
 - paperclip.gemspec
@@ -432,6 +436,7 @@ files:
 - test/fixtures/animated.gif
 - test/fixtures/animated.unknown
 - test/fixtures/bad.png
+- test/fixtures/empty.html
 - test/fixtures/fog.yml
 - test/fixtures/rotated.jpg
 - test/fixtures/s3.yml
@@ -463,6 +468,7 @@ files:
 - test/matchers/validate_attachment_content_type_matcher_test.rb
 - test/matchers/validate_attachment_presence_matcher_test.rb
 - test/matchers/validate_attachment_size_matcher_test.rb
+- test/media_type_spoof_detector_test.rb
 - test/meta_class_test.rb
 - test/paperclip_missing_attachment_styles_test.rb
 - test/paperclip_test.rb
@@ -483,8 +489,10 @@ files:
 - test/thumbnail_test.rb
 - test/url_generator_test.rb
 - test/validators/attachment_content_type_validator_test.rb
+- test/validators/attachment_file_name_validator_test.rb
 - test/validators/attachment_presence_validator_test.rb
 - test/validators/attachment_size_validator_test.rb
+- test/validators/media_type_spoof_detection_validator_test.rb
 - test/validators_test.rb
 homepage: https://github.com/thoughtbot/paperclip
 licenses:
@@ -544,6 +552,7 @@ test_files:
 - test/fixtures/animated.gif
 - test/fixtures/animated.unknown
 - test/fixtures/bad.png
+- test/fixtures/empty.html
 - test/fixtures/fog.yml
 - test/fixtures/rotated.jpg
 - test/fixtures/s3.yml
@@ -575,6 +584,7 @@ test_files:
 - test/matchers/validate_attachment_content_type_matcher_test.rb
 - test/matchers/validate_attachment_presence_matcher_test.rb
 - test/matchers/validate_attachment_size_matcher_test.rb
+- test/media_type_spoof_detector_test.rb
 - test/meta_class_test.rb
 - test/paperclip_missing_attachment_styles_test.rb
 - test/paperclip_test.rb
@@ -595,6 +605,8 @@ test_files:
 - test/thumbnail_test.rb
 - test/url_generator_test.rb
 - test/validators/attachment_content_type_validator_test.rb
+- test/validators/attachment_file_name_validator_test.rb
 - test/validators/attachment_presence_validator_test.rb
 - test/validators/attachment_size_validator_test.rb
+- test/validators/media_type_spoof_detection_validator_test.rb
 - test/validators_test.rb