mirror of
https://github.com/Shopify/liquid.git
synced 2026-09-12 23:40:45 -07:00
Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f78c443ccd | ||
|
|
e753b9025d |
@@ -49,14 +49,14 @@ module Liquid
|
||||
def render_tag(context, output)
|
||||
template = context.evaluate(@template_name_expr)
|
||||
|
||||
if template.respond_to?(:to_partial)
|
||||
partial = template.to_partial
|
||||
template_name = template.filename
|
||||
context_variable_name = @alias_name || template.name
|
||||
elsif @template_name_expr.is_a?(String)
|
||||
if @template_name_expr.is_a?(String)
|
||||
partial = PartialCache.load(template, context: context, parse_context: parse_context)
|
||||
template_name = partial.name
|
||||
context_variable_name = @alias_name || template_name.split('/').last
|
||||
elsif template.respond_to?(:to_partial) && template.respond_to?(:name)
|
||||
partial = template.to_partial
|
||||
template_name = template.filename
|
||||
context_variable_name = @alias_name || template.name
|
||||
else
|
||||
raise ::ArgumentError
|
||||
end
|
||||
|
||||
@@ -28,18 +28,12 @@ module Liquid
|
||||
def render_to_output_buffer(context, output)
|
||||
snippet_drop = SnippetDrop.new(@body, @to, context.template_name)
|
||||
context.scopes.last[@to] = snippet_drop
|
||||
context.resource_limits.increment_assign_score(assign_score_of(snippet_drop))
|
||||
context.resource_limits.increment_assign_score(1)
|
||||
output
|
||||
end
|
||||
|
||||
def blank?
|
||||
true
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def assign_score_of(snippet_drop)
|
||||
snippet_drop.body.nodelist.sum { |node| node.to_s.bytesize }
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -1081,7 +1081,7 @@ class SnippetTest < Minitest::Test
|
||||
def test_increment_assign_score_by_bytes_not_characters
|
||||
t = Template.parse("{% snippet foo %}すごい{% endsnippet %}")
|
||||
t.render!
|
||||
assert_equal(9, t.resource_limits.assign_score)
|
||||
assert_equal(1, t.resource_limits.assign_score)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user