diff options
| author | José Valim <jose.valim@gmail.com> | 2011-12-21 02:04:24 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-12-21 02:04:24 -0800 |
| commit | 559196519a860e49886f586d0169aca23cbcdeb0 (patch) | |
| tree | cb8dd961e55c64c4a5d9c4abf8775f0d37267f13 /activemodel/lib | |
| parent | 08dcd84b42475c06fd618db52390759e265c3d45 (diff) | |
| parent | 0fe311a7fcf1457b9a72f99f887f756a28a53db4 (diff) | |
| download | rails-559196519a860e49886f586d0169aca23cbcdeb0.tar.gz rails-559196519a860e49886f586d0169aca23cbcdeb0.tar.bz2 rails-559196519a860e49886f586d0169aca23cbcdeb0.zip | |
Merge pull request #4092 from qoobaa/other_than_numericality_validator
added :other_than => :!= option to numericality validator
Diffstat (limited to 'activemodel/lib')
| -rw-r--r-- | activemodel/lib/active_model/locale/en.yml | 1 | ||||
| -rw-r--r-- | activemodel/lib/active_model/validations/numericality.rb | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/activemodel/lib/active_model/locale/en.yml b/activemodel/lib/active_model/locale/en.yml index 44425b4a28..ba49c6beaa 100644 --- a/activemodel/lib/active_model/locale/en.yml +++ b/activemodel/lib/active_model/locale/en.yml @@ -23,5 +23,6 @@ en: equal_to: "must be equal to %{count}" less_than: "must be less than %{count}" less_than_or_equal_to: "must be less than or equal to %{count}" + other_than: "must be other than %{count}" odd: "must be odd" even: "must be even" diff --git a/activemodel/lib/active_model/validations/numericality.rb b/activemodel/lib/active_model/validations/numericality.rb index 34d447a0fa..bb9f9679fc 100644 --- a/activemodel/lib/active_model/validations/numericality.rb +++ b/activemodel/lib/active_model/validations/numericality.rb @@ -5,7 +5,7 @@ module ActiveModel class NumericalityValidator < EachValidator CHECKS = { :greater_than => :>, :greater_than_or_equal_to => :>=, :equal_to => :==, :less_than => :<, :less_than_or_equal_to => :<=, - :odd => :odd?, :even => :even? }.freeze + :odd => :odd?, :even => :even?, :other_than => :!= }.freeze RESERVED_OPTIONS = CHECKS.keys + [:only_integer] @@ -99,6 +99,7 @@ module ActiveModel # * <tt>:equal_to</tt> - Specifies the value must be equal to the supplied value. # * <tt>:less_than</tt> - Specifies the value must be less than the supplied value. # * <tt>:less_than_or_equal_to</tt> - Specifies the value must be less than or equal the supplied value. + # * <tt>:other_than</tt> - Specifies the value must be other than the supplied value. # * <tt>:odd</tt> - Specifies the value must be an odd number. # * <tt>:even</tt> - Specifies the value must be an even number. # * <tt>:if</tt> - Specifies a method, proc or string to call to determine if the validation should @@ -107,7 +108,7 @@ module ActiveModel # * <tt>:unless</tt> - Specifies a method, proc or string to call to determine if the validation should # 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. - # * <tt>:strict</tt> - Specifies whether validation should be strict. + # * <tt>:strict</tt> - Specifies whether validation should be strict. # See <tt>ActiveModel::Validation#validates!</tt> for more information # # The following checks can also be supplied with a proc or a symbol which corresponds to a method: |