Clean up ActionView some:

  * Call _evaluate_assigns_and_ivars at the two entry points so we don't have to
    do a check at every render.
  * Make template.render viable without having to go through a wrapper method
  * Remove old TemplateHandler#render(template, local_assigns) path so we don't have
    to set self.template every time we render a template.
  * Move Template rescuing code to Template#render so it gets caught every time.
  * Pull in some tests from Pratik that test render @object in ActionView

1 files changed, 4 insertions, 2 deletions

diff --git a/actionpack/lib/action_view/render/partials.rb b/actionpack/lib/action_view/render/partials.rb
index 83175ab4cf..e287021eb1 100644
--- a/actionpack/lib/action_view/render/partials.rb
+++ b/actionpack/lib/action_view/render/partials.rb
@@ -265,7 +265,9 @@ module ActionView
         @locals[:object] = @locals[template.variable_name] = object
         @locals[@options[:as]] = object if @options[:as]
 
-        content = @view._render_single_template(template, @locals, &@block)
+        content = template.render(@view, @locals) do |*names|
+          @view._layout_for(names, &@block)
+        end
         return content if @block || !@options[:layout]
         find_template(@options[:layout]).render(@view, @locals) { content }
       end
@@ -302,7 +304,7 @@ module ActionView
     end
 
     def render_partial(options)
-      @assigns_added = false
+      _evaluate_assigns_and_ivars
       # TODO: Handle other details here.
       self.formats = options[:_details][:formats] if options[:_details]
       _render_partial(options)