liquid 4.0.3 → 5.0.1

data/test/unit/tokenizer_unit_test.rb

@@ -1,50 +1,57 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class TokenizerTest < Minitest::Test
   def test_tokenize_strings
-    assert_equal [' '], tokenize(' ')
-    assert_equal ['hello world'], tokenize('hello world')
+    assert_equal([' '], tokenize(' '))
+    assert_equal(['hello world'], tokenize('hello world'))
   end
 
   def test_tokenize_variables
-    assert_equal ['{{funk}}'], tokenize('{{funk}}')
-    assert_equal [' ', '{{funk}}', ' '], tokenize(' {{funk}} ')
-    assert_equal [' ', '{{funk}}', ' ', '{{so}}', ' ', '{{brother}}', ' '], tokenize(' {{funk}} {{so}} {{brother}} ')
-    assert_equal [' ', '{{  funk  }}', ' '], tokenize(' {{  funk  }} ')
+    assert_equal(['{{funk}}'], tokenize('{{funk}}'))
+    assert_equal([' ', '{{funk}}', ' '], tokenize(' {{funk}} '))
+    assert_equal([' ', '{{funk}}', ' ', '{{so}}', ' ', '{{brother}}', ' '], tokenize(' {{funk}} {{so}} {{brother}} '))
+    assert_equal([' ', '{{  funk  }}', ' '], tokenize(' {{  funk  }} '))
   end
 
   def test_tokenize_blocks
-    assert_equal ['{%comment%}'], tokenize('{%comment%}')
-    assert_equal [' ', '{%comment%}', ' '], tokenize(' {%comment%} ')
+    assert_equal(['{%comment%}'], tokenize('{%comment%}'))
+    assert_equal([' ', '{%comment%}', ' '], tokenize(' {%comment%} '))
 
-    assert_equal [' ', '{%comment%}', ' ', '{%endcomment%}', ' '], tokenize(' {%comment%} {%endcomment%} ')
-    assert_equal ['  ', '{% comment %}', ' ', '{% endcomment %}', ' '], tokenize("  {% comment %} {% endcomment %} ")
+    assert_equal([' ', '{%comment%}', ' ', '{%endcomment%}', ' '], tokenize(' {%comment%} {%endcomment%} '))
+    assert_equal(['  ', '{% comment %}', ' ', '{% endcomment %}', ' '], tokenize("  {% comment %} {% endcomment %} "))
   end
 
   def test_calculate_line_numbers_per_token_with_profiling
-    assert_equal [1],       tokenize_line_numbers("{{funk}}")
-    assert_equal [1, 1, 1], tokenize_line_numbers(" {{funk}} ")
-    assert_equal [1, 2, 2], tokenize_line_numbers("\n{{funk}}\n")
-    assert_equal [1, 1, 3], tokenize_line_numbers(" {{\n funk \n}} ")
+    assert_equal([1],       tokenize_line_numbers("{{funk}}"))
+    assert_equal([1, 1, 1], tokenize_line_numbers(" {{funk}} "))
+    assert_equal([1, 2, 2], tokenize_line_numbers("\n{{funk}}\n"))
+    assert_equal([1, 1, 3], tokenize_line_numbers(" {{\n funk \n}} "))
   end
 
   private
 
+  def new_tokenizer(source, parse_context: Liquid::ParseContext.new, start_line_number: nil)
+    parse_context.new_tokenizer(source, start_line_number: start_line_number)
+  end
+
   def tokenize(source)
-    tokenizer = Liquid::Tokenizer.new(source)
-    tokens = []
-    while t = tokenizer.shift
+    tokenizer = new_tokenizer(source)
+    tokens    = []
+    # shift is private in Liquid::C::Tokenizer, since it is only for unit testing
+    while (t = tokenizer.send(:shift))
       tokens << t
     end
     tokens
   end
 
   def tokenize_line_numbers(source)
-    tokenizer = Liquid::Tokenizer.new(source, true)
+    tokenizer    = new_tokenizer(source, start_line_number: 1)
     line_numbers = []
     loop do
       line_number = tokenizer.line_number
-      if tokenizer.shift
+      if tokenizer.send(:shift)
         line_numbers << line_number
       else
         break

data/test/unit/variable_unit_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class VariableUnitTest < Minitest::Test
@@ -5,108 +7,108 @@ class VariableUnitTest < Minitest::Test
 
   def test_variable
     var = create_variable('hello')
-    assert_equal VariableLookup.new('hello'), var.name
+    assert_equal(VariableLookup.new('hello'), var.name)
   end
 
   def test_filters
     var = create_variable('hello | textileze')
-    assert_equal VariableLookup.new('hello'), var.name
-    assert_equal [['textileze', []]], var.filters
+    assert_equal(VariableLookup.new('hello'), var.name)
+    assert_equal([['textileze', []]], var.filters)
 
     var = create_variable('hello | textileze | paragraph')
-    assert_equal VariableLookup.new('hello'), var.name
-    assert_equal [['textileze', []], ['paragraph', []]], var.filters
+    assert_equal(VariableLookup.new('hello'), var.name)
+    assert_equal([['textileze', []], ['paragraph', []]], var.filters)
 
     var = create_variable(%( hello | strftime: '%Y'))
-    assert_equal VariableLookup.new('hello'), var.name
-    assert_equal [['strftime', ['%Y']]], var.filters
+    assert_equal(VariableLookup.new('hello'), var.name)
+    assert_equal([['strftime', ['%Y']]], var.filters)
 
     var = create_variable(%( 'typo' | link_to: 'Typo', true ))
-    assert_equal 'typo', var.name
-    assert_equal [['link_to', ['Typo', true]]], var.filters
+    assert_equal('typo', var.name)
+    assert_equal([['link_to', ['Typo', true]]], var.filters)
 
     var = create_variable(%( 'typo' | link_to: 'Typo', false ))
-    assert_equal 'typo', var.name
-    assert_equal [['link_to', ['Typo', false]]], var.filters
+    assert_equal('typo', var.name)
+    assert_equal([['link_to', ['Typo', false]]], var.filters)
 
     var = create_variable(%( 'foo' | repeat: 3 ))
-    assert_equal 'foo', var.name
-    assert_equal [['repeat', [3]]], var.filters
+    assert_equal('foo', var.name)
+    assert_equal([['repeat', [3]]], var.filters)
 
     var = create_variable(%( 'foo' | repeat: 3, 3 ))
-    assert_equal 'foo', var.name
-    assert_equal [['repeat', [3, 3]]], var.filters
+    assert_equal('foo', var.name)
+    assert_equal([['repeat', [3, 3]]], var.filters)
 
     var = create_variable(%( 'foo' | repeat: 3, 3, 3 ))
-    assert_equal 'foo', var.name
-    assert_equal [['repeat', [3, 3, 3]]], var.filters
+    assert_equal('foo', var.name)
+    assert_equal([['repeat', [3, 3, 3]]], var.filters)
 
     var = create_variable(%( hello | strftime: '%Y, okay?'))
-    assert_equal VariableLookup.new('hello'), var.name
-    assert_equal [['strftime', ['%Y, okay?']]], var.filters
+    assert_equal(VariableLookup.new('hello'), var.name)
+    assert_equal([['strftime', ['%Y, okay?']]], var.filters)
 
     var = create_variable(%( hello | things: "%Y, okay?", 'the other one'))
-    assert_equal VariableLookup.new('hello'), var.name
-    assert_equal [['things', ['%Y, okay?', 'the other one']]], var.filters
+    assert_equal(VariableLookup.new('hello'), var.name)
+    assert_equal([['things', ['%Y, okay?', 'the other one']]], var.filters)
   end
 
   def test_filter_with_date_parameter
     var = create_variable(%( '2006-06-06' | date: "%m/%d/%Y"))
-    assert_equal '2006-06-06', var.name
-    assert_equal [['date', ['%m/%d/%Y']]], var.filters
+    assert_equal('2006-06-06', var.name)
+    assert_equal([['date', ['%m/%d/%Y']]], var.filters)
   end
 
   def test_filters_without_whitespace
     var = create_variable('hello | textileze | paragraph')
-    assert_equal VariableLookup.new('hello'), var.name
-    assert_equal [['textileze', []], ['paragraph', []]], var.filters
+    assert_equal(VariableLookup.new('hello'), var.name)
+    assert_equal([['textileze', []], ['paragraph', []]], var.filters)
 
     var = create_variable('hello|textileze|paragraph')
-    assert_equal VariableLookup.new('hello'), var.name
-    assert_equal [['textileze', []], ['paragraph', []]], var.filters
+    assert_equal(VariableLookup.new('hello'), var.name)
+    assert_equal([['textileze', []], ['paragraph', []]], var.filters)
 
     var = create_variable("hello|replace:'foo','bar'|textileze")
-    assert_equal VariableLookup.new('hello'), var.name
-    assert_equal [['replace', ['foo', 'bar']], ['textileze', []]], var.filters
+    assert_equal(VariableLookup.new('hello'), var.name)
+    assert_equal([['replace', ['foo', 'bar']], ['textileze', []]], var.filters)
   end
 
   def test_symbol
     var = create_variable("http://disney.com/logo.gif | image: 'med' ", error_mode: :lax)
-    assert_equal VariableLookup.new('http://disney.com/logo.gif'), var.name
-    assert_equal [['image', ['med']]], var.filters
+    assert_equal(VariableLookup.new('http://disney.com/logo.gif'), var.name)
+    assert_equal([['image', ['med']]], var.filters)
   end
 
   def test_string_to_filter
     var = create_variable("'http://disney.com/logo.gif' | image: 'med' ")
-    assert_equal 'http://disney.com/logo.gif', var.name
-    assert_equal [['image', ['med']]], var.filters
+    assert_equal('http://disney.com/logo.gif', var.name)
+    assert_equal([['image', ['med']]], var.filters)
   end
 
   def test_string_single_quoted
     var = create_variable(%( "hello" ))
-    assert_equal 'hello', var.name
+    assert_equal('hello', var.name)
   end
 
   def test_string_double_quoted
     var = create_variable(%( 'hello' ))
-    assert_equal 'hello', var.name
+    assert_equal('hello', var.name)
   end
 
   def test_integer
     var = create_variable(%( 1000 ))
-    assert_equal 1000, var.name
+    assert_equal(1000, var.name)
   end
 
   def test_float
     var = create_variable(%( 1000.01 ))
-    assert_equal 1000.01, var.name
+    assert_equal(1000.01, var.name)
   end
 
   def test_dashes
-    assert_equal VariableLookup.new('foo-bar'), create_variable('foo-bar').name
-    assert_equal VariableLookup.new('foo-bar-2'), create_variable('foo-bar-2').name
+    assert_equal(VariableLookup.new('foo-bar'), create_variable('foo-bar').name)
+    assert_equal(VariableLookup.new('foo-bar-2'), create_variable('foo-bar-2').name)
 
-    with_error_mode :strict do
+    with_error_mode(:strict) do
       assert_raises(Liquid::SyntaxError) { create_variable('foo - bar') }
       assert_raises(Liquid::SyntaxError) { create_variable('-foo') }
       assert_raises(Liquid::SyntaxError) { create_variable('2foo') }
@@ -115,24 +117,24 @@ class VariableUnitTest < Minitest::Test
 
   def test_string_with_special_chars
     var = create_variable(%( 'hello! $!@.;"ddasd" ' ))
-    assert_equal 'hello! $!@.;"ddasd" ', var.name
+    assert_equal('hello! $!@.;"ddasd" ', var.name)
   end
 
   def test_string_dot
     var = create_variable(%( test.test ))
-    assert_equal VariableLookup.new('test.test'), var.name
+    assert_equal(VariableLookup.new('test.test'), var.name)
   end
 
   def test_filter_with_keyword_arguments
     var = create_variable(%( hello | things: greeting: "world", farewell: 'goodbye'))
-    assert_equal VariableLookup.new('hello'), var.name
-    assert_equal [['things', [], { 'greeting' => 'world', 'farewell' => 'goodbye' }]], var.filters
+    assert_equal(VariableLookup.new('hello'), var.name)
+    assert_equal([['things', [], { 'greeting' => 'world', 'farewell' => 'goodbye' }]], var.filters)
   end
 
   def test_lax_filter_argument_parsing
     var = create_variable(%( number_of_comments | pluralize: 'comment': 'comments' ), error_mode: :lax)
-    assert_equal VariableLookup.new('number_of_comments'), var.name
-    assert_equal [['pluralize', ['comment', 'comments']]], var.filters
+    assert_equal(VariableLookup.new('number_of_comments'), var.name)
+    assert_equal([['pluralize', ['comment', 'comments']]], var.filters)
   end
 
   def test_strict_filter_argument_parsing
@@ -145,13 +147,13 @@ class VariableUnitTest < Minitest::Test
 
   def test_output_raw_source_of_variable
     var = create_variable(%( name_of_variable | upcase ))
-    assert_equal " name_of_variable | upcase ", var.raw
+    assert_equal(" name_of_variable | upcase ", var.raw)
   end
 
   def test_variable_lookup_interface
     lookup = VariableLookup.new('a.b.c')
-    assert_equal 'a', lookup.name
-    assert_equal ['b', 'c'], lookup.lookups
+    assert_equal('a', lookup.name)
+    assert_equal(['b', 'c'], lookup.lookups)
   end
 
   private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: liquid
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 5.0.1
 platform: ruby
 authors:
 - Tobias Lütke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-12 00:00:00.000000000 Z
+date: 2021-03-24 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
@@ -70,14 +70,20 @@ files:
 - 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/register.rb
 - lib/liquid/resource_limits.rb
 - lib/liquid/standardfilters.rb
-- lib/liquid/strainer.rb
+- lib/liquid/static_registers.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
@@ -86,17 +92,20 @@ 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/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/truffle.rb
+- lib/liquid/usage.rb
 - lib/liquid/utils.rb
 - lib/liquid/variable.rb
 - lib/liquid/variable_lookup.rb
@@ -110,21 +119,26 @@ files:
 - test/integration/document_test.rb
 - test/integration/drop_test.rb
 - test/integration/error_handling_test.rb
+- test/integration/expression_test.rb
 - test/integration/filter_test.rb
 - test/integration/hash_ordering_test.rb
 - test/integration/output_test.rb
-- test/integration/parse_tree_visitor_test.rb
 - test/integration/parsing_quirks_test.rb
-- test/integration/render_profiling_test.rb
+- test/integration/profiler_test.rb
 - test/integration/security_test.rb
 - test/integration/standard_filter_test.rb
+- test/integration/tag/disableable_test.rb
+- test/integration/tag_test.rb
 - test/integration/tags/break_tag_test.rb
 - test/integration/tags/continue_tag_test.rb
+- test/integration/tags/echo_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/liquid_tag_test.rb
 - test/integration/tags/raw_tag_test.rb
+- test/integration/tags/render_tag_test.rb
 - test/integration/tags/standard_tag_test.rb
 - test/integration/tags/statements_test.rb
 - test/integration/tags/table_row_test.rb
@@ -133,27 +147,31 @@ files:
 - test/integration/trim_mode_test.rb
 - test/integration/variable_test.rb
 - test/test_helper.rb
-- test/truffle/truffle_test.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/parse_tree_visitor_test.rb
 - test/unit/parser_unit_test.rb
+- test/unit/partial_cache_unit_test.rb
 - test/unit/regexp_unit_test.rb
-- test/unit/strainer_unit_test.rb
+- test/unit/static_registers_unit_test.rb
+- test/unit/strainer_factory_unit_test.rb
+- test/unit/strainer_template_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_factory_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:
@@ -162,64 +180,72 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.7
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.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/fixtures/en_locale.yml
+- test/unit/condition_unit_test.rb
 - test/unit/variable_unit_test.rb
-- test/unit/parser_unit_test.rb
+- test/unit/template_unit_test.rb
+- test/unit/strainer_template_unit_test.rb
+- test/unit/file_system_unit_test.rb
+- test/unit/static_registers_unit_test.rb
+- test/unit/tags/for_tag_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/strainer_factory_unit_test.rb
+- test/unit/parse_tree_visitor_test.rb
+- test/unit/lexer_unit_test.rb
+- test/unit/block_unit_test.rb
+- test/unit/regexp_unit_test.rb
+- test/unit/partial_cache_unit_test.rb
+- test/unit/parser_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/unit/tokenizer_unit_test.rb
+- test/unit/template_factory_unit_test.rb
+- test/test_helper.rb
 - test/integration/blank_test.rb
-- test/integration/parse_tree_visitor_test.rb
-- test/integration/assign_test.rb
-- test/integration/trim_mode_test.rb
+- test/integration/standard_filter_test.rb
+- test/integration/parsing_quirks_test.rb
+- test/integration/tag/disableable_test.rb
 - test/integration/context_test.rb
+- test/integration/error_handling_test.rb
+- test/integration/security_test.rb
 - test/integration/capture_test.rb
+- test/integration/assign_test.rb
 - test/integration/tags/increment_tag_test.rb
+- test/integration/tags/break_tag_test.rb
+- test/integration/tags/if_else_tag_test.rb
+- test/integration/tags/liquid_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/unless_else_tag_test.rb
 - test/integration/tags/include_tag_test.rb
-- test/integration/tags/raw_tag_test.rb
+- test/integration/tags/echo_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/render_tag_test.rb
+- test/integration/tags/raw_tag_test.rb
 - test/integration/tags/continue_tag_test.rb
-- test/integration/tags/break_tag_test.rb
+- test/integration/tags/table_row_test.rb
+- test/integration/tags/standard_tag_test.rb
+- test/integration/variable_test.rb
+- test/integration/template_test.rb
 - test/integration/block_test.rb
-- test/integration/standard_filter_test.rb
+- test/integration/profiler_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/expression_test.rb
 - test/integration/filter_test.rb
-- test/truffle/truffle_test.rb
-- test/fixtures/en_locale.yml
-- test/test_helper.rb
+- test/integration/document_test.rb
+- test/integration/trim_mode_test.rb
+- test/integration/output_test.rb
+- test/integration/hash_ordering_test.rb
+- test/integration/tag_test.rb