From 9c33e9601bc7b2d5a12790ccb4e15b494709390e Mon Sep 17 00:00:00 2001 From: Florian Weingarten Date: Fri, 7 Nov 2014 01:48:16 +0000 Subject: [PATCH] Revert "Merge pull request #476 from Shopify/missing-variable-name-error" This reverts commit 4dc682313f1d3159eca28dffbe9206ef4879078c, reversing changes made to a8f60ff6b1b22429e7b8bd5779437df1f534116c. --- lib/liquid/variable.rb | 4 ++-- test/integration/parsing_quirks_test.rb | 11 ++++------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/lib/liquid/variable.rb b/lib/liquid/variable.rb index a93fed7..5e18710 100644 --- a/lib/liquid/variable.rb +++ b/lib/liquid/variable.rb @@ -62,8 +62,8 @@ module Liquid @filters = [] p = Parser.new(markup) - - @name = Expression.parse(p.expression) + # Could be just filters with no input + @name = p.look(:pipe) ? nil : Expression.parse(p.expression) while p.consume?(:pipe) filtername = p.consume(:id) filterargs = p.consume?(:colon) ? parse_filterargs(p) : [] diff --git a/test/integration/parsing_quirks_test.rb b/test/integration/parsing_quirks_test.rb index 7d0ada7..a7617c9 100644 --- a/test/integration/parsing_quirks_test.rb +++ b/test/integration/parsing_quirks_test.rb @@ -28,14 +28,11 @@ class ParsingQuirksTest < Minitest::Test def test_error_on_empty_filter assert Template.parse("{{test}}") - - with_error_mode(:lax) do - assert Template.parse("{{|test}}") - end - + assert Template.parse("{{|test}}") with_error_mode(:strict) do - assert_raises(SyntaxError) { Template.parse("{{|test}}") } - assert_raises(SyntaxError) { Template.parse("{{test |a|b|}}") } + assert_raises(SyntaxError) do + Template.parse("{{test |a|b|}}") + end end end