Check blocks are not incorrectly detected when compiling erubis templ…

…ates [#4575 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
rails · May 16, 2010 · f58bdae · f58bdae
1 parent 4ea48f2
commit f58bdae
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/actionpack/lib/action_view/template/handlers/erb.rb b/actionpack/lib/action_view/template/handlers/erb.rb
@@ -28,7 +28,7 @@ def add_text(src, text)
         src << "@output_buffer.safe_concat('" << escape_text(text) << "');"
       end
 
-      BLOCK_EXPR = /(do|\{)(\s*\|[^|]*\|)?\s*\Z/
+      BLOCK_EXPR = /\s+(do|\{)(\s*\|[^|]*\|)?\s*\Z/
 
       def add_expr_literal(src, code)
         if code =~ BLOCK_EXPR

diff --git a/actionpack/test/controller/capture_test.rb b/actionpack/test/controller/capture_test.rb
@@ -61,6 +61,11 @@ def test_non_erb_block_content_for
     assert_equal expected_content_for_output, @response.body
   end
 
+  def test_proper_block_detection
+    @todo = "some todo"
+    get :proper_block_detection
+  end
+
   private
     def expected_content_for_output
       "<title>Putting stuff in the title!</title>\n\nGreat stuff!"

diff --git a/actionpack/test/fixtures/test/proper_block_detection.erb b/actionpack/test/fixtures/test/proper_block_detection.erb
@@ -0,0 +1 @@
+<%= @todo %>