Skip to content

Commit

Permalink
Don't enable validations when passing false hash values to ActiveMode…
Browse files Browse the repository at this point in the history
…l.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.)
  • Loading branch information
purcell committed May 28, 2012
1 parent 5acb10d commit b3ccd7b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 0 deletions.
2 changes: 2 additions & 0 deletions activemodel/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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*
Expand Down
1 change: 1 addition & 0 deletions activemodel/lib/active_model/validations/validates.rb
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ def validates(*attributes)
defaults.merge!(:attributes => attributes)

validations.each do |key, options|
next unless options
key = "#{key.to_s.camelize}Validator"

begin
Expand Down
5 changes: 5 additions & 0 deletions activemodel/test/cases/validations_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,11 @@ def test_validates_with_bang
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

Expand Down

0 comments on commit b3ccd7b

Please sign in to comment.