Merge commit 'mainstream/master'

1 files changed, 41 insertions, 23 deletions

diff --git a/actionpack/lib/action_controller/new_base/compatibility.rb b/actionpack/lib/action_controller/new_base/compatibility.rb
index b3190486e8..f278c2da14 100644
--- a/actionpack/lib/action_controller/new_base/compatibility.rb
+++ b/actionpack/lib/action_controller/new_base/compatibility.rb
@@ -1,6 +1,6 @@
 module ActionController
   module Rails2Compatibility
-    extend ActiveSupport::DependencyModule
+    extend ActiveSupport::Concern
 
     class ::ActionController::ActionControllerError < StandardError #:nodoc:
     end
@@ -9,43 +9,43 @@ module ActionController
     included do
       ::ActionController::UnknownAction = ::AbstractController::ActionNotFound
       ::ActionController::DoubleRenderError = ::AbstractController::DoubleRenderError
-      
+
       cattr_accessor :session_options
       self.session_options = {}
-      
+
       cattr_accessor :allow_concurrency
       self.allow_concurrency = false
-      
+
       cattr_accessor :param_parsers
       self.param_parsers = { Mime::MULTIPART_FORM   => :multipart_form,
                              Mime::URL_ENCODED_FORM => :url_encoded_form,
                              Mime::XML              => :xml_simple,
                              Mime::JSON             => :json }
-                          
+
       cattr_accessor :relative_url_root
       self.relative_url_root = ENV['RAILS_RELATIVE_URL_ROOT']
-      
+
       cattr_accessor :default_charset
       self.default_charset = "utf-8"
-      
+
       # cattr_reader :protected_instance_variables
       cattr_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 @action_cache_path @_headers @_params
                                           @_flash @_response)
-                                          
+
       # Indicates whether or not optimise the generated named
       # route helper methods
       cattr_accessor :optimise_named_routes
       self.optimise_named_routes = true
-      
+
       cattr_accessor :resources_path_names
       self.resources_path_names = { :new => 'new', :edit => 'edit' }
-      
+
       # Controls the resource action separator
       cattr_accessor :resource_action_separator
       self.resource_action_separator = "/"
-      
+
       cattr_accessor :use_accept_header
       self.use_accept_header = true
 
@@ -61,19 +61,29 @@ module ActionController
       # and images to a dedicated asset server away from the main web server. Example:
       #   ActionController::Base.asset_host = "http://assets.example.com"
       cattr_accessor :asset_host
+
+      cattr_accessor :ip_spoofing_check
+      self.ip_spoofing_check = true
     end
-    
+
     # For old tests
     def initialize_template_class(*) end
     def assign_shortcuts(*) end
 
     # TODO: Remove this after we flip
     def template
-      _action_view
+      @template ||= _action_view
+    end
+
+    def process_action(*)
+      template
+      super
     end
 
     module ClassMethods
-      def consider_all_requests_local() end
+      def consider_all_requests_local
+      end
+
       def rescue_action(env)
         raise env["action_dispatch.rescue.exception"]
       end
@@ -83,17 +93,12 @@ module ActionController
         @@cache_store = ActiveSupport::Cache.lookup_store(store_option)
       end
     end
-    
-    def initialize(*)
-      super
-      @template = _action_view
-    end
-    
+
     def render_to_body(options)
       if options.is_a?(Hash) && options.key?(:template)
         options[:template].sub!(/^\//, '')
       end
-      
+
       options[:text] = nil if options[:nothing] == true
 
       body = super
@@ -107,8 +112,8 @@ module ActionController
 
     def method_for_action(action_name)
       super || (respond_to?(:method_missing) && "_handle_method_missing")
-    end    
-      
+    end
+
     def _layout_prefix(name)
       super unless name =~ /\blayouts/
     end
@@ -116,5 +121,18 @@ module ActionController
     def performed?
       response_body
     end
+
+    # ==== Request only view path switching ====
+    def append_view_path(path)
+      view_paths.push(*path)
+    end
+
+    def prepend_view_path(path)
+      view_paths.unshift(*path)
+    end
+
+    def view_paths
+      _action_view.view_paths
+    end
   end
 end