Merge branch 'master' of git@github.com:rails/rails

6 files changed, 24 insertions, 14 deletions

diff --git a/actionpack/lib/action_controller/routing/recognition_optimisation.rb b/actionpack/lib/action_controller/routing/recognition_optimisation.rb
index 4935432d87..6c47ced6d1 100644
--- a/actionpack/lib/action_controller/routing/recognition_optimisation.rb
+++ b/actionpack/lib/action_controller/routing/recognition_optimisation.rb
@@ -153,13 +153,7 @@ module ActionController
 
         def clear_recognize_optimized!
           remove_recognize_optimized!
-
-          class << self
-            def recognize_optimized(path, environment)
-              write_recognize_optimized!
-              recognize_optimized(path, environment)
-            end
-          end
+          write_recognize_optimized!
         end
 
         def remove_recognize_optimized!
diff --git a/actionpack/lib/action_controller/test_process.rb b/actionpack/lib/action_controller/test_process.rb
index f84c48f102..7a31f0e8d5 100644
--- a/actionpack/lib/action_controller/test_process.rb
+++ b/actionpack/lib/action_controller/test_process.rb
@@ -218,7 +218,7 @@ module ActionController #:nodoc:
     # Returns the template of the file which was used to
     # render this response (or nil)
     def rendered_template
-      template.send(:_first_render)
+      template.instance_variable_get(:@_first_render)
     end
 
     # A shortcut to the flash. Returns an empty hash if no session flash exists.
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb
index e22978fe27..945246a39a 100644
--- a/actionpack/lib/action_view/base.rb
+++ b/actionpack/lib/action_view/base.rb
@@ -222,6 +222,7 @@ 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
@@ -271,9 +272,13 @@ module ActionView #:nodoc:
       end
     end
 
-    private
-      attr_accessor :_first_render, :_last_render
+    # Access the current template being rendered.
+    # Returns a ActionView::Template object.
+    def template
+      @_render_stack.last
+    end
 
+    private
       # Evaluates the local assigns and controller ivars, pushes them to the view.
       def _evaluate_assigns_and_ivars #:nodoc:
         unless @assigns_added
@@ -312,7 +317,7 @@ module ActionView #:nodoc:
           template
         elsif template = self.view_paths[template_file_name]
           template
-        elsif _first_render && template = self.view_paths["#{template_file_name}.#{_first_render.format_and_extension}"]
+        elsif @_render_stack.first && template = self.view_paths["#{template_file_name}.#{@_render_stack.first.format_and_extension}"]
           template
         elsif template_format == :js && template = self.view_paths["#{template_file_name}.html"]
           @template_format = :html
diff --git a/actionpack/lib/action_view/renderable.rb b/actionpack/lib/action_view/renderable.rb
index 0134bc988f..3d4dc6d522 100644
--- a/actionpack/lib/action_view/renderable.rb
+++ b/actionpack/lib/action_view/renderable.rb
@@ -25,13 +25,16 @@ module ActionView
     def render(view, local_assigns = {})
       compile(local_assigns)
 
-      view.send(:_first_render=, self) unless view.send(:_first_render)
-      view.send(:_last_render=, self)
+      stack = view.instance_variable_get(:@_render_stack)
+      stack.push(self)
+
+      # This is only used for TestResponse to set rendered_template
+      view.instance_variable_set(:@_first_render, self) unless view.instance_variable_get(:@_first_render)
 
       view.send(:_evaluate_assigns_and_ivars)
       view.send(:_set_controller_content_type, mime_type) if respond_to?(:mime_type)
 
-      view.send(method_name(local_assigns), local_assigns) do |*names|
+      result = view.send(method_name(local_assigns), local_assigns) do |*names|
         ivar = :@_proc_for_layout
         if view.instance_variable_defined?(ivar) and proc = view.instance_variable_get(ivar)
           view.capture(*names, &proc)
@@ -39,6 +42,9 @@ module ActionView
           view.instance_variable_get(ivar)
         end
       end
+
+      stack.pop
+      result
     end
 
     def method_name(local_assigns)
diff --git a/actionpack/test/fixtures/test/template.erb b/actionpack/test/fixtures/test/template.erb
new file mode 100644
index 0000000000..785afa8f6a
--- /dev/null
+++ b/actionpack/test/fixtures/test/template.erb
@@ -0,0 +1 @@
+<%= template.path %>
\ No newline at end of file
diff --git a/actionpack/test/template/render_test.rb b/actionpack/test/template/render_test.rb
index a4ea22ddcb..7e4fff3da6 100644
--- a/actionpack/test/template/render_test.rb
+++ b/actionpack/test/template/render_test.rb
@@ -41,6 +41,10 @@ class ViewRenderTest < Test::Unit::TestCase
     assert_equal "The secret is in the sauce\n", @view.render("test/dot.directory/render_file_with_ivar")
   end
 
+  def test_render_has_access_current_template
+    assert_equal "test/template.erb", @view.render("test/template.erb")
+  end
+
   def test_render_update
     # TODO: You should not have to stub out template because template is self!
     @view.instance_variable_set(:@template, @view)