From 85d73e462d57712a3e10ce645dd55d95b94ca9c5 Mon Sep 17 00:00:00 2001 From: "Charles-P. Clermont" Date: Tue, 2 Dec 2025 12:21:26 -0500 Subject: [PATCH] Remove Expression#safe_parse --- lib/liquid/expression.rb | 4 ---- test/integration/expression_test.rb | 12 ++++++------ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/lib/liquid/expression.rb b/lib/liquid/expression.rb index 175231be..a9ddb508 100644 --- a/lib/liquid/expression.rb +++ b/lib/liquid/expression.rb @@ -25,10 +25,6 @@ module Liquid FLOAT_REGEX = /\A(-?\d+)\.\d+\z/ class << self - def safe_parse(parser, ss = StringScanner.new(""), cache = nil) - parse(parser.expression_string, ss, cache) - end - def parse(markup, ss = StringScanner.new(""), cache = nil) return unless markup diff --git a/test/integration/expression_test.rb b/test/integration/expression_test.rb index 988f1d12..166df250 100644 --- a/test/integration/expression_test.rb +++ b/test/integration/expression_test.rb @@ -134,30 +134,30 @@ class ExpressionTest < Minitest::Test assert(parse_context.instance_variable_get(:@expression_cache).nil?) end - def test_safe_parse_with_variable_lookup + def test_parser_expression_with_variable_lookup parse_context = Liquid::ParseContext.new parser = parse_context.new_parser('product.title') - result = Liquid::Expression.safe_parse(parser) + result = parser.expression assert_instance_of(Liquid::VariableLookup, result) assert_equal('product', result.name) assert_equal(['title'], result.lookups) end - def test_safe_parse_with_number + def test_parser_expression_with_number parse_context = Liquid::ParseContext.new parser = parse_context.new_parser('42') - result = Liquid::Expression.safe_parse(parser) + result = parser.expression assert_equal(42, result) end - def test_safe_parse_raises_syntax_error_for_invalid_expression + def test_parser_expression_raises_syntax_error_for_invalid_expression parse_context = Liquid::ParseContext.new parser = parse_context.new_parser('') error = assert_raises(Liquid::SyntaxError) do - Liquid::Expression.safe_parse(parser) + parser.expression end assert_match(/is not a valid expression/, error.message)