Changeset 5591

Timestamp:

11/20/06 11:03:21 (3 years ago)

Author:

bitsweat

Message:

Ensure render_to_string cleans up after itself when an exception is raised. Closes #6658. Great tests!

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/base.rb (modified) (1 diff)
• trunk/actionpack/test/controller/new_render_test.rb (modified) (4 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Ensure render_to_string cleans up after itself when an exception is raised.  #6658 [rsanheim]
-
-* Extract template_changed_since? from compile_template? so plugins may override its behavior for non-file-based templates.  #6651 [Jeff Barczewski]

trunk/actionpack/lib/action_controller/base.rb

@@ -764 +764 @@
-      # of sending it as the response body to the browser.
-      def render_to_string(options = nil, &block) #:doc:
-result = 
-
+
+
-        erase_render_results
-        forget_variables_added_to_assigns
-        reset_variables_added_to_assigns
-
-        result
-      end
-

trunk/actionpack/test/controller/new_render_test.rb

@@ -161 +161 @@
-    render :text =>  "How's there? #{render_to_string("test/list")}"
-  end
+  
+  def render_to_string_with_assigns
+    @before = "i'm before the render"
+    render_to_string :text => "foo"
+    @after = "i'm after the render"
+    render :action => "test/hello_world"
+  end
+  
+  def render_to_string_with_exception
+    render_to_string :file => "exception that will not be caught - this will certainly not work", :use_full_path => true
+  end
+  
+  def render_to_string_with_caught_exception
+    @before = "i'm before the render"
+    begin
+      render_to_string :file => "exception that will be caught- hope my future instance vars still work!", :use_full_path => true
+    rescue
+    end
+    @after = "i'm after the render"
+    render :action => "test/hello_world"
+  end
-
-  def accessing_params_in_template
@@ -187 +208 @@
-    render :text => "hello"
-    redirect_to :action => "double_render"
+  end
+  
+  def render_to_string_and_render
+    @stuff = render_to_string :text => "here is some cached stuff"
+    render :text => "Hi web users! #{@stuff}"
-  end
-
@@ -524 +550 @@
-    assert_equal "How's there? goodbyeHello: davidHello: marygoodbye\n", @response.body
-  end
+  
+  def test_render_to_string_doesnt_break_assigns
+    get :render_to_string_with_assigns
+    assert_equal "i'm before the render", assigns(:before)
+    assert_equal "i'm after the render", assigns(:after)
+  end
+  
+  def test_bad_render_to_string_still_throws_exception
+    assert_raises(ActionController::MissingTemplate) { get :render_to_string_with_exception }
+  end
+  
+  def test_render_to_string_that_throws_caught_exception_doesnt_break_assigns
+    assert_nothing_raised { get :render_to_string_with_caught_exception }
+    assert_equal "i'm before the render", assigns(:before)
+    assert_equal "i'm after the render", assigns(:after)
+  end
-
-  def test_nested_rendering
@@ -555 +597 @@
-  def test_render_and_redirect
-    assert_raises(ActionController::DoubleRenderError) { get :render_and_redirect }
+  end
+  
+  # specify the one exception to double render rule - render_to_string followed by render
+  def test_render_to_string_and_render
+    get :render_to_string_and_render
+    assert_equal("Hi web users! here is some cached stuff", @response.body)
-  end
-