Added check_validity! to EachValidator and refactor existing ones.

1 files changed, 5 insertions, 4 deletions

diff --git a/activemodel/lib/active_model/validations/inclusion.rb b/activemodel/lib/active_model/validations/inclusion.rb
index d42c95357c..a122e9e737 100644
--- a/activemodel/lib/active_model/validations/inclusion.rb
+++ b/activemodel/lib/active_model/validations/inclusion.rb
@@ -1,6 +1,11 @@
 module ActiveModel
   module Validations
     class InclusionValidator < EachValidator
+      def check_validity!
+         raise ArgumentError, "An object with the method include? is required must be supplied as the " <<
+                              ":in option of the configuration hash" unless options[:in].respond_to?(:include?)
+       end
+
       def validate_each(record, attribute, value)
         return if options[:in].include?(value)
         record.errors.add(attribute, :inclusion, :default => options[:message], :value => value)
@@ -30,10 +35,6 @@ module ActiveModel
       def validates_inclusion_of(*attr_names)
         options = attr_names.extract_options!
         options[:in] ||= options.delete(:within)
-
-        raise ArgumentError, "An object with the method include? is required must be supplied as the " <<
-                             ":in option of the configuration hash" unless options[:in].respond_to?(:include?)
-
         validates_with InclusionValidator, options.merge(:attributes => attr_names)
       end
     end