From 43aad195ccb926ba50301ea602cff503694ad69f Mon Sep 17 00:00:00 2001 From: Patrik Ragnarsson Date: Sun, 3 Aug 2025 01:03:16 +0200 Subject: [PATCH] Use `URI::RFC2396_Parser` Fixes `warning: URI::RFC3986_PARSER.unescape is obsolete. Use URI::RFC2396_PARSER.unescape explicitly.` warnings from `mustermann-contrib/lib/mustermann/simple.rb` and `mustermann-contrib/lib/mustermann/file_utils.rb`. Seen when running tests. --- mustermann-contrib/lib/mustermann/file_utils.rb | 2 +- mustermann-contrib/lib/mustermann/simple.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mustermann-contrib/lib/mustermann/file_utils.rb b/mustermann-contrib/lib/mustermann/file_utils.rb index b6bb1ce..cb28ec8 100644 --- a/mustermann-contrib/lib/mustermann/file_utils.rb +++ b/mustermann-contrib/lib/mustermann/file_utils.rb @@ -187,7 +187,7 @@ def f # Unescape an URI escaped string. # @!visibility private def unescape(string) - @uri ||= URI::Parser.new + @uri ||= URI::RFC2396_Parser.new @uri.unescape(string) end diff --git a/mustermann-contrib/lib/mustermann/simple.rb b/mustermann-contrib/lib/mustermann/simple.rb index 40aa539..1e4c1c3 100644 --- a/mustermann-contrib/lib/mustermann/simple.rb +++ b/mustermann-contrib/lib/mustermann/simple.rb @@ -40,7 +40,7 @@ def compile(greedy: true, uri_decode: true, space_matches_plus: true, **options) def encoded(char, uri_decode, space_matches_plus) return Regexp.escape(char) unless uri_decode - parser = URI::Parser.new + parser = URI::RFC2396_Parser.new encoded = Regexp.union(parser.escape(char), parser.escape(char, /./).downcase, parser.escape(char, /./).upcase) encoded = Regexp.union(encoded, encoded('+', true, true)) if space_matches_plus and char == " " encoded