paperclip 4.1.1 → 4.2.0

data/spec/paperclip/validators/attachment_file_name_validator_spec.rb

@@ -0,0 +1,160 @@
+require 'spec_helper'
+
+describe Paperclip::Validators::AttachmentFileNameValidator do
+  before do
+    rebuild_model
+    @dummy = Dummy.new
+  end
+
+  def build_validator(options)
+    @validator = Paperclip::Validators::AttachmentFileNameValidator.new(options.merge(
+      attributes: :avatar
+    ))
+  end
+
+  context "with a failing validation" do
+    before do
+      build_validator matches: /.*\.png$/, allow_nil: false
+      @dummy.stubs(avatar_file_name: "data.txt")
+      @validator.validate(@dummy)
+    end
+
+    it "adds error to the base object" do
+      assert @dummy.errors[:avatar].present?,
+        "Error not added to base attribute"
+    end
+
+    it "adds error to base object as a string" do
+      expect(@dummy.errors[:avatar].first).to be_a String
+    end
+  end
+
+  it "does 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
+        before do
+          build_validator matches: /.*\.jpg$/
+          @dummy.stubs(avatar_file_name: "image.jpg")
+          @validator.validate(@dummy)
+        end
+
+        it "does not set an error message" do
+          assert @dummy.errors[:avatar_file_name].blank?
+        end
+      end
+
+      context "as a list" do
+        before do
+          build_validator matches: [/.*\.png$/, /.*\.jpe?g$/]
+          @dummy.stubs(avatar_file_name: "image.jpg")
+          @validator.validate(@dummy)
+        end
+
+        it "does not set an error message" do
+          assert @dummy.errors[:avatar_file_name].blank?
+        end
+      end
+    end
+
+    context "with a disallowed type" do
+      it "sets 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?
+        expect(@dummy.errors[:avatar_file_name]).to include "is invalid"
+      end
+
+      it "sets 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)
+
+        expect(@dummy.errors[:avatar_file_name]).to include "should be a PNG image"
+      end
+    end
+  end
+
+  context "blacklist format" do
+    context "with an allowed type" do
+      context "as a single regexp" do
+        before do
+          build_validator not: /^text\/.*/
+          @dummy.stubs(avatar_file_name: "image.jpg")
+          @validator.validate(@dummy)
+        end
+
+        it "does not set an error message" do
+          assert @dummy.errors[:avatar_file_name].blank?
+        end
+      end
+
+      context "as a list" do
+        before do
+          build_validator not: [/.*\.png$/, /.*\.jpe?g$/]
+          @dummy.stubs(avatar_file_name: "image.gif")
+          @validator.validate(@dummy)
+        end
+
+        it "does not set an error message" do
+          assert @dummy.errors[:avatar_file_name].blank?
+        end
+      end
+    end
+
+    context "with a disallowed type" do
+      it "sets 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?
+        expect(@dummy.errors[:avatar_file_name]).to include "is invalid"
+      end
+
+      it "sets 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)
+
+        expect(@dummy.errors[:avatar_file_name]).to include "should not be a PNG image"
+      end
+    end
+  end
+
+  context "using the helper" do
+    before do
+      Dummy.validates_attachment_file_name :avatar, matches: /.*\.jpg$/
+    end
+
+    it "adds the validator to the class" do
+      assert Dummy.validators_on(:avatar).any?{ |validator| validator.kind == :attachment_file_name }
+    end
+  end
+
+  context "given options" do
+    it "raises argument error if no required argument was given" do
+      assert_raises(ArgumentError) do
+        build_validator message: "Some message"
+      end
+    end
+
+    it "does not raise argument error if :matches was given" do
+      build_validator matches: /.*\.jpg$/
+    end
+
+    it "does not raise argument error if :not was given" do
+      build_validator not: /.*\.jpg$/
+    end
+  end
+end
+

data/{test/validators/attachment_presence_validator_test.rb → spec/paperclip/validators/attachment_presence_validator_spec.rb}

@@ -1,56 +1,56 @@
-require './test/helper'
+require 'spec_helper'
 
-class AttachmentPresenceValidatorTest < Test::Unit::TestCase
-  def setup
+describe Paperclip::Validators::AttachmentPresenceValidator do
+  before do
     rebuild_model
     @dummy = Dummy.new
   end
 
   def build_validator(options={})
     @validator = Paperclip::Validators::AttachmentPresenceValidator.new(options.merge(
-      :attributes => :avatar
+      attributes: :avatar
     ))
   end
 
   context "nil attachment" do
-    setup do
+    before do
       @dummy.avatar = nil
     end
 
     context "with default options" do
-      setup do
+      before do
         build_validator
         @validator.validate(@dummy)
       end
 
-      should "add error on the attachment" do
+      it "adds error on the attachment" do
         assert @dummy.errors[:avatar].present?
       end
 
-      should "not add an error on the file_name attribute" do
+      it "does not add an error on the file_name attribute" do
         assert @dummy.errors[:avatar_file_name].blank?
       end
     end
 
     context "with :if option" do
       context "returning true" do
-        setup do
-          build_validator :if => true
+        before do
+          build_validator if: true
           @validator.validate(@dummy)
         end
 
-        should "perform a validation" do
+        it "performs a validation" do
           assert @dummy.errors[:avatar].present?
         end
       end
 
       context "returning false" do
-        setup do
-          build_validator :if => false
+        before do
+          build_validator if: false
           @validator.validate(@dummy)
         end
 
-        should "perform a validation" do
+        it "performs a validation" do
           assert @dummy.errors[:avatar].present?
         end
       end
@@ -58,27 +58,27 @@ class AttachmentPresenceValidatorTest < Test::Unit::TestCase
   end
 
   context "with attachment" do
-    setup do
+    before do
       build_validator
       @dummy.avatar = StringIO.new('.\n')
       @validator.validate(@dummy)
     end
 
-    should "not add error on the attachment" do
+    it "does not add error on the attachment" do
       assert @dummy.errors[:avatar].blank?
     end
 
-    should "not add an error on the file_name attribute" do
+    it "does not add an error on the file_name attribute" do
       assert @dummy.errors[:avatar_file_name].blank?
     end
   end
 
   context "using the helper" do
-    setup do
+    before do
       Dummy.validates_attachment_presence :avatar
     end
 
-    should "add the validator to the class" do
+    it "adds the validator to the class" do
       assert Dummy.validators_on(:avatar).any?{ |validator| validator.kind == :attachment_presence }
     end
   end

data/{test/validators/attachment_size_validator_test.rb → spec/paperclip/validators/attachment_size_validator_spec.rb}

@@ -1,27 +1,35 @@
-require './test/helper'
+require 'spec_helper'
 
-class AttachmentSizeValidatorTest < Test::Unit::TestCase
-  def setup
+describe Paperclip::Validators::AttachmentSizeValidator do
+  before do
     rebuild_model
     @dummy = Dummy.new
   end
 
   def build_validator(options)
     @validator = Paperclip::Validators::AttachmentSizeValidator.new(options.merge(
-      :attributes => :avatar
+      attributes: :avatar
     ))
   end
 
+  def self.storage_units
+    if defined?(ActiveSupport::NumberHelper) # Rails 4.0+
+      { 5120 => '5 KB',       10240 => '10 KB' }
+    else
+      { 5120 => '5120 Bytes', 10240 => '10240 Bytes' }
+    end
+  end
+
   def self.should_allow_attachment_file_size(size)
     context "when the attachment size is #{size}" do
-      should "add error to dummy object" do
+      it "adds error to dummy object" do
         @dummy.stubs(:avatar_file_size).returns(size)
         @validator.validate(@dummy)
         assert @dummy.errors[:avatar_file_size].blank?,
           "Expect an error message on :avatar_file_size, got none."
       end
 
-      should "not add error to the base dummy object" do
+      it "does not add error to the base dummy object" do
         assert @dummy.errors[:avatar].blank?,
           "Error added to base attribute"
       end
@@ -30,29 +38,28 @@ class AttachmentSizeValidatorTest < Test::Unit::TestCase
 
   def self.should_not_allow_attachment_file_size(size, options = {})
     context "when the attachment size is #{size}" do
-      setup do
+      before do
         @dummy.stubs(:avatar_file_size).returns(size)
         @validator.validate(@dummy)
       end
 
-      should "add error to dummy object" do
+      it "adds error to dummy object" do
         assert @dummy.errors[:avatar_file_size].present?,
           "Unexpected error message on :avatar_file_size"
       end
 
-      should "add error to the base dummy object" do
+      it "adds error to the base dummy 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"
+      it "adds error to base object as a string" do
+        expect(@dummy.errors[:avatar].first).to be_a String
       end
 
       if options[:message]
-        should "return a correct error message" do
-          assert_includes @dummy.errors[:avatar_file_size], options[:message]
+        it "returns a correct error message" do
+          expect(@dummy.errors[:avatar_file_size]).to include options[:message]
         end
       end
     end
@@ -60,8 +67,8 @@ class AttachmentSizeValidatorTest < Test::Unit::TestCase
 
   context "with :in option" do
     context "as a range" do
-      setup do
-        build_validator :in => (5.kilobytes..10.kilobytes)
+      before do
+        build_validator in: (5.kilobytes..10.kilobytes)
       end
 
       should_allow_attachment_file_size(7.kilobytes)
@@ -70,8 +77,8 @@ class AttachmentSizeValidatorTest < Test::Unit::TestCase
     end
 
     context "as a proc" do
-      setup do
-        build_validator :in => lambda { |avatar| (5.kilobytes..10.kilobytes) }
+      before do
+        build_validator in: lambda { |avatar| (5.kilobytes..10.kilobytes) }
       end
 
       should_allow_attachment_file_size(7.kilobytes)
@@ -82,8 +89,8 @@ class AttachmentSizeValidatorTest < Test::Unit::TestCase
 
   context "with :greater_than option" do
     context "as number" do
-      setup do
-        build_validator :greater_than => 10.kilobytes
+      before do
+        build_validator greater_than: 10.kilobytes
       end
 
       should_allow_attachment_file_size 11.kilobytes
@@ -91,8 +98,8 @@ class AttachmentSizeValidatorTest < Test::Unit::TestCase
     end
 
     context "as a proc" do
-      setup do
-        build_validator :greater_than => lambda { |avatar| 10.kilobytes }
+      before do
+        build_validator greater_than: lambda { |avatar| 10.kilobytes }
       end
 
       should_allow_attachment_file_size 11.kilobytes
@@ -102,8 +109,8 @@ class AttachmentSizeValidatorTest < Test::Unit::TestCase
 
   context "with :less_than option" do
     context "as number" do
-      setup do
-        build_validator :less_than => 10.kilobytes
+      before do
+        build_validator less_than: 10.kilobytes
       end
 
       should_allow_attachment_file_size 9.kilobytes
@@ -111,8 +118,8 @@ class AttachmentSizeValidatorTest < Test::Unit::TestCase
     end
 
     context "as a proc" do
-      setup do
-        build_validator :less_than => lambda { |avatar| 10.kilobytes }
+      before do
+        build_validator less_than: lambda { |avatar| 10.kilobytes }
       end
 
       should_allow_attachment_file_size 9.kilobytes
@@ -122,9 +129,9 @@ class AttachmentSizeValidatorTest < Test::Unit::TestCase
 
   context "with :greater_than and :less_than option" do
     context "as numbers" do
-      setup do
-        build_validator :greater_than => 5.kilobytes,
-          :less_than => 10.kilobytes
+      before do
+        build_validator greater_than: 5.kilobytes,
+          less_than: 10.kilobytes
       end
 
       should_allow_attachment_file_size 7.kilobytes
@@ -133,9 +140,9 @@ class AttachmentSizeValidatorTest < Test::Unit::TestCase
     end
 
     context "as a proc" do
-      setup do
-        build_validator :greater_than => lambda { |avatar| 5.kilobytes },
-          :less_than => lambda { |avatar| 10.kilobytes }
+      before do
+        build_validator greater_than: lambda { |avatar| 5.kilobytes },
+          less_than: lambda { |avatar| 10.kilobytes }
       end
 
       should_allow_attachment_file_size 7.kilobytes
@@ -146,77 +153,77 @@ class AttachmentSizeValidatorTest < Test::Unit::TestCase
 
   context "with :message option" do
     context "given a range" do
-      setup do
-        build_validator :in => (5.kilobytes..10.kilobytes),
-          :message => "is invalid. (Between %{min} and %{max} please.)"
+      before do
+        build_validator in: (5.kilobytes..10.kilobytes),
+          message: "is invalid. (Between %{min} and %{max} please.)"
       end
 
       should_not_allow_attachment_file_size 11.kilobytes,
-        :message => "is invalid. (Between 5120 Bytes and 10240 Bytes please.)"
+        message: "is invalid. (Between #{storage_units[5120]} and #{storage_units[10240]} please.)"
     end
 
     context "given :less_than and :greater_than" do
-      setup do
-        build_validator :less_than => 10.kilobytes,
-          :greater_than => 5.kilobytes,
-          :message => "is invalid. (Between %{min} and %{max} please.)"
+      before do
+        build_validator less_than: 10.kilobytes,
+          greater_than: 5.kilobytes,
+          message: "is invalid. (Between %{min} and %{max} please.)"
       end
 
       should_not_allow_attachment_file_size 11.kilobytes,
-        :message => "is invalid. (Between 5120 Bytes and 10240 Bytes please.)"
+        message: "is invalid. (Between #{storage_units[5120]} and #{storage_units[10240]} please.)"
     end
   end
 
   context "default error messages" do
     context "given :less_than and :greater_than" do
-      setup do
-        build_validator :greater_than => 5.kilobytes,
-          :less_than => 10.kilobytes
+      before do
+        build_validator greater_than: 5.kilobytes,
+          less_than: 10.kilobytes
       end
 
       should_not_allow_attachment_file_size 11.kilobytes,
-        :message => "must be less than 10240 Bytes"
+        message: "must be less than #{storage_units[10240]}"
       should_not_allow_attachment_file_size 4.kilobytes,
-        :message => "must be greater than 5120 Bytes"
+        message: "must be greater than #{storage_units[5120]}"
     end
 
     context "given a size range" do
-      setup do
-        build_validator :in => (5.kilobytes..10.kilobytes)
+      before do
+        build_validator in: (5.kilobytes..10.kilobytes)
       end
 
       should_not_allow_attachment_file_size 11.kilobytes,
-        :message => "must be in between 5120 Bytes and 10240 Bytes"
+        message: "must be in between #{storage_units[5120]} and #{storage_units[10240]}"
       should_not_allow_attachment_file_size 4.kilobytes,
-        :message => "must be in between 5120 Bytes and 10240 Bytes"
+        message: "must be in between #{storage_units[5120]} and #{storage_units[10240]}"
     end
   end
 
   context "using the helper" do
-    setup do
-      Dummy.validates_attachment_size :avatar, :in => (5.kilobytes..10.kilobytes)
+    before do
+      Dummy.validates_attachment_size :avatar, in: (5.kilobytes..10.kilobytes)
     end
 
-    should "add the validator to the class" do
+    it "adds the validator to the class" do
       assert Dummy.validators_on(:avatar).any?{ |validator| validator.kind == :attachment_size }
     end
   end
 
   context "given options" do
-    should "raise argument error if no required argument was given" do
+    it "raises argument error if no required argument was given" do
       assert_raises(ArgumentError) do
-        build_validator :message => "Some message"
+        build_validator message: "Some message"
       end
     end
 
     (Paperclip::Validators::AttachmentSizeValidator::AVAILABLE_CHECKS).each do |argument|
-      should "not raise arguemnt error if #{argument} was given" do
+      it "does not raise arguemnt error if #{argument} was given" do
         build_validator argument => 5.kilobytes
       end
     end
 
-    should "not raise argument error if :in was given" do
-      build_validator :in => (5.kilobytes..10.kilobytes)
+    it "does not raise argument error if :in was given" do
+      build_validator in: (5.kilobytes..10.kilobytes)
     end
   end
 end