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

Change Parser#expression to build the parsed expression

Browse Source
This commit is contained in:
Peter Zhu
2020-11-11 14:19:31 -05:00
parent ed0aebcbc9
commit 933a1f1e7e
11 changed files with 183 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
test/unit/variable_unit_test.rb
View File

@@ -7,20 +7,20 @@ class VariableUnitTest < Minitest::Test
def test_variable
var = create_variable('hello')
assert_equal(VariableLookup.new('hello'), var.name)
assert_equal(parse_variable_lookup('hello'), var.name)
end
def test_filters
var = create_variable('hello | textileze')
assert_equal(VariableLookup.new('hello'), var.name)
assert_equal(parse_variable_lookup('hello'), var.name)
assert_equal([['textileze', []]], var.filters)
var = create_variable('hello | textileze | paragraph')
assert_equal(VariableLookup.new('hello'), var.name)
assert_equal(parse_variable_lookup('hello'), var.name)
assert_equal([['textileze', []], ['paragraph', []]], var.filters)
var = create_variable(%( hello | strftime: '%Y'))
assert_equal(VariableLookup.new('hello'), var.name)
assert_equal(parse_variable_lookup('hello'), var.name)
assert_equal([['strftime', ['%Y']]], var.filters)
var = create_variable(%( 'typo' | link_to: 'Typo', true ))
@@ -44,11 +44,11 @@ class VariableUnitTest < Minitest::Test
assert_equal([['repeat', [3, 3, 3]]], var.filters)
var = create_variable(%( hello | strftime: '%Y, okay?'))
assert_equal(VariableLookup.new('hello'), var.name)
assert_equal(parse_variable_lookup('hello'), var.name)
assert_equal([['strftime', ['%Y, okay?']]], var.filters)
var = create_variable(%( hello | things: "%Y, okay?", 'the other one'))
assert_equal(VariableLookup.new('hello'), var.name)
assert_equal(parse_variable_lookup('hello'), var.name)
assert_equal([['things', ['%Y, okay?', 'the other one']]], var.filters)
end
@@ -60,22 +60,24 @@ class VariableUnitTest < Minitest::Test
def test_filters_without_whitespace
var = create_variable('hello | textileze | paragraph')
assert_equal(VariableLookup.new('hello'), var.name)
assert_equal(parse_variable_lookup('hello'), var.name)
assert_equal([['textileze', []], ['paragraph', []]], var.filters)
var = create_variable('hello|textileze|paragraph')
assert_equal(VariableLookup.new('hello'), var.name)
assert_equal(parse_variable_lookup('hello'), var.name)
assert_equal([['textileze', []], ['paragraph', []]], var.filters)
var = create_variable("hello|replace:'foo','bar'|textileze")
assert_equal(VariableLookup.new('hello'), var.name)
assert_equal(parse_variable_lookup('hello'), var.name)
assert_equal([['replace', ['foo', 'bar']], ['textileze', []]], var.filters)
end
def test_symbol
var = create_variable("http://disney.com/logo.gif | image: 'med' ", error_mode: :lax)
assert_equal(VariableLookup.new('http://disney.com/logo.gif'), var.name)
assert_equal([['image', ['med']]], var.filters)
with_error_mode(:lax) do
var = create_variable("http://disney.com/logo.gif | image: 'med' ", error_mode: :lax)
assert_equal(parse_variable_lookup('http://disney.com/logo.gif'), var.name)
assert_equal([['image', ['med']]], var.filters)
end
end
def test_string_to_filter
@@ -105,8 +107,8 @@ class VariableUnitTest < Minitest::Test
end
def test_dashes
assert_equal(VariableLookup.new('foo-bar'), create_variable('foo-bar').name)
assert_equal(VariableLookup.new('foo-bar-2'), create_variable('foo-bar-2').name)
assert_equal(parse_variable_lookup('foo-bar'), create_variable('foo-bar').name)
assert_equal(parse_variable_lookup('foo-bar-2'), create_variable('foo-bar-2').name)
with_error_mode :strict do
assert_raises(Liquid::SyntaxError) { create_variable('foo - bar') }
@@ -122,18 +124,18 @@ class VariableUnitTest < Minitest::Test
def test_string_dot
var = create_variable(%( test.test ))
assert_equal(VariableLookup.new('test.test'), var.name)
assert_equal(parse_variable_lookup('test.test'), var.name)
end
def test_filter_with_keyword_arguments
var = create_variable(%( hello | things: greeting: "world", farewell: 'goodbye'))
assert_equal(VariableLookup.new('hello'), var.name)
assert_equal(parse_variable_lookup('hello'), var.name)
assert_equal([['things', [], { 'greeting' => 'world', 'farewell' => 'goodbye' }]], var.filters)
end
def test_lax_filter_argument_parsing
var = create_variable(%( number_of_comments | pluralize: 'comment': 'comments' ), error_mode: :lax)
assert_equal(VariableLookup.new('number_of_comments'), var.name)
assert_equal(parse_variable_lookup('number_of_comments'), var.name)
assert_equal([['pluralize', ['comment', 'comments']]], var.filters)
end
@@ -151,13 +153,22 @@ class VariableUnitTest < Minitest::Test
end
def test_variable_lookup_interface
lookup = VariableLookup.new('a.b.c')
lookup = parse_variable_lookup('a.b.c')
assert_equal('a', lookup.name)
assert_equal(['b', 'c'], lookup.lookups)
end
private
def parse_variable_lookup(markup)
if Liquid::Template.error_mode == :strict
p = Liquid::Parser.new(markup)
VariableLookup.strict_parse(p)
else
VariableLookup.lax_parse(markup)
end
end
def create_variable(markup, options = {})
Variable.new(markup, ParseContext.new(options))
end