ExceptionWrapper doesn't need to know about `env`

ExceptionWrapper only cares about the backtrace cleaner, so lets just
pass the cleaner to the wrapper.  It does not need to know that env
exists or what key the backtrace cleaner is stored in

4 files changed, 22 insertions, 26 deletions

diff --git a/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb b/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
index 9082aac271..53a025a975 100644
--- a/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
@@ -60,7 +60,8 @@ module ActionDispatch
     private
 
     def render_exception(env, exception)
-      wrapper = ExceptionWrapper.new(env, exception)
+      backtrace_cleaner = env['action_dispatch.backtrace_cleaner']
+      wrapper = ExceptionWrapper.new(backtrace_cleaner, exception)
       log_error(env, wrapper)
 
       if env['action_dispatch.show_detailed_exceptions']
diff --git a/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb b/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb
index 8c3d45584d..039efc3af8 100644
--- a/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb
+++ b/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb
@@ -31,10 +31,10 @@ module ActionDispatch
       'ActionView::Template::Error'         => 'template_error'
     )
 
-    attr_reader :env, :exception, :line_number, :file
+    attr_reader :backtrace_cleaner, :exception, :line_number, :file
 
-    def initialize(env, exception)
-      @env = env
+    def initialize(backtrace_cleaner, exception)
+      @backtrace_cleaner = backtrace_cleaner
       @exception = original_exception(exception)
 
       expand_backtrace if exception.is_a?(SyntaxError) || exception.try(:original_exception).try(:is_a?, SyntaxError)
@@ -125,10 +125,6 @@ module ActionDispatch
       end
     end
 
-    def backtrace_cleaner
-      @backtrace_cleaner ||= @env['action_dispatch.backtrace_cleaner']
-    end
-
     def source_fragment(path, line)
       return unless Rails.respond_to?(:root) && Rails.root
       full_path = Rails.root.join(path)
diff --git a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
index f0779279c1..a764a1aea5 100644
--- a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
@@ -39,7 +39,8 @@ module ActionDispatch
     private
 
     def render_exception(env, exception)
-      wrapper = ExceptionWrapper.new(env, exception)
+      backtrace_cleaner = env['action_dispatch.backtrace_cleaner']
+      wrapper = ExceptionWrapper.new(backtrace_cleaner, exception)
       status  = wrapper.status_code
       env["action_dispatch.exception"] = wrapper.exception
       env["action_dispatch.original_path"] = env["PATH_INFO"]
diff --git a/actionpack/test/dispatch/exception_wrapper_test.rb b/actionpack/test/dispatch/exception_wrapper_test.rb
index 7a29a7ff97..3dac582407 100644
--- a/actionpack/test/dispatch/exception_wrapper_test.rb
+++ b/actionpack/test/dispatch/exception_wrapper_test.rb
@@ -19,15 +19,13 @@ module ActionDispatch
     setup do
       Rails.stubs(:root).returns(Pathname.new('.'))
 
-      cleaner = ActiveSupport::BacktraceCleaner.new
-      cleaner.add_silencer { |line| line !~ /^lib/ }
-
-      @environment = { 'action_dispatch.backtrace_cleaner' => cleaner }
+      @cleaner = ActiveSupport::BacktraceCleaner.new
+      @cleaner.add_silencer { |line| line !~ /^lib/ }
     end
 
     test '#source_extracts fetches source fragments for every backtrace entry' do
       exception = TestError.new("lib/file.rb:42:in `index'")
-      wrapper = ExceptionWrapper.new({}, exception)
+      wrapper = ExceptionWrapper.new(nil, exception)
 
       wrapper.expects(:source_fragment).with('lib/file.rb', 42).returns('foo')
 
@@ -37,7 +35,7 @@ module ActionDispatch
     test '#source_extracts works with Windows paths' do
       exc = TestError.new("c:/path/to/rails/app/controller.rb:27:in 'index':")
 
-      wrapper = ExceptionWrapper.new({}, exc)
+      wrapper = ExceptionWrapper.new(nil, exc)
       wrapper.expects(:source_fragment).with('c:/path/to/rails/app/controller.rb', 27).returns('nothing')
 
       assert_equal [ code: 'nothing', line_number: 27 ], wrapper.source_extracts
@@ -46,7 +44,7 @@ module ActionDispatch
     test '#source_extracts works with non standard backtrace' do
       exc = TestError.new('invalid')
 
-      wrapper = ExceptionWrapper.new({}, exc)
+      wrapper = ExceptionWrapper.new(nil, exc)
       wrapper.expects(:source_fragment).with('invalid', 0).returns('nothing')
 
       assert_equal [ code: 'nothing', line_number: 0 ], wrapper.source_extracts
@@ -54,14 +52,14 @@ module ActionDispatch
 
     test '#application_trace returns traces only from the application' do
       exception = TestError.new(caller.prepend("lib/file.rb:42:in `index'"))
-      wrapper = ExceptionWrapper.new(@environment, exception)
+      wrapper = ExceptionWrapper.new(@cleaner, exception)
 
       assert_equal [ "lib/file.rb:42:in `index'" ], wrapper.application_trace
     end
 
     test '#application_trace cannot be nil' do
-      nil_backtrace_wrapper = ExceptionWrapper.new(@environment, BadlyDefinedError.new)
-      nil_cleaner_wrapper = ExceptionWrapper.new({}, BadlyDefinedError.new)
+      nil_backtrace_wrapper = ExceptionWrapper.new(@cleaner, BadlyDefinedError.new)
+      nil_cleaner_wrapper = ExceptionWrapper.new(nil, BadlyDefinedError.new)
 
       assert_equal [], nil_backtrace_wrapper.application_trace
       assert_equal [], nil_cleaner_wrapper.application_trace
@@ -69,14 +67,14 @@ module ActionDispatch
 
     test '#framework_trace returns traces outside the application' do
       exception = TestError.new(caller.prepend("lib/file.rb:42:in `index'"))
-      wrapper = ExceptionWrapper.new(@environment, exception)
+      wrapper = ExceptionWrapper.new(@cleaner, exception)
 
       assert_equal caller, wrapper.framework_trace
     end
 
     test '#framework_trace cannot be nil' do
-      nil_backtrace_wrapper = ExceptionWrapper.new(@environment, BadlyDefinedError.new)
-      nil_cleaner_wrapper = ExceptionWrapper.new({}, BadlyDefinedError.new)
+      nil_backtrace_wrapper = ExceptionWrapper.new(@cleaner, BadlyDefinedError.new)
+      nil_cleaner_wrapper = ExceptionWrapper.new(nil, BadlyDefinedError.new)
 
       assert_equal [], nil_backtrace_wrapper.framework_trace
       assert_equal [], nil_cleaner_wrapper.framework_trace
@@ -84,14 +82,14 @@ module ActionDispatch
 
     test '#full_trace returns application and framework traces' do
       exception = TestError.new(caller.prepend("lib/file.rb:42:in `index'"))
-      wrapper = ExceptionWrapper.new(@environment, exception)
+      wrapper = ExceptionWrapper.new(@cleaner, exception)
 
       assert_equal exception.backtrace, wrapper.full_trace
     end
 
     test '#full_trace cannot be nil' do
-      nil_backtrace_wrapper = ExceptionWrapper.new(@environment, BadlyDefinedError.new)
-      nil_cleaner_wrapper = ExceptionWrapper.new({}, BadlyDefinedError.new)
+      nil_backtrace_wrapper = ExceptionWrapper.new(@cleaner, BadlyDefinedError.new)
+      nil_cleaner_wrapper = ExceptionWrapper.new(nil, BadlyDefinedError.new)
 
       assert_equal [], nil_backtrace_wrapper.full_trace
       assert_equal [], nil_cleaner_wrapper.full_trace
@@ -99,7 +97,7 @@ module ActionDispatch
 
     test '#traces returns every trace by category enumerated with an index' do
       exception = TestError.new("lib/file.rb:42:in `index'", "/gems/rack.rb:43:in `index'")
-      wrapper = ExceptionWrapper.new(@environment, exception)
+      wrapper = ExceptionWrapper.new(@cleaner, exception)
 
       assert_equal({
         'Application Trace' => [ id: 0, trace: "lib/file.rb:42:in `index'" ],