lib/action_dispatch/middleware/debug_exceptions.rb in actionpack-3.2.22.5 vs lib/action_dispatch/middleware/debug_exceptions.rb in actionpack-4.0.0.beta1

@@ -1,32 +1,32 @@
 require 'action_dispatch/http/request'
 require 'action_dispatch/middleware/exception_wrapper'
+require 'action_dispatch/routing/inspector'
 
 module ActionDispatch
   # This middleware is responsible for logging exceptions and
   # showing a debugging page in case the request is local.
   class DebugExceptions
-    RESCUES_TEMPLATE_PATH = File.join(File.dirname(__FILE__), 'templates')
+    RESCUES_TEMPLATE_PATH = File.expand_path('../templates', __FILE__)
 
-    def initialize(app)
-      @app = app
+    def initialize(app, routes_app = nil)
+      @app        = app
+      @routes_app = routes_app
     end
 
     def call(env)
-      begin
-        response = @app.call(env)
+      _, headers, body = response = @app.call(env)
 
-        if response[1]['X-Cascade'] == 'pass'
-          body = response[2]
-          body.close if body.respond_to?(:close)
-          raise ActionController::RoutingError, "No route matches [#{env['REQUEST_METHOD']}] #{env['PATH_INFO'].inspect}"
-        end
-      rescue Exception => exception
-        raise exception if env['action_dispatch.show_exceptions'] == false
+      if headers['X-Cascade'] == 'pass'
+        body.close if body.respond_to?(:close)
+        raise ActionController::RoutingError, "No route matches [#{env['REQUEST_METHOD']}] #{env['PATH_INFO'].inspect}"
       end
 
-      exception ? render_exception(env, exception) : response
+      response
+    rescue Exception => exception
+      raise exception if env['action_dispatch.show_exceptions'] == false
+      render_exception(env, exception)
     end
 
     private
 
     def render_exception(env, exception)
@@ -37,13 +37,16 @@
         template = ActionView::Base.new([RESCUES_TEMPLATE_PATH],
           :request => Request.new(env),
           :exception => wrapper.exception,
           :application_trace => wrapper.application_trace,
           :framework_trace => wrapper.framework_trace,
-          :full_trace => wrapper.full_trace
+          :full_trace => wrapper.full_trace,
+          :routes_inspector => routes_inspector(exception),
+          :source_extract => wrapper.source_extract,
+          :line_number => wrapper.line_number,
+          :file => wrapper.file
         )
-
         file = "rescues/#{wrapper.rescue_template}"
         body = template.render(:template => file, :layout => 'rescues/layout')
         render(wrapper.status_code, body)
       else
         raise exception
@@ -74,9 +77,15 @@
     def logger(env)
       env['action_dispatch.logger'] || stderr_logger
     end
 
     def stderr_logger
-      @stderr_logger ||= Logger.new($stderr)
+      @stderr_logger ||= ActiveSupport::Logger.new($stderr)
+    end
+
+    def routes_inspector(exception)
+      if @routes_app.respond_to?(:routes) && (exception.is_a?(ActionController::RoutingError) || exception.is_a?(ActionView::Template::Error))
+        ActionDispatch::Routing::RoutesInspector.new(@routes_app.routes.routes)
+      end
     end
   end
 end