Ported Rescuable to new base

1 files changed, 29 insertions, 21 deletions

diff --git a/actionpack/lib/action_controller/new_base/base.rb b/actionpack/lib/action_controller/new_base/base.rb
index 3ee17769a8..c25ffd5c84 100644
--- a/actionpack/lib/action_controller/new_base/base.rb
+++ b/actionpack/lib/action_controller/new_base/base.rb
@@ -12,14 +12,40 @@ module ActionController
     include ActionController::Renderer
     include ActionController::Layouts
     include ActionController::ConditionalGet
-    
+
     # Legacy modules
     include SessionManagement
     include ActionDispatch::StatusCodes
-    
+
     # Rails 2.x compatibility
     include ActionController::Rails2Compatibility
-    
+
+    # TODO: Extract into its own module
+    # This should be moved together with other normalizing behavior
+    module ImplicitRender
+      def process_action(method_name)
+        ret = super
+        render if response_body.nil?
+        ret
+      end
+
+      def _implicit_render
+        render
+      end
+
+      def method_for_action(action_name)
+        super || begin
+          if view_paths.find_by_parts?(action_name.to_s, {:formats => formats, :locales => [I18n.locale]}, controller_path)
+            "_implicit_render"
+          end
+        end
+      end
+    end
+
+    include ImplicitRender
+
+    include ActionController::Rescue
+
     def self.inherited(klass)
       ::ActionController::Base.subclasses << klass.to_s
       super
@@ -113,23 +139,5 @@ module ActionController
       
       super(url, status)
     end
-    
-    def process_action(method_name)
-      ret = super
-      render if response_body.nil?
-      ret
-    end
-
-    def _implicit_render
-      render
-    end
-
-    def method_for_action(action_name)
-      super || begin
-        if view_paths.find_by_parts?(action_name.to_s, {:formats => formats, :locales => [I18n.locale]}, controller_path)
-          "_implicit_render"
-        end
-      end
-    end
   end
 end
\ No newline at end of file