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

4 files changed, 10 insertions, 10 deletions

diff --git a/actionpack/lib/action_controller/abstract/renderer.rb b/actionpack/lib/action_controller/abstract/renderer.rb
index 68c3b07b84..eb248652a8 100644
--- a/actionpack/lib/action_controller/abstract/renderer.rb
+++ b/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
\ No newline at end of file
+end
diff --git a/actionpack/lib/action_controller/new_base/base.rb b/actionpack/lib/action_controller/new_base/base.rb
index 0400ddbf7a..1d2cd8428c 100644
--- a/actionpack/lib/action_controller/new_base/base.rb
+++ b/actionpack/lib/action_controller/new_base/base.rb
@@ -58,4 +58,4 @@ module ActionController
       response.to_a
     end
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/lib/action_controller/new_base/layouts.rb b/actionpack/lib/action_controller/new_base/layouts.rb
index 149847c968..a8e0809ac6 100644
--- a/actionpack/lib/action_controller/new_base/layouts.rb
+++ b/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
\ No newline at end of file
+end
diff --git a/actionpack/lib/action_controller/new_base/renderer.rb b/actionpack/lib/action_controller/new_base/renderer.rb
index 044c15f409..ed34c46aed 100644
--- a/actionpack/lib/action_controller/new_base/renderer.rb
+++ b/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
\ No newline at end of file
+end