Finished implementing render :text in Base2

3 files changed, 16 insertions, 7 deletions

diff --git a/actionpack/lib/action_controller/abstract/renderer.rb b/actionpack/lib/action_controller/abstract/renderer.rb
index 37da2398ec..c1f420f7b4 100644
--- a/actionpack/lib/action_controller/abstract/renderer.rb
+++ b/actionpack/lib/action_controller/abstract/renderer.rb
@@ -1,6 +1,15 @@
 require "action_controller/abstract/logger"
 
 module AbstractController
+  class AbstractControllerError < StandardError; end
+  class DoubleRenderError < AbstractControllerError
+    DEFAULT_MESSAGE = "Render and/or redirect were called multiple times in this action. Please note that you may only call render OR redirect, and at most once per action. Also note that neither redirect nor render terminate execution of the action, so if you want to exit an action after redirecting, you need to do something like \"redirect_to(...) and return\"."
+
+    def initialize(message = nil)
+      super(message || DEFAULT_MESSAGE)
+    end
+  end  
+  
   module Renderer
     depends_on AbstractController::Logger
     
@@ -17,6 +26,10 @@ module AbstractController
     end
         
     def render(options = {})
+      unless response_body.nil?
+        raise AbstractController::DoubleRenderError, "OMG"
+      end
+      
       self.response_body = render_to_body(options)
     end
     
diff --git a/actionpack/lib/action_controller/new_base/base.rb b/actionpack/lib/action_controller/new_base/base.rb
index 6711cd932a..9f7a148b3c 100644
--- a/actionpack/lib/action_controller/new_base/base.rb
+++ b/actionpack/lib/action_controller/new_base/base.rb
@@ -40,23 +40,19 @@ module ActionController
       controller.call(env).to_rack
     end
     
-    # :api: plugin
-    def response_body=(body)
-      @_response.body = body
-    end
-    
     # :api: private
     def call(env)
       @_request = ActionDispatch::Request.new(env)
       @_response = ActionDispatch::Response.new
       process(@_request.parameters[:action])
+      @_response.body = response_body
       @_response.prepare!
       self
     end
     
     # :api: private
     def to_rack
-      response.to_a
+      @_response.to_a
     end
   end
 end
diff --git a/actionpack/lib/action_controller/new_base/renderer.rb b/actionpack/lib/action_controller/new_base/renderer.rb
index ed34c46aed..9a965c18e8 100644
--- a/actionpack/lib/action_controller/new_base/renderer.rb
+++ b/actionpack/lib/action_controller/new_base/renderer.rb
@@ -17,7 +17,7 @@ module ActionController
       
       _process_options(options)
       
-      self.response_body = render_to_body(options)
+      super(options)
     end
 
     def render_to_body(options)