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

The if tag now raises Liquid::SyntaxError rather than a generic RuntimeError for syntax problems.

Browse Source
This commit is contained in:
Nathaniel Bibler
2008-05-21 23:58:12 -04:00
parent ed75a6d948
commit 4c30922d8e
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/liquid/tags/if.rb
View File

@@ -51,14 +51,14 @@ module Liquid
else
expressions = markup.split(/\b(and|or)\b/).reverse
raise SyntaxHelp unless expressions.shift =~ Syntax
raise(SyntaxError, SyntaxHelp) unless expressions.shift =~ Syntax
condition = Condition.new($1, $2, $3)
while not expressions.empty?
operator = expressions.shift
raise SyntaxHelp unless expressions.shift.to_s =~ Syntax
raise(SyntaxError, SyntaxHelp) unless expressions.shift.to_s =~ Syntax
new_condition = Condition.new($1, $2, $3)
new_condition.send(operator.to_sym, condition)

4
test/if_else_test.rb
View File

@@ -116,6 +116,10 @@ class IfElseTest < Test::Unit::TestCase
assert_raise(SyntaxError){ assert_template_result('', '{% if jerry == 1 %}')}
end
def test_syntax_error_no_expression
assert_raise(SyntaxError) { assert_template_result('', '{% if %}') }
end
def test_if_with_custom_condition
Condition.operators['contains'] = :[]