From d08f65118cc328de5493a68db33a155487f5fceb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Sun, 1 May 2011 10:33:30 +0200
Subject: Start abstracting the renderer.

---
 actionpack/lib/action_view/rendering.rb | 46 ++-------------------------------
 1 file changed, 2 insertions(+), 44 deletions(-)

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

diff --git a/actionpack/lib/action_view/rendering.rb b/actionpack/lib/action_view/rendering.rb
index 2bce2fb045..017a27976c 100644
--- a/actionpack/lib/action_view/rendering.rb
+++ b/actionpack/lib/action_view/rendering.rb
@@ -3,42 +3,8 @@ require 'active_support/core_ext/object/try'
 module ActionView
   # = Action View Rendering
   module Rendering
-    # Returns the result of a render that's dictated by the options hash. The primary options are:
-    #
-    # * <tt>:partial</tt> - See ActionView::Partials.
-    # * <tt>:file</tt> - Renders an explicit template file (this used to be the old default), add :locals to pass in those.
-    # * <tt>:inline</tt> - Renders an inline template similar to how it's done in the controller.
-    # * <tt>:text</tt> - Renders the text passed in out.
-    #
-    # 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)
-      case options
-      when Hash
-        if block_given?
-          _render_partial(options.merge(:partial => options[:layout]), &block)
-        elsif options.key?(:partial)
-          _render_partial(options)
-        else
-          _render_template(options)
-        end
-      else
-        _render_partial(:partial => options, :locals => locals)
-      end
-    end
-
-    # Render but returns a valid Rack body. If fibers are defined, we return
-    # a streaming body that renders the template piece by piece.
-    #
-    # Note that partials are not supported to be rendered with streaming,
-    # so in such cases, we just wrap them in an array.
-    def render_body(options)
-      if options.key?(:partial)
-        [_render_partial(options)]
-      else
-        StreamingTemplateRenderer.new(self).render(options)
-      end
-    end
+    # This is temporary until we remove the renderer dependency from AV.
+    delegate :render, :render_body, :to => :@_renderer
 
     # Returns the contents that are yielded to a layout, given a name or a block.
     #
@@ -102,13 +68,5 @@ module ActionView
         _layout_for(*args)
       end
     end
-
-    def _render_template(options) #:nodoc:
-      _template_renderer.render(options)
-    end
-
-    def _template_renderer #:nodoc:
-      @_template_renderer ||= TemplateRenderer.new(self)
-    end
   end
 end
-- 
cgit v1.2.3