mirror of
https://github.com/kemko/liquid.git
synced 2026-01-01 15:55:40 +03:00
blank and empty as variable names
This commit is contained in:
@@ -78,17 +78,17 @@ module Liquid
|
||||
private
|
||||
|
||||
def equal_variables(left, right)
|
||||
if left.is_a?(Symbol)
|
||||
if right.respond_to?(left)
|
||||
return right.send(left.to_s)
|
||||
if left.is_a?(Liquid::Expression::MethodLiteral)
|
||||
if right.respond_to?(left.method_name)
|
||||
return right.send(left.method_name)
|
||||
else
|
||||
return nil
|
||||
end
|
||||
end
|
||||
|
||||
if right.is_a?(Symbol)
|
||||
if left.respond_to?(right)
|
||||
return left.send(right.to_s)
|
||||
if right.is_a?(Liquid::Expression::MethodLiteral)
|
||||
if left.respond_to?(right.method_name)
|
||||
return left.send(right.method_name)
|
||||
else
|
||||
return nil
|
||||
end
|
||||
|
||||
@@ -1,11 +1,24 @@
|
||||
module Liquid
|
||||
class Expression
|
||||
class MethodLiteral
|
||||
attr_reader :method_name, :to_s
|
||||
|
||||
def initialize(method_name, to_s)
|
||||
@method_name = method_name
|
||||
@to_s = to_s
|
||||
end
|
||||
|
||||
def to_liquid
|
||||
to_s
|
||||
end
|
||||
end
|
||||
|
||||
LITERALS = {
|
||||
nil => nil, 'nil'.freeze => nil, 'null'.freeze => nil, ''.freeze => nil,
|
||||
'true'.freeze => true,
|
||||
'false'.freeze => false,
|
||||
'blank'.freeze => :blank?,
|
||||
'empty'.freeze => :empty?
|
||||
'blank'.freeze => MethodLiteral.new(:blank?, '').freeze,
|
||||
'empty'.freeze => MethodLiteral.new(:empty?, '').freeze
|
||||
}
|
||||
|
||||
def self.parse(markup)
|
||||
|
||||
@@ -24,6 +24,16 @@ class VariableTest < Minitest::Test
|
||||
assert_equal '', template.render!
|
||||
end
|
||||
|
||||
def test_using_blank_as_variable_name
|
||||
template = Template.parse("{% assign foo = blank %}{{ foo }}")
|
||||
assert_equal '', template.render!
|
||||
end
|
||||
|
||||
def test_using_empty_as_variable_name
|
||||
template = Template.parse("{% assign foo = empty %}{{ foo }}")
|
||||
assert_equal '', template.render!
|
||||
end
|
||||
|
||||
def test_hash_scoping
|
||||
template = Template.parse(%({{ test.test }}))
|
||||
assert_equal 'worked', template.render!('test' => { 'test' => 'worked' })
|
||||
|
||||
@@ -110,4 +110,3 @@ class ErrorDrop < Liquid::Drop
|
||||
raise Exception, 'exception'
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user