From 82c6597dc244715c40151c7eb10f2016ed5ebb47 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Thu, 12 Mar 2009 12:22:52 -0700
Subject: Eliminate internal render stack since we only need its head and tail

---
 actionpack/lib/action_view/base.rb | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'actionpack/lib/action_view/base.rb')

diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index fe6053e574..0f396817a5 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -221,10 +221,12 @@ module ActionView #:nodoc:
     def initialize(view_paths = [], assigns_for_first_render = {}, controller = nil)#:nodoc:
       @assigns = assigns_for_first_render
       @assigns_added = nil
-      @_render_stack = []
       @controller = controller
       @helpers = ProxyModule.new(self)
       self.view_paths = view_paths
+
+      @_first_template = nil
+      @_current_template = nil
     end
 
     attr_reader :view_paths
@@ -286,7 +288,19 @@ module ActionView #:nodoc:
     # Access the current template being rendered.
     # Returns a ActionView::Template object.
     def template
-      @_render_stack.last
+      @_current_template
+    end
+
+    def template=(template) #:nodoc:
+      @_first_template ||= template
+      @_current_template = template
+    end
+
+    def with_template(current_template)
+      last_template, self.template = template, current_template
+      yield
+    ensure
+      self.template = last_template
     end
 
     private
-- 
cgit v1.2.3


From 5f1d6465b47333db730a4bb4ac3d2a083b7c8f3c Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Thu, 12 Mar 2009 13:32:52 -0700
Subject: Change naming to match 2.2 so life is easier on plugin developers

---
 actionpack/lib/action_view/base.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'actionpack/lib/action_view/base.rb')

diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index 0f396817a5..e19acc5c29 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -225,8 +225,8 @@ module ActionView #:nodoc:
       @helpers = ProxyModule.new(self)
       self.view_paths = view_paths
 
-      @_first_template = nil
-      @_current_template = nil
+      @_first_render = nil
+      @_current_render = nil
     end
 
     attr_reader :view_paths
@@ -288,12 +288,12 @@ module ActionView #:nodoc:
     # Access the current template being rendered.
     # Returns a ActionView::Template object.
     def template
-      @_current_template
+      @_current_render
     end
 
     def template=(template) #:nodoc:
-      @_first_template ||= template
-      @_current_template = template
+      @_first_render ||= template
+      @_current_render = template
     end
 
     def with_template(current_template)
-- 
cgit v1.2.3