Merge pull request #1515 from quainjn/allow_subclassed_validators

Ensure required validations accepts subclasses

lib/paperclip/attachment.rb

@@ -389,8 +389,16 @@ module Paperclip
       @instance.class.validators.map(&:class)
       @instance.class.validators.map(&:class)
     end
     end
 
 
+    def required_validator_classes
+      Paperclip::REQUIRED_VALIDATORS + Paperclip::REQUIRED_VALIDATORS.flat_map(&:descendants)
+    end
+
+    def missing_required_validator?
+      (active_validator_classes & required_validator_classes).empty?
+    end
+
     def ensure_required_validations!
     def ensure_required_validations!
-      if (active_validator_classes & Paperclip::REQUIRED_VALIDATORS).empty?
+      if missing_required_validator?
         raise Paperclip::Errors::MissingRequiredValidatorError
         raise Paperclip::Errors::MissingRequiredValidatorError
       end
       end
     end
     end

spec/paperclip/validators_spec.rb

@@ -77,6 +77,28 @@ describe Paperclip::Validators do
       end
       end
     end
     end
 
 
+    it 'does not raise an error when a content_type validation exists using validates_with' do
+      Dummy.validates_with Paperclip::Validators::AttachmentContentTypeValidator, attributes: :attachment, content_type: 'images/jpeg'
+
+      assert_nothing_raised do
+        Dummy.new(avatar: File.new(fixture_file("12k.png")))
+      end
+    end
+
+    it 'does not raise an error when an inherited validator is used' do
+      class MyValidator < Paperclip::Validators::AttachmentContentTypeValidator
+        def initialize(options)
+          options[:content_type] = "images/jpeg" unless options.has_key?(:content_type)
+          super
+        end
+      end
+      Dummy.validates_with MyValidator, attributes: :attachment
+
+      assert_nothing_raised do
+        Dummy.new(avatar: File.new(fixture_file("12k.png")))
+      end
+    end
+
     it 'does not raise an error when a file_name validation exists' do
     it 'does not raise an error when a file_name validation exists' do
       Dummy.validates_attachment :avatar, file_name: { matches: /png$/ }
       Dummy.validates_attachment :avatar, file_name: { matches: /png$/ }