Clean up unused methods from AV::Base and pass in the template object…

… on rendering.

actionpack/lib/action_view/base.rb

@@ -155,9 +155,6 @@ module ActionView #:nodoc:
   #
   # See the ActionView::Helpers::PrototypeHelper::JavaScriptGenerator::GeneratorMethods documentation for more details.
   class Base
-    module Subclasses
-    end
-
     include Helpers, Rendering, Partials, ::ERB::Util, Context
 
     # Specify whether RJS responses should be wrapped in a try/catch block
@@ -177,12 +174,12 @@ class << self
       delegate :logger, :to => 'ActionController::Base', :allow_nil => true
     end
 
-    attr_accessor :base_path, :assigns, :template_extension, :lookup_context
-    attr_internal :captures, :request, :controller, :template, :config
+    attr_accessor :_template
+    attr_internal :request, :controller, :config, :assigns, :lookup_context
 
     delegate :formats, :formats=, :locale, :locale=, :view_paths, :view_paths=, :to => :lookup_context
 
-    delegate :request_forgery_protection_token, :template, :params, :session, :cookies, :response, :headers,
+    delegate :request_forgery_protection_token, :params, :session, :cookies, :response, :headers,
              :flash, :action_name, :controller_name, :to => :controller
 
     delegate :logger, :to => :controller, :allow_nil => true
@@ -197,26 +194,26 @@ def self.process_view_paths(value)
     end
 
     def assign(new_assigns) # :nodoc:
-      self.assigns = new_assigns.each { |key, value| instance_variable_set("@#{key}", value) }
+      @_assigns = new_assigns.each { |key, value| instance_variable_set("@#{key}", value) }
     end
 
     def initialize(lookup_context = nil, assigns_for_first_render = {}, controller = nil, formats = nil) #:nodoc:
       assign(assigns_for_first_render)
-      self.helpers = self.class.helpers || Module.new
-
-      if @_controller = controller
-        @_request = controller.request if controller.respond_to?(:request)
-      end
-
-      @_config = controller && controller.respond_to?(:config) ? controller.config.inheritable_copy : {}
+      self.helpers = Module.new unless self.class.helpers
 
+      @_config = {}
       @_content_for  = Hash.new { |h,k| h[k] = ActiveSupport::SafeBuffer.new }
       @_virtual_path = nil
       @output_buffer = nil
 
-      @lookup_context = lookup_context.is_a?(ActionView::LookupContext) ?
+      if @_controller = controller
+        @_request = controller.request if controller.respond_to?(:request)
+        @_config  = controller.config.inheritable_copy if controller.respond_to?(:config)
+      end
+
+      @_lookup_context = lookup_context.is_a?(ActionView::LookupContext) ?
         lookup_context : ActionView::LookupContext.new(lookup_context)
-      @lookup_context.formats = formats if formats
+      @_lookup_context.formats = formats if formats
     end
 
     def store_content_for(key, value)

actionpack/lib/action_view/helpers/translation_helper.rb

@@ -45,8 +45,8 @@ def localize(*args)
       private
         def scope_key_by_partial(key)
           if key.to_s.first == "."
-            if @_virtual_path
-              @_virtual_path.gsub(%r{/_?}, ".") + key.to_s
+            if (path = @_template && @_template.virtual_path)
+              path.gsub(%r{/_?}, ".") + key.to_s
             else
               raise "Cannot use t(#{key.inspect}) shortcut because path is not available"
             end

actionpack/lib/action_view/template.rb

@@ -133,12 +133,15 @@ def initialize(source, identifier, handler, details)
     # we use a bang in this instrumentation because you don't want to
     # consume this in production. This is only slow if it's being listened to.
     def render(view, locals, &block)
+      old_template, view._template = view._template, self
       ActiveSupport::Notifications.instrument("!render_template.action_view", :virtual_path => @virtual_path) do
         compile!(view)
         view.send(method_name, locals, &block)
       end
     rescue Exception => e
       handle_render_error(view, e)
+    ensure
+      view._template = old_template
     end
 
     def mime_type
@@ -272,9 +275,9 @@ def compile(view, mod) #:nodoc:
         # encoding of the code
         source = <<-end_src
           def #{method_name}(local_assigns)
-            _old_virtual_path, @_virtual_path = @_virtual_path, #{@virtual_path.inspect};_old_output_buffer = @output_buffer;#{locals_code};#{code}
+            _old_output_buffer = @output_buffer;#{locals_code};#{code}
           ensure
-            @_virtual_path, @output_buffer = _old_virtual_path, _old_output_buffer
+            @output_buffer = _old_output_buffer
           end
         end_src
 

actionpack/test/template/template_test.rb

@@ -4,12 +4,14 @@
 class TestERBTemplate < ActiveSupport::TestCase
   ERBHandler = ActionView::Template::Handlers::ERB.new
 
-  class Context
-    class LookupContext
-      def disable_cache
-        yield
-      end
+  class LookupContext
+    def disable_cache
+      yield
     end
+  end
+
+  class Context
+    attr_accessor :_template
 
     def initialize
       @output_buffer = "original"
@@ -22,7 +24,7 @@ def hello
 
     def partial
       ActionView::Template.new(
-        "<%= @_virtual_path %>",
+        "<%= @_template.virtual_path %>",
         "partial",
         ERBHandler,
         :virtual_path => "partial"
@@ -84,9 +86,9 @@ def test_restores_buffer
   end
 
   def test_virtual_path
-    @template = new_template("<%= @_virtual_path %>" \
+    @template = new_template("<%= @_template.virtual_path %>" \
                              "<%= partial.render(self, {}) %>" \
-                             "<%= @_virtual_path %>")
+                             "<%= @_template.virtual_path %>")
     assert_equal "hellopartialhello", render
   end
 

actionpack/test/template/translation_helper_test.rb

@@ -31,13 +31,13 @@ def test_delegates_localize_to_i18n
 
   def test_scoping_by_partial
     I18n.expects(:translate).with("test.translation.helper", :raise => true).returns("helper")
-    @view = ActionView::Base.new(ActionController::Base.view_paths, {})
+    @view = ::ActionView::Base.new(ActionController::Base.view_paths, {})
     assert_equal "helper", @view.render(:file => "test/translation")
   end
 
   def test_scoping_by_partial_of_an_array
     I18n.expects(:translate).with("test.scoped_translation.foo.bar", :raise => true).returns(["foo", "bar"])
-    @view = ActionView::Base.new(ActionController::Base.view_paths, {})
+    @view = ::ActionView::Base.new(ActionController::Base.view_paths, {})
     assert_equal "foobar", @view.render(:file => "test/scoped_translation")
   end
 

actionpack/test/template/url_helper_test.rb

@@ -9,7 +9,7 @@ class UrlHelperTest < ActiveSupport::TestCase
   # or request.
   #
   # In those cases, we'll set up a simple mock
-  attr_accessor :controller, :request
+  attr_accessor :controller, :request, :_template
 
   routes = ActionDispatch::Routing::RouteSet.new
   routes.draw do