From bd6b61be88dfe6eb1ff1dcc5c17542d804a842c7 Mon Sep 17 00:00:00 2001
From: Yehuda Katz <wycats@gmail.com>
Date: Thu, 6 Aug 2009 19:52:11 -0300
Subject: Rename /base to /metal and make base.rb and metal.rb top-level to
 reflect their module locations

---
 actionpack/lib/action_controller/base/rescuable.rb | 52 ----------------------
 1 file changed, 52 deletions(-)
 delete mode 100644 actionpack/lib/action_controller/base/rescuable.rb

(limited to 'actionpack/lib/action_controller/base/rescuable.rb')

diff --git a/actionpack/lib/action_controller/base/rescuable.rb b/actionpack/lib/action_controller/base/rescuable.rb
deleted file mode 100644
index 029e643d93..0000000000
--- a/actionpack/lib/action_controller/base/rescuable.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-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::Concern
-
-    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
-- 
cgit v1.2.3