mirror of
https://github.com/kemko/liquid.git
synced 2026-01-01 15:55:40 +03:00
Allow multiple tags to be disabled at once
This commit is contained in:
@@ -9,11 +9,11 @@ module Liquid
|
||||
@disabled_tags[tag] > 0
|
||||
end
|
||||
|
||||
def disable(tag)
|
||||
increment(tag)
|
||||
def disable(tags)
|
||||
tags.each { |tag| increment(tag) }
|
||||
yield
|
||||
ensure
|
||||
decrement(tag)
|
||||
tags.each { |tag| decrement(tag) }
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
@@ -48,6 +48,12 @@ module Liquid
|
||||
"#{tag_name} #{options[:locale].t('errors.disabled.tag')}"
|
||||
end
|
||||
|
||||
def disable_tags(context, tags)
|
||||
context.registers['disabled_tags'].disable(tags) do
|
||||
yield
|
||||
end
|
||||
end
|
||||
|
||||
# For backwards compatibility with custom tags. In a future release, the semantics
|
||||
# of the `render_to_output_buffer` method will become the default and the `render`
|
||||
# method will be removed.
|
||||
|
||||
@@ -22,7 +22,7 @@ module Liquid
|
||||
end
|
||||
|
||||
def render_to_output_buffer(context, output)
|
||||
context.registers['disabled_tags'].disable('include') do
|
||||
disable_tags(context, %w(include)) do
|
||||
render_tag(context, output)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -7,23 +7,24 @@ class DisabledTagsTest < Minitest::Test
|
||||
|
||||
def test_disables_tag_specified
|
||||
register = DisabledTags.new
|
||||
register.disable("foo") do
|
||||
register.disable(%w(foo bar)) do
|
||||
assert_equal true, register.disabled?("foo")
|
||||
assert_equal false, register.disabled?("bar")
|
||||
assert_equal true, register.disabled?("bar")
|
||||
assert_equal false, register.disabled?("unknown")
|
||||
end
|
||||
end
|
||||
|
||||
def test_disables_nested_tags
|
||||
register = DisabledTags.new
|
||||
register.disable("foo") do
|
||||
register.disable("foo") do
|
||||
register.disable(["foo"]) do
|
||||
register.disable(["foo"]) do
|
||||
assert_equal true, register.disabled?("foo")
|
||||
assert_equal false, register.disabled?("bar")
|
||||
end
|
||||
register.disable("bar") do
|
||||
register.disable(["bar"]) do
|
||||
assert_equal true, register.disabled?("foo")
|
||||
assert_equal true, register.disabled?("bar")
|
||||
register.disable("foo") do
|
||||
register.disable(["foo"]) do
|
||||
assert_equal true, register.disabled?("foo")
|
||||
assert_equal true, register.disabled?("bar")
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user