kemko/liquid
1
0
Fork 0
mirror of https://github.com/kemko/liquid.git synced 2026-01-01 15:55:40 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/EmmanuelOga/liquid into EmmanuelOga/master

Browse Source
This commit is contained in:
Tobias Lütke
2008-11-02 10:04:01 -08:00
parent 3bfde37a53 3eddf5fb9e
commit 7959664c9d
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/liquid.rb
View File

@@ -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

12
test/parsing_quirks_test.rb
View File

@@ -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