Syntax errors and other exceptions thrown outside of an action are now gracefully handled by the dispatcher

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@51 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 8 insertions, 2 deletions

diff --git a/actionpack/lib/action_controller/rescue.rb b/actionpack/lib/action_controller/rescue.rb
index e624888b64..328eca7fe4 100644
--- a/actionpack/lib/action_controller/rescue.rb
+++ b/actionpack/lib/action_controller/rescue.rb
@@ -8,12 +8,19 @@ module ActionController #:nodoc:
   module Rescue
     def self.append_features(base) #:nodoc:
       super
+      base.extend(ClassMethods)
       base.class_eval do
         alias_method :perform_action_without_rescue, :perform_action
         alias_method :perform_action, :perform_action_with_rescue
       end
     end
 
+    module ClassMethods
+      def process_with_exception(request, response, exception)
+        new.process(request, response, :rescue_action, exception)
+      end
+    end
+
     protected
       # Exception handler called when the performance of an action raises an exception.
       def rescue_action(exception)
@@ -87,8 +94,7 @@ module ActionController #:nodoc:
       end
       
       def clean_backtrace(exception)
-        base_dir = File.expand_path(File.dirname(__FILE__) + "/../../../../")
-        exception.backtrace.collect { |line| line.gsub(base_dir, "").gsub("/public/../config/environments/../../", "").gsub("/public/../", "") }
+        exception.backtrace.collect { |line| Object.const_defined?(:RAILS_ROOT) ? line.gsub(RAILS_ROOT, "") : line }
       end
   end
 end