Clean up unused methods from AV::Base and pass in the template object on rendering.

1 files changed, 13 insertions, 16 deletions

diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 2a601c7cee..a7a6bbd3a4 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/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 @@ module ActionView #:nodoc:
       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 @@ module ActionView #:nodoc:
     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)