Validate multiple contexts on `valid?` and `invalid?` at once.

Example:

```ruby
class Person
  include ActiveModel::Validations

  attr_reader :name, :title
  validates_presence_of :name, on: :create
  validates_presence_of :title, on: :update
end

person = Person.new
person.valid?([:create, :update])    # => true
person.errors.messages               # => {:name=>["can't be blank"], :title=>["can't be blank"]}
```
This commit is contained in:
Dmitry Polushkin 2015-09-07 22:41:50 +01:00
parent d1ce45cd8c
commit e3d99e239d
5 changed files with 50 additions and 2 deletions

View File

@ -1,3 +1,21 @@
* Validate multiple contexts on `valid?` and `invalid?` at once.
Example:
class Person
include ActiveModel::Validations
attr_reader :name, :title
validates_presence_of :name, on: :create
validates_presence_of :title, on: :update
end
person = Person.new
person.valid?([:create, :update]) # => true
person.errors.messages # => {:name=>["can't be blank"], :title=>["can't be blank"]}
*Dmitry Polushkin*
* Add case_sensitive option for confirmation validator in models.
*Akshat Sharma*

View File

@ -162,7 +162,7 @@ module ActiveModel
options = options.dup
options[:if] = Array(options[:if])
options[:if].unshift ->(o) {
Array(options[:on]).include?(o.validation_context)
!(Array(options[:on]) & Array(o.validation_context)).empty?
}
end

View File

@ -8,6 +8,7 @@ class ValidationsContextTest < ActiveModel::TestCase
end
ERROR_MESSAGE = "Validation error from validator"
ANOTHER_ERROR_MESSAGE = "Another validation error from validator"
class ValidatorThatAddsErrors < ActiveModel::Validator
def validate(record)
@ -15,6 +16,12 @@ class ValidationsContextTest < ActiveModel::TestCase
end
end
class AnotherValidatorThatAddsErrors < ActiveModel::Validator
def validate(record)
record.errors[:base] << ANOTHER_ERROR_MESSAGE
end
end
test "with a class that adds errors on create and validating a new model with no arguments" do
Topic.validates_with(ValidatorThatAddsErrors, on: :create)
topic = Topic.new
@ -46,4 +53,16 @@ class ValidationsContextTest < ActiveModel::TestCase
assert topic.invalid?(:context2), "Validation did not run on context2 when 'on' is set to context1 and context2"
assert topic.errors[:base].include?(ERROR_MESSAGE)
end
test "with a class that validating a model for a multiple contexts" do
Topic.validates_with(ValidatorThatAddsErrors, on: :context1)
Topic.validates_with(AnotherValidatorThatAddsErrors, on: :context2)
topic = Topic.new
assert topic.valid?, "Validation ran with no context given when 'on' is set to context1 and context2"
assert topic.invalid?([:context1, :context2]), "Validation did not run on context1 when 'on' is set to context1 and context2"
assert topic.errors[:base].include?(ERROR_MESSAGE)
assert topic.errors[:base].include?(ANOTHER_ERROR_MESSAGE)
end
end

View File

@ -54,7 +54,7 @@ module ActiveRecord
# Validations with no <tt>:on</tt> option will run no matter the context. Validations with
# some <tt>:on</tt> option will only run in the specified context.
def valid?(context = nil)
context ||= (new_record? ? :create : :update)
context ||= default_validation_context
output = super(context)
errors.empty? && output
end
@ -63,6 +63,10 @@ module ActiveRecord
protected
def default_validation_context
new_record? ? :create : :update
end
def raise_validation_error
raise(RecordInvalid.new(self))
end

View File

@ -52,6 +52,13 @@ class ValidationsTest < ActiveRecord::TestCase
assert r.valid?(:special_case)
end
def test_invalid_using_multiple_contexts
r = WrongReply.new(:title => 'Wrong Create')
assert r.invalid?([:special_case, :create])
assert_equal "Invalid", r.errors[:author_name].join
assert_equal "is Wrong Create", r.errors[:title].join
end
def test_validate
r = WrongReply.new