Move validations in ActiveModel to validators, however all validatity checks are still in the class method.

1 files changed, 12 insertions, 9 deletions

diff --git a/activemodel/lib/active_model/validations/inclusion.rb b/activemodel/lib/active_model/validations/inclusion.rb
index 0d7dc5cd64..d42c95357c 100644
--- a/activemodel/lib/active_model/validations/inclusion.rb
+++ b/activemodel/lib/active_model/validations/inclusion.rb
@@ -1,5 +1,12 @@
 module ActiveModel
   module Validations
+    class InclusionValidator < EachValidator
+      def validate_each(record, attribute, value)
+        return if options[:in].include?(value)
+        record.errors.add(attribute, :inclusion, :default => options[:message], :value => value)
+      end
+    end
+
     module ClassMethods
       # Validates whether the value of the specified attribute is available in a particular enumerable object.
       #
@@ -21,17 +28,13 @@ module ActiveModel
       #   not occur (e.g. <tt>:unless => :skip_validation</tt>, or <tt>:unless => Proc.new { |user| user.signup_step <= 2 }</tt>).  The
       #   method, proc or string should return or evaluate to a true or false value.
       def validates_inclusion_of(*attr_names)
-        configuration = attr_names.extract_options!
-
-        enum = configuration[:in] || configuration[:within]
+        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 enum.respond_to?(:include?)
+        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_each(attr_names, configuration) do |record, attr_name, value|
-          unless enum.include?(value)
-            record.errors.add(attr_name, :inclusion, :default => configuration[:message], :value => value)
-          end
-        end
+        validates_with InclusionValidator, options.merge(:attributes => attr_names)
       end
     end
   end