Shift tag parsing into parse method

lib/liquid/block.rb

@@ -7,6 +7,7 @@ module Liquid
     def initialize(tag_name, markup, options)
       super
       @blank = true
+      @body = nil
     end
 
     def parse(tokens)
@@ -17,7 +18,7 @@ module Liquid
 
     # For backwards compatibility
     def render(context)
-      @body.render(context)
+      @body&.render(context)
     end
 
     def blank?

lib/liquid/tag.rb

@@ -17,8 +17,6 @@ module Liquid
         disabled_tags.push(*tags)
       end
 
-      private :new
-
       def disabled_tags
         @disabled_tags ||= []
       end

lib/liquid/tags/assign.rb

@@ -18,13 +18,12 @@ module Liquid
 
     attr_reader :to, :from
 
-    def initialize(tag_name, markup, options)
+    def parse(_tokens)
-      super
+      if @markup =~ Syntax
-      if markup =~ Syntax
         @to = Regexp.last_match(1)
-        @from = Variable.new(Regexp.last_match(2), options)
+        @from = Variable.new(Regexp.last_match(2), @parse_context)
       else
-        raise SyntaxError, options[:locale].t(self.class.syntax_error_translation_key)
+        raise SyntaxError, @parse_context[:locale].t(self.class.syntax_error_translation_key)
       end
     end
 

lib/liquid/tags/capture.rb

@@ -15,13 +15,13 @@ module Liquid
   class Capture < Block
     Syntax = /(#{VariableSignature}+)/o
 
-    def initialize(tag_name, markup, options)
+    def parse(_tokens)
-      super
+      if @markup =~ Syntax
-      if markup =~ Syntax
         @to = Regexp.last_match(1)
       else
-        raise SyntaxError, options[:locale].t("errors.syntax.capture")
+        raise SyntaxError, @parse_context[:locale].t("errors.syntax.capture")
       end
+      super
     end
 
     def render_to_output_buffer(context, output)

lib/liquid/tags/case.rb

@@ -7,18 +7,15 @@ module Liquid
 
     attr_reader :blocks, :left
 
-    def initialize(tag_name, markup, options)
+    def parse(tokens)
-      super
       @blocks = []
 
-      if markup =~ Syntax
+      if @markup =~ Syntax
         @left = Expression.parse(Regexp.last_match(1))
       else
-        raise SyntaxError, options[:locale].t("errors.syntax.case")
+        raise SyntaxError, @parse_context[:locale].t("errors.syntax.case")
       end
-    end
 
-    def parse(tokens)
       body = BlockBody.new
       body = @blocks.last.attachment while parse_body(body, tokens)
     end

lib/liquid/tags/cycle.rb

@@ -19,17 +19,16 @@ module Liquid
 
     attr_reader :variables
 
-    def initialize(tag_name, markup, options)
+    def parse(_tokens)
-      super
+      case @markup
-      case markup
       when NamedSyntax
         @variables = variables_from_string(Regexp.last_match(2))
         @name = Expression.parse(Regexp.last_match(1))
       when SimpleSyntax
-        @variables = variables_from_string(markup)
+        @variables = variables_from_string(@markup)
         @name = @variables.to_s
       else
-        raise SyntaxError, options[:locale].t("errors.syntax.cycle")
+        raise SyntaxError, @parse_context[:locale].t("errors.syntax.cycle")
       end
     end
 

lib/liquid/tags/decrement.rb

@@ -20,9 +20,8 @@ module Liquid
   #    Hello: -3
   #
   class Decrement < Tag
-    def initialize(tag_name, markup, options)
+    def parse(_tokens)
-      super
+      @variable = @markup.strip
-      @variable = markup.strip
     end
 
     def render_to_output_buffer(context, output)

lib/liquid/tags/echo.rb

@@ -12,13 +12,14 @@ module Liquid
   #   {% echo user | link %}
   #
   class Echo < Tag
-    def initialize(tag_name, markup, parse_context)
+    attr_reader :variable
-      super
+
-      @variable = Variable.new(markup, parse_context)
+    def parse(_tokens)
+      @variable = Variable.new(@markup, @parse_context)
     end
 
     def render(context)
-      @variable.render_to_output_buffer(context, +'')
+      variable&.render_to_output_buffer(context, +'')
     end
   end
 

lib/liquid/tags/for.rb

@@ -50,15 +50,11 @@ module Liquid
 
     attr_reader :collection_name, :variable_name, :limit, :from
 
-    def initialize(tag_name, markup, options)
+    def parse(tokens)
-      super
       @from = @limit = nil
-      parse_with_selected_parser(markup)
       @for_block = BlockBody.new
       @else_block = nil
-    end
+      parse_with_selected_parser(@markup)
-
-    def parse(tokens)
       return unless parse_body(@for_block, tokens)
       parse_body(@else_block, tokens)
     end

lib/liquid/tags/if.rb

@@ -18,17 +18,13 @@ module Liquid
 
     attr_reader :blocks
 
-    def initialize(tag_name, markup, options)
-      super
-      @blocks = []
-      push_block('if', markup)
-    end
-
     def nodelist
       @blocks.map(&:attachment)
     end
 
     def parse(tokens)
+      @blocks = []
+      push_block('if', @markup)
       while parse_body(@blocks.last.attachment, tokens)
       end
     end

lib/liquid/tags/include.rb

@@ -21,10 +21,8 @@ module Liquid
 
     attr_reader :template_name_expr, :variable_name_expr, :attributes
 
-    def initialize(tag_name, markup, options)
+    def parse(_tokens)
-      super
+      if @markup =~ SYNTAX
-
-      if markup =~ SYNTAX
 
         template_name = Regexp.last_match(1)
         variable_name = Regexp.last_match(3)
@@ -34,18 +32,15 @@ module Liquid
         @template_name_expr = Expression.parse(template_name)
         @attributes = {}
 
-        markup.scan(TagAttributes) do |key, value|
+        @markup.scan(TagAttributes) do |key, value|
           @attributes[key] = Expression.parse(value)
         end
 
       else
-        raise SyntaxError, options[:locale].t("errors.syntax.include")
+        raise SyntaxError, @parse_context[:locale].t("errors.syntax.include")
       end
     end
 
-    def parse(_tokens)
-    end
-
     def render_to_output_buffer(context, output)
       template_name = context.evaluate(@template_name_expr)
       raise ArgumentError, options[:locale].t("errors.argument.include") unless template_name

lib/liquid/tags/increment.rb

@@ -17,9 +17,8 @@ module Liquid
   #    Hello: 2
   #
   class Increment < Tag
-    def initialize(tag_name, markup, options)
+    def parse(_tokens)
-      super
+      @variable = @markup.strip
-      @variable = markup.strip
     end
 
     def render_to_output_buffer(context, output)

lib/liquid/tags/raw.rb

@@ -5,13 +5,8 @@ module Liquid
     Syntax = /\A\s*\z/
     FullTokenPossiblyInvalid = /\A(.*)#{TagStart}\s*(\w+)\s*(.*)?#{TagEnd}\z/om
 
-    def initialize(tag_name, markup, parse_context)
-      super
-
-      ensure_valid_markup(tag_name, markup, parse_context)
-    end
-
     def parse(tokens)
+      ensure_valid_markup(@tag_name, @markup, @parse_context)
       @body = +''
       while (token = tokens.shift)
         if token =~ FullTokenPossiblyInvalid

lib/liquid/tags/render.rb

@@ -8,10 +8,8 @@ module Liquid
 
     attr_reader :template_name_expr, :attributes
 
-    def initialize(tag_name, markup, options)
+    def parse(_tokens)
-      super
+      raise SyntaxError, @parse_context[:locale].t("errors.syntax.render") unless @markup =~ SYNTAX
-
-      raise SyntaxError, options[:locale].t("errors.syntax.render") unless markup =~ SYNTAX
 
       template_name = Regexp.last_match(1)
       variable_name = Regexp.last_match(3)
@@ -21,7 +19,7 @@ module Liquid
       @template_name_expr = Expression.parse(template_name)
 
       @attributes = {}
-      markup.scan(TagAttributes) do |key, value|
+      @markup.scan(TagAttributes) do |key, value|
         @attributes[key] = Expression.parse(value)
       end
     end

lib/liquid/tags/table_row.rb

@@ -6,18 +6,18 @@ module Liquid
 
     attr_reader :variable_name, :collection_name, :attributes
 
-    def initialize(tag_name, markup, options)
+    def parse(_tokens)
-      super
+      if @markup =~ Syntax
-      if markup =~ Syntax
         @variable_name = Regexp.last_match(1)
         @collection_name = Expression.parse(Regexp.last_match(2))
         @attributes = {}
-        markup.scan(TagAttributes) do |key, value|
+        @markup.scan(TagAttributes) do |key, value|
           @attributes[key] = Expression.parse(value)
         end
       else
-        raise SyntaxError, options[:locale].t("errors.syntax.table_row")
+        raise SyntaxError, @parse_context[:locale].t("errors.syntax.table_row")
       end
+      super
     end
 
     def render_to_output_buffer(context, output)

test/integration/tag_test.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+class TagTest < Minitest::Test
+  include Liquid
+
+  def test_all_tags_with_no_parse_can_render
+    Template.tags.each do |key, _tag|
+      Template.tags[key].new(key, '', ParseContext.new).render(Context.new)
+      assert_nil(nil)
+    end
+  end
+
+  def test_all_tags_are_registered
+    tags = Template.tags.map { |key, _tag| key }
+    expected_tags = %w(tablerow echo if break for assign ifchanged case include continue capture decrement unless increment comment raw render cycle)
+    assert_equal(expected_tags, tags)
+  end
+end