liquid 4.0.1 → 5.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/History.md +142 -0
- data/README.md +10 -4
- data/lib/liquid/block.rb +31 -14
- data/lib/liquid/block_body.rb +169 -56
- data/lib/liquid/condition.rb +59 -23
- data/lib/liquid/context.rb +111 -52
- data/lib/liquid/document.rb +47 -9
- data/lib/liquid/drop.rb +4 -2
- data/lib/liquid/errors.rb +20 -18
- data/lib/liquid/expression.rb +29 -33
- data/lib/liquid/extensions.rb +2 -0
- data/lib/liquid/file_system.rb +6 -4
- data/lib/liquid/forloop_drop.rb +54 -4
- data/lib/liquid/i18n.rb +5 -3
- data/lib/liquid/interrupts.rb +3 -1
- data/lib/liquid/lexer.rb +31 -24
- data/lib/liquid/locales/en.yml +8 -5
- data/lib/liquid/parse_context.rb +20 -4
- data/lib/liquid/parse_tree_visitor.rb +42 -0
- data/lib/liquid/parser.rb +30 -18
- data/lib/liquid/parser_switching.rb +17 -3
- data/lib/liquid/partial_cache.rb +24 -0
- data/lib/liquid/profiler/hooks.rb +26 -14
- data/lib/liquid/profiler.rb +67 -86
- data/lib/liquid/range_lookup.rb +13 -3
- data/lib/liquid/registers.rb +51 -0
- data/lib/liquid/resource_limits.rb +47 -8
- data/lib/liquid/standardfilters.rb +616 -129
- data/lib/liquid/strainer_factory.rb +41 -0
- data/lib/liquid/strainer_template.rb +62 -0
- data/lib/liquid/tablerowloop_drop.rb +64 -5
- data/lib/liquid/tag/disableable.rb +22 -0
- data/lib/liquid/tag/disabler.rb +21 -0
- data/lib/liquid/tag.rb +28 -6
- data/lib/liquid/tags/assign.rb +44 -18
- data/lib/liquid/tags/break.rb +16 -3
- data/lib/liquid/tags/capture.rb +24 -18
- data/lib/liquid/tags/case.rb +69 -27
- data/lib/liquid/tags/comment.rb +18 -3
- data/lib/liquid/tags/continue.rb +16 -12
- data/lib/liquid/tags/cycle.rb +45 -25
- data/lib/liquid/tags/decrement.rb +22 -20
- data/lib/liquid/tags/echo.rb +41 -0
- data/lib/liquid/tags/for.rb +97 -89
- data/lib/liquid/tags/if.rb +61 -35
- data/lib/liquid/tags/ifchanged.rb +11 -10
- data/lib/liquid/tags/include.rb +56 -56
- data/lib/liquid/tags/increment.rb +23 -17
- data/lib/liquid/tags/inline_comment.rb +43 -0
- data/lib/liquid/tags/raw.rb +25 -11
- data/lib/liquid/tags/render.rb +109 -0
- data/lib/liquid/tags/table_row.rb +53 -19
- data/lib/liquid/tags/unless.rb +38 -19
- data/lib/liquid/template.rb +52 -72
- data/lib/liquid/template_factory.rb +9 -0
- data/lib/liquid/tokenizer.rb +18 -10
- data/lib/liquid/usage.rb +8 -0
- data/lib/liquid/utils.rb +13 -3
- data/lib/liquid/variable.rb +52 -41
- data/lib/liquid/variable_lookup.rb +24 -10
- data/lib/liquid/version.rb +3 -1
- data/lib/liquid.rb +19 -6
- metadata +21 -104
- data/lib/liquid/strainer.rb +0 -66
- data/test/fixtures/en_locale.yml +0 -9
- data/test/integration/assign_test.rb +0 -48
- data/test/integration/blank_test.rb +0 -106
- data/test/integration/block_test.rb +0 -12
- data/test/integration/capture_test.rb +0 -50
- data/test/integration/context_test.rb +0 -32
- data/test/integration/document_test.rb +0 -19
- data/test/integration/drop_test.rb +0 -273
- data/test/integration/error_handling_test.rb +0 -260
- data/test/integration/filter_test.rb +0 -178
- data/test/integration/hash_ordering_test.rb +0 -23
- data/test/integration/output_test.rb +0 -123
- data/test/integration/parsing_quirks_test.rb +0 -122
- data/test/integration/render_profiling_test.rb +0 -154
- data/test/integration/security_test.rb +0 -80
- data/test/integration/standard_filter_test.rb +0 -626
- data/test/integration/tags/break_tag_test.rb +0 -15
- data/test/integration/tags/continue_tag_test.rb +0 -15
- data/test/integration/tags/for_tag_test.rb +0 -410
- data/test/integration/tags/if_else_tag_test.rb +0 -188
- data/test/integration/tags/include_tag_test.rb +0 -245
- data/test/integration/tags/increment_tag_test.rb +0 -23
- data/test/integration/tags/raw_tag_test.rb +0 -31
- data/test/integration/tags/standard_tag_test.rb +0 -296
- data/test/integration/tags/statements_test.rb +0 -111
- data/test/integration/tags/table_row_test.rb +0 -64
- data/test/integration/tags/unless_else_tag_test.rb +0 -26
- data/test/integration/template_test.rb +0 -332
- data/test/integration/trim_mode_test.rb +0 -529
- data/test/integration/variable_test.rb +0 -96
- data/test/test_helper.rb +0 -116
- data/test/unit/block_unit_test.rb +0 -58
- data/test/unit/condition_unit_test.rb +0 -166
- data/test/unit/context_unit_test.rb +0 -489
- data/test/unit/file_system_unit_test.rb +0 -35
- data/test/unit/i18n_unit_test.rb +0 -37
- data/test/unit/lexer_unit_test.rb +0 -51
- data/test/unit/parser_unit_test.rb +0 -82
- data/test/unit/regexp_unit_test.rb +0 -44
- data/test/unit/strainer_unit_test.rb +0 -164
- data/test/unit/tag_unit_test.rb +0 -21
- data/test/unit/tags/case_tag_unit_test.rb +0 -10
- data/test/unit/tags/for_tag_unit_test.rb +0 -13
- data/test/unit/tags/if_tag_unit_test.rb +0 -8
- data/test/unit/template_unit_test.rb +0 -78
- data/test/unit/tokenizer_unit_test.rb +0 -55
- data/test/unit/variable_unit_test.rb +0 -162
data/lib/liquid/forloop_drop.rb
CHANGED
@@ -1,34 +1,84 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
module Liquid
|
4
|
+
# @liquid_public_docs
|
5
|
+
# @liquid_type object
|
6
|
+
# @liquid_name forloop
|
7
|
+
# @liquid_summary
|
8
|
+
# Information about a parent [`for` loop](/api/liquid/tags#for).
|
2
9
|
class ForloopDrop < Drop
|
3
10
|
def initialize(name, length, parentloop)
|
4
|
-
@name
|
5
|
-
@length
|
11
|
+
@name = name
|
12
|
+
@length = length
|
6
13
|
@parentloop = parentloop
|
7
|
-
@index
|
14
|
+
@index = 0
|
8
15
|
end
|
9
16
|
|
10
|
-
|
17
|
+
# @liquid_public_docs
|
18
|
+
# @liquid_name length
|
19
|
+
# @liquid_summary
|
20
|
+
# The total number of iterations in the loop.
|
21
|
+
# @liquid_return [number]
|
22
|
+
attr_reader :length
|
23
|
+
|
24
|
+
# @liquid_public_docs
|
25
|
+
# @liquid_name parentloop
|
26
|
+
# @liquid_summary
|
27
|
+
# The parent `forloop` object.
|
28
|
+
# @liquid_description
|
29
|
+
# If the current `for` loop isn't nested inside another `for` loop, then `nil` is returned.
|
30
|
+
# @liquid_return [forloop]
|
31
|
+
attr_reader :parentloop
|
32
|
+
|
33
|
+
def name
|
34
|
+
Usage.increment('forloop_drop_name')
|
35
|
+
@name
|
36
|
+
end
|
11
37
|
|
38
|
+
# @liquid_public_docs
|
39
|
+
# @liquid_summary
|
40
|
+
# The 1-based index of the current iteration.
|
41
|
+
# @liquid_return [number]
|
12
42
|
def index
|
13
43
|
@index + 1
|
14
44
|
end
|
15
45
|
|
46
|
+
# @liquid_public_docs
|
47
|
+
# @liquid_summary
|
48
|
+
# The 0-based index of the current iteration.
|
49
|
+
# @liquid_return [number]
|
16
50
|
def index0
|
17
51
|
@index
|
18
52
|
end
|
19
53
|
|
54
|
+
# @liquid_public_docs
|
55
|
+
# @liquid_summary
|
56
|
+
# The 1-based index of the current iteration, in reverse order.
|
57
|
+
# @liquid_return [number]
|
20
58
|
def rindex
|
21
59
|
@length - @index
|
22
60
|
end
|
23
61
|
|
62
|
+
# @liquid_public_docs
|
63
|
+
# @liquid_summary
|
64
|
+
# The 0-based index of the current iteration, in reverse order.
|
65
|
+
# @liquid_return [number]
|
24
66
|
def rindex0
|
25
67
|
@length - @index - 1
|
26
68
|
end
|
27
69
|
|
70
|
+
# @liquid_public_docs
|
71
|
+
# @liquid_summary
|
72
|
+
# Returns `true` if the current iteration is the first. Returns `false` if not.
|
73
|
+
# @liquid_return [boolean]
|
28
74
|
def first
|
29
75
|
@index == 0
|
30
76
|
end
|
31
77
|
|
78
|
+
# @liquid_public_docs
|
79
|
+
# @liquid_summary
|
80
|
+
# Returns `true` if the current iteration is the last. Returns `false` if not.
|
81
|
+
# @liquid_return [boolean]
|
32
82
|
def last
|
33
83
|
@index == @length - 1
|
34
84
|
end
|
data/lib/liquid/i18n.rb
CHANGED
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
require 'yaml'
|
2
4
|
|
3
5
|
module Liquid
|
@@ -26,13 +28,13 @@ module Liquid
|
|
26
28
|
def interpolate(name, vars)
|
27
29
|
name.gsub(/%\{(\w+)\}/) do
|
28
30
|
# raise TranslationError, "Undefined key #{$1} for interpolation in translation #{name}" unless vars[$1.to_sym]
|
29
|
-
|
31
|
+
(vars[Regexp.last_match(1).to_sym]).to_s
|
30
32
|
end
|
31
33
|
end
|
32
34
|
|
33
35
|
def deep_fetch_translation(name)
|
34
|
-
name.split('.'
|
35
|
-
level[cur]
|
36
|
+
name.split('.').reduce(locale) do |level, cur|
|
37
|
+
level[cur] || raise(TranslationError, "Translation for #{name} does not exist in locale #{path}")
|
36
38
|
end
|
37
39
|
end
|
38
40
|
end
|
data/lib/liquid/interrupts.rb
CHANGED
@@ -1,10 +1,12 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
module Liquid
|
2
4
|
# An interrupt is any command that breaks processing of a block (ex: a for loop).
|
3
5
|
class Interrupt
|
4
6
|
attr_reader :message
|
5
7
|
|
6
8
|
def initialize(message = nil)
|
7
|
-
@message = message || "interrupt"
|
9
|
+
@message = message || "interrupt"
|
8
10
|
end
|
9
11
|
end
|
10
12
|
|
data/lib/liquid/lexer.rb
CHANGED
@@ -1,24 +1,26 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
require "strscan"
|
2
4
|
module Liquid
|
3
5
|
class Lexer
|
4
6
|
SPECIALS = {
|
5
|
-
'|'
|
6
|
-
'.'
|
7
|
-
':'
|
8
|
-
','
|
9
|
-
'['
|
10
|
-
']'
|
11
|
-
'('
|
12
|
-
')'
|
13
|
-
'?'
|
14
|
-
'-'
|
15
|
-
}
|
16
|
-
IDENTIFIER
|
7
|
+
'|' => :pipe,
|
8
|
+
'.' => :dot,
|
9
|
+
':' => :colon,
|
10
|
+
',' => :comma,
|
11
|
+
'[' => :open_square,
|
12
|
+
']' => :close_square,
|
13
|
+
'(' => :open_round,
|
14
|
+
')' => :close_round,
|
15
|
+
'?' => :question,
|
16
|
+
'-' => :dash,
|
17
|
+
}.freeze
|
18
|
+
IDENTIFIER = /[a-zA-Z_][\w-]*\??/
|
17
19
|
SINGLE_STRING_LITERAL = /'[^\']*'/
|
18
20
|
DOUBLE_STRING_LITERAL = /"[^\"]*"/
|
19
|
-
NUMBER_LITERAL
|
20
|
-
DOTDOT
|
21
|
-
COMPARISON_OPERATOR
|
21
|
+
NUMBER_LITERAL = /-?\d+(\.\d+)?/
|
22
|
+
DOTDOT = /\.\./
|
23
|
+
COMPARISON_OPERATOR = /==|!=|<>|<=?|>=?|contains(?=\s)/
|
22
24
|
WHITESPACE_OR_NOTHING = /\s*/
|
23
25
|
|
24
26
|
def initialize(input)
|
@@ -31,16 +33,21 @@ module Liquid
|
|
31
33
|
until @ss.eos?
|
32
34
|
@ss.skip(WHITESPACE_OR_NOTHING)
|
33
35
|
break if @ss.eos?
|
34
|
-
tok =
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
36
|
+
tok = if (t = @ss.scan(COMPARISON_OPERATOR))
|
37
|
+
[:comparison, t]
|
38
|
+
elsif (t = @ss.scan(SINGLE_STRING_LITERAL))
|
39
|
+
[:string, t]
|
40
|
+
elsif (t = @ss.scan(DOUBLE_STRING_LITERAL))
|
41
|
+
[:string, t]
|
42
|
+
elsif (t = @ss.scan(NUMBER_LITERAL))
|
43
|
+
[:number, t]
|
44
|
+
elsif (t = @ss.scan(IDENTIFIER))
|
45
|
+
[:id, t]
|
46
|
+
elsif (t = @ss.scan(DOTDOT))
|
47
|
+
[:dotdot, t]
|
41
48
|
else
|
42
|
-
c
|
43
|
-
if s = SPECIALS[c]
|
49
|
+
c = @ss.getch
|
50
|
+
if (s = SPECIALS[c])
|
44
51
|
[s, c]
|
45
52
|
else
|
46
53
|
raise SyntaxError, "Unexpected character #{c}"
|
data/lib/liquid/locales/en.yml
CHANGED
@@ -13,14 +13,17 @@
|
|
13
13
|
for_invalid_attribute: "Invalid attribute in for loop. Valid attributes are limit and offset"
|
14
14
|
if: "Syntax Error in tag 'if' - Valid syntax: if [expression]"
|
15
15
|
include: "Error in tag 'include' - Valid syntax: include '[template]' (with|for) [object|collection]"
|
16
|
-
|
16
|
+
inline_comment_invalid: "Syntax error in tag '#' - Each line of comments must be prefixed by the '#' character"
|
17
17
|
invalid_delimiter: "'%{tag}' is not a valid delimiter for %{block_name} tags. use %{block_delimiter}"
|
18
|
+
render: "Syntax error in tag 'render' - Template name must be a quoted string"
|
19
|
+
table_row: "Syntax Error in 'table_row loop' - Valid syntax: table_row [item] in [collection] cols=3"
|
20
|
+
tag_never_closed: "'%{block_name}' tag was never closed"
|
21
|
+
tag_termination: "Tag '%{token}' was not properly terminated with regexp: %{tag_end}"
|
18
22
|
unexpected_else: "%{block_name} tag does not expect 'else' tag"
|
19
23
|
unexpected_outer_tag: "Unexpected outer '%{tag}' tag"
|
20
|
-
|
24
|
+
unknown_tag: "Unknown tag '%{tag}'"
|
21
25
|
variable_termination: "Variable '%{token}' was not properly terminated with regexp: %{tag_end}"
|
22
|
-
tag_never_closed: "'%{block_name}' tag was never closed"
|
23
|
-
meta_syntax_error: "Liquid syntax error: #{e.message}"
|
24
|
-
table_row: "Syntax Error in 'table_row loop' - Valid syntax: table_row [item] in [collection] cols=3"
|
25
26
|
argument:
|
26
27
|
include: "Argument error in tag 'include' - Illegal template name"
|
28
|
+
disabled:
|
29
|
+
tag: "usage is not allowed in this context"
|
data/lib/liquid/parse_context.rb
CHANGED
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
module Liquid
|
2
4
|
class ParseContext
|
3
5
|
attr_accessor :locale, :line_number, :trim_whitespace, :depth
|
@@ -5,9 +7,11 @@ module Liquid
|
|
5
7
|
|
6
8
|
def initialize(options = {})
|
7
9
|
@template_options = options ? options.dup : {}
|
8
|
-
|
10
|
+
|
11
|
+
@locale = @template_options[:locale] ||= I18n.new
|
9
12
|
@warnings = []
|
10
|
-
|
13
|
+
|
14
|
+
self.depth = 0
|
11
15
|
self.partial = false
|
12
16
|
end
|
13
17
|
|
@@ -15,11 +19,23 @@ module Liquid
|
|
15
19
|
@options[option_key]
|
16
20
|
end
|
17
21
|
|
22
|
+
def new_block_body
|
23
|
+
Liquid::BlockBody.new
|
24
|
+
end
|
25
|
+
|
26
|
+
def new_tokenizer(markup, start_line_number: nil, for_liquid_tag: false)
|
27
|
+
Tokenizer.new(markup, line_number: start_line_number, for_liquid_tag: for_liquid_tag)
|
28
|
+
end
|
29
|
+
|
30
|
+
def parse_expression(markup)
|
31
|
+
Expression.parse(markup)
|
32
|
+
end
|
33
|
+
|
18
34
|
def partial=(value)
|
19
35
|
@partial = value
|
20
36
|
@options = value ? partial_options : @template_options
|
37
|
+
|
21
38
|
@error_mode = @options[:error_mode] || Template.error_mode
|
22
|
-
value
|
23
39
|
end
|
24
40
|
|
25
41
|
def partial_options
|
@@ -28,7 +44,7 @@ module Liquid
|
|
28
44
|
if dont_pass == true
|
29
45
|
{ locale: locale }
|
30
46
|
elsif dont_pass.is_a?(Array)
|
31
|
-
@template_options.reject { |k,
|
47
|
+
@template_options.reject { |k, _v| dont_pass.include?(k) }
|
32
48
|
else
|
33
49
|
@template_options
|
34
50
|
end
|
@@ -0,0 +1,42 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Liquid
|
4
|
+
class ParseTreeVisitor
|
5
|
+
def self.for(node, callbacks = Hash.new(proc {}))
|
6
|
+
if defined?(node.class::ParseTreeVisitor)
|
7
|
+
node.class::ParseTreeVisitor
|
8
|
+
else
|
9
|
+
self
|
10
|
+
end.new(node, callbacks)
|
11
|
+
end
|
12
|
+
|
13
|
+
def initialize(node, callbacks)
|
14
|
+
@node = node
|
15
|
+
@callbacks = callbacks
|
16
|
+
end
|
17
|
+
|
18
|
+
def add_callback_for(*classes, &block)
|
19
|
+
callback = block
|
20
|
+
callback = ->(node, _) { yield node } if block.arity.abs == 1
|
21
|
+
callback = ->(_, _) { yield } if block.arity.zero?
|
22
|
+
classes.each { |klass| @callbacks[klass] = callback }
|
23
|
+
self
|
24
|
+
end
|
25
|
+
|
26
|
+
def visit(context = nil)
|
27
|
+
children.map do |node|
|
28
|
+
item, new_context = @callbacks[node.class].call(node, context)
|
29
|
+
[
|
30
|
+
item,
|
31
|
+
ParseTreeVisitor.for(node, @callbacks).visit(new_context || context),
|
32
|
+
]
|
33
|
+
end
|
34
|
+
end
|
35
|
+
|
36
|
+
protected
|
37
|
+
|
38
|
+
def children
|
39
|
+
@node.respond_to?(:nodelist) ? Array(@node.nodelist) : []
|
40
|
+
end
|
41
|
+
end
|
42
|
+
end
|
data/lib/liquid/parser.rb
CHANGED
@@ -1,9 +1,11 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
module Liquid
|
2
4
|
class Parser
|
3
5
|
def initialize(input)
|
4
|
-
l
|
6
|
+
l = Lexer.new(input)
|
5
7
|
@tokens = l.tokenize
|
6
|
-
@p
|
8
|
+
@p = 0 # pointer to current location
|
7
9
|
end
|
8
10
|
|
9
11
|
def jump(point)
|
@@ -46,11 +48,18 @@ module Liquid
|
|
46
48
|
|
47
49
|
def expression
|
48
50
|
token = @tokens[@p]
|
49
|
-
|
50
|
-
|
51
|
-
|
51
|
+
case token[0]
|
52
|
+
when :id
|
53
|
+
str = consume
|
54
|
+
str << variable_lookups
|
55
|
+
when :open_square
|
56
|
+
str = consume
|
57
|
+
str << expression
|
58
|
+
str << consume(:close_square)
|
59
|
+
str << variable_lookups
|
60
|
+
when :string, :number
|
52
61
|
consume
|
53
|
-
|
62
|
+
when :open_round
|
54
63
|
consume
|
55
64
|
first = expression
|
56
65
|
consume(:dotdot)
|
@@ -63,26 +72,29 @@ module Liquid
|
|
63
72
|
end
|
64
73
|
|
65
74
|
def argument
|
66
|
-
str = ""
|
75
|
+
str = +""
|
67
76
|
# might be a keyword argument (identifier: expression)
|
68
77
|
if look(:id) && look(:colon, 1)
|
69
|
-
str << consume << consume << ' '
|
78
|
+
str << consume << consume << ' '
|
70
79
|
end
|
71
80
|
|
72
81
|
str << expression
|
73
82
|
str
|
74
83
|
end
|
75
84
|
|
76
|
-
def
|
77
|
-
str =
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
85
|
+
def variable_lookups
|
86
|
+
str = +""
|
87
|
+
loop do
|
88
|
+
if look(:open_square)
|
89
|
+
str << consume
|
90
|
+
str << expression
|
91
|
+
str << consume(:close_square)
|
92
|
+
elsif look(:dot)
|
93
|
+
str << consume
|
94
|
+
str << consume(:id)
|
95
|
+
else
|
96
|
+
break
|
97
|
+
end
|
86
98
|
end
|
87
99
|
str
|
88
100
|
end
|
@@ -1,15 +1,29 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
module Liquid
|
2
4
|
module ParserSwitching
|
5
|
+
def strict_parse_with_error_mode_fallback(markup)
|
6
|
+
strict_parse_with_error_context(markup)
|
7
|
+
rescue SyntaxError => e
|
8
|
+
case parse_context.error_mode
|
9
|
+
when :strict
|
10
|
+
raise
|
11
|
+
when :warn
|
12
|
+
parse_context.warnings << e
|
13
|
+
end
|
14
|
+
lax_parse(markup)
|
15
|
+
end
|
16
|
+
|
3
17
|
def parse_with_selected_parser(markup)
|
4
18
|
case parse_context.error_mode
|
5
19
|
when :strict then strict_parse_with_error_context(markup)
|
6
20
|
when :lax then lax_parse(markup)
|
7
21
|
when :warn
|
8
22
|
begin
|
9
|
-
|
23
|
+
strict_parse_with_error_context(markup)
|
10
24
|
rescue SyntaxError => e
|
11
25
|
parse_context.warnings << e
|
12
|
-
|
26
|
+
lax_parse(markup)
|
13
27
|
end
|
14
28
|
end
|
15
29
|
end
|
@@ -19,7 +33,7 @@ module Liquid
|
|
19
33
|
def strict_parse_with_error_context(markup)
|
20
34
|
strict_parse(markup)
|
21
35
|
rescue SyntaxError => e
|
22
|
-
e.line_number
|
36
|
+
e.line_number = line_number
|
23
37
|
e.markup_context = markup_context(markup)
|
24
38
|
raise e
|
25
39
|
end
|
@@ -0,0 +1,24 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Liquid
|
4
|
+
class PartialCache
|
5
|
+
def self.load(template_name, context:, parse_context:)
|
6
|
+
cached_partials = context.registers[:cached_partials]
|
7
|
+
cached = cached_partials[template_name]
|
8
|
+
return cached if cached
|
9
|
+
|
10
|
+
file_system = context.registers[:file_system]
|
11
|
+
source = file_system.read_template_file(template_name)
|
12
|
+
|
13
|
+
parse_context.partial = true
|
14
|
+
|
15
|
+
template_factory = context.registers[:template_factory]
|
16
|
+
template = template_factory.for(template_name)
|
17
|
+
|
18
|
+
partial = template.parse(source, parse_context)
|
19
|
+
cached_partials[template_name] = partial
|
20
|
+
ensure
|
21
|
+
parse_context.partial = false
|
22
|
+
end
|
23
|
+
end
|
24
|
+
end
|
@@ -1,23 +1,35 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
module Liquid
|
2
|
-
|
3
|
-
def
|
4
|
-
|
5
|
-
|
4
|
+
module BlockBodyProfilingHook
|
5
|
+
def render_node(context, output, node)
|
6
|
+
if (profiler = context.profiler)
|
7
|
+
profiler.profile_node(context.template_name, code: node.raw, line_number: node.line_number) do
|
8
|
+
super
|
9
|
+
end
|
10
|
+
else
|
11
|
+
super
|
6
12
|
end
|
7
13
|
end
|
8
|
-
|
9
|
-
alias_method :render_node_without_profiling, :render_node_to_output
|
10
|
-
alias_method :render_node_to_output, :render_node_with_profiling
|
11
14
|
end
|
15
|
+
BlockBody.prepend(BlockBodyProfilingHook)
|
12
16
|
|
13
|
-
|
14
|
-
def
|
15
|
-
|
16
|
-
|
17
|
-
end
|
17
|
+
module DocumentProfilingHook
|
18
|
+
def render_to_output_buffer(context, output)
|
19
|
+
return super unless context.profiler
|
20
|
+
context.profiler.profile(context.template_name) { super }
|
18
21
|
end
|
22
|
+
end
|
23
|
+
Document.prepend(DocumentProfilingHook)
|
24
|
+
|
25
|
+
module ContextProfilingHook
|
26
|
+
attr_accessor :profiler
|
19
27
|
|
20
|
-
|
21
|
-
|
28
|
+
def new_isolated_subcontext
|
29
|
+
new_context = super
|
30
|
+
new_context.profiler = profiler
|
31
|
+
new_context
|
32
|
+
end
|
22
33
|
end
|
34
|
+
Context.prepend(ContextProfilingHook)
|
23
35
|
end
|