From afa7d7ff05a0d4787b216d50d609084649f21669 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Tue, 28 Apr 2009 16:15:17 -0500
Subject: Fix validate_request method name

---
 actionpack/lib/action_controller/testing/assertions/response.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_controller/testing/assertions/response.rb b/actionpack/lib/action_controller/testing/assertions/response.rb
index 574b8d6825..a4a3dcdec8 100644
--- a/actionpack/lib/action_controller/testing/assertions/response.rb
+++ b/actionpack/lib/action_controller/testing/assertions/response.rb
@@ -22,7 +22,7 @@ module ActionController
       #   assert_response 401
       #
       def assert_response(type, message = nil)
-        validate_response!
+        validate_request!
 
         clean_backtrace do
           if [ :success, :missing, :redirect, :error ].include?(type) && @response.send("#{type}?")
@@ -59,7 +59,7 @@ module ActionController
       #   assert_redirected_to @customer
       #
       def assert_redirected_to(options = {}, message=nil)
-        validate_response!
+        validate_request!
 
         clean_backtrace do
           assert_response(:redirect, message)
@@ -93,7 +93,7 @@ module ActionController
       #   assert_template :partial => false
       #
       def assert_template(options = {}, message = nil)
-        validate_response!
+        validate_request!
 
         clean_backtrace do
           case options
@@ -152,7 +152,7 @@ module ActionController
           end
         end
 
-        def validate_response!
+        def validate_request!
           unless @request.is_a?(ActionDispatch::Request)
             raise ArgumentError, "@request must be an ActionDispatch::Request"
           end
-- 
cgit v1.2.3


From d63b42da362d696398fd371815734cb0caed48df Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Tue, 28 Apr 2009 16:25:04 -0500
Subject: Move header injection back into integration tests

---
 actionpack/lib/action_controller/testing/integration.rb |  7 ++++++-
 actionpack/lib/action_dispatch/test/mock.rb             | 12 +-----------
 2 files changed, 7 insertions(+), 12 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_controller/testing/integration.rb b/actionpack/lib/action_controller/testing/integration.rb
index be5f216e2b..037463e489 100644
--- a/actionpack/lib/action_controller/testing/integration.rb
+++ b/actionpack/lib/action_controller/testing/integration.rb
@@ -263,7 +263,6 @@ module ActionController
           opts = {
             :method => method.to_s.upcase,
             :params => parameters,
-            :headers => headers,
 
             "SERVER_NAME"     => host,
             "SERVER_PORT"     => (https? ? "443" : "80"),
@@ -282,6 +281,12 @@ module ActionController
           }
           env = ActionDispatch::Test::MockRequest.env_for(@path, opts)
 
+          (headers || {}).each do |key, value|
+            key = key.to_s.upcase.gsub(/-/, "_")
+            key = "HTTP_#{key}" unless env.has_key?(key) || key =~ /^HTTP_/
+            env[key] = value
+          end
+
           app = Rack::Lint.new(@app)
           status, headers, body = app.call(env)
           response = ::Rack::MockResponse.new(status, headers, body)
diff --git a/actionpack/lib/action_dispatch/test/mock.rb b/actionpack/lib/action_dispatch/test/mock.rb
index 8dc048af11..4042f9fbc8 100644
--- a/actionpack/lib/action_dispatch/test/mock.rb
+++ b/actionpack/lib/action_dispatch/test/mock.rb
@@ -5,8 +5,6 @@ module ActionDispatch
 
       class << self
         def env_for(path, opts)
-          headers = opts.delete(:headers)
-
           method = (opts[:method] || opts["REQUEST_METHOD"]).to_s.upcase
           opts[:method] = opts["REQUEST_METHOD"] = method
 
@@ -48,15 +46,7 @@ module ActionDispatch
             uri.query = requestify(params)
           end
 
-          env = ::Rack::MockRequest.env_for(uri.to_s, opts)
-
-          (headers || {}).each do |key, value|
-            key = key.to_s.upcase.gsub(/-/, "_")
-            key = "HTTP_#{key}" unless env.has_key?(key) || key =~ /^HTTP_/
-            env[key] = value
-          end
-
-          env
+          ::Rack::MockRequest.env_for(uri.to_s, opts)
         end
 
         private
-- 
cgit v1.2.3


From 8925e89c6307b8b7c8aeb0277ae5e059904b2fc6 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Tue, 28 Apr 2009 16:32:26 -0500
Subject: Deprecate response.assigns

---
 actionpack/lib/action_dispatch/http/response.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb
index ebba4eefa0..f570b8e8ed 100644
--- a/actionpack/lib/action_dispatch/http/response.rb
+++ b/actionpack/lib/action_dispatch/http/response.rb
@@ -34,7 +34,7 @@ module ActionDispatch # :nodoc:
     DEFAULT_HEADERS = { "Cache-Control" => "no-cache" }
     attr_accessor :request
 
-    attr_accessor :assigns, :template, :layout
+    attr_accessor :template, :layout
     attr_accessor :redirected_to, :redirected_to_method_params
 
     attr_writer :header
@@ -45,12 +45,16 @@ module ActionDispatch # :nodoc:
       request.session
     end
 
+    def assigns
+      ActiveSupport::Deprecation.warn("response.assigns has been deprecated. Use controller.assigns instead", caller)
+      template.assigns
+    end
+
     delegate :default_charset, :to => 'ActionController::Base'
 
     def initialize
       super
       @header = Rack::Utils::HeaderHash.new(DEFAULT_HEADERS)
-      @session, @assigns = [], []
     end
 
     # The response code of the request
-- 
cgit v1.2.3


From c0a372ba87f556769b98a6d06e8c684c3c3156df Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Tue, 28 Apr 2009 23:29:29 -0500
Subject: Deprecate template, session, assigns, and layout accessors on
 response object. Instead access them through the controller instance. This
 mainly affects functional test assertions.

---
 actionpack/lib/action_controller/base/base.rb            |  4 +++-
 actionpack/lib/action_controller/base/mime_responds.rb   |  2 +-
 actionpack/lib/action_controller/caching/actions.rb      |  2 +-
 .../lib/action_controller/testing/assertions/response.rb | 10 +++++-----
 actionpack/lib/action_controller/testing/process.rb      | 13 ++++++++-----
 actionpack/lib/action_dispatch/http/response.rb          | 16 +++++++++++++---
 actionpack/lib/action_view/base.rb                       |  2 +-
 actionpack/lib/action_view/render/rendering.rb           |  2 +-
 actionpack/lib/action_view/test_case.rb                  |  5 +++--
 9 files changed, 36 insertions(+), 20 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_controller/base/base.rb b/actionpack/lib/action_controller/base/base.rb
index 2063df54b4..14c4339c94 100644
--- a/actionpack/lib/action_controller/base/base.rb
+++ b/actionpack/lib/action_controller/base/base.rb
@@ -367,6 +367,8 @@ module ActionController #:nodoc:
     # Returns the name of the action this controller is processing.
     attr_accessor :action_name
 
+    attr_reader :template
+
     class << self
       def call(env)
         # HACK: For global rescue to have access to the original request and response
@@ -816,7 +818,7 @@ module ActionController #:nodoc:
 
       def initialize_template_class(response)
         @template = response.template = ActionView::Base.new(self.class.view_paths, {}, self, formats)
-        response.template.helpers.send :include, self.class.master_helper_module
+        @template.helpers.send :include, self.class.master_helper_module
         response.redirected_to = nil
         @performed_render = @performed_redirect = false
       end
diff --git a/actionpack/lib/action_controller/base/mime_responds.rb b/actionpack/lib/action_controller/base/mime_responds.rb
index bac225ab2a..1003e61a0b 100644
--- a/actionpack/lib/action_controller/base/mime_responds.rb
+++ b/actionpack/lib/action_controller/base/mime_responds.rb
@@ -127,7 +127,7 @@ module ActionController #:nodoc:
         @order << mime_type
 
         @responses[mime_type] ||= Proc.new do
-          @response.template.formats = [mime_type.to_sym]
+          @controller.template.formats = [mime_type.to_sym]
           @response.content_type = mime_type.to_s
           block_given? ? block.call : @controller.send(:render, :action => @controller.action_name)
         end
diff --git a/actionpack/lib/action_controller/caching/actions.rb b/actionpack/lib/action_controller/caching/actions.rb
index b99feddf77..d95a346862 100644
--- a/actionpack/lib/action_controller/caching/actions.rb
+++ b/actionpack/lib/action_controller/caching/actions.rb
@@ -121,7 +121,7 @@ module ActionController #:nodoc:
           end
 
           def content_for_layout(controller)
-            controller.response.layout && controller.response.template.instance_variable_get('@cached_content_for_layout')
+            controller.template.layout && controller.template.instance_variable_get('@cached_content_for_layout')
           end
       end
 
diff --git a/actionpack/lib/action_controller/testing/assertions/response.rb b/actionpack/lib/action_controller/testing/assertions/response.rb
index a4a3dcdec8..684fe1ffe0 100644
--- a/actionpack/lib/action_controller/testing/assertions/response.rb
+++ b/actionpack/lib/action_controller/testing/assertions/response.rb
@@ -33,7 +33,7 @@ module ActionController
             assert_block("") { true } # to count the assertion
           else
             if @controller && @response.error?
-              exception = @controller.response.template.instance_variable_get(:@exception)
+              exception = @controller.template.instance_variable_get(:@exception)
               exception_message = exception && exception.message
               assert_block(build_message(message, "Expected response to be a <?>, but was <?>\n<?>", type, @response.response_code, exception_message.to_s)) { false }
             else
@@ -98,20 +98,20 @@ module ActionController
         clean_backtrace do
           case options
            when NilClass, String
-            rendered = (@controller.response.rendered[:template] || []).map { |t| t.identifier }
+            rendered = (@controller.template.rendered[:template] || []).map { |t| t.identifier }
             msg = build_message(message,
                     "expecting <?> but rendering with <?>",
                     options, rendered.join(', '))
             assert_block(msg) do
               if options.nil?
-                @controller.response.rendered[:template].blank?
+                @controller.template.rendered[:template].blank?
               else
                 rendered.any? { |t| t.match(options) }
               end
             end
           when Hash
             if expected_partial = options[:partial]
-              partials = @controller.response.rendered[:partials]
+              partials = @controller.template.rendered[:partials]
               if expected_count = options[:count]
                 found = partials.detect { |p, _| p.identifier.match(expected_partial) }
                 actual_count = found.nil? ? 0 : found.second
@@ -126,7 +126,7 @@ module ActionController
                 assert(partials.keys.any? { |p| p.identifier.match(expected_partial) }, msg)
               end
             else
-              assert @controller.response.rendered[:partials].empty?,
+              assert @controller.template.rendered[:partials].empty?,
                 "Expected no partials to be rendered"
             end
           end
diff --git a/actionpack/lib/action_controller/testing/process.rb b/actionpack/lib/action_controller/testing/process.rb
index d073d06b19..16a8f66bc4 100644
--- a/actionpack/lib/action_controller/testing/process.rb
+++ b/actionpack/lib/action_controller/testing/process.rb
@@ -160,7 +160,8 @@ module ActionController #:nodoc:
     # Returns the template of the file which was used to
     # render this response (or nil)
     def rendered
-      template.instance_variable_get(:@_rendered)
+      ActiveSupport::Deprecation.warn("response.rendered has been deprecated. Use tempate.rendered instead", caller)
+      @template.instance_variable_get(:@_rendered)
     end
 
     # A shortcut to the flash. Returns an empty hash if no session flash exists.
@@ -190,11 +191,13 @@ module ActionController #:nodoc:
 
     # A shortcut to the template.assigns
     def template_objects
-      template.assigns || {}
+      ActiveSupport::Deprecation.warn("response.template_objects has been deprecated. Use tempate.assigns instead", caller)
+      @template.assigns || {}
     end
 
     # Does the specified template object exist?
     def has_template_object?(name=nil)
+      ActiveSupport::Deprecation.warn("response.has_template_object? has been deprecated. Use tempate.assigns[name].nil? instead", caller)
       !template_objects[name].nil?
     end
 
@@ -317,9 +320,9 @@ module ActionController #:nodoc:
 
     def assigns(key = nil)
       if key.nil?
-        @response.template.assigns
+        @controller.template.assigns
       else
-        @response.template.assigns[key.to_s]
+        @controller.template.assigns[key.to_s]
       end
     end
 
@@ -431,7 +434,7 @@ module ActionController #:nodoc:
         (instance_variable_names - self.class.protected_instance_variables).each do |var|
           name, value = var[1..-1], instance_variable_get(var)
           @assigns[name] = value
-          response.template.assigns[name] = value if response
+          @template.assigns[name] = value if response
         end
       end
   end
diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb
index f570b8e8ed..d104dcb8a0 100644
--- a/actionpack/lib/action_dispatch/http/response.rb
+++ b/actionpack/lib/action_dispatch/http/response.rb
@@ -34,20 +34,30 @@ module ActionDispatch # :nodoc:
     DEFAULT_HEADERS = { "Cache-Control" => "no-cache" }
     attr_accessor :request
 
-    attr_accessor :template, :layout
     attr_accessor :redirected_to, :redirected_to_method_params
 
     attr_writer :header
     alias_method :headers=, :header=
 
+    def template
+      ActiveSupport::Deprecation.warn("response.template has been deprecated. Use controller.template instead", caller)
+      @template
+    end
+    attr_writer :template
+
     def session
       ActiveSupport::Deprecation.warn("response.session has been deprecated. Use request.session instead", caller)
-      request.session
+      @request.session
     end
 
     def assigns
       ActiveSupport::Deprecation.warn("response.assigns has been deprecated. Use controller.assigns instead", caller)
-      template.assigns
+      @template.controller.assigns
+    end
+
+    def layout
+      ActiveSupport::Deprecation.warn("response.layout has been deprecated. Use template.layout instead", caller)
+      @template.layout
     end
 
     delegate :default_charset, :to => 'ActionController::Base'
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index d087395361..44bd401631 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -191,7 +191,7 @@ module ActionView #:nodoc:
       ActionController::Base.allow_concurrency || (cache_template_loading.nil? ? !ActiveSupport::Dependencies.load? : cache_template_loading)
     end
 
-    attr_internal :request
+    attr_internal :request, :layout
 
     delegate :controller_path, :to => :controller, :allow_nil => true
 
diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/render/rendering.rb
index f174053b86..6e368f27eb 100644
--- a/actionpack/lib/action_view/render/rendering.rb
+++ b/actionpack/lib/action_view/render/rendering.rb
@@ -46,7 +46,7 @@ module ActionView
       locals ||= {}
 
       if controller && layout
-        response.layout = layout.identifier if controller.respond_to?(:response)
+        @_layout = layout.identifier
         logger.info("Rendering template within #{layout.identifier}") if logger
       end
   
diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb
index dddd671812..50bed67f7d 100644
--- a/actionpack/lib/action_view/test_case.rb
+++ b/actionpack/lib/action_view/test_case.rb
@@ -7,7 +7,8 @@ module ActionView
       @_rendered = { :template => nil, :partials => Hash.new(0) }
       initialize_without_template_tracking(*args)
     end
-    
+
+    attr_internal :rendered
     alias_method :_render_template_without_template_tracking, :_render_template
     def _render_template(template, local_assigns = {})
       if template.respond_to?(:identifier)
@@ -16,7 +17,7 @@ module ActionView
         @_rendered[:template] << template
       end
       _render_template_without_template_tracking(template, local_assigns)
-    end    
+    end
   end
 
   class TestCase < ActiveSupport::TestCase
-- 
cgit v1.2.3