Merge pull request #1511 from Envek/arrays_in_validations

Allow to pass arrays of validations to the validators

lib/paperclip/validators.rb

 require 'active_model'
 require 'active_model'
 require 'active_support/concern'
 require 'active_support/concern'
+require 'active_support/core_ext/array/wrap'
 require 'paperclip/validators/attachment_content_type_validator'
 require 'paperclip/validators/attachment_content_type_validator'
 require 'paperclip/validators/attachment_file_name_validator'
 require 'paperclip/validators/attachment_file_name_validator'
 require 'paperclip/validators/attachment_presence_validator'
 require 'paperclip/validators/attachment_presence_validator'
@@ -41,10 +42,11 @@ module Paperclip
             if options.has_key?(validator_kind)
             if options.has_key?(validator_kind)
               validator_options = options.delete(validator_kind)
               validator_options = options.delete(validator_kind)
               validator_options = {} if validator_options == true
               validator_options = {} if validator_options == true
-              local_options = attributes + [validator_options]
               conditional_options = options.slice(:if, :unless)
               conditional_options = options.slice(:if, :unless)
-              local_options.last.merge!(conditional_options)
-              send(Paperclip::Validators.const_get(constant.to_s).helper_method_name, *local_options)
+              Array.wrap(validator_options).each do |local_options|
+                method_name = Paperclip::Validators.const_get(constant.to_s).helper_method_name
+                send(method_name, attributes, local_options.merge(conditional_options))
+              end
             end
             end
           end
           end
         end
         end

spec/paperclip/validators_spec.rb

@@ -26,6 +26,52 @@ describe Paperclip::Validators do
     end
     end
   end
   end
 
 
+  context 'using the helper with array of validations' do
+    before do
+      rebuild_class
+      Dummy.validates_attachment :avatar, file_type_ignorance: true, file_name: [
+          { matches: /\A.*\.jpe?g\Z/i, message: :invalid_extension },
+          { matches: /\A.{,8}\..+\Z/i, message: [:too_long, count: 8] },
+      ]
+    end
+
+    it 'adds the attachment_file_name validator to the class' do
+      assert Dummy.validators_on(:avatar).any?{ |validator| validator.kind == :attachment_file_name }
+    end
+
+    it 'adds the attachment_file_name validator with two validations' do
+      assert_equal 2, Dummy.validators_on(:avatar).select{ |validator| validator.kind == :attachment_file_name }.size
+    end
+
+    it 'prevents you from attaching a file that violates all of these validations' do
+      Dummy.class_eval{ validate(:name) { raise 'DO NOT RUN THIS' } }
+      dummy = Dummy.new(avatar: File.new(fixture_file('spaced file.png')))
+      expect(dummy.errors.keys).to match_array [:avatar, :avatar_file_name]
+      assert_raises(RuntimeError){ dummy.valid? }
+    end
+
+    it 'prevents you from attaching a file that violates only first of these validations' do
+      Dummy.class_eval{ validate(:name) { raise 'DO NOT RUN THIS' } }
+      dummy = Dummy.new(avatar: File.new(fixture_file('5k.png')))
+      expect(dummy.errors.keys).to match_array [:avatar, :avatar_file_name]
+      assert_raises(RuntimeError){ dummy.valid? }
+    end
+
+    it 'prevents you from attaching a file that violates only second of these validations' do
+      Dummy.class_eval{ validate(:name) { raise 'DO NOT RUN THIS' } }
+      dummy = Dummy.new(avatar: File.new(fixture_file('spaced file.jpg')))
+      expect(dummy.errors.keys).to match_array [:avatar, :avatar_file_name]
+      assert_raises(RuntimeError){ dummy.valid? }
+    end
+
+    it 'allows you to attach a file that does not violates these validations' do
+      dummy = Dummy.new(avatar: File.new(fixture_file('rotated.jpg')))
+      expect(dummy.errors.keys).to match_array []
+      assert dummy.valid?
+    end
+
+  end
+
   context "using the helper with a conditional" do
   context "using the helper with a conditional" do
     before do
     before do
       rebuild_class
       rebuild_class