validation macros can now be used within an instance

Author: joshk

activemodel/lib/active_model/validations.rb

@@ -46,6 +46,9 @@ module Validations
 
     included do
       extend ActiveModel::Translation
+
+      extend HelperMethods; include HelperMethods
+
       define_callbacks :validate, :scope => :name
 
       attr_accessor :validation_context
@@ -138,12 +141,6 @@ def validators_on(attribute)
       def attribute_method?(attribute)
         method_defined?(attribute)
       end
-    private
-
-      def _merge_attributes(attr_names)
-        options = attr_names.extract_options!
-        options.merge(:attributes => attr_names.flatten)
-      end
     end
 
     # Returns the Errors object that holds all information about attribute error messages.

activemodel/lib/active_model/validations/acceptance.rb

@@ -21,7 +21,7 @@ def setup(klass)
       end
     end
 
-    module ClassMethods
+    module HelperMethods
       # Encapsulates the pattern of wanting to validate the acceptance of a terms of service check box (or similar agreement). Example:
       #
       #   class Person < ActiveRecord::Base

activemodel/lib/active_model/validations/confirmation.rb

@@ -12,7 +12,7 @@ def setup(klass)
       end
     end
 
-    module ClassMethods
+    module HelperMethods
       # Encapsulates the pattern of wanting to validate a password or email address field with a confirmation. Example:
       #
       #   Model:

activemodel/lib/active_model/validations/exclusion.rb

@@ -12,7 +12,7 @@ def validate_each(record, attribute, value)
       end
     end
 
-    module ClassMethods
+    module HelperMethods
       # Validates that the value of the specified attribute is not in a particular enumerable object.
       #
       #   class Person < ActiveRecord::Base

activemodel/lib/active_model/validations/format.rb

@@ -24,7 +24,7 @@ def check_validity!
       end
     end
 
-    module ClassMethods
+    module HelperMethods
       # Validates whether the value of the specified attribute is of the correct form, going by the regular expression provided.
       # You can require that the attribute matches the regular expression:
       #

activemodel/lib/active_model/validations/helper_methods.rb

@@ -0,0 +1,12 @@
+module ActiveModel
+  module Validations
+    module HelperMethods
+      private
+
+        def _merge_attributes(attr_names)
+          options = attr_names.extract_options!
+          options.merge(:attributes => attr_names.flatten)
+        end
+    end
+  end
+end

activemodel/lib/active_model/validations/inclusion.rb

@@ -12,7 +12,7 @@ def validate_each(record, attribute, value)
       end
     end
 
-    module ClassMethods
+    module HelperMethods
       # Validates whether the value of the specified attribute is available in a particular enumerable object.
       #
       #   class Person < ActiveRecord::Base

activemodel/lib/active_model/validations/length.rb

@@ -51,7 +51,7 @@ def validate_each(record, attribute, value)
       end
     end
 
-    module ClassMethods
+    module HelperMethods
 
       # Validates that the specified attribute matches the length restrictions supplied. Only one option can be used at a time:
       #

activemodel/lib/active_model/validations/numericality.rb

@@ -70,7 +70,7 @@ def parse_raw_value_as_an_integer(raw_value)
 
     end
 
-    module ClassMethods
+    module HelperMethods
       # Validates whether the value of the specified attribute is numeric by trying to convert it to
       # a float with Kernel.Float (if <tt>only_integer</tt> is false) or applying it to the regular expression
       # <tt>/\A[\+\-]?\d+\Z/</tt> (if <tt>only_integer</tt> is set to true).

activemodel/lib/active_model/validations/presence.rb

@@ -8,7 +8,7 @@ def validate(record)
       end
     end
 
-    module ClassMethods
+    module HelperMethods
       # Validates that the specified attributes are not blank (as defined by Object#blank?). Happens by default on save. Example:
       #
       #   class Person < ActiveRecord::Base