Don't enable validations when passing false hash values to ActiveModel.validates

Passing a falsey option value for a validator currently causes that validator to
be enabled, just like "true":

    ActiveModel.validates :foo, :presence => false

This is rather counterintuitive, and makes it inconvenient to wrap `validates` in
methods which may conditionally enable different validators.

As an example, one is currently forced to write:

      def has_slug(source_field, options={:unique => true})
        slugger = Proc.new { |r| r[:slug] = self.class.sluggify(r[source_field]) if r[:slug].blank? }
        before_validation slugger
        validations = { :presence => true, :slug => true }
        if options[:unique]
          validations[:uniqueness] = true
        end
        validates :slug, validations
      end

because the following reasonable-looking alternative fails to work as expected:

      def has_slug(source_field, options={:unique => true})
        slugger = Proc.new { |r| r[:slug] = self.class.sluggify(r[source_field]) if r[:slug].blank? }
        before_validation slugger
        validates :slug, :presence => true, :slug => true, :uniqueness => options[:unique]
      end

(This commit includes a test, and all activemodel and activerecord tests pass as before.)
This commit is contained in:
Steve Purcell 2012-05-28 14:39:09 +01:00
parent 5acb10d6c3
commit b3ccd7b27a
3 changed files with 8 additions and 0 deletions

View File

@ -1,5 +1,7 @@
## Rails 4.0.0 (unreleased) ##
* Passing false hash values to `validates` will no longer enable the corresponding validators *Steve Purcell*
* `ConfirmationValidator` error messages will attach to `:#{attribute}_confirmation` instead of `attribute` *Brian Cardarella*
* Added ActiveModel::Model, a mixin to make Ruby objects work with AP out of box *Guillermo Iguaran*

View File

@ -88,6 +88,7 @@ module ActiveModel
defaults.merge!(:attributes => attributes)
validations.each do |key, options|
next unless options
key = "#{key.to_s.camelize}Validator"
begin

View File

@ -330,6 +330,11 @@ class ValidationsTest < ActiveModel::TestCase
end
end
def test_validates_with_false_hash_value
Topic.validates :title, :presence => false
assert Topic.new.valid?
end
def test_strict_validation_error_message
Topic.validates :title, :strict => true, :presence => true