TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Refactor callback setup in to use lambda instead of eval

Browse Source
This commit is contained in:
Pablo Herrero 2014-09-30 08:58:37 -03:00
parent 79c491e838
commit 291f64469f
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemodel/lib/active_model/validations.rb
View File

@ -156,7 +156,7 @@ def validate(*args, &block)
if options.key?(:on)
options = options.dup
options[:if] = Array(options[:if])
options[:if].unshift lambda { |o|
options[:if].unshift ->(o) {
Array(options[:on]).include?(o.validation_context)
}
end

6
activemodel/lib/active_model/validations/callbacks.rb
View File

@ -58,7 +58,7 @@ def before_validation(*args, &block)
if options.is_a?(Hash) && options[:on]
options[:if] = Array(options[:if])
options[:on] = Array(options[:on])
options[:if].unshift lambda { |o|
options[:if].unshift ->(o) {
options[:on].include? o.validation_context
}
end
@ -98,7 +98,9 @@ def after_validation(*args, &block)
options[:if] = Array(options[:if])
if options[:on]
options[:on] = Array(options[:on])
options[:if].unshift("#{options[:on]}.include? self.validation_context")
options[:if].unshift ->(o) {
options[:on].include? o.validation_context
}
end
set_callback(:validation, :after, *(args << options), &block)
end