@@ -35,7 +35,9 @@ module Liquid VariableIncompleteEnd = /\}\}?/ QuotedFragment = /"[^"]+"|'[^']+'|[^\s,|]+/ TagAttributes = /(\w+)\s*\:\s*(#{QuotedFragment})/ - TemplateParser = /(#{TagStart}.*?#{TagEnd}|#{VariableStart}.*?#{VariableIncompleteEnd})/ + AnyStartingTag = /\{\{|\{\%/ + PartialTemplateParser = /#{TagStart}.*?#{TagEnd}|#{VariableStart}.*?#{VariableIncompleteEnd}/ + TemplateParser = /(#{PartialTemplateParser}|#{AnyStartingTag})/ VariableParser = /\[[^\]]+\]|#{VariableSegment}+/ end lib/liquid.rb @@ -18,6 +18,17 @@ class ParsingQuirksTest < Test::Unit::TestCase end end + def test_raise_on_label_and_no_close_bracets + assert_raise(SyntaxError) do + Template.parse("TEST {{ ") + end + end + + def test_raise_on_label_and_no_close_bracets_percent + assert_raise(SyntaxError) do + Template.parse("TEST {% ") + end + end def test_error_on_empty_filter assert_nothing_raised do @@ -26,4 +37,5 @@ class ParsingQuirksTest < Test::Unit::TestCase Template.parse("{{|test|}}") end end + end \ No newline at end of file test/parsing_quirks_test.rb 6dd4f716f824b66680976f564cfc85615283fe9e Emmanuel Oga eoga@elctech.com http://github.com/tobi/liquid/commit/3eddf5fb9e708cf26603d1f535a60e2e5ae0fc65 3eddf5fb9e708cf26603d1f535a60e2e5ae0fc65 2008-07-08T08:54:52-07:00 2008-07-08T08:54:52-07:00 adjusted parsing regex for syntax quirk 61f0e314c49a8c47640654dad4049676573812e5 Emmanuel Oga eoga@elctech.com