@@ -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) lib/liquid/tags/if.rb @@ -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'] = :[] test/if_else_test.rb ed75a6d948a12fae73430e3df59d226263f5bf6b Nathaniel Bibler git@nathanielbibler.com http://github.com/tobi/liquid/commit/4c30922d8ec5e40f10adb6911487e90694cab53b 4c30922d8ec5e40f10adb6911487e90694cab53b 2008-05-21T20:58:12-07:00 2008-05-21T20:58:12-07:00 The if tag now raises Liquid::SyntaxError rather than a generic RuntimeError for syntax problems. 2301d6231d94fd0f6db0b67104cd78520aa751b4 Nathaniel Bibler git@nathanielbibler.com