diff options
author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-15 17:49:11 -0700 |
---|---|---|
committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-15 17:49:11 -0700 |
commit | 5a45446cff0daf4ca747257a8779dcd5d9cae1d7 (patch) | |
tree | 23a7ff81593e1d1060f01f340852fd8477c825c4 /actionpack/lib/action_controller/new_base/rescuable.rb | |
parent | 7e10504bdeab14ea70a942110a1b1ef6d8467ed3 (diff) | |
download | rails-5a45446cff0daf4ca747257a8779dcd5d9cae1d7.tar.gz rails-5a45446cff0daf4ca747257a8779dcd5d9cae1d7.tar.bz2 rails-5a45446cff0daf4ca747257a8779dcd5d9cae1d7.zip |
Ported Rescuable to new base
Diffstat (limited to 'actionpack/lib/action_controller/new_base/rescuable.rb')
-rw-r--r-- | actionpack/lib/action_controller/new_base/rescuable.rb | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/new_base/rescuable.rb b/actionpack/lib/action_controller/new_base/rescuable.rb new file mode 100644 index 0000000000..29ffe19d5f --- /dev/null +++ b/actionpack/lib/action_controller/new_base/rescuable.rb @@ -0,0 +1,53 @@ +module ActionController #:nodoc: + # Actions that fail to perform as expected throw exceptions. These + # exceptions can either be rescued for the public view (with a nice + # user-friendly explanation) or for the developers view (with tons of + # debugging information). The developers view is already implemented by + # the Action Controller, but the public view should be tailored to your + # specific application. + # + # The default behavior for public exceptions is to render a static html + # file with the name of the error code thrown. If no such file exists, an + # empty response is sent with the correct status code. + # + # You can override what constitutes a local request by overriding the + # <tt>local_request?</tt> method in your own controller. Custom rescue + # behavior is achieved by overriding the <tt>rescue_action_in_public</tt> + # and <tt>rescue_action_locally</tt> methods. + module Rescue + extend ActiveSupport::DependencyModule + + included do + include ActiveSupport::Rescuable + end + + module ClassMethods + # This can be removed once we can move action(:_rescue_action) into middlewares.rb + # Currently, it does controller.method(:rescue_action), which is hiding the implementation + # difference between the old and new base. + def rescue_action(env) + action(:_rescue_action).call(env) + end + end + + attr_internal :rescued_exception + + private + + def method_for_action(action_name) + return action_name if self.rescued_exception = request.env.delete("action_dispatch.rescue.exception") + super + end + + def _rescue_action + rescue_with_handler(rescued_exception) || raise(rescued_exception) + end + + def process_action(*) + super + rescue Exception => exception + self.rescued_exception = exception + _rescue_action + end + end +end |