diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2011-01-09 10:15:05 -0800 |
---|---|---|
committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-01-31 19:45:53 -0200 |
commit | 57bc25c5f8129f57b08a2dc7c319b86778dd8a40 (patch) | |
tree | 4e21728c5dd1866f654ed88d169552a77fa6483b /activemodel/lib/active_model | |
parent | 9666b6a625c9fef555c2a18df6721fed2000f131 (diff) | |
download | rails-57bc25c5f8129f57b08a2dc7c319b86778dd8a40.tar.gz rails-57bc25c5f8129f57b08a2dc7c319b86778dd8a40.tar.bz2 rails-57bc25c5f8129f57b08a2dc7c319b86778dd8a40.zip |
Use run_callbacks; the generated _run_<name>_callbacks method is not a public interface.
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
Diffstat (limited to 'activemodel/lib/active_model')
-rw-r--r-- | activemodel/lib/active_model/callbacks.rb | 5 | ||||
-rw-r--r-- | activemodel/lib/active_model/validations.rb | 2 | ||||
-rw-r--r-- | activemodel/lib/active_model/validations/callbacks.rb | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/activemodel/lib/active_model/callbacks.rb b/activemodel/lib/active_model/callbacks.rb index 7302a869c8..2a1f51a9a7 100644 --- a/activemodel/lib/active_model/callbacks.rb +++ b/activemodel/lib/active_model/callbacks.rb @@ -24,14 +24,11 @@ module ActiveModel # you want callbacks on in a block so that the callbacks get a chance to fire: # # def create - # _run_create_callbacks do + # run_callbacks :create do # # Your create action methods here # end # end # - # The _run_<method_name>_callbacks methods are dynamically created when you extend - # the <tt>ActiveModel::Callbacks</tt> module. - # # Then in your class, you can use the +before_create+, +after_create+ and +around_create+ # methods, just as you would in an Active Record module. # diff --git a/activemodel/lib/active_model/validations.rb b/activemodel/lib/active_model/validations.rb index 6cb015a144..cdf23c7b1b 100644 --- a/activemodel/lib/active_model/validations.rb +++ b/activemodel/lib/active_model/validations.rb @@ -207,7 +207,7 @@ module ActiveModel protected def run_validations! - _run_validate_callbacks + run_callbacks :validate errors.empty? end end diff --git a/activemodel/lib/active_model/validations/callbacks.rb b/activemodel/lib/active_model/validations/callbacks.rb index 621518de5b..adc2867ad0 100644 --- a/activemodel/lib/active_model/validations/callbacks.rb +++ b/activemodel/lib/active_model/validations/callbacks.rb @@ -50,7 +50,7 @@ module ActiveModel # Overwrite run validations to include callbacks. def run_validations! - _run_validation_callbacks { super } + run_callbacks(:validation) { super } end end end |