Update Exception extension to show the first few framework frames in an application trace.

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

1 files changed, 7 insertions, 1 deletions

diff --git a/activesupport/lib/active_support/core_ext/exception.rb b/activesupport/lib/active_support/core_ext/exception.rb
index 323d97aa44..5a2d21590b 100644
--- a/activesupport/lib/active_support/core_ext/exception.rb
+++ b/activesupport/lib/active_support/core_ext/exception.rb
@@ -13,6 +13,12 @@ class Exception
   end
   
   def application_backtrace
-    clean_backtrace.reject { |line| line =~ /(vendor|dispatch|ruby|script\/\w+)/ }
+    before_application_frame = true
+    
+    clean_backtrace.reject do |line|
+      non_app_frame = !! (line =~ /vendor|dispatch|ruby|script\/\w+/)
+      before_application_frame = false unless non_app_frame
+      non_app_frame && ! before_application_frame
+    end
   end
 end
\ No newline at end of file