Merge pull request #792 from tony-brewerio/patch-1

Fix AttachmentContentTypeValidator to work with multiple values

lib/paperclip/validators/attachment_content_type_validator.rb

@@ -6,16 +6,14 @@ module Paperclip
         value = record.send(:read_attribute_for_validation, attribute)
         value = record.send(:read_attribute_for_validation, attribute)
         allowed_types = [options[:content_type]].flatten
         allowed_types = [options[:content_type]].flatten
 
 
-        unless value.blank?
-          allowed_types.any? do |type|
-            unless type === value
+        if value.present? 
+          unless allowed_types.any? { |type| type === value }
             record.errors.add(attribute, :invalid, options.merge(
             record.errors.add(attribute, :invalid, options.merge(
               :types => allowed_types.join(', ')
               :types => allowed_types.join(', ')
             ))
             ))
           end
           end
         end
         end
       end
       end
-      end
 
 
       def check_validity!
       def check_validity!
         unless options.has_key?(:content_type)
         unless options.has_key?(:content_type)

test/validators/attachment_content_type_validator_test.rb

@@ -48,6 +48,18 @@ class AttachmentContentTypeValidatorTest < Test::Unit::TestCase
         assert @dummy.errors[:avatar_content_type].blank?
         assert @dummy.errors[:avatar_content_type].blank?
       end
       end
     end
     end
+    
+    context "as a list" do
+      setup do
+        build_validator :content_type => ["image/png", "image/jpg", "image/jpeg"]
+        @dummy.stubs(:avatar_content_type => "image/jpg")
+        @validator.validate(@dummy)
+      end
+
+      should "not set an error message" do
+        assert @dummy.errors[:avatar_content_type].blank?
+      end
+    end
   end
   end
 
 
   context "with a disallowed type" do
   context "with a disallowed type" do