Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

unified the param names across all callbacks manipulation methods

_ Rename the define_callbacks params to `names`
  - in order to match the naming conventions for `get_callbacks` and `set_callbacks` at https://github.com/rails/rails/blob/master/activesupport/lib/active_support/callbacks.rb#L736-743
  - `define_callbacks` just register names(events), not define the real callback functions.
- Rename the `reset_callbacks` params
  • Loading branch information...
commit 42a3817cd64affb38ec98985490939748569caaf 1 parent 49fd826
@yangchenyun yangchenyun authored
Showing with 10 additions and 10 deletions.
  1. +10 −10 activesupport/lib/active_support/callbacks.rb
View
20 activesupport/lib/active_support/callbacks.rb
@@ -637,16 +637,16 @@ def skip_callback(name, *filter_list, &block)
end
# Remove all set callbacks for the given event.
- def reset_callbacks(symbol)
- callbacks = get_callbacks symbol
+ def reset_callbacks(name)
+ callbacks = get_callbacks name
ActiveSupport::DescendantsTracker.descendants(self).each do |target|
- chain = target.get_callbacks(symbol).dup
+ chain = target.get_callbacks(name).dup
callbacks.each { |c| chain.delete(c) }
- target.set_callbacks symbol, chain
+ target.set_callbacks name, chain
end
- self.set_callbacks symbol, callbacks.dup.clear
+ self.set_callbacks name, callbacks.dup.clear
end
# Define sets of events in the object lifecycle that support callbacks.
@@ -717,8 +717,8 @@ def reset_callbacks(symbol)
# define_callbacks :save, scope: [:name]
#
# would call <tt>Audit#save</tt>.
- def define_callbacks(*callbacks)
- config = callbacks.last.is_a?(Hash) ? callbacks.pop : {}
+ def define_callbacks(*names)
+ config = names.last.is_a?(Hash) ? names.pop : {}
if config.key?(:terminator) && String === config[:terminator]
ActiveSupport::Deprecation.warn "String based terminators are deprecated, please use a lambda"
value = config[:terminator]
@@ -726,9 +726,9 @@ def define_callbacks(*callbacks)
config[:terminator] = lambda { |target, result| target.instance_exec(result, &l) }
end
- callbacks.each do |callback|
- class_attribute "_#{callback}_callbacks"
- set_callbacks callback, CallbackChain.new(callback, config)
+ names.each do |name|
+ class_attribute "_#{name}_callbacks"
+ set_callbacks name, CallbackChain.new(name, config)
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.