Move variables to underscore format, update protected instance variables list.

3 files changed, 25 insertions, 14 deletions

diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index f78365afdb..09398c322a 100644
--- a/actionpack/lib/abstract_controller/rendering.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -32,9 +32,13 @@ module AbstractController
 
   module Rendering
     extend ActiveSupport::Concern
-
     include AbstractController::ViewPaths
 
+    included do
+      config_accessor :protected_instance_variables, :instance_reader => false
+      self.protected_instance_variables = []
+    end
+
     # Overwrite process to setup I18n proxy.
     def process(*) #:nodoc:
       old_config, I18n.config = I18n.config, I18nProxy.new(I18n.config, lookup_context)
@@ -53,14 +57,20 @@ module AbstractController
       end
     end
 
-    attr_writer :view_context_class
+    attr_internal_writer :view_context_class
+
+    # Explicitly define protected_instance_variables so it can be
+    # inherited and overwritten by other modules if needed.
+    def protected_instance_variables
+      config.protected_instance_variables
+    end
 
     def view_context_class
-      @view_context_class || self.class.view_context_class
+      @_view_context_class || self.class.view_context_class
     end
 
     def initialize(*)
-      @view_context_class = nil
+      @_view_context_class = nil
       super
     end
 
@@ -79,7 +89,7 @@ module AbstractController
 
     # Returns an object that is able to render templates.
     def view_renderer
-      @view_renderer ||= ActionView::Renderer.new(lookup_context)
+      @_view_renderer ||= ActionView::Renderer.new(lookup_context)
     end
 
     # Normalize arguments, options and then delegates render_to_body and
@@ -112,13 +122,19 @@ module AbstractController
 
     private
 
+    DEFAULT_PROTECTED_INSTANCE_VARIABLES = %w(
+      @_action_name @_response_body @_formats @_prefixes
+      @_view_context_class @_view_renderer @_lookup_context
+    )
+
     # This method should return a hash with assigns.
     # You can overwrite this configuration per controller.
     # :api: public
     def view_assigns
       hash = {}
       variables  = instance_variable_names
-      variables -= protected_instance_variables if respond_to?(:protected_instance_variables)
+      variables -= protected_instance_variables
+      variables -= DEFAULT_PROTECTED_INSTANCE_VARIABLES
       variables.each { |name| hash[name.to_s[1, name.length]] = instance_variable_get(name) }
       hash
     end
diff --git a/actionpack/lib/abstract_controller/view_paths.rb b/actionpack/lib/abstract_controller/view_paths.rb
index 0893459e24..6b7aae8c74 100644
--- a/actionpack/lib/abstract_controller/view_paths.rb
+++ b/actionpack/lib/abstract_controller/view_paths.rb
@@ -39,7 +39,7 @@ module AbstractController
     # templates, i.e. view paths and details. Check ActionView::LookupContext for more
     # information.
     def lookup_context
-      @lookup_context ||=
+      @_lookup_context ||=
         ActionView::LookupContext.new(self.class._view_paths, details_for_lookup, _prefixes)
     end
 
diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb
index 006b9fd456..6ee5b41c8d 100644
--- a/actionpack/lib/action_controller/metal/compatibility.rb
+++ b/actionpack/lib/action_controller/metal/compatibility.rb
@@ -18,13 +18,8 @@ module ActionController
         delegate :default_charset=, :to => "ActionDispatch::Response"
       end
 
-      # TODO: Update protected instance variables list
-      config_accessor :protected_instance_variables
-      self.protected_instance_variables = %w(@assigns @performed_redirect @performed_render
-                                             @variables_added @request_origin @url
-                                             @parent_controller @action_name
-                                             @before_filter_chain_aborted @_headers @_params
-                                             @_response)
+      self.protected_instance_variables = %w(@_headers @_params @_env @_response @_request
+                                             @_view_runtime @_stream @_url_options)
 
       def rescue_action(env)
         raise env["action_dispatch.rescue.exception"]