Merge pull request rails#6649 from route/logger_in_metal_3_2

Logger in metal backport for 3.2

actionpack/lib/action_view/helpers/controller_helper.rb

@@ -10,14 +10,16 @@ module ControllerHelper #:nodoc:
       delegate :request_forgery_protection_token, :params, :session, :cookies, :response, :headers,
                :flash, :action_name, :controller_name, :controller_path, :to => :controller
 
-      delegate :logger, :to => :controller, :allow_nil => true
-
       def assign_controller(controller)
         if @_controller = controller
           @_request = controller.request if controller.respond_to?(:request)
           @_config  = controller.config.inheritable_copy if controller.respond_to?(:config)
         end
       end
+
+      def logger
+        controller.logger if controller.respond_to?(:logger)
+      end
     end
   end
 end

actionpack/test/controller/render_test.rb

@@ -718,6 +718,14 @@ def determine_layout
     end
 end
 
+class MetalTestController < ActionController::Metal
+  include ActionController::Rendering
+
+  def accessing_logger_in_template
+    render :inline =>  "<%= logger.class %>"
+  end
+end
+
 class RenderTest < ActionController::TestCase
   tests TestController
 
@@ -1583,3 +1591,12 @@ def test_last_modified_works_with_less_than_too
     assert_response :success
   end
 end
+
+class MetalRenderTest < ActionController::TestCase
+  tests MetalTestController
+
+  def test_access_to_logger_in_view
+    get :accessing_logger_in_template
+    assert_equal "NilClass", @response.body
+  end
+end