diff options
Diffstat (limited to 'activesupport/lib/active_support/callbacks.rb')
| -rw-r--r-- | activesupport/lib/active_support/callbacks.rb | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb index fa37b24f51..3be23c17e1 100644 --- a/activesupport/lib/active_support/callbacks.rb +++ b/activesupport/lib/active_support/callbacks.rb @@ -96,6 +96,15 @@ module ActiveSupport module Filters Environment = Struct.new(:target, :halted, :value, :run_block) + + class End + def call(env) + block = env.run_block + env.value = !env.halted && (!block || block.call) + env + end + end + ENDING = End.new end class Callback #:nodoc:# @@ -361,11 +370,7 @@ module ActiveSupport def compile return @callbacks if @callbacks - @callbacks = lambda { |env| - block = env.run_block - env.value = !env.halted && (!block || block.call) - env - } + @callbacks = Filters::ENDING @chain.reverse_each do |callback| @callbacks = callback.apply(@callbacks) end |