Use hash for mocking tags in tests

Co-authored-by: Dylan Thacker-Smith <[email protected]>

Gemfile

@@ -22,6 +22,6 @@ group :test do
   gem 'rubocop-performance', require: false
 
   platform :mri, :truffleruby do
-    gem 'liquid-c', github: 'Shopify/liquid-c', ref: 'master'
+    gem 'liquid-c', github: 'Shopify/liquid-c', ref: 'parse-specific-tags'
   end
 end

History.md

@@ -1,5 +1,8 @@
 # Liquid Change Log
 
+### Features
+* Add ability to pass `tags` to parse context to take precedence over `Liquid::Template.tags`
+
 ## 5.4.0 2022-07-29
 
 ### Breaking Changes

lib/liquid/block_body.rb

@@ -45,7 +45,7 @@ module Liquid
           end
           tag_name = Regexp.last_match(1)
           markup   = Regexp.last_match(2)
-          unless (tag = registered_tags[tag_name])
+          unless (tag = parse_context.tags[tag_name])
             # end parsing if we reach an unknown tag and let the caller decide
             # determine how to proceed
             return yield tag_name, markup
@@ -132,7 +132,7 @@ module Liquid
             next
           end
 
-          unless (tag = registered_tags[tag_name])
+          unless (tag = parse_context.tags[tag_name])
             # end parsing if we reach an unknown tag and let the caller decide
             # determine how to proceed
             return yield tag_name, markup
@@ -247,9 +247,5 @@ module Liquid
     def raise_missing_variable_terminator(token, parse_context)
       BlockBody.raise_missing_variable_terminator(token, parse_context)
     end
-
-    def registered_tags
-      Template.tags
-    end
   end
 end

lib/liquid/parse_context.rb

@@ -3,13 +3,24 @@
 module Liquid
   class ParseContext
     attr_accessor :locale, :line_number, :trim_whitespace, :depth
-    attr_reader :partial, :warnings, :error_mode
+    attr_reader :partial, :warnings, :error_mode, :tags
+
+    class Tags
+      def initialize(tags)
+        @tags = tags || {}
+      end
+
+      def [](tag_name)
+        @tags[tag_name] || Liquid::Template.tags[tag_name]
+      end
+    end
 
     def initialize(options = {})
       @template_options = options ? options.dup : {}
 
       @locale   = @template_options[:locale] ||= I18n.new
       @warnings = []
+      @tags = Tags.new(@template_options[:tags])
 
       self.depth   = 0
       self.partial = false

test/integration/tag_test.rb

@@ -42,4 +42,38 @@ class TagTest < Minitest::Test
       assert_equal(buf.object_id, output.object_id)
     end
   end
+
+  def test_tags_can_be_overwritten_using_parse_context
+    static_tag = Class.new(Tag) do
+      def render(*)
+        'static_tag'
+      end
+    end
+
+    original_tag = Class.new(Tag) do
+      def render(*)
+        'original_tag'
+      end
+    end
+
+    new_tag = Class.new(Tag) do
+      def render(*)
+        'new_tag'
+      end
+    end
+
+    tags_overwrite = { 'dynamic_tag' => new_tag }
+
+    with_custom_tag('static_tag', static_tag) do
+      with_custom_tag('dynamic_tag', original_tag) do
+        liquid = '{% static_tag %} {% dynamic_tag %}'
+
+        template = Liquid::Template.parse(liquid)
+        assert_equal('static_tag original_tag', template.render)
+
+        template_with_overwrite = Liquid::Template.parse(liquid, tags: tags_overwrite)
+        assert_equal('static_tag new_tag', template_with_overwrite.render)
+      end
+    end
+  end
 end