liquid 3.0.6 → 4.0.0.rc1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/History.md +89 -58
- data/{MIT-LICENSE → LICENSE} +0 -0
- data/lib/liquid.rb +7 -6
- data/lib/liquid/block.rb +31 -124
- data/lib/liquid/block_body.rb +54 -57
- data/lib/liquid/condition.rb +23 -22
- data/lib/liquid/context.rb +50 -42
- data/lib/liquid/document.rb +19 -9
- data/lib/liquid/drop.rb +12 -13
- data/lib/liquid/errors.rb +16 -17
- data/lib/liquid/expression.rb +15 -3
- data/lib/liquid/extensions.rb +7 -7
- data/lib/liquid/file_system.rb +3 -3
- data/lib/liquid/forloop_drop.rb +42 -0
- data/lib/liquid/i18n.rb +5 -5
- data/lib/liquid/interrupts.rb +1 -2
- data/lib/liquid/lexer.rb +6 -4
- data/lib/liquid/locales/en.yml +3 -1
- data/lib/liquid/parse_context.rb +37 -0
- data/lib/liquid/parser_switching.rb +4 -4
- data/lib/liquid/profiler.rb +18 -19
- data/lib/liquid/profiler/hooks.rb +7 -7
- data/lib/liquid/range_lookup.rb +16 -1
- data/lib/liquid/resource_limits.rb +23 -0
- data/lib/liquid/standardfilters.rb +101 -56
- data/lib/liquid/strainer.rb +4 -5
- data/lib/liquid/tablerowloop_drop.rb +62 -0
- data/lib/liquid/tag.rb +9 -8
- data/lib/liquid/tags/assign.rb +5 -4
- data/lib/liquid/tags/break.rb +0 -3
- data/lib/liquid/tags/capture.rb +1 -1
- data/lib/liquid/tags/case.rb +19 -12
- data/lib/liquid/tags/comment.rb +2 -2
- data/lib/liquid/tags/cycle.rb +6 -6
- data/lib/liquid/tags/decrement.rb +1 -4
- data/lib/liquid/tags/for.rb +93 -75
- data/lib/liquid/tags/if.rb +49 -44
- data/lib/liquid/tags/ifchanged.rb +0 -2
- data/lib/liquid/tags/include.rb +60 -52
- data/lib/liquid/tags/raw.rb +26 -4
- data/lib/liquid/tags/table_row.rb +12 -30
- data/lib/liquid/tags/unless.rb +3 -4
- data/lib/liquid/template.rb +23 -50
- data/lib/liquid/tokenizer.rb +31 -0
- data/lib/liquid/utils.rb +48 -8
- data/lib/liquid/variable.rb +46 -45
- data/lib/liquid/variable_lookup.rb +3 -3
- data/lib/liquid/version.rb +1 -1
- data/test/integration/assign_test.rb +8 -8
- data/test/integration/blank_test.rb +14 -14
- data/test/integration/context_test.rb +2 -2
- data/test/integration/document_test.rb +19 -0
- data/test/integration/drop_test.rb +42 -40
- data/test/integration/error_handling_test.rb +64 -45
- data/test/integration/filter_test.rb +60 -20
- data/test/integration/output_test.rb +26 -27
- data/test/integration/parsing_quirks_test.rb +15 -13
- data/test/integration/render_profiling_test.rb +20 -20
- data/test/integration/security_test.rb +5 -7
- data/test/integration/standard_filter_test.rb +119 -37
- data/test/integration/tags/break_tag_test.rb +1 -2
- data/test/integration/tags/continue_tag_test.rb +0 -1
- data/test/integration/tags/for_tag_test.rb +133 -98
- data/test/integration/tags/if_else_tag_test.rb +75 -77
- data/test/integration/tags/include_tag_test.rb +23 -30
- data/test/integration/tags/increment_tag_test.rb +10 -11
- data/test/integration/tags/raw_tag_test.rb +7 -1
- data/test/integration/tags/standard_tag_test.rb +121 -122
- data/test/integration/tags/statements_test.rb +3 -5
- data/test/integration/tags/table_row_test.rb +20 -19
- data/test/integration/tags/unless_else_tag_test.rb +6 -6
- data/test/integration/template_test.rb +91 -45
- data/test/integration/variable_test.rb +23 -13
- data/test/test_helper.rb +33 -5
- data/test/unit/block_unit_test.rb +6 -5
- data/test/unit/condition_unit_test.rb +82 -77
- data/test/unit/context_unit_test.rb +48 -57
- data/test/unit/file_system_unit_test.rb +3 -3
- data/test/unit/i18n_unit_test.rb +2 -2
- data/test/unit/lexer_unit_test.rb +11 -8
- data/test/unit/parser_unit_test.rb +2 -2
- data/test/unit/regexp_unit_test.rb +1 -1
- data/test/unit/strainer_unit_test.rb +13 -2
- data/test/unit/tag_unit_test.rb +7 -2
- data/test/unit/tags/case_tag_unit_test.rb +1 -1
- data/test/unit/tags/for_tag_unit_test.rb +2 -2
- data/test/unit/tags/if_tag_unit_test.rb +1 -1
- data/test/unit/template_unit_test.rb +6 -5
- data/test/unit/tokenizer_unit_test.rb +24 -7
- data/test/unit/variable_unit_test.rb +60 -43
- metadata +44 -41
- data/lib/liquid/module_ex.rb +0 -62
- data/lib/liquid/token.rb +0 -18
- data/test/unit/module_ex_unit_test.rb +0 -87
data/lib/liquid/utils.rb
CHANGED
@@ -1,27 +1,24 @@
|
|
1
1
|
module Liquid
|
2
2
|
module Utils
|
3
|
-
|
4
3
|
def self.slice_collection(collection, from, to)
|
5
|
-
if (from != 0 || to
|
4
|
+
if (from != 0 || !to.nil?) && collection.respond_to?(:load_slice)
|
6
5
|
collection.load_slice(from, to)
|
7
6
|
else
|
8
7
|
slice_collection_using_each(collection, from, to)
|
9
8
|
end
|
10
9
|
end
|
11
10
|
|
12
|
-
def self.non_blank_string?(collection)
|
13
|
-
collection.is_a?(String) && collection != ''.freeze
|
14
|
-
end
|
15
|
-
|
16
11
|
def self.slice_collection_using_each(collection, from, to)
|
17
12
|
segments = []
|
18
13
|
index = 0
|
19
14
|
|
20
15
|
# Maintains Ruby 1.8.7 String#each behaviour on 1.9
|
21
|
-
|
16
|
+
if collection.is_a?(String)
|
17
|
+
return collection.empty? ? [] : [collection]
|
18
|
+
end
|
19
|
+
return [] unless collection.respond_to?(:each)
|
22
20
|
|
23
21
|
collection.each do |item|
|
24
|
-
|
25
22
|
if to && to <= index
|
26
23
|
break
|
27
24
|
end
|
@@ -35,5 +32,48 @@ module Liquid
|
|
35
32
|
|
36
33
|
segments
|
37
34
|
end
|
35
|
+
|
36
|
+
def self.to_integer(num)
|
37
|
+
return num if num.is_a?(Integer)
|
38
|
+
num = num.to_s
|
39
|
+
begin
|
40
|
+
Integer(num)
|
41
|
+
rescue ::ArgumentError
|
42
|
+
raise Liquid::ArgumentError, "invalid integer"
|
43
|
+
end
|
44
|
+
end
|
45
|
+
|
46
|
+
def self.to_number(obj)
|
47
|
+
case obj
|
48
|
+
when Float
|
49
|
+
BigDecimal.new(obj.to_s)
|
50
|
+
when Numeric
|
51
|
+
obj
|
52
|
+
when String
|
53
|
+
(obj.strip =~ /\A\d+\.\d+\z/) ? BigDecimal.new(obj) : obj.to_i
|
54
|
+
else
|
55
|
+
0
|
56
|
+
end
|
57
|
+
end
|
58
|
+
|
59
|
+
def self.to_date(obj)
|
60
|
+
return obj if obj.respond_to?(:strftime)
|
61
|
+
|
62
|
+
if obj.is_a?(String)
|
63
|
+
return nil if obj.empty?
|
64
|
+
obj = obj.downcase
|
65
|
+
end
|
66
|
+
|
67
|
+
case obj
|
68
|
+
when 'now'.freeze, 'today'.freeze
|
69
|
+
Time.now
|
70
|
+
when /\A\d+\z/, Integer
|
71
|
+
Time.at(obj.to_i)
|
72
|
+
when String
|
73
|
+
Time.parse(obj)
|
74
|
+
end
|
75
|
+
rescue ::ArgumentError
|
76
|
+
nil
|
77
|
+
end
|
38
78
|
end
|
39
79
|
end
|
data/lib/liquid/variable.rb
CHANGED
@@ -1,5 +1,4 @@
|
|
1
1
|
module Liquid
|
2
|
-
|
3
2
|
# Holds variables. Variables are only loaded "just in time"
|
4
3
|
# and are not evaluated as part of the render stage
|
5
4
|
#
|
@@ -12,15 +11,16 @@ module Liquid
|
|
12
11
|
#
|
13
12
|
class Variable
|
14
13
|
FilterParser = /(?:\s+|#{QuotedFragment}|#{ArgumentSeparator})+/o
|
15
|
-
|
16
|
-
|
17
|
-
|
14
|
+
attr_accessor :filters, :name, :line_number
|
15
|
+
attr_reader :parse_context
|
16
|
+
alias_method :options, :parse_context
|
18
17
|
include ParserSwitching
|
19
18
|
|
20
|
-
def initialize(markup,
|
19
|
+
def initialize(markup, parse_context)
|
21
20
|
@markup = markup
|
22
21
|
@name = nil
|
23
|
-
@
|
22
|
+
@parse_context = parse_context
|
23
|
+
@line_number = parse_context.line_number
|
24
24
|
|
25
25
|
parse_with_selected_parser(markup)
|
26
26
|
end
|
@@ -35,35 +35,27 @@ module Liquid
|
|
35
35
|
|
36
36
|
def lax_parse(markup)
|
37
37
|
@filters = []
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
end
|
38
|
+
return unless markup =~ /(#{QuotedFragment})(.*)/om
|
39
|
+
|
40
|
+
name_markup = $1
|
41
|
+
filter_markup = $2
|
42
|
+
@name = Expression.parse(name_markup)
|
43
|
+
if filter_markup =~ /#{FilterSeparator}\s*(.*)/om
|
44
|
+
filters = $1.scan(FilterParser)
|
45
|
+
filters.each do |f|
|
46
|
+
next unless f =~ /\w+/
|
47
|
+
filtername = Regexp.last_match(0)
|
48
|
+
filterargs = f.scan(/(?:#{FilterArgumentSeparator}|#{ArgumentSeparator})\s*((?:\w+\s*\:\s*)?#{QuotedFragment})/o).flatten
|
49
|
+
@filters << parse_filter_expressions(filtername, filterargs)
|
51
50
|
end
|
52
51
|
end
|
53
52
|
end
|
54
53
|
|
55
54
|
def strict_parse(markup)
|
56
|
-
# Very simple valid cases
|
57
|
-
if markup =~ EasyParse
|
58
|
-
@name = Expression.parse($1)
|
59
|
-
@filters = []
|
60
|
-
return
|
61
|
-
end
|
62
|
-
|
63
55
|
@filters = []
|
64
56
|
p = Parser.new(markup)
|
65
|
-
|
66
|
-
@name =
|
57
|
+
|
58
|
+
@name = Expression.parse(p.expression)
|
67
59
|
while p.consume?(:pipe)
|
68
60
|
filtername = p.consume(:id)
|
69
61
|
filterargs = p.consume?(:colon) ? parse_filterargs(p) : []
|
@@ -76,17 +68,21 @@ module Liquid
|
|
76
68
|
# first argument
|
77
69
|
filterargs = [p.argument]
|
78
70
|
# followed by comma separated others
|
79
|
-
while p.consume?(:comma)
|
80
|
-
filterargs << p.argument
|
81
|
-
end
|
71
|
+
filterargs << p.argument while p.consume?(:comma)
|
82
72
|
filterargs
|
83
73
|
end
|
84
74
|
|
85
75
|
def render(context)
|
86
|
-
@filters.inject(context.evaluate(@name)) do |output, (filter_name, filter_args, filter_kwargs)|
|
76
|
+
obj = @filters.inject(context.evaluate(@name)) do |output, (filter_name, filter_args, filter_kwargs)|
|
87
77
|
filter_args = evaluate_filter_expressions(context, filter_args, filter_kwargs)
|
88
|
-
|
89
|
-
end
|
78
|
+
context.invoke(filter_name, output, *filter_args)
|
79
|
+
end
|
80
|
+
|
81
|
+
obj = context.apply_global_filter(obj)
|
82
|
+
|
83
|
+
taint_check(context, obj)
|
84
|
+
|
85
|
+
obj
|
90
86
|
end
|
91
87
|
|
92
88
|
private
|
@@ -118,17 +114,22 @@ module Liquid
|
|
118
114
|
parsed_args
|
119
115
|
end
|
120
116
|
|
121
|
-
def taint_check(obj)
|
122
|
-
|
123
|
-
|
124
|
-
|
125
|
-
|
126
|
-
|
127
|
-
|
128
|
-
|
129
|
-
|
130
|
-
|
131
|
-
|
117
|
+
def taint_check(context, obj)
|
118
|
+
return unless obj.tainted?
|
119
|
+
return if Template.taint_mode == :lax
|
120
|
+
|
121
|
+
@markup =~ QuotedFragment
|
122
|
+
name = Regexp.last_match(0)
|
123
|
+
|
124
|
+
error = TaintedError.new("variable '#{name}' is tainted and was not escaped")
|
125
|
+
error.line_number = line_number
|
126
|
+
error.template_name = context.template_name
|
127
|
+
|
128
|
+
case Template.taint_mode
|
129
|
+
when :warn
|
130
|
+
context.warnings << error
|
131
|
+
when :error
|
132
|
+
raise error
|
132
133
|
end
|
133
134
|
end
|
134
135
|
end
|
@@ -41,8 +41,8 @@ module Liquid
|
|
41
41
|
# If object is a hash- or array-like object we look for the
|
42
42
|
# presence of the key and if its available we return it
|
43
43
|
if object.respond_to?(:[]) &&
|
44
|
-
|
45
|
-
|
44
|
+
((object.respond_to?(:key?) && object.key?(key)) ||
|
45
|
+
(object.respond_to?(:fetch) && key.is_a?(Integer)))
|
46
46
|
|
47
47
|
# if its a proc we will replace the entry with the proc
|
48
48
|
res = context.lookup_and_evaluate(object, key)
|
@@ -68,7 +68,7 @@ module Liquid
|
|
68
68
|
end
|
69
69
|
|
70
70
|
def ==(other)
|
71
|
-
self.class == other.class &&
|
71
|
+
self.class == other.class && state == other.state
|
72
72
|
end
|
73
73
|
|
74
74
|
protected
|
data/lib/liquid/version.rb
CHANGED
@@ -15,24 +15,24 @@ class AssignTest < Minitest::Test
|
|
15
15
|
|
16
16
|
def test_assigned_variable
|
17
17
|
assert_template_result('.foo.',
|
18
|
-
|
19
|
-
|
18
|
+
'{% assign foo = values %}.{{ foo[0] }}.',
|
19
|
+
'values' => %w(foo bar baz))
|
20
20
|
|
21
21
|
assert_template_result('.bar.',
|
22
|
-
|
23
|
-
|
22
|
+
'{% assign foo = values %}.{{ foo[1] }}.',
|
23
|
+
'values' => %w(foo bar baz))
|
24
24
|
end
|
25
25
|
|
26
26
|
def test_assign_with_filter
|
27
27
|
assert_template_result('.bar.',
|
28
|
-
|
29
|
-
|
28
|
+
'{% assign foo = values | split: "," %}.{{ foo[1] }}.',
|
29
|
+
'values' => "foo,bar,baz")
|
30
30
|
end
|
31
31
|
|
32
32
|
def test_assign_syntax_error
|
33
33
|
assert_match_syntax_error(/assign/,
|
34
|
-
|
35
|
-
|
34
|
+
'{% assign foo not values %}.',
|
35
|
+
'values' => "foo,bar,baz")
|
36
36
|
end
|
37
37
|
|
38
38
|
def test_assign_uses_error_mode
|
@@ -9,7 +9,7 @@ class FoobarTag < Liquid::Tag
|
|
9
9
|
end
|
10
10
|
|
11
11
|
class BlankTestFileSystem
|
12
|
-
def read_template_file(template_path
|
12
|
+
def read_template_file(template_path)
|
13
13
|
template_path
|
14
14
|
end
|
15
15
|
end
|
@@ -31,7 +31,7 @@ class BlankTest < Minitest::Test
|
|
31
31
|
end
|
32
32
|
|
33
33
|
def test_new_tags_are_not_blank_by_default
|
34
|
-
assert_template_result(" "*N, wrap_in_for("{% foobar %}"))
|
34
|
+
assert_template_result(" " * N, wrap_in_for("{% foobar %}"))
|
35
35
|
end
|
36
36
|
|
37
37
|
def test_loops_are_blank
|
@@ -47,7 +47,7 @@ class BlankTest < Minitest::Test
|
|
47
47
|
end
|
48
48
|
|
49
49
|
def test_mark_as_blank_only_during_parsing
|
50
|
-
assert_template_result(" "*(N+1), wrap(" {% if false %} this never happens, but still, this block is not blank {% endif %}"))
|
50
|
+
assert_template_result(" " * (N + 1), wrap(" {% if false %} this never happens, but still, this block is not blank {% endif %}"))
|
51
51
|
end
|
52
52
|
|
53
53
|
def test_comments_are_blank
|
@@ -60,9 +60,9 @@ class BlankTest < Minitest::Test
|
|
60
60
|
|
61
61
|
def test_nested_blocks_are_blank_but_only_if_all_children_are
|
62
62
|
assert_template_result("", wrap(wrap(" ")))
|
63
|
-
assert_template_result("\n but this is not "*(N+1),
|
64
|
-
wrap(
|
65
|
-
{% if true %} but this is not {% endif %}
|
63
|
+
assert_template_result("\n but this is not " * (N + 1),
|
64
|
+
wrap('{% if true %} {% comment %} this is blank {% endcomment %} {% endif %}
|
65
|
+
{% if true %} but this is not {% endif %}'))
|
66
66
|
end
|
67
67
|
|
68
68
|
def test_assigns_are_blank
|
@@ -76,31 +76,31 @@ class BlankTest < Minitest::Test
|
|
76
76
|
|
77
77
|
def test_whitespace_is_not_blank_if_other_stuff_is_present
|
78
78
|
body = " x "
|
79
|
-
assert_template_result(body*(N+1), wrap(body))
|
79
|
+
assert_template_result(body * (N + 1), wrap(body))
|
80
80
|
end
|
81
81
|
|
82
82
|
def test_increment_is_not_blank
|
83
|
-
assert_template_result(" 0"*2*(N+1), wrap("{% assign foo = 0 %} {% increment foo %} {% decrement foo %}"))
|
83
|
+
assert_template_result(" 0" * 2 * (N + 1), wrap("{% assign foo = 0 %} {% increment foo %} {% decrement foo %}"))
|
84
84
|
end
|
85
85
|
|
86
86
|
def test_cycle_is_not_blank
|
87
|
-
assert_template_result(" "*((N+1)/2)+" ", wrap("{% cycle ' ', ' ' %}"))
|
87
|
+
assert_template_result(" " * ((N + 1) / 2) + " ", wrap("{% cycle ' ', ' ' %}"))
|
88
88
|
end
|
89
89
|
|
90
90
|
def test_raw_is_not_blank
|
91
|
-
assert_template_result(" "*(N+1), wrap(" {% raw %} {% endraw %}"))
|
91
|
+
assert_template_result(" " * (N + 1), wrap(" {% raw %} {% endraw %}"))
|
92
92
|
end
|
93
93
|
|
94
94
|
def test_include_is_blank
|
95
95
|
Liquid::Template.file_system = BlankTestFileSystem.new
|
96
|
-
assert_template_result "foobar"*(N+1), wrap("{% include 'foobar' %}")
|
97
|
-
assert_template_result " foobar "*(N+1), wrap("{% include ' foobar ' %}")
|
98
|
-
assert_template_result " "*(N+1), wrap(" {% include ' ' %} ")
|
96
|
+
assert_template_result "foobar" * (N + 1), wrap("{% include 'foobar' %}")
|
97
|
+
assert_template_result " foobar " * (N + 1), wrap("{% include ' foobar ' %}")
|
98
|
+
assert_template_result " " * (N + 1), wrap(" {% include ' ' %} ")
|
99
99
|
end
|
100
100
|
|
101
101
|
def test_case_is_blank
|
102
102
|
assert_template_result("", wrap(" {% assign foo = 'bar' %} {% case foo %} {% when 'bar' %} {% when 'whatever' %} {% else %} {% endcase %} "))
|
103
103
|
assert_template_result("", wrap(" {% assign foo = 'else' %} {% case foo %} {% when 'bar' %} {% when 'whatever' %} {% else %} {% endcase %} "))
|
104
|
-
assert_template_result(" x "*(N+1), wrap(" {% assign foo = 'else' %} {% case foo %} {% when 'bar' %} {% when 'whatever' %} {% else %} x {% endcase %} "))
|
104
|
+
assert_template_result(" x " * (N + 1), wrap(" {% assign foo = 'else' %} {% case foo %} {% when 'bar' %} {% when 'whatever' %} {% else %} x {% endcase %} "))
|
105
105
|
end
|
106
106
|
end
|
@@ -18,14 +18,14 @@ class ContextTest < Minitest::Test
|
|
18
18
|
|
19
19
|
with_global_filter(global) do
|
20
20
|
assert_equal 'Global test', Template.parse("{{'test' | notice }}").render!
|
21
|
-
assert_equal 'Local test', Template.parse("{{'test' | notice }}").render!({}, :
|
21
|
+
assert_equal 'Local test', Template.parse("{{'test' | notice }}").render!({}, filters: [local])
|
22
22
|
end
|
23
23
|
end
|
24
24
|
|
25
25
|
def test_has_key_will_not_add_an_error_for_missing_keys
|
26
26
|
with_error_mode :strict do
|
27
27
|
context = Context.new
|
28
|
-
context.
|
28
|
+
context.key?('unknown')
|
29
29
|
assert_empty context.errors
|
30
30
|
end
|
31
31
|
end
|
@@ -0,0 +1,19 @@
|
|
1
|
+
require 'test_helper'
|
2
|
+
|
3
|
+
class DocumentTest < Minitest::Test
|
4
|
+
include Liquid
|
5
|
+
|
6
|
+
def test_unexpected_outer_tag
|
7
|
+
exc = assert_raises(SyntaxError) do
|
8
|
+
Template.parse("{% else %}")
|
9
|
+
end
|
10
|
+
assert_equal exc.message, "Liquid syntax error: Unexpected outer 'else' tag"
|
11
|
+
end
|
12
|
+
|
13
|
+
def test_unknown_tag
|
14
|
+
exc = assert_raises(SyntaxError) do
|
15
|
+
Template.parse("{% foo %}")
|
16
|
+
end
|
17
|
+
assert_equal exc.message, "Liquid syntax error: Unknown tag 'foo'"
|
18
|
+
end
|
19
|
+
end
|
@@ -13,13 +13,12 @@ class ContextDrop < Liquid::Drop
|
|
13
13
|
@context['forloop.index']
|
14
14
|
end
|
15
15
|
|
16
|
-
def
|
17
|
-
|
16
|
+
def liquid_method_missing(method)
|
17
|
+
@context[method]
|
18
18
|
end
|
19
19
|
end
|
20
20
|
|
21
21
|
class ProductDrop < Liquid::Drop
|
22
|
-
|
23
22
|
class TextDrop < Liquid::Drop
|
24
23
|
def array
|
25
24
|
['text1', 'text2']
|
@@ -31,8 +30,8 @@ class ProductDrop < Liquid::Drop
|
|
31
30
|
end
|
32
31
|
|
33
32
|
class CatchallDrop < Liquid::Drop
|
34
|
-
def
|
35
|
-
|
33
|
+
def liquid_method_missing(method)
|
34
|
+
'catchall_method: ' << method.to_s
|
36
35
|
end
|
37
36
|
end
|
38
37
|
|
@@ -53,13 +52,14 @@ class ProductDrop < Liquid::Drop
|
|
53
52
|
end
|
54
53
|
|
55
54
|
protected
|
56
|
-
|
57
|
-
|
58
|
-
|
55
|
+
|
56
|
+
def callmenot
|
57
|
+
"protected"
|
58
|
+
end
|
59
59
|
end
|
60
60
|
|
61
61
|
class EnumerableDrop < Liquid::Drop
|
62
|
-
def
|
62
|
+
def liquid_method_missing(method)
|
63
63
|
method
|
64
64
|
end
|
65
65
|
|
@@ -93,7 +93,7 @@ end
|
|
93
93
|
class RealEnumerableDrop < Liquid::Drop
|
94
94
|
include Enumerable
|
95
95
|
|
96
|
-
def
|
96
|
+
def liquid_method_missing(method)
|
97
97
|
method
|
98
98
|
end
|
99
99
|
|
@@ -124,8 +124,10 @@ class DropsTest < Minitest::Test
|
|
124
124
|
def test_rendering_warns_on_tainted_attr
|
125
125
|
with_taint_mode(:warn) do
|
126
126
|
tpl = Liquid::Template.parse('{{ product.user_input }}')
|
127
|
-
|
128
|
-
|
127
|
+
context = Context.new('product' => ProductDrop.new)
|
128
|
+
tpl.render!(context)
|
129
|
+
assert_equal [Liquid::TaintedError], context.warnings.map(&:class)
|
130
|
+
assert_equal "variable 'product.user_input' is tainted and was not escaped", context.warnings.first.to_s(false)
|
129
131
|
end
|
130
132
|
end
|
131
133
|
|
@@ -151,37 +153,37 @@ class DropsTest < Minitest::Test
|
|
151
153
|
end
|
152
154
|
|
153
155
|
def test_text_drop
|
154
|
-
output = Liquid::Template.parse(
|
156
|
+
output = Liquid::Template.parse(' {{ product.texts.text }} ').render!('product' => ProductDrop.new)
|
155
157
|
assert_equal ' text1 ', output
|
156
158
|
end
|
157
159
|
|
158
|
-
def
|
159
|
-
output = Liquid::Template.parse(
|
160
|
-
assert_equal '
|
160
|
+
def test_catchall_unknown_method
|
161
|
+
output = Liquid::Template.parse(' {{ product.catchall.unknown }} ').render!('product' => ProductDrop.new)
|
162
|
+
assert_equal ' catchall_method: unknown ', output
|
161
163
|
end
|
162
164
|
|
163
|
-
def
|
164
|
-
output = Liquid::Template.parse(
|
165
|
-
assert_equal '
|
165
|
+
def test_catchall_integer_argument_drop
|
166
|
+
output = Liquid::Template.parse(' {{ product.catchall[8] }} ').render!('product' => ProductDrop.new)
|
167
|
+
assert_equal ' catchall_method: 8 ', output
|
166
168
|
end
|
167
169
|
|
168
170
|
def test_text_array_drop
|
169
|
-
output = Liquid::Template.parse(
|
171
|
+
output = Liquid::Template.parse('{% for text in product.texts.array %} {{text}} {% endfor %}').render!('product' => ProductDrop.new)
|
170
172
|
assert_equal ' text1 text2 ', output
|
171
173
|
end
|
172
174
|
|
173
175
|
def test_context_drop
|
174
|
-
output = Liquid::Template.parse(
|
176
|
+
output = Liquid::Template.parse(' {{ context.bar }} ').render!('context' => ContextDrop.new, 'bar' => "carrot")
|
175
177
|
assert_equal ' carrot ', output
|
176
178
|
end
|
177
179
|
|
178
180
|
def test_nested_context_drop
|
179
|
-
output = Liquid::Template.parse(
|
181
|
+
output = Liquid::Template.parse(' {{ product.context.foo }} ').render!('product' => ProductDrop.new, 'foo' => "monkey")
|
180
182
|
assert_equal ' monkey ', output
|
181
183
|
end
|
182
184
|
|
183
185
|
def test_protected
|
184
|
-
output = Liquid::Template.parse(
|
186
|
+
output = Liquid::Template.parse(' {{ product.callmenot }} ').render!('product' => ProductDrop.new)
|
185
187
|
assert_equal ' ', output
|
186
188
|
end
|
187
189
|
|
@@ -193,43 +195,43 @@ class DropsTest < Minitest::Test
|
|
193
195
|
end
|
194
196
|
|
195
197
|
def test_scope
|
196
|
-
assert_equal '1', Liquid::Template.parse(
|
197
|
-
assert_equal '2', Liquid::Template.parse(
|
198
|
-
assert_equal '3', Liquid::Template.parse(
|
198
|
+
assert_equal '1', Liquid::Template.parse('{{ context.scopes }}').render!('context' => ContextDrop.new)
|
199
|
+
assert_equal '2', Liquid::Template.parse('{%for i in dummy%}{{ context.scopes }}{%endfor%}').render!('context' => ContextDrop.new, 'dummy' => [1])
|
200
|
+
assert_equal '3', Liquid::Template.parse('{%for i in dummy%}{%for i in dummy%}{{ context.scopes }}{%endfor%}{%endfor%}').render!('context' => ContextDrop.new, 'dummy' => [1])
|
199
201
|
end
|
200
202
|
|
201
203
|
def test_scope_though_proc
|
202
|
-
assert_equal '1', Liquid::Template.parse(
|
203
|
-
assert_equal '2', Liquid::Template.parse(
|
204
|
-
assert_equal '3', Liquid::Template.parse(
|
204
|
+
assert_equal '1', Liquid::Template.parse('{{ s }}').render!('context' => ContextDrop.new, 's' => proc{ |c| c['context.scopes'] })
|
205
|
+
assert_equal '2', Liquid::Template.parse('{%for i in dummy%}{{ s }}{%endfor%}').render!('context' => ContextDrop.new, 's' => proc{ |c| c['context.scopes'] }, 'dummy' => [1])
|
206
|
+
assert_equal '3', Liquid::Template.parse('{%for i in dummy%}{%for i in dummy%}{{ s }}{%endfor%}{%endfor%}').render!('context' => ContextDrop.new, 's' => proc{ |c| c['context.scopes'] }, 'dummy' => [1])
|
205
207
|
end
|
206
208
|
|
207
209
|
def test_scope_with_assigns
|
208
|
-
assert_equal 'variable', Liquid::Template.parse(
|
209
|
-
assert_equal 'variable', Liquid::Template.parse(
|
210
|
-
assert_equal 'test', Liquid::Template.parse(
|
211
|
-
assert_equal 'test', Liquid::Template.parse(
|
210
|
+
assert_equal 'variable', Liquid::Template.parse('{% assign a = "variable"%}{{a}}').render!('context' => ContextDrop.new)
|
211
|
+
assert_equal 'variable', Liquid::Template.parse('{% assign a = "variable"%}{%for i in dummy%}{{a}}{%endfor%}').render!('context' => ContextDrop.new, 'dummy' => [1])
|
212
|
+
assert_equal 'test', Liquid::Template.parse('{% assign header_gif = "test"%}{{header_gif}}').render!('context' => ContextDrop.new)
|
213
|
+
assert_equal 'test', Liquid::Template.parse("{% assign header_gif = 'test'%}{{header_gif}}").render!('context' => ContextDrop.new)
|
212
214
|
end
|
213
215
|
|
214
216
|
def test_scope_from_tags
|
215
|
-
assert_equal '1', Liquid::Template.parse(
|
216
|
-
assert_equal '12', Liquid::Template.parse(
|
217
|
-
assert_equal '123', Liquid::Template.parse(
|
217
|
+
assert_equal '1', Liquid::Template.parse('{% for i in context.scopes_as_array %}{{i}}{% endfor %}').render!('context' => ContextDrop.new, 'dummy' => [1])
|
218
|
+
assert_equal '12', Liquid::Template.parse('{%for a in dummy%}{% for i in context.scopes_as_array %}{{i}}{% endfor %}{% endfor %}').render!('context' => ContextDrop.new, 'dummy' => [1])
|
219
|
+
assert_equal '123', Liquid::Template.parse('{%for a in dummy%}{%for a in dummy%}{% for i in context.scopes_as_array %}{{i}}{% endfor %}{% endfor %}{% endfor %}').render!('context' => ContextDrop.new, 'dummy' => [1])
|
218
220
|
end
|
219
221
|
|
220
222
|
def test_access_context_from_drop
|
221
|
-
assert_equal '123', Liquid::Template.parse(
|
223
|
+
assert_equal '123', Liquid::Template.parse('{%for a in dummy%}{{ context.loop_pos }}{% endfor %}').render!('context' => ContextDrop.new, 'dummy' => [1, 2, 3])
|
222
224
|
end
|
223
225
|
|
224
226
|
def test_enumerable_drop
|
225
|
-
assert_equal '123', Liquid::Template.parse(
|
227
|
+
assert_equal '123', Liquid::Template.parse('{% for c in collection %}{{c}}{% endfor %}').render!('collection' => EnumerableDrop.new)
|
226
228
|
end
|
227
229
|
|
228
230
|
def test_enumerable_drop_size
|
229
|
-
assert_equal '3', Liquid::Template.parse(
|
231
|
+
assert_equal '3', Liquid::Template.parse('{{collection.size}}').render!('collection' => EnumerableDrop.new)
|
230
232
|
end
|
231
233
|
|
232
|
-
def
|
234
|
+
def test_enumerable_drop_will_invoke_liquid_method_missing_for_clashing_method_names
|
233
235
|
["select", "each", "map", "cycle"].each do |method|
|
234
236
|
assert_equal method.to_s, Liquid::Template.parse("{{collection.#{method}}}").render!('collection' => EnumerableDrop.new)
|
235
237
|
assert_equal method.to_s, Liquid::Template.parse("{{collection[\"#{method}\"]}}").render!('collection' => EnumerableDrop.new)
|