Improve disable tag API

lib/liquid/block_body.rb

@@ -155,7 +155,9 @@ module Liquid
 
     def render_node(context, output, node)
       return if node.is_a?(Tag) && node.disabled?(context, output)
+      disable_tags(context, node.is_a?(Tag) ? node.disabled_tags : nil) do
         node.render_to_output_buffer(context, output)
+      end
     rescue UndefinedVariable, UndefinedDropMethod, UndefinedFilter => e
       context.handle_error(e, node.line_number)
     rescue ::StandardError => e
@@ -163,6 +165,11 @@ module Liquid
       output << context.handle_error(e, line_number)
     end
 
+    def disable_tags(context, tags, &block)
+      return yield unless tags
+      context.registers['disabled_tags'].disable(tags, &block)
+    end
+
     def raise_if_resource_limits_reached(context, length)
       context.resource_limits.render_length += length
       return unless context.resource_limits.reached?

lib/liquid/tag.rb

@@ -13,7 +13,15 @@ module Liquid
         tag
       end
 
+      def disable_nested_tags(*tags)
+        @disabled_tags = tags
+      end
+
       private :new
+
+      def disabled_tags
+        @disabled_tags ||= []
+      end
     end
 
     def initialize(tag_name, markup, parse_context)
@@ -48,10 +56,6 @@ module Liquid
       "#{tag_name} #{options[:locale].t('errors.disabled.tag')}"
     end
 
-    def disable_tags(context, tags, &block)
-      context.registers['disabled_tags'].disable(tags, &block)
-    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.
@@ -63,5 +67,9 @@ module Liquid
     def blank?
       false
     end
+
+    def disabled_tags
+      self.class.disabled_tags
+    end
   end
 end

lib/liquid/tags/render.rb

@@ -3,7 +3,8 @@
 module Liquid
   class Render < Tag
     SYNTAX = /(#{QuotedString})#{QuotedFragment}*/o
-    DISABLED_TAGS = %w(include).freeze
+
+    disable_nested_tags "include"
 
     attr_reader :template_name_expr, :attributes
 
@@ -23,10 +24,8 @@ module Liquid
     end
 
     def render_to_output_buffer(context, output)
-      disable_tags(context, DISABLED_TAGS) do
       render_tag(context, output)
     end
-    end
 
     def render_tag(context, output)
       # Though we evaluate this here we will only ever parse it as a string literal.

test/integration/registers/disabled_tags_test.rb

@@ -6,19 +6,11 @@ class DisabledTagsTest < Minitest::Test
   include Liquid
 
   class DisableRaw < Block
-    def render(context)
+    disable_nested_tags "raw"
-      disable_tags(context, ["raw"]) do
-        @body.render(context)
-      end
-    end
   end
 
   class DisableRawEcho < Block
-    def render(context)
+    disable_nested_tags "raw", "echo"
-      disable_tags(context, ["raw", "echo"]) do
-        @body.render(context)
-      end
-    end
   end
 
   def test_disables_raw