From 015b05da996638c45e4719a0e6be4ec3cbc23721 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Fri, 9 Aug 2024 16:04:12 +0900 Subject: [PATCH] Use rfc2396 parser (#139) `URI::DEFAULT_PARSER.escape` is obsoleted at next stable release of URI. We should use `URI::RFC2396_PARSER.escape` instead of `URI::DEFAULT_PARSER`. Follow-up to #138 --- mustermann/lib/mustermann/ast/translator.rb | 2 +- mustermann/lib/mustermann/pattern.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mustermann/lib/mustermann/ast/translator.rb b/mustermann/lib/mustermann/ast/translator.rb index 505dec0..33b8a7d 100644 --- a/mustermann/lib/mustermann/ast/translator.rb +++ b/mustermann/lib/mustermann/ast/translator.rb @@ -118,7 +118,7 @@ def decorator_for(node) # @return [String] escaped character # @!visibility private - def escape(char, parser: URI::DEFAULT_PARSER, escape: URI::RFC2396_Parser.new.regexp[:UNSAFE], also_escape: nil) + def escape(char, parser: URI::RFC2396_Parser.new, escape: URI::RFC2396_Parser.new.regexp[:UNSAFE], also_escape: nil) escape = Regexp.union(also_escape, escape) if also_escape char.to_s =~ escape ? parser.escape(char, Regexp.union(*escape)) : char end diff --git a/mustermann/lib/mustermann/pattern.rb b/mustermann/lib/mustermann/pattern.rb index cc15187..f9ecd01 100644 --- a/mustermann/lib/mustermann/pattern.rb +++ b/mustermann/lib/mustermann/pattern.rb @@ -9,7 +9,7 @@ module Mustermann # @abstract class Pattern include Mustermann - @@uri ||= URI::Parser.new + @@uri ||= URI::RFC2396_Parser.new # List of supported options. #