liquid 4.0.0 → 4.0.1

data/test/integration/tags/for_tag_test.rb

@@ -159,7 +159,7 @@ HERE
     assert_template_result(expected, markup, assigns)
   end
 
-  def test_pause_resume_BIG_limit
+  def test_pause_resume_big_limit
     assigns = { 'array' => { 'items' => [1, 2, 3, 4, 5, 6, 7, 8, 9, 0] } }
     markup = <<-MKUP
       {%for i in array.items limit:3 %}{{i}}{%endfor%}
@@ -178,7 +178,7 @@ HERE
     assert_template_result(expected, markup, assigns)
   end
 
-  def test_pause_resume_BIG_offset
+  def test_pause_resume_big_offset
     assigns = { 'array' => { 'items' => [1, 2, 3, 4, 5, 6, 7, 8, 9, 0] } }
     markup = '{%for i in array.items limit:3 %}{{i}}{%endfor%}
       next

data/test/integration/tags/include_tag_test.rb

@@ -137,7 +137,7 @@ class IncludeTagTest < Minitest::Test
 
     Liquid::Template.file_system = infinite_file_system.new
 
-    assert_raises(Liquid::StackLevelError, SystemStackError) do
+    assert_raises(Liquid::StackLevelError) do
       Template.parse("{% include 'loop' %}").render!
     end
   end
@@ -235,4 +235,11 @@ class IncludeTagTest < Minitest::Test
 
     assert_template_result "Product: Draft 151cm ", "{% assign page = 'product' %}{% include page for foo %}", "foo" => { 'title' => 'Draft 151cm' }
   end
+
+  def test_including_with_strict_variables
+    template = Liquid::Template.parse("{% include 'simple' %}", error_mode: :warn)
+    template.render(nil, strict_variables: true)
+
+    assert_equal [], template.errors
+  end
 end # IncludeTagTest

data/test/integration/template_test.rb

@@ -261,6 +261,15 @@ class TemplateTest < Minitest::Test
     assert_equal 'Liquid error: undefined variable d', t.errors[2].message
   end
 
+  def test_nil_value_does_not_raise
+    Liquid::Template.error_mode = :strict
+    t = Template.parse("some{{x}}thing")
+    result = t.render!({ 'x' => nil }, strict_variables: true)
+
+    assert_equal 0, t.errors.count
+    assert_equal 'something', result
+  end
+
   def test_undefined_variables_raise
     t = Template.parse("{{x}} {{y}} {{z.a}} {{z.b}} {{z.c.d}}")
 

data/test/integration/trim_mode_test.rb

@@ -496,6 +496,10 @@ class TrimModeTest < Minitest::Test
     assert_template_result(expected, text)
   end
 
+  def test_right_trim_followed_by_tag
+    assert_template_result('ab c', '{{ "a" -}}{{ "b" }} c')
+  end
+
   def test_raw_output
     whitespace = '        '
     text = <<-END_TEMPLATE

data/test/integration/variable_test.rb

@@ -89,4 +89,8 @@ class VariableTest < Minitest::Test
   def test_multiline_variable
     assert_equal 'worked', Template.parse("{{\ntest\n}}").render!('test' => 'worked')
   end
+
+  def test_render_symbol
+    assert_template_result 'bar', '{{ foo }}', 'foo' => :bar
+  end
 end

data/test/test_helper.rb

@@ -2,7 +2,6 @@
 
 ENV["MT_NO_EXPECTATIONS"] = "1"
 require 'minitest/autorun'
-require 'spy/integration'
 
 $LOAD_PATH.unshift(File.join(File.expand_path(__dir__), '..', 'lib'))
 require 'liquid.rb'

data/test/unit/condition_unit_test.rb

@@ -64,6 +64,14 @@ class ConditionUnitTest < Minitest::Test
     assert_evaluates_argument_error '1', '<=', 0
   end
 
+  def test_hash_compare_backwards_compatibility
+    assert_nil Condition.new({}, '>', 2).evaluate
+    assert_nil Condition.new(2, '>', {}).evaluate
+    assert_equal false, Condition.new({}, '==', 2).evaluate
+    assert_equal true, Condition.new({ 'a' => 1 }, '==', { 'a' => 1 }).evaluate
+    assert_equal true, Condition.new({ 'a' => 2 }, 'contains', 'a').evaluate
+  end
+
   def test_contains_works_on_arrays
     @context = Liquid::Context.new
     @context['array'] = [1, 2, 3, 4, 5]

data/test/unit/context_unit_test.rb

@@ -70,10 +70,6 @@ class ContextUnitTest < Minitest::Test
     @context = Liquid::Context.new
   end
 
-  def teardown
-    Spy.teardown
-  end
-
   def test_variables
     @context['string'] = 'string'
     assert_equal 'string', @context['string']
@@ -98,12 +94,12 @@ class ContextUnitTest < Minitest::Test
     assert_equal false, @context['bool']
 
     @context['nil'] = nil
-    assert_equal nil, @context['nil']
-    assert_equal nil, @context['nil']
+    assert_nil @context['nil']
+    assert_nil @context['nil']
   end
 
   def test_variables_not_existing
-    assert_equal nil, @context['does_not_exist']
+    assert_nil @context['does_not_exist']
   end
 
   def test_scoping
@@ -185,7 +181,7 @@ class ContextUnitTest < Minitest::Test
     @context['test'] = 'test'
     assert_equal 'test', @context['test']
     @context.pop
-    assert_equal nil, @context['test']
+    assert_nil @context['test']
   end
 
   def test_hierachical_data
@@ -300,7 +296,7 @@ class ContextUnitTest < Minitest::Test
     @context['hash'] = { 'first' => 'Hello' }
 
     assert_equal 1, @context['array.first']
-    assert_equal nil, @context['array["first"]']
+    assert_nil @context['array["first"]']
     assert_equal 'Hello', @context['hash["first"]']
   end
 
@@ -450,14 +446,10 @@ class ContextUnitTest < Minitest::Test
     assert_equal @context, @context['category'].context
   end
 
-  def test_use_empty_instead_of_any_in_interrupt_handling_to_avoid_lots_of_unnecessary_object_allocations
-    mock_any = Spy.on_instance_method(Array, :any?)
-    mock_empty = Spy.on_instance_method(Array, :empty?)
-
-    @context.interrupt?
-
-    refute mock_any.has_been_called?
-    assert mock_empty.has_been_called?
+  def test_interrupt_avoids_object_allocations
+    assert_no_object_allocations do
+      @context.interrupt?
+    end
   end
 
   def test_context_initialization_with_a_proc_in_environment
@@ -480,4 +472,18 @@ class ContextUnitTest < Minitest::Test
     context = Context.new
     assert_equal 'hi', context.apply_global_filter('hi')
   end
+
+  private
+
+  def assert_no_object_allocations
+    unless RUBY_ENGINE == 'ruby'
+      skip "stackprof needed to count object allocations"
+    end
+    require 'stackprof'
+
+    profile = StackProf.run(mode: :object) do
+      yield
+    end
+    assert_equal 0, profile[:samples]
+  end
 end # ContextTest

data/test/unit/lexer_unit_test.rb

@@ -19,7 +19,7 @@ class LexerUnitTest < Minitest::Test
   end
 
   def test_comparison
-    tokens = Lexer.new('== <> contains').tokenize
+    tokens = Lexer.new('== <> contains ').tokenize
     assert_equal [[:comparison, '=='], [:comparison, '<>'], [:comparison, 'contains'], [:end_of_string]], tokens
   end
 

data/test/unit/strainer_unit_test.rb

@@ -145,4 +145,20 @@ class StrainerUnitTest < Minitest::Test
     Strainer.global_filter(LateAddedFilter)
     assert_equal 'filtered', Strainer.create(nil).invoke('late_added_filter', 'input')
   end
+
+  def test_add_filter_does_not_include_already_included_module
+    mod = Module.new do
+      class << self
+        attr_accessor :include_count
+        def included(mod)
+          self.include_count += 1
+        end
+      end
+      self.include_count = 0
+    end
+    strainer = Context.new.strainer
+    strainer.class.add_filter(mod)
+    strainer.class.add_filter(mod)
+    assert_equal 1, mod.include_count
+  end
 end # StrainerTest

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: liquid
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Tobias Lütke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-14 00:00:00.000000000 Z
+date: 2018-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -102,6 +102,7 @@ files:
 - 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
@@ -165,54 +166,55 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.7
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A secure, non-evaling end user template engine with aesthetic markup.
 test_files:
-- test/fixtures/en_locale.yml
-- test/integration/assign_test.rb
+- 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/capture_test.rb
+- test/integration/assign_test.rb
+- test/integration/trim_mode_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/capture_test.rb
+- test/integration/tags/increment_tag_test.rb
 - test/integration/tags/for_tag_test.rb
-- test/integration/tags/if_else_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/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/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/trim_mode_test.rb
-- test/integration/variable_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/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