diff options
| author | José Valim <jose.valim@gmail.com> | 2009-09-21 21:47:21 -0300 |
|---|---|---|
| committer | Yehuda Katz <wycats@gmail.com> | 2009-09-21 17:56:24 -0700 |
| commit | 24074796031d76d3ac2f5f0078d75699cce1bc54 (patch) | |
| tree | b7fd118165f29f4ce469b9d4ded1cbabb208a8dd /actionpack/lib/action_dispatch/middleware/callbacks.rb | |
| parent | 1bbb9b2db05730194edfd7d2cef9f5fcb9d79e50 (diff) | |
| download | rails-24074796031d76d3ac2f5f0078d75699cce1bc54.tar.gz rails-24074796031d76d3ac2f5f0078d75699cce1bc54.tar.bz2 rails-24074796031d76d3ac2f5f0078d75699cce1bc54.zip | |
Fixes Sam Ruby tests suite.
Signed-off-by: Yehuda Katz <wycats@gmail.com>
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware/callbacks.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/callbacks.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/callbacks.rb b/actionpack/lib/action_dispatch/middleware/callbacks.rb index 2f86a382c2..56d6da1706 100644 --- a/actionpack/lib/action_dispatch/middleware/callbacks.rb +++ b/actionpack/lib/action_dispatch/middleware/callbacks.rb @@ -2,7 +2,7 @@ module ActionDispatch class Callbacks include ActiveSupport::NewCallbacks - define_callbacks :call, :terminator => "result == false", :scope => :kind + define_callbacks :call, :terminator => "result == false", :rescuable => true define_callbacks :prepare, :scope => :name # Add a preparation callback. Preparation callbacks are run before every @@ -25,10 +25,6 @@ module ActionDispatch set_callback(:call, :before, *args, &block) end - def self.around(*args, &block) - set_callback(:call, :around, *args, &block) - end - def self.after(*args, &block) set_callback(:call, :after, *args, &block) end @@ -36,7 +32,6 @@ module ActionDispatch class << self # DEPRECATED alias_method :before_dispatch, :before - alias_method :around_dispatch, :around alias_method :after_dispatch, :after end |