Check blocks are not incorrectly detected when compiling erubis templates [rails#4575 state:resolved]

Signed-off-by: José Valim <[email protected]>

Author: simonjefford

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

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!"

actionpack/test/fixtures/test/proper_block_detection.erb

@@ -0,0 +1 @@
+<%= @todo %>