Permalink
Browse files

Merge pull request #5999 from bogdan/callbacks

AS::Callbacks#run_callbacks optimized to reduce backtrace
  • Loading branch information...
2 parents 3de6a75 + 764f69e commit a89827e97c7e8887ca23e1279a481d548f63b262 @jeremy jeremy committed Apr 29, 2012
Showing with 7 additions and 7 deletions.
  1. +7 −7 activesupport/lib/active_support/callbacks.rb
@@ -76,7 +76,8 @@ module Callbacks
#
def run_callbacks(kind, key = nil, &block)
#TODO: deprecate key argument
- self.class.__run_callbacks(kind, self, &block)
+ runner_name = self.class.__define_callbacks(kind, self)
+ send(runner_name, &block)
end
private
@@ -323,18 +324,17 @@ def compile
method << callbacks
method << "halted ? false : (block_given? ? value : true)"
- method.flatten.compact.join("\n")
+ method.join("\n")
end
end
module ClassMethods
- # This method runs callback chain for the given kind.
- # If this called first time it creates a new callback method for the kind.
+ # This method defines callback chain method for the given kind
+ # if it was not yet defined.
# This generated method plays caching role.
- #
- def __run_callbacks(kind, object, &blk) #:nodoc:
+ def __define_callbacks(kind, object) #:nodoc:
name = __callback_runner_name(kind)
unless object.respond_to?(name, true)
str = object.send("_#{kind}_callbacks").compile
@@ -343,7 +343,7 @@ def #{name}() #{str} end
protected :#{name}
RUBY_EVAL
end
- object.send(name, &blk)
+ name
end
def __reset_runner(symbol)

0 comments on commit a89827e

Please sign in to comment.