liquid 4.0.1 → 5.4.0

data/lib/liquid/variable_lookup.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 module Liquid
   class VariableLookup
-    SQUARE_BRACKETED = /\A\[(.*)\]\z/m
-    COMMAND_METHODS = ['size'.freeze, 'first'.freeze, 'last'.freeze]
+    COMMAND_METHODS = ['size', 'first', 'last'].freeze
 
     attr_reader :name, :lookups
 
@@ -13,31 +14,38 @@ module Liquid
       lookups = markup.scan(VariableParser)
 
       name = lookups.shift
-      if name =~ SQUARE_BRACKETED
-        name = Expression.parse($1)
+      if name&.start_with?('[') && name&.end_with?(']')
+        name = Expression.parse(name[1..-2])
       end
       @name = name
 
-      @lookups = lookups
+      @lookups       = lookups
       @command_flags = 0
 
       @lookups.each_index do |i|
         lookup = lookups[i]
-        if lookup =~ SQUARE_BRACKETED
-          lookups[i] = Expression.parse($1)
+        if lookup&.start_with?('[') && lookup&.end_with?(']')
+          lookups[i] = Expression.parse(lookup[1..-2])
         elsif COMMAND_METHODS.include?(lookup)
           @command_flags |= 1 << i
         end
       end
     end
 
+    def lookup_command?(lookup_index)
+      @command_flags & (1 << lookup_index) != 0
+    end
+
     def evaluate(context)
-      name = context.evaluate(@name)
+      name   = context.evaluate(@name)
       object = context.find_variable(name)
 
       @lookups.each_index do |i|
         key = context.evaluate(@lookups[i])
 
+        # Cast "key" to its liquid value to enable it to act as a primitive value
+        key = Liquid::Utils.to_liquid_value(key)
+
         # If object is a hash- or array-like object we look for the
         # presence of the key and if its available we return it
         if object.respond_to?(:[]) &&
@@ -45,13 +53,13 @@ module Liquid
              (object.respond_to?(:fetch) && key.is_a?(Integer)))
 
           # if its a proc we will replace the entry with the proc
-          res = context.lookup_and_evaluate(object, key)
+          res    = context.lookup_and_evaluate(object, key)
           object = res.to_liquid
 
           # Some special cases. If the part wasn't in square brackets and
           # no key with the same name was found we interpret following calls
           # as commands and call them on the current object
-        elsif @command_flags & (1 << i) != 0 && object.respond_to?(key)
+        elsif lookup_command?(i) && object.respond_to?(key)
           object = object.send(key).to_liquid
 
           # No key was present with the desired value and it wasn't one of the directly supported
@@ -78,5 +86,11 @@ module Liquid
     def state
       [@name, @lookups, @command_flags]
     end
+
+    class ParseTreeVisitor < Liquid::ParseTreeVisitor
+      def children
+        @node.lookups
+      end
+    end
   end
 end

data/lib/liquid/version.rb

@@ -1,4 +1,6 @@
 # encoding: utf-8
+# frozen_string_literal: true
+
 module Liquid
-  VERSION = "4.0.1"
+  VERSION = "5.4.0"
 end

data/lib/liquid.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2005 Tobias Luetke
 #
 # Permission is hereby granted, free of charge, to any person obtaining
@@ -21,12 +23,13 @@
 
 module Liquid
   FilterSeparator             = /\|/
-  ArgumentSeparator           = ','.freeze
-  FilterArgumentSeparator     = ':'.freeze
-  VariableAttributeSeparator  = '.'.freeze
-  WhitespaceControl           = '-'.freeze
+  ArgumentSeparator           = ','
+  FilterArgumentSeparator     = ':'
+  VariableAttributeSeparator  = '.'
+  WhitespaceControl           = '-'
   TagStart                    = /\{\%/
   TagEnd                      = /\%\}/
+  TagName                     = /#|\w+/
   VariableSignature           = /\(?[\w\-\.\[\]]\)?/
   VariableSegment             = /[\w\-]/
   VariableStart               = /\{\{/
@@ -34,17 +37,20 @@ module Liquid
   VariableIncompleteEnd       = /\}\}?/
   QuotedString                = /"[^"]*"|'[^']*'/
   QuotedFragment              = /#{QuotedString}|(?:[^\s,\|'"]|#{QuotedString})+/o
-  TagAttributes               = /(\w+)\s*\:\s*(#{QuotedFragment})/o
+  TagAttributes               = /(\w[\w-]*)\s*\:\s*(#{QuotedFragment})/o
   AnyStartingTag              = /#{TagStart}|#{VariableStart}/o
   PartialTemplateParser       = /#{TagStart}.*?#{TagEnd}|#{VariableStart}.*?#{VariableIncompleteEnd}/om
   TemplateParser              = /(#{PartialTemplateParser}|#{AnyStartingTag})/om
   VariableParser              = /\[[^\]]+\]|#{VariableSegment}+\??/o
 
+  RAISE_EXCEPTION_LAMBDA = ->(_e) { raise }
+
   singleton_class.send(:attr_accessor, :cache_classes)
   self.cache_classes = true
 end
 
 require "liquid/version"
+require 'liquid/parse_tree_visitor'
 require 'liquid/lexer'
 require 'liquid/parser'
 require 'liquid/i18n'
@@ -54,11 +60,14 @@ require 'liquid/forloop_drop'
 require 'liquid/extensions'
 require 'liquid/errors'
 require 'liquid/interrupts'
-require 'liquid/strainer'
+require 'liquid/strainer_template'
+require 'liquid/strainer_factory'
 require 'liquid/expression'
 require 'liquid/context'
 require 'liquid/parser_switching'
 require 'liquid/tag'
+require 'liquid/tag/disabler'
+require 'liquid/tag/disableable'
 require 'liquid/block'
 require 'liquid/block_body'
 require 'liquid/document'
@@ -73,6 +82,10 @@ require 'liquid/condition'
 require 'liquid/utils'
 require 'liquid/tokenizer'
 require 'liquid/parse_context'
+require 'liquid/partial_cache'
+require 'liquid/usage'
+require 'liquid/registers'
+require 'liquid/template_factory'
 
 # Load all the tags of the standard library
 #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: liquid
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 5.4.0
 platform: ruby
 authors:
 - Tobias Lütke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-09 00:00:00.000000000 Z
+date: 2022-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -67,16 +67,22 @@ files:
 - lib/liquid/lexer.rb
 - lib/liquid/locales/en.yml
 - lib/liquid/parse_context.rb
+- lib/liquid/parse_tree_visitor.rb
 - lib/liquid/parser.rb
 - lib/liquid/parser_switching.rb
+- lib/liquid/partial_cache.rb
 - lib/liquid/profiler.rb
 - lib/liquid/profiler/hooks.rb
 - lib/liquid/range_lookup.rb
+- lib/liquid/registers.rb
 - lib/liquid/resource_limits.rb
 - lib/liquid/standardfilters.rb
-- lib/liquid/strainer.rb
+- lib/liquid/strainer_factory.rb
+- lib/liquid/strainer_template.rb
 - lib/liquid/tablerowloop_drop.rb
 - lib/liquid/tag.rb
+- lib/liquid/tag/disableable.rb
+- lib/liquid/tag/disabler.rb
 - lib/liquid/tags/assign.rb
 - lib/liquid/tags/break.rb
 - lib/liquid/tags/capture.rb
@@ -85,71 +91,30 @@ files:
 - lib/liquid/tags/continue.rb
 - lib/liquid/tags/cycle.rb
 - lib/liquid/tags/decrement.rb
+- lib/liquid/tags/echo.rb
 - lib/liquid/tags/for.rb
 - lib/liquid/tags/if.rb
 - lib/liquid/tags/ifchanged.rb
 - lib/liquid/tags/include.rb
 - lib/liquid/tags/increment.rb
+- lib/liquid/tags/inline_comment.rb
 - lib/liquid/tags/raw.rb
+- lib/liquid/tags/render.rb
 - lib/liquid/tags/table_row.rb
 - lib/liquid/tags/unless.rb
 - lib/liquid/template.rb
+- lib/liquid/template_factory.rb
 - lib/liquid/tokenizer.rb
+- lib/liquid/usage.rb
 - lib/liquid/utils.rb
 - lib/liquid/variable.rb
 - lib/liquid/variable_lookup.rb
 - lib/liquid/version.rb
-- test/fixtures/en_locale.yml
-- test/integration/assign_test.rb
-- test/integration/blank_test.rb
-- test/integration/block_test.rb
-- test/integration/capture_test.rb
-- test/integration/context_test.rb
-- test/integration/document_test.rb
-- test/integration/drop_test.rb
-- test/integration/error_handling_test.rb
-- test/integration/filter_test.rb
-- test/integration/hash_ordering_test.rb
-- test/integration/output_test.rb
-- test/integration/parsing_quirks_test.rb
-- test/integration/render_profiling_test.rb
-- test/integration/security_test.rb
-- test/integration/standard_filter_test.rb
-- test/integration/tags/break_tag_test.rb
-- test/integration/tags/continue_tag_test.rb
-- test/integration/tags/for_tag_test.rb
-- test/integration/tags/if_else_tag_test.rb
-- test/integration/tags/include_tag_test.rb
-- test/integration/tags/increment_tag_test.rb
-- test/integration/tags/raw_tag_test.rb
-- test/integration/tags/standard_tag_test.rb
-- test/integration/tags/statements_test.rb
-- test/integration/tags/table_row_test.rb
-- test/integration/tags/unless_else_tag_test.rb
-- test/integration/template_test.rb
-- test/integration/trim_mode_test.rb
-- test/integration/variable_test.rb
-- test/test_helper.rb
-- test/unit/block_unit_test.rb
-- test/unit/condition_unit_test.rb
-- test/unit/context_unit_test.rb
-- test/unit/file_system_unit_test.rb
-- test/unit/i18n_unit_test.rb
-- test/unit/lexer_unit_test.rb
-- test/unit/parser_unit_test.rb
-- test/unit/regexp_unit_test.rb
-- test/unit/strainer_unit_test.rb
-- test/unit/tag_unit_test.rb
-- test/unit/tags/case_tag_unit_test.rb
-- test/unit/tags/for_tag_unit_test.rb
-- test/unit/tags/if_tag_unit_test.rb
-- test/unit/template_unit_test.rb
-- test/unit/tokenizer_unit_test.rb
-- test/unit/variable_unit_test.rb
 homepage: http://www.liquidmarkup.org
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -158,63 +123,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.7
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: A secure, non-evaling end user template engine with aesthetic markup.
-test_files:
-- test/unit/lexer_unit_test.rb
-- test/unit/block_unit_test.rb
-- test/unit/variable_unit_test.rb
-- test/unit/parser_unit_test.rb
-- test/unit/tags/if_tag_unit_test.rb
-- test/unit/tags/case_tag_unit_test.rb
-- test/unit/tags/for_tag_unit_test.rb
-- test/unit/context_unit_test.rb
-- test/unit/tokenizer_unit_test.rb
-- test/unit/tag_unit_test.rb
-- test/unit/i18n_unit_test.rb
-- test/unit/template_unit_test.rb
-- test/unit/condition_unit_test.rb
-- test/unit/file_system_unit_test.rb
-- test/unit/regexp_unit_test.rb
-- test/unit/strainer_unit_test.rb
-- test/integration/output_test.rb
-- test/integration/hash_ordering_test.rb
-- test/integration/variable_test.rb
-- test/integration/blank_test.rb
-- test/integration/assign_test.rb
-- test/integration/trim_mode_test.rb
-- test/integration/context_test.rb
-- test/integration/capture_test.rb
-- test/integration/tags/increment_tag_test.rb
-- test/integration/tags/for_tag_test.rb
-- test/integration/tags/standard_tag_test.rb
-- test/integration/tags/table_row_test.rb
-- test/integration/tags/include_tag_test.rb
-- test/integration/tags/raw_tag_test.rb
-- test/integration/tags/statements_test.rb
-- test/integration/tags/if_else_tag_test.rb
-- test/integration/tags/unless_else_tag_test.rb
-- test/integration/tags/continue_tag_test.rb
-- test/integration/tags/break_tag_test.rb
-- test/integration/block_test.rb
-- test/integration/standard_filter_test.rb
-- test/integration/drop_test.rb
-- test/integration/error_handling_test.rb
-- test/integration/template_test.rb
-- test/integration/document_test.rb
-- test/integration/security_test.rb
-- test/integration/render_profiling_test.rb
-- test/integration/parsing_quirks_test.rb
-- test/integration/filter_test.rb
-- test/fixtures/en_locale.yml
-- test/test_helper.rb
+test_files: []

data/lib/liquid/strainer.rb

@@ -1,66 +0,0 @@
-require 'set'
-
-module Liquid
-  # Strainer is the parent class for the filters system.
-  # New filters are mixed into the strainer class which is then instantiated for each liquid template render run.
-  #
-  # The Strainer only allows method calls defined in filters given to it via Strainer.global_filter,
-  # Context#add_filters or Template.register_filter
-  class Strainer #:nodoc:
-    @@global_strainer = Class.new(Strainer) do
-      @filter_methods = Set.new
-    end
-    @@strainer_class_cache = Hash.new do |hash, filters|
-      hash[filters] = Class.new(@@global_strainer) do
-        @filter_methods = @@global_strainer.filter_methods.dup
-        filters.each { |f| add_filter(f) }
-      end
-    end
-
-    def initialize(context)
-      @context = context
-    end
-
-    class << self
-      attr_reader :filter_methods
-    end
-
-    def self.add_filter(filter)
-      raise ArgumentError, "Expected module but got: #{filter.class}" unless filter.is_a?(Module)
-      unless self.include?(filter)
-        invokable_non_public_methods = (filter.private_instance_methods + filter.protected_instance_methods).select { |m| invokable?(m) }
-        if invokable_non_public_methods.any?
-          raise MethodOverrideError, "Filter overrides registered public methods as non public: #{invokable_non_public_methods.join(', ')}"
-        else
-          send(:include, filter)
-          @filter_methods.merge(filter.public_instance_methods.map(&:to_s))
-        end
-      end
-    end
-
-    def self.global_filter(filter)
-      @@strainer_class_cache.clear
-      @@global_strainer.add_filter(filter)
-    end
-
-    def self.invokable?(method)
-      @filter_methods.include?(method.to_s)
-    end
-
-    def self.create(context, filters = [])
-      @@strainer_class_cache[filters].new(context)
-    end
-
-    def invoke(method, *args)
-      if self.class.invokable?(method)
-        send(method, *args)
-      elsif @context && @context.strict_filters
-        raise Liquid::UndefinedFilter, "undefined filter #{method}"
-      else
-        args.first
-      end
-    rescue ::ArgumentError => e
-      raise Liquid::ArgumentError, e.message, e.backtrace
-    end
-  end
-end

data/test/fixtures/en_locale.yml

@@ -1,9 +0,0 @@
----
-  simple: "less is more"
-  whatever: "something %{something}"
-  errors:
-    i18n:
-      undefined_interpolation: "undefined key %{key}"
-      unknown_translation: "translation '%{name}' wasn't found"
-    syntax:
-      oops: "something wasn't right"

data/test/integration/assign_test.rb

@@ -1,48 +0,0 @@
-require 'test_helper'
-
-class AssignTest < Minitest::Test
-  include Liquid
-
-  def test_assign_with_hyphen_in_variable_name
-    template_source = <<-END_TEMPLATE
-    {% assign this-thing = 'Print this-thing' %}
-    {{ this-thing }}
-    END_TEMPLATE
-    template = Template.parse(template_source)
-    rendered = template.render!
-    assert_equal "Print this-thing", rendered.strip
-  end
-
-  def test_assigned_variable
-    assert_template_result('.foo.',
-      '{% assign foo = values %}.{{ foo[0] }}.',
-      'values' => %w(foo bar baz))
-
-    assert_template_result('.bar.',
-      '{% assign foo = values %}.{{ foo[1] }}.',
-      'values' => %w(foo bar baz))
-  end
-
-  def test_assign_with_filter
-    assert_template_result('.bar.',
-      '{% assign foo = values | split: "," %}.{{ foo[1] }}.',
-      'values' => "foo,bar,baz")
-  end
-
-  def test_assign_syntax_error
-    assert_match_syntax_error(/assign/,
-      '{% assign foo not values %}.',
-      'values' => "foo,bar,baz")
-  end
-
-  def test_assign_uses_error_mode
-    with_error_mode(:strict) do
-      assert_raises(SyntaxError) do
-        Template.parse("{% assign foo = ('X' | downcase) %}")
-      end
-    end
-    with_error_mode(:lax) do
-      assert Template.parse("{% assign foo = ('X' | downcase) %}")
-    end
-  end
-end # AssignTest

data/test/integration/blank_test.rb

@@ -1,106 +0,0 @@
-require 'test_helper'
-
-class FoobarTag < Liquid::Tag
-  def render(*args)
-    " "
-  end
-
-  Liquid::Template.register_tag('foobar', FoobarTag)
-end
-
-class BlankTestFileSystem
-  def read_template_file(template_path)
-    template_path
-  end
-end
-
-class BlankTest < Minitest::Test
-  include Liquid
-  N = 10
-
-  def wrap_in_for(body)
-    "{% for i in (1..#{N}) %}#{body}{% endfor %}"
-  end
-
-  def wrap_in_if(body)
-    "{% if true %}#{body}{% endif %}"
-  end
-
-  def wrap(body)
-    wrap_in_for(body) + wrap_in_if(body)
-  end
-
-  def test_new_tags_are_not_blank_by_default
-    assert_template_result(" " * N, wrap_in_for("{% foobar %}"))
-  end
-
-  def test_loops_are_blank
-    assert_template_result("", wrap_in_for(" "))
-  end
-
-  def test_if_else_are_blank
-    assert_template_result("", "{% if true %} {% elsif false %} {% else %} {% endif %}")
-  end
-
-  def test_unless_is_blank
-    assert_template_result("", wrap("{% unless true %} {% endunless %}"))
-  end
-
-  def test_mark_as_blank_only_during_parsing
-    assert_template_result(" " * (N + 1), wrap(" {% if false %} this never happens, but still, this block is not blank {% endif %}"))
-  end
-
-  def test_comments_are_blank
-    assert_template_result("", wrap(" {% comment %} whatever {% endcomment %} "))
-  end
-
-  def test_captures_are_blank
-    assert_template_result("", wrap(" {% capture foo %} whatever {% endcapture %} "))
-  end
-
-  def test_nested_blocks_are_blank_but_only_if_all_children_are
-    assert_template_result("", wrap(wrap(" ")))
-    assert_template_result("\n       but this is not " * (N + 1),
-      wrap('{% if true %} {% comment %} this is blank {% endcomment %} {% endif %}
-      {% if true %} but this is not {% endif %}'))
-  end
-
-  def test_assigns_are_blank
-    assert_template_result("", wrap(' {% assign foo = "bar" %} '))
-  end
-
-  def test_whitespace_is_blank
-    assert_template_result("", wrap(" "))
-    assert_template_result("", wrap("\t"))
-  end
-
-  def test_whitespace_is_not_blank_if_other_stuff_is_present
-    body = "     x "
-    assert_template_result(body * (N + 1), wrap(body))
-  end
-
-  def test_increment_is_not_blank
-    assert_template_result(" 0" * 2 * (N + 1), wrap("{% assign foo = 0 %} {% increment foo %} {% decrement foo %}"))
-  end
-
-  def test_cycle_is_not_blank
-    assert_template_result("  " * ((N + 1) / 2) + " ", wrap("{% cycle ' ', ' ' %}"))
-  end
-
-  def test_raw_is_not_blank
-    assert_template_result("  " * (N + 1), wrap(" {% raw %} {% endraw %}"))
-  end
-
-  def test_include_is_blank
-    Liquid::Template.file_system = BlankTestFileSystem.new
-    assert_template_result "foobar" * (N + 1), wrap("{% include 'foobar' %}")
-    assert_template_result " foobar " * (N + 1), wrap("{% include ' foobar ' %}")
-    assert_template_result "   " * (N + 1), wrap(" {% include ' ' %} ")
-  end
-
-  def test_case_is_blank
-    assert_template_result("", wrap(" {% assign foo = 'bar' %} {% case foo %} {% when 'bar' %} {% when 'whatever' %} {% else %} {% endcase %} "))
-    assert_template_result("", wrap(" {% assign foo = 'else' %} {% case foo %} {% when 'bar' %} {% when 'whatever' %} {% else %} {% endcase %} "))
-    assert_template_result("   x  " * (N + 1), wrap(" {% assign foo = 'else' %} {% case foo %} {% when 'bar' %} {% when 'whatever' %} {% else %} x {% endcase %} "))
-  end
-end

data/test/integration/block_test.rb

@@ -1,12 +0,0 @@
-require 'test_helper'
-
-class BlockTest < Minitest::Test
-  include Liquid
-
-  def test_unexpected_end_tag
-    exc = assert_raises(SyntaxError) do
-      Template.parse("{% if true %}{% endunless %}")
-    end
-    assert_equal exc.message, "Liquid syntax error: 'endunless' is not a valid delimiter for if tags. use endif"
-  end
-end

data/test/integration/capture_test.rb

@@ -1,50 +0,0 @@
-require 'test_helper'
-
-class CaptureTest < Minitest::Test
-  include Liquid
-
-  def test_captures_block_content_in_variable
-    assert_template_result("test string", "{% capture 'var' %}test string{% endcapture %}{{var}}", {})
-  end
-
-  def test_capture_with_hyphen_in_variable_name
-    template_source = <<-END_TEMPLATE
-    {% capture this-thing %}Print this-thing{% endcapture %}
-    {{ this-thing }}
-    END_TEMPLATE
-    template = Template.parse(template_source)
-    rendered = template.render!
-    assert_equal "Print this-thing", rendered.strip
-  end
-
-  def test_capture_to_variable_from_outer_scope_if_existing
-    template_source = <<-END_TEMPLATE
-    {% assign var = '' %}
-    {% if true %}
-    {% capture var %}first-block-string{% endcapture %}
-    {% endif %}
-    {% if true %}
-    {% capture var %}test-string{% endcapture %}
-    {% endif %}
-    {{var}}
-    END_TEMPLATE
-    template = Template.parse(template_source)
-    rendered = template.render!
-    assert_equal "test-string", rendered.gsub(/\s/, '')
-  end
-
-  def test_assigning_from_capture
-    template_source = <<-END_TEMPLATE
-    {% assign first = '' %}
-    {% assign second = '' %}
-    {% for number in (1..3) %}
-    {% capture first %}{{number}}{% endcapture %}
-    {% assign second = first %}
-    {% endfor %}
-    {{ first }}-{{ second }}
-    END_TEMPLATE
-    template = Template.parse(template_source)
-    rendered = template.render!
-    assert_equal "3-3", rendered.gsub(/\s/, '')
-  end
-end # CaptureTest