From 4bbd05c90e5a62c0316307b3ca7c2262ed98b567 Mon Sep 17 00:00:00 2001 From: Francesco Rodriguez Date: Thu, 17 May 2012 10:54:29 -0500 Subject: [PATCH] fix validations docs --- .../active_model/validations/acceptance.rb | 3 +- .../active_model/validations/confirmation.rb | 3 +- .../lib/active_model/validations/exclusion.rb | 42 ++++++++------ .../lib/active_model/validations/format.rb | 55 +++++++++++-------- .../lib/active_model/validations/inclusion.rb | 36 +++++++----- .../lib/active_model/validations/length.rb | 45 +++++++++------ .../active_model/validations/numericality.rb | 36 +++++++----- .../lib/active_model/validations/presence.rb | 29 +++++----- .../lib/active_model/validations/with.rb | 21 +++---- 9 files changed, 154 insertions(+), 116 deletions(-) diff --git a/activemodel/lib/active_model/validations/acceptance.rb b/activemodel/lib/active_model/validations/acceptance.rb index e628c6f3062de..38a32c479c948 100644 --- a/activemodel/lib/active_model/validations/acceptance.rb +++ b/activemodel/lib/active_model/validations/acceptance.rb @@ -1,5 +1,4 @@ module ActiveModel - # == Active Model Acceptance Validator module Validations class AcceptanceValidator < EachValidator @@ -59,7 +58,7 @@ module HelperMethods # The method, proc or string should return or evaluate to a true or # false value. # * :strict - Specifies whether validation should be strict. - # See ActiveModel::Validation#validates! for more information + # See ActiveModel::Validation#validates! for more information. def validates_acceptance_of(*attr_names) validates_with AcceptanceValidator, _merge_attributes(attr_names) end diff --git a/activemodel/lib/active_model/validations/confirmation.rb b/activemodel/lib/active_model/validations/confirmation.rb index 6573a7d264a02..d1796dcbf2d10 100644 --- a/activemodel/lib/active_model/validations/confirmation.rb +++ b/activemodel/lib/active_model/validations/confirmation.rb @@ -1,5 +1,4 @@ module ActiveModel - # == Active Model Confirmation Validator module Validations class ConfirmationValidator < EachValidator @@ -59,7 +58,7 @@ module HelperMethods # :unless => Proc.new { |user| user.signup_step <= 2 }). The # method, proc or string should return or evaluate to a true or false value. # * :strict - Specifies whether validation should be strict. - # See ActiveModel::Validation#validates! for more information + # See ActiveModel::Validation#validates! for more information. def validates_confirmation_of(*attr_names) validates_with ConfirmationValidator, _merge_attributes(attr_names) end diff --git a/activemodel/lib/active_model/validations/exclusion.rb b/activemodel/lib/active_model/validations/exclusion.rb index 644cc814a76b4..725f810fa739a 100644 --- a/activemodel/lib/active_model/validations/exclusion.rb +++ b/activemodel/lib/active_model/validations/exclusion.rb @@ -1,7 +1,6 @@ require 'active_support/core_ext/range' module ActiveModel - # == Active Model Exclusion Validator module Validations class ExclusionValidator < EachValidator @@ -24,43 +23,50 @@ def validate_each(record, attribute, value) private - # In Ruby 1.9 Range#include? on non-numeric ranges checks all possible values in the - # range for equality, so it may be slow for large ranges. The new Range#cover? - # uses the previous logic of comparing a value with the range endpoints. + # In Ruby 1.9 Range#include? on non-numeric ranges checks all possible + # values in the range for equality, so it may be slow for large ranges. The new + # Range#cover? uses the previous logic of comparing a value with the + # range endpoints. def inclusion_method(enumerable) enumerable.is_a?(Range) ? :cover? : :include? end end module HelperMethods - # Validates that the value of the specified attribute is not in a particular enumerable object. + # Validates that the value of the specified attribute is not in a particular + # enumerable object. # # class Person < ActiveRecord::Base # validates_exclusion_of :username, :in => %w( admin superuser ), :message => "You don't belong here" # validates_exclusion_of :age, :in => 30..60, :message => "This site is only for under 30 and over 60" # validates_exclusion_of :format, :in => %w( mov avi ), :message => "extension %{value} is not allowed" - # validates_exclusion_of :password, :in => lambda { |p| [p.username, p.first_name] }, :message => "should not be the same as your username or first name" + # validates_exclusion_of :password, :in => lambda { |p| [p.username, p.first_name] }, + # :message => "should not be the same as your username or first name" # end # # Configuration options: - # * :in - An enumerable object of items that the value shouldn't be part of. - # This can be supplied as a proc or lambda which returns an enumerable. If the enumerable - # is a range the test is performed with Range#cover? + # * :in - An enumerable object of items that the value shouldn't be + # part of. This can be supplied as a proc or lambda which returns an enumerable. + # If the enumerable is a range the test is performed with Range#cover? # (backported in Active Support for 1.8), otherwise with include?. # * :message - Specifies a custom error message (default is: "is reserved"). - # * :allow_nil - If set to true, skips this validation if the attribute is +nil+ (default is +false+). - # * :allow_blank - If set to true, skips this validation if the attribute is blank (default is +false+). + # * :allow_nil - If set to true, skips this validation if the attribute + # is +nil+ (default is +false+). + # * :allow_blank - If set to true, skips this validation if the + # attribute is blank (default is +false+). # * :on - Specifies when this validation is active. Runs in all # validation contexts by default (+nil+), other options are :create # and :update. - # * :if - Specifies a method, proc or string to call to determine if the validation should - # occur (e.g. :if => :allow_validation, or :if => Proc.new { |user| user.signup_step > 2 }). The - # method, proc or string should return or evaluate to a true or false value. - # * :unless - Specifies a method, proc or string to call to determine if the validation should - # not occur (e.g. :unless => :skip_validation, or :unless => Proc.new { |user| user.signup_step <= 2 }). The - # method, proc or string should return or evaluate to a true or false value. + # * :if - Specifies a method, proc or string to call to determine if the + # validation should occur (e.g. :if => :allow_validation, or + # :if => Proc.new { |user| user.signup_step > 2 }). The method, proc + # or string should return or evaluate to a true or false value. + # * :unless - Specifies a method, proc or string to call to determine if + # the validation should not occur (e.g. :unless => :skip_validation, + # or :unless => Proc.new { |user| user.signup_step <= 2 }). The method, + # proc or string should return or evaluate to a true or false value. # * :strict - Specifies whether validation should be strict. - # See ActiveModel::Validation#validates! for more information + # See ActiveModel::Validation#validates! for more information. def validates_exclusion_of(*attr_names) validates_with ExclusionValidator, _merge_attributes(attr_names) end diff --git a/activemodel/lib/active_model/validations/format.rb b/activemodel/lib/active_model/validations/format.rb index d3faa8c6a6390..225c95eb12b6d 100644 --- a/activemodel/lib/active_model/validations/format.rb +++ b/activemodel/lib/active_model/validations/format.rb @@ -1,5 +1,4 @@ module ActiveModel - # == Active Model Format Validator module Validations class FormatValidator < EachValidator @@ -42,50 +41,62 @@ def check_options_validity(options, name) end 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: + # 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: # # class Person < ActiveRecord::Base # validates_format_of :email, :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i, :on => :create # end # - # Alternatively, you can require that the specified attribute does _not_ match the regular expression: + # Alternatively, you can require that the specified attribute does _not_ match + # the regular expression: # # class Person < ActiveRecord::Base # validates_format_of :email, :without => /NOSPAM/ # end # - # You can also provide a proc or lambda which will determine the regular expression that will be used to validate the attribute + # You can also provide a proc or lambda which will determine the regular + # expression that will be used to validate the attribute. # # class Person < ActiveRecord::Base # # Admin can have number as a first letter in their screen name - # validates_format_of :screen_name, :with => lambda{ |person| person.admin? ? /\A[a-z0-9][a-z0-9_\-]*\Z/i : /\A[a-z][a-z0-9_\-]*\Z/i } + # validates_format_of :screen_name, + # :with => lambda{ |person| person.admin? ? /\A[a-z0-9][a-z0-9_\-]*\Z/i : /\A[a-z][a-z0-9_\-]*\Z/i } # end # - # Note: use \A and \Z to match the start and end of the string, ^ and $ match the start/end of a line. + # Note: use \A and \Z to match the start and end of the string, + # ^ and $ match the start/end of a line. # - # You must pass either :with or :without as an option. In addition, both must be a regular expression - # or a proc or lambda, or else an exception will be raised. + # You must pass either :with or :without as an option. In + # addition, both must be a regular expression or a proc or lambda, or else an + # exception will be raised. # # Configuration options: # * :message - A custom error message (default is: "is invalid"). - # * :allow_nil - If set to true, skips this validation if the attribute is +nil+ (default is +false+). - # * :allow_blank - If set to true, skips this validation if the attribute is blank (default is +false+). - # * :with - Regular expression that if the attribute matches will result in a successful validation. - # This can be provided as a proc or lambda returning regular expression which will be called at runtime. - # * :without - Regular expression that if the attribute does not match will result in a successful validation. - # This can be provided as a proc or lambda returning regular expression which will be called at runtime. + # * :allow_nil - If set to true, skips this validation if the attribute + # is +nil+ (default is +false+). + # * :allow_blank - If set to true, skips this validation if the + # attribute is blank (default is +false+). + # * :with - Regular expression that if the attribute matches will + # result in a successful validation. This can be provided as a proc or lambda + # returning regular expression which will be called at runtime. + # * :without - Regular expression that if the attribute does not match + # will result in a successful validation. This can be provided as a proc or + # lambda returning regular expression which will be called at runtime. # * :on - Specifies when this validation is active. Runs in all # validation contexts by default (+nil+), other options are :create # and :update. - # * :if - Specifies a method, proc or string to call to determine if the validation should - # occur (e.g. :if => :allow_validation, or :if => Proc.new { |user| user.signup_step > 2 }). The - # method, proc or string should return or evaluate to a true or false value. - # * :unless - Specifies a method, proc or string to call to determine if the validation should - # not occur (e.g. :unless => :skip_validation, or :unless => Proc.new { |user| user.signup_step <= 2 }). The - # method, proc or string should return or evaluate to a true or false value. + # * :if - Specifies a method, proc or string to call to determine if the + # validation should occur (e.g. :if => :allow_validation, or + # :if => Proc.new { |user| user.signup_step > 2 }). The method, proc + # or string should return or evaluate to a true or false value. + # * :unless - Specifies a method, proc or string to call to determine if + # the validation should not occur (e.g. :unless => :skip_validation, + # or :unless => Proc.new { |user| user.signup_step <= 2 }). The method, + # proc or string should return or evaluate to a true or false value. # * :strict - Specifies whether validation should be strict. - # See ActiveModel::Validation#validates! for more information + # See ActiveModel::Validation#validates! for more information. def validates_format_of(*attr_names) validates_with FormatValidator, _merge_attributes(attr_names) end diff --git a/activemodel/lib/active_model/validations/inclusion.rb b/activemodel/lib/active_model/validations/inclusion.rb index 147e2ecb69279..568e877d9585e 100644 --- a/activemodel/lib/active_model/validations/inclusion.rb +++ b/activemodel/lib/active_model/validations/inclusion.rb @@ -1,7 +1,6 @@ require 'active_support/core_ext/range' module ActiveModel - # == Active Model Inclusion Validator module Validations class InclusionValidator < EachValidator @@ -24,16 +23,18 @@ def validate_each(record, attribute, value) private - # In Ruby 1.9 Range#include? on non-numeric ranges checks all possible values in the - # range for equality, so it may be slow for large ranges. The new Range#cover? - # uses the previous logic of comparing a value with the range endpoints. + # In Ruby 1.9 Range#include? on non-numeric ranges checks all possible + # values in the range for equality, so it may be slow for large ranges. The new + # Range#cover? uses the previous logic of comparing a value with the + # range endpoints. def inclusion_method(enumerable) enumerable.is_a?(Range) ? :cover? : :include? end end module HelperMethods - # Validates whether the value of the specified attribute is available in a particular enumerable object. + # Validates whether the value of the specified attribute is available in a + # particular enumerable object. # # class Person < ActiveRecord::Base # validates_inclusion_of :gender, :in => %w( m f ) @@ -47,20 +48,25 @@ module HelperMethods # supplied as a proc or lambda which returns an enumerable. If the enumerable # is a range the test is performed with Range#cover? # (backported in Active Support for 1.8), otherwise with include?. - # * :message - Specifies a custom error message (default is: "is not included in the list"). - # * :allow_nil - If set to true, skips this validation if the attribute is +nil+ (default is +false+). - # * :allow_blank - If set to true, skips this validation if the attribute is blank (default is +false+). + # * :message - Specifies a custom error message (default is: "is not + # included in the list"). + # * :allow_nil - If set to true, skips this validation if the attribute + # is +nil+ (default is +false+). + # * :allow_blank - If set to true, skips this validation if the + # attribute is blank (default is +false+). # * :on - Specifies when this validation is active. Runs in all # validation contexts by default (+nil+), other options are :create # and :update. - # * :if - Specifies a method, proc or string to call to determine if the validation should - # occur (e.g. :if => :allow_validation, or :if => Proc.new { |user| user.signup_step > 2 }). The - # method, proc or string should return or evaluate to a true or false value. - # * :unless - Specifies a method, proc or string to call to determine if the validation should - # not occur (e.g. :unless => :skip_validation, or :unless => Proc.new { |user| user.signup_step <= 2 }). The - # method, proc or string should return or evaluate to a true or false value. + # * :if - Specifies a method, proc or string to call to determine if + # the validation should occur (e.g. :if => :allow_validation, or + # :if => Proc.new { |user| user.signup_step > 2 }). The method, proc + # or string should return or evaluate to a true or false value. + # * :unless - Specifies a method, proc or string to call to determine + # if the validation should not occur (e.g. :unless => :skip_validation, + # or :unless => Proc.new { |user| user.signup_step <= 2 }). The method, + # proc or string should return or evaluate to a true or false value. # * :strict - Specifies whether validation should be strict. - # See ActiveModel::Validation#validates! for more information + # See ActiveModel::Validation#validates! for more information. def validates_inclusion_of(*attr_names) validates_with InclusionValidator, _merge_attributes(attr_names) end diff --git a/activemodel/lib/active_model/validations/length.rb b/activemodel/lib/active_model/validations/length.rb index a38de27b3c841..b385a49c61201 100644 --- a/activemodel/lib/active_model/validations/length.rb +++ b/activemodel/lib/active_model/validations/length.rb @@ -1,7 +1,6 @@ require "active_support/core_ext/string/encoding" module ActiveModel - # == Active Model Length Validator module Validations class LengthValidator < EachValidator @@ -68,8 +67,8 @@ def tokenize(value) end module HelperMethods - - # Validates that the specified attribute matches the length restrictions supplied. Only one option can be used at a time: + # Validates that the specified attribute matches the length restrictions supplied. + # Only one option can be used at a time: # # class Person < ActiveRecord::Base # validates_length_of :first_name, :maximum => 30 @@ -79,35 +78,45 @@ module HelperMethods # validates_length_of :user_name, :within => 6..20, :too_long => "pick a shorter name", :too_short => "pick a longer name" # validates_length_of :zip_code, :minimum => 5, :too_short => "please enter at least 5 characters" # validates_length_of :smurf_leader, :is => 4, :message => "papa is spelled with 4 characters... don't play me." - # validates_length_of :essay, :minimum => 100, :too_short => "Your essay must be at least 100 words.", :tokenizer => lambda { |str| str.scan(/\w+/) } + # validates_length_of :essay, :minimum => 100, :too_short => "Your essay must be at least 100 words.", + # :tokenizer => lambda { |str| str.scan(/\w+/) } # end # # Configuration options: # * :minimum - The minimum size of the attribute. # * :maximum - The maximum size of the attribute. # * :is - The exact size of the attribute. - # * :within - A range specifying the minimum and maximum size of the attribute. + # * :within - A range specifying the minimum and maximum size of the + # attribute. # * :in - A synonym(or alias) for :within. # * :allow_nil - Attribute may be +nil+; skip validation. # * :allow_blank - Attribute may be blank; skip validation. - # * :too_long - The error message if the attribute goes over the maximum (default is: "is too long (maximum is %{count} characters)"). - # * :too_short - The error message if the attribute goes under the minimum (default is: "is too short (min is %{count} characters)"). - # * :wrong_length - The error message if using the :is method and the attribute is the wrong size (default is: "is the wrong length (should be %{count} characters)"). - # * :message - The error message to use for a :minimum, :maximum, or :is violation. An alias of the appropriate too_long/too_short/wrong_length message. + # * :too_long - The error message if the attribute goes over the + # maximum (default is: "is too long (maximum is %{count} characters)"). + # * :too_short - The error message if the attribute goes under the + # minimum (default is: "is too short (min is %{count} characters)"). + # * :wrong_length - The error message if using the :is method + # and the attribute is the wrong size (default is: "is the wrong length + # should be %{count} characters)"). + # * :message - The error message to use for a :minimum, + # :maximum, or :is violation. An alias of the appropriate + # too_long/too_short/wrong_length message. # * :on - Specifies when this validation is active. Runs in all # validation contexts by default (+nil+), other options are :create # and :update. - # * :if - Specifies a method, proc or string to call to determine if the validation should - # occur (e.g. :if => :allow_validation, or :if => Proc.new { |user| user.signup_step > 2 }). The - # method, proc or string should return or evaluate to a true or false value. - # * :unless - Specifies a method, proc or string to call to determine if the validation should - # not occur (e.g. :unless => :skip_validation, or :unless => Proc.new { |user| user.signup_step <= 2 }). The + # * :if - Specifies a method, proc or string to call to determine if + # the validation should occur (e.g. :if => :allow_validation, or + # :if => Proc.new { |user| user.signup_step > 2 }). The method, proc + # or string should return or evaluate to a true or false value. + # * :unless - Specifies a method, proc or string to call to determine + # if the validation should not occur (e.g. :unless => :skip_validation, + # or :unless => Proc.new { |user| user.signup_step <= 2 }). The # method, proc or string should return or evaluate to a true or false value. - # * :tokenizer - Specifies how to split up the attribute string. (e.g. :tokenizer => lambda {|str| str.scan(/\w+/)} to - # count words as in above example.) - # Defaults to lambda{ |value| value.split(//) } which counts individual characters. + # * :tokenizer - Specifies how to split up the attribute string. + # (e.g. :tokenizer => lambda {|str| str.scan(/\w+/)} to count words + # as in above example). Defaults to lambda{ |value| value.split(//) } which counts individual characters. # * :strict - Specifies whether validation should be strict. - # See ActiveModel::Validation#validates! for more information + # See ActiveModel::Validation#validates! for more information. def validates_length_of(*attr_names) validates_with LengthValidator, _merge_attributes(attr_names) end diff --git a/activemodel/lib/active_model/validations/numericality.rb b/activemodel/lib/active_model/validations/numericality.rb index 34d447a0fabc9..c73fa55ed3a72 100644 --- a/activemodel/lib/active_model/validations/numericality.rb +++ b/activemodel/lib/active_model/validations/numericality.rb @@ -1,5 +1,4 @@ module ActiveModel - # == Active Model Numericality Validator module Validations class NumericalityValidator < EachValidator @@ -93,22 +92,30 @@ module HelperMethods # validation contexts by default (+nil+), other options are :create # and :update. # * :only_integer - Specifies whether the value has to be an integer, e.g. an integral value (default is +false+). - # * :allow_nil - Skip validation if attribute is +nil+ (default is +false+). Notice that for fixnum and float columns empty strings are converted to +nil+. - # * :greater_than - Specifies the value must be greater than the supplied value. - # * :greater_than_or_equal_to - Specifies the value must be greater than or equal the supplied value. + # * :allow_nil - Skip validation if attribute is +nil+ (default is + # +false+). Notice that for fixnum and float columns empty strings are + # converted to +nil+. + # * :greater_than - Specifies the value must be greater than the + # supplied value. + # * :greater_than_or_equal_to - Specifies the value must be greater + # than or equal the supplied value. # * :equal_to - Specifies the value must be equal to the supplied value. - # * :less_than - Specifies the value must be less than the supplied value. - # * :less_than_or_equal_to - Specifies the value must be less than or equal the supplied value. + # * :less_than - Specifies the value must be less than the supplied + # value. + # * :less_than_or_equal_to - Specifies the value must be less than + # or equal the supplied value. # * :odd - Specifies the value must be an odd number. # * :even - Specifies the value must be an even number. - # * :if - Specifies a method, proc or string to call to determine if the validation should - # occur (e.g. :if => :allow_validation, or :if => Proc.new { |user| user.signup_step > 2 }). The - # method, proc or string should return or evaluate to a true or false value. - # * :unless - Specifies a method, proc or string to call to determine if the validation should - # not occur (e.g. :unless => :skip_validation, or :unless => Proc.new { |user| user.signup_step <= 2 }). The - # method, proc or string should return or evaluate to a true or false value. + # * :if - Specifies a method, proc or string to call to determine + # if the validation should occur (e.g. :if => :allow_validation, + # or :if => Proc.new { |user| user.signup_step > 2 }). The method, + # proc or string should return or evaluate to a true or false value. + # * :unless - Specifies a method, proc or string to call to determine + # if the validation should not occur (e.g. :unless => :skip_validation, + # or :unless => Proc.new { |user| user.signup_step <= 2 }). The method, + # proc or string should return or evaluate to a true or false value. # * :strict - Specifies whether validation should be strict. - # See ActiveModel::Validation#validates! for more information + # See ActiveModel::Validation#validates! for more information. # # The following checks can also be supplied with a proc or a symbol which corresponds to a method: # * :greater_than @@ -117,11 +124,12 @@ module HelperMethods # * :less_than # * :less_than_or_equal_to # + # For example: + # # class Person < ActiveRecord::Base # validates_numericality_of :width, :less_than => Proc.new { |person| person.height } # validates_numericality_of :width, :greater_than => :minimum_weight # end - # def validates_numericality_of(*attr_names) validates_with NumericalityValidator, _merge_attributes(attr_names) end diff --git a/activemodel/lib/active_model/validations/presence.rb b/activemodel/lib/active_model/validations/presence.rb index 9a643a6f5cf75..efd1372a6bbcc 100644 --- a/activemodel/lib/active_model/validations/presence.rb +++ b/activemodel/lib/active_model/validations/presence.rb @@ -1,7 +1,6 @@ require 'active_support/core_ext/object/blank' module ActiveModel - # == Active Model Presence Validator module Validations class PresenceValidator < EachValidator @@ -11,7 +10,8 @@ def validate(record) end module HelperMethods - # Validates that the specified attributes are not blank (as defined by Object#blank?). Happens by default on save. Example: + # Validates that the specified attributes are not blank (as defined by + # Object#blank?). Happens by default on save. Example: # # class Person < ActiveRecord::Base # validates_presence_of :first_name @@ -19,25 +19,28 @@ module HelperMethods # # The first_name attribute must be in the object and it cannot be blank. # - # If you want to validate the presence of a boolean field (where the real values are true and false), - # you will want to use validates_inclusion_of :field_name, :in => [true, false]. + # If you want to validate the presence of a boolean field (where the real values + # are true and false), you will want to use validates_inclusion_of :field_name, + # :in => [true, false]. # - # This is due to the way Object#blank? handles boolean values: false.blank? # => true. + # This is due to the way Object#blank? handles boolean values: + # false.blank? # => true. # # Configuration options: # * :message - A custom error message (default is: "can't be blank"). # * :on - Specifies when this validation is active. Runs in all # validation contexts by default (+nil+), other options are :create # and :update. - # * :if - Specifies a method, proc or string to call to determine if the validation should - # occur (e.g. :if => :allow_validation, or :if => Proc.new { |user| user.signup_step > 2 }). - # The method, proc or string should return or evaluate to a true or false value. - # * :unless - Specifies a method, proc or string to call to determine if the validation should - # not occur (e.g. :unless => :skip_validation, or :unless => Proc.new { |user| user.signup_step <= 2 }). - # The method, proc or string should return or evaluate to a true or false value. + # * :if - Specifies a method, proc or string to call to determine if + # the validation should occur (e.g. :if => :allow_validation, or + # :if => Proc.new { |user| user.signup_step > 2 }). The method, proc + # or string should return or evaluate to a true or false value. + # * :unless - Specifies a method, proc or string to call to determine + # if the validation should not occur (e.g. :unless => :skip_validation, + # or :unless => Proc.new { |user| user.signup_step <= 2 }). The method, + # proc or string should return or evaluate to a true or false value. # * :strict - Specifies whether validation should be strict. - # See ActiveModel::Validation#validates! for more information - # + # See ActiveModel::Validation#validates! for more information. def validates_presence_of(*attr_names) validates_with PresenceValidator, _merge_attributes(attr_names) end diff --git a/activemodel/lib/active_model/validations/with.rb b/activemodel/lib/active_model/validations/with.rb index 72b8562b93b5b..4ad882b5541b3 100644 --- a/activemodel/lib/active_model/validations/with.rb +++ b/activemodel/lib/active_model/validations/with.rb @@ -54,15 +54,14 @@ module ClassMethods # (:create or :update # * :if - Specifies a method, proc or string to call to determine # if the validation should occur (e.g. :if => :allow_validation, - # or :if => Proc.new { |user| user.signup_step > 2 }). - # The method, proc or string should return or evaluate to a true or false value. - # * :unless - Specifies a method, proc or string to call to - # determine if the validation should not occur - # (e.g. :unless => :skip_validation, or - # :unless => Proc.new { |user| user.signup_step <= 2 }). - # The method, proc or string should return or evaluate to a true or false value. + # or :if => Proc.new { |user| user.signup_step > 2 }). The method, + # proc or string should return or evaluate to a true or false value. + # * :unless - Specifies a method, proc or string to call to determine + # if the validation should not occur (e.g. :unless => :skip_validation, + # or :unless => Proc.new { |user| user.signup_step <= 2 }). The method, + # proc or string should return or evaluate to a true or false value. # * :strict - Specifies whether validation should be strict. - # See ActiveModel::Validation#validates! for more information + # See ActiveModel::Validation#validates! for more information. # If you pass any additional configuration options, they will be passed # to the class and available as options: @@ -77,7 +76,6 @@ module ClassMethods # options[:my_custom_key] # => "my custom value" # end # end - # def validates_with(*args, &block) options = args.extract_options! args.each do |klass| @@ -128,12 +126,11 @@ def validates_with(*args, &block) # Standard configuration options (:on, :if and :unless), which are # available on the class version of validates_with, should instead be # placed on the validates method as these are applied and tested - # in the callback + # in the callback. # # If you pass any additional configuration options, they will be passed # to the class and available as options, please refer to the - # class version of this method for more information - # + # class version of this method for more information. def validates_with(*args, &block) options = args.extract_options! args.each do |klass|