Rename render_to_string to render_to_body since it may return any Rack-compatible body, not just strings

actionpack/lib/action_controller/abstract/renderer.rb

@@ -17,7 +17,7 @@ module AbstractController
     end
         
     def render(options = {})
-      self.response_body = render_to_string(options)
+      self.response_body = render_to_body(options)
     end
     
     # Raw rendering of a template.
@@ -26,7 +26,7 @@ module AbstractController
     # @option _layout<String> The relative path to the layout template to use
     # 
     # :api: plugin
-    def render_to_string(options = {})
+    def render_to_body(options = {})
       name = options[:_template_name] || action_name
       
       template = options[:_template] || view_paths.find_by_parts(name.to_s, formats, options[:_prefix])
@@ -55,4 +55,4 @@ module AbstractController
       end
     end
   end
-end
+end

actionpack/lib/action_controller/new_base/base.rb

@@ -58,4 +58,4 @@ module ActionController
       response.to_a
     end
   end
-end
+end

actionpack/lib/action_controller/new_base/layouts.rb

@@ -9,7 +9,7 @@ module ActionController
       end
     end
     
-    def render_to_string(options)
+    def render_to_body(options)
       # render :text => ..., :layout => ...
       # or
       # render :anything_else
@@ -34,4 +34,4 @@ module ActionController
     end
     
   end
-end
+end

actionpack/lib/action_controller/new_base/renderer.rb

@@ -8,7 +8,7 @@ module ActionController
     end
     
     def render(action, options = {})
-      # TODO: Move this into #render_to_string
+      # TODO: Move this into #render_to_body
       if action.is_a?(Hash)
         options, action = action, nil 
       else
@@ -17,10 +17,10 @@ module ActionController
       
       _process_options(options)
       
-      self.response_body = render_to_string(options)
+      self.response_body = render_to_body(options)
     end
 
-    def render_to_string(options)
+    def render_to_body(options)
       unless options.is_a?(Hash)
         options = {:action => options}
       end
@@ -59,4 +59,4 @@ module ActionController
       end
     end
   end
-end
+end

actionpack/test/abstract_controller/abstract_controller_test.rb

@@ -134,7 +134,7 @@ module AbstractController
         self.class.layout(formats)
       end      
       
-      def render_to_string(options = {})
+      def render_to_body(options = {})
         options[:_layout] = options[:layout] || _layout
         super
       end  
@@ -223,4 +223,4 @@ module AbstractController
     end
     
   end
-end
+end

actionpack/test/abstract_controller/layouts_test.rb

@@ -23,7 +23,7 @@ module AbstractControllerTests
       
       def controller_path() self.class.controller_path end
       
-      def render_to_string(options)
+      def render_to_body(options)
         options[:_layout] = _default_layout
         super
       end
@@ -229,4 +229,4 @@ module AbstractControllerTests
       end
     end
   end
-end
+end