lib/action_dispatch/middleware/debug_exceptions.rb in actionpack-4.0.13 vs lib/action_dispatch/middleware/debug_exceptions.rb in actionpack-4.1.0.beta1

@@ -32,30 +32,38 @@
     def render_exception(env, exception)
       wrapper = ExceptionWrapper.new(env, exception)
       log_error(env, wrapper)
 
       if env['action_dispatch.show_detailed_exceptions']
+        request = Request.new(env)
         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,
-          :routes_inspector => routes_inspector(exception),
-          :source_extract => wrapper.source_extract,
-          :line_number => wrapper.line_number,
-          :file => wrapper.file
+          request: request,
+          exception: wrapper.exception,
+          application_trace: wrapper.application_trace,
+          framework_trace: wrapper.framework_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)
+
+        if request.xhr?
+          body = template.render(template: file, layout: false, formats: [:text])
+          format = "text/plain"
+        else
+          body = template.render(template: file, layout: 'rescues/layout')
+          format = "text/html"
+        end
+        render(wrapper.status_code, body, format)
       else
         raise exception
       end
     end
 
-    def render(status, body)
-      [status, {'Content-Type' => "text/html; charset=#{Response.default_charset}", 'Content-Length' => body.bytesize.to_s}, [body]]
+    def render(status, body, format)
+      [status, {'Content-Type' => "#{format}; charset=#{Response.default_charset}", 'Content-Length' => body.bytesize.to_s}, [body]]
     end
 
     def log_error(env, wrapper)
       logger = logger(env)
       return unless logger