From 764f69e8418635d7aa6d42b750bf4d784580e895 Mon Sep 17 00:00:00 2001 From: Bogdan Gusiev Date: Fri, 27 Apr 2012 10:12:47 +0300 Subject: AS::Callbacks optimized to reduce call backtrace --- activesupport/lib/active_support/callbacks.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'activesupport/lib/active_support') diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb index 2a569d9a9b..cbeba3139a 100644 --- a/activesupport/lib/active_support/callbacks.rb +++ b/activesupport/lib/active_support/callbacks.rb @@ -76,7 +76,8 @@ module ActiveSupport # 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 @@ module ActiveSupport 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 @@ module ActiveSupport protected :#{name} RUBY_EVAL end - object.send(name, &blk) + name end def __reset_runner(symbol) -- cgit v1.2.3