kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

call extracted method from callback manipulation methods

Browse source
This commit is contained in:
Aaron Patterson 2013-05-13 14:14:50 -07:00
parent 35c4a2ca95
commit 72be280ffe
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
activesupport/lib/active_support/callbacks.rb
View file

@ -446,12 +446,10 @@ module ActiveSupport
# This is used internally to append, prepend and skip callbacks to the
# CallbackChain.
def __update_callbacks(name, filters, block) #:nodoc:
type, filters, options = normalize_callback_params(name, filters, block)
def __update_callbacks(name) #:nodoc:
([self] + ActiveSupport::DescendantsTracker.descendants(self)).reverse.each do |target|
chain = target.send("_#{name}_callbacks")
yield target, chain.dup, type, filters, options
yield target, chain.dup
target.__reset_runner(name)
end
end
@ -494,7 +492,9 @@ module ActiveSupport
def set_callback(name, *filter_list, &block)
mapped = nil
__update_callbacks(name, filter_list, block) do |target, chain, type, filters, options|
type, filters, options = normalize_callback_params(name, filter_list, block)
__update_callbacks(name) do |target, chain|
mapped ||= filters.map do |filter|
Callback.build(chain, filter, type, options.dup, self)
end
@ -513,7 +513,9 @@ module ActiveSupport
# skip_callback :validate, :before, :check_membership, if: -> { self.age > 18 }
# end
def skip_callback(name, *filter_list, &block)
__update_callbacks(name, filter_list, block) do |target, chain, type, filters, options|
type, filters, options = normalize_callback_params(name, filter_list, block)
__update_callbacks(name) do |target, chain|
filters.each do |filter|
filter = chain.find {|c| c.matches?(type, filter) }