From f2c0a353aef41a6df2de8e1fe3eaa3d8bbd8a6dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 12 Mar 2010 20:39:53 +0100
Subject: Finish cleaning up rendering stack from views and move assigns
 evaluation to controller (so plugins and/or controllers can overwrite just
 one method).

---
 actionpack/lib/action_view/render/rendering.rb | 37 ++++++--------------------
 1 file changed, 8 insertions(+), 29 deletions(-)

(limited to 'actionpack/lib/action_view/render/rendering.rb')

diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/render/rendering.rb
index d9ac1f6290..9b5b976727 100644
--- a/actionpack/lib/action_view/render/rendering.rb
+++ b/actionpack/lib/action_view/render/rendering.rb
@@ -12,14 +12,17 @@ module ActionView
     #
     # If no options hash is passed or :update specified, the default is to render a partial and use the second parameter
     # as the locals hash.
-    def render(options = {}, locals = {}, &block) #:nodoc:
+    def render(options = {}, locals = {}, &block)
       case options
       when Hash
         if block_given?
           content = _render_partial(options.merge(:partial => options[:layout]), &block)
           safe_concat(content)
+        elsif options.key?(:partial)
+          _render_partial(options)
         else
-          _render(options)
+          template = _determine_template(options)
+          _render_template(template, options[:layout], options)
         end
       when :update
         update_page(&block)
@@ -28,31 +31,6 @@ module ActionView
       end
     end
 
-    # This is the API to render a ViewContext's template from a controller.
-    def render_template(options, &block)
-      _evaluate_assigns_and_ivars
-
-      # TODO Layout for partials should be handled here, because inside the
-      # partial renderer it looks for the layout as a partial.
-      if options.key?(:partial) && options[:layout]
-        options[:layout] = _find_layout(options[:layout])
-      end
-
-      _render(options, &block)
-    end
-
-    # This method holds the common render logic for both controllers and
-    # views rendering stacks.
-    def _render(options) #:nodoc:
-      if options.key?(:partial)
-        _render_partial(options)
-      else
-        template = _determine_template(options)
-        yield template if block_given?
-        _render_template(template, options[:layout], options)
-      end
-    end
-
     # Determine the template to be rendered using the given options.
     def _determine_template(options) #:nodoc:
       if options.key?(:inline)
@@ -71,8 +49,10 @@ module ActionView
     # Renders the given template. An string representing the layout can be
     # supplied as well.
     def _render_template(template, layout = nil, options = {}) #:nodoc:
+      self.formats = template.formats
+
       locals = options[:locals] || {}
-      layout = _find_layout(layout) if layout
+      layout = find_layout(layout) if layout
 
       ActiveSupport::Notifications.instrument("action_view.render_template",
         :identifier => template.identifier, :layout => layout.try(:identifier)) do
@@ -88,6 +68,5 @@ module ActionView
         content
       end
     end
-
   end
 end
-- 
cgit v1.2.3