Merge pull request #1874 from Shopify/bp/bump-version

Bump version patch
2026-09-14 00:10:39 -07:00 · 2024-12-17 17:39:35 -05:00 · 2024-12-17 17:37:00 +00:00 · 2024-12-17 17:37:00 +00:00 · 2024-12-17 11:43:16 -05:00 · 2024-12-17 15:34:13 +00:00
8 changed files with 14 additions and 14 deletions
@@ -23,8 +23,4 @@ group :test do
  gem 'rubocop', '~> 1.61.0'
  gem 'rubocop-shopify', '~> 2.12.0', require: false
  gem 'rubocop-performance', require: false
-
-  platform :mri, :truffleruby do
-    gem 'liquid-c', github: 'Shopify/liquid-c', ref: 'main'
-  end
 end
@@ -1,5 +1,12 @@
 # Liquid Change Log

+## 5.6.0 (unreleased)
+
+### Fixes
+
+* Fix Tokenizer to handle null source value (#1873) [Bahar Pourazar]
+
+
 ## 5.5.0 2024-03-21

 Please reference the GitHub release for more information.
@@ -43,8 +43,6 @@ task :test do
  Rake::Task['base_test'].invoke

  if RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'truffleruby'
-    ENV['LIQUID_C'] = '1'
-
    ENV['LIQUID_PARSER_MODE'] = 'lax'
    Rake::Task['integration_test'].reenable
    Rake::Task['integration_test'].invoke
@@ -5,7 +5,7 @@ module Liquid
    attr_reader :line_number, :for_liquid_tag

    def initialize(source, line_numbers = false, line_number: nil, for_liquid_tag: false)
-      @source         = source
+      @source         = source.to_s.to_str
      @line_number    = line_number || (line_numbers ? 1 : nil)
      @for_liquid_tag = for_liquid_tag
      @offset         = 0
@@ -2,5 +2,5 @@
 # frozen_string_literal: true

 module Liquid
-  VERSION = "5.6.0.rc1"
+  VERSION = "5.6.0.rc3"
 end
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
  s.summary     = "A secure, non-evaling end user template engine with aesthetic markup."
  s.authors     = ["Tobias Lütke"]
  s.email       = ["[email protected]"]
-  s.homepage    = "http://www.liquidmarkup.org"
+  s.homepage    = "https://shopify.github.io/liquid/"
  s.license     = "MIT"
  # s.description = "A secure, non-evaling end user template engine with aesthetic markup."

@@ -15,11 +15,6 @@ if (env_mode = ENV['LIQUID_PARSER_MODE'])
 end
 Liquid::Environment.default.error_mode = mode

-if ENV['LIQUID_C'] == '1'
-  puts "-- LIQUID C"
-  require 'liquid/c'
-end
-
 if Minitest.const_defined?('Test')
  # We're on Minitest 5+. Nothing to do here.
 else
@@ -30,6 +30,10 @@ class TokenizerTest < Minitest::Test
    assert_equal([1, 1, 3], tokenize_line_numbers(" {{\n funk \n}} "))
  end

+  def test_tokenize_with_nil_source_returns_empty_array
+    assert_equal([], tokenize(nil))
+  end
+
  private

  def new_tokenizer(source, parse_context: Liquid::ParseContext.new, start_line_number: nil)
Author	SHA1	Message	Date
Bahar PourazarandGitHub	94e02d765f	Merge pull request #1874 from Shopify/bp/bump-version Bump version patch	2024-12-17 17:39:35 -05:00
Bahar Pourazar	60701f865d	Bump version patch	2024-12-17 17:37:00 +00:00
Bahar Pourazar	0c49dd592f	bring back to_s.to_str	2024-12-17 17:37:00 +00:00
Bahar PourazarandGitHub	c3ac0e0127	Merge pull request #1873 from Shopify/bp/tokenizer-fix Fix bug in tokenizer with nil source value	2024-12-17 11:43:16 -05:00
Bahar Pourazar	a0a4307e7d	Fix bug in tokenizer with nil value	2024-12-17 15:34:13 +00:00
Ian Ker-SeymerandGitHub	fdd8c714b2	Stop testing against `liquid-c` (#1868 ) * Stop testing against `liquid-c` * Bump to `v5.6.0.rc2`	2024-12-11 12:23:50 -05:00
Ian Ker-SeymerandGitHub	63583ffe5b	Write one value at a time for array variables (#1863 ) * Write one value at a time for array variables * Handle recursive array	2024-12-11 10:16:58 -05:00
Benjamin SehlandGitHub	9a06cedbba	Merge pull request #1634 from tjoyal/patch-1 Update homepage url	2024-12-11 09:20:15 -05:00
Thierry JoyalandGitHub	347a2418c4	Update homepage url `http://www.liquidmarkup.org` is `http` `http://www.liquidmarkup.org` redirects to `https://shopify.github.io/liquid/` `https://www.liquidmarkup.org` can’t provide a secure connection (ERR_SSL_PROTOCOL_ERROR)	2022-10-03 16:52:22 -04:00