Use URI::RFC2396_PARSER.regexp[:ABS_URI_REF] directly to resolve de…

…precation warning ruby/uri#107 ruby/uri#113
haines · Nov 12, 2024 · d09dd26 · d09dd26
1 parent 44cf717
commit d09dd26
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Changed
 * Test against Active Record 8.0 ([#685](https://github.com/haines/pg-aws_rds_iam/pull/685))
+* Use `URI::RFC2396_PARSER.regexp[:ABS_URI_REF]` directly to resolve deprecation warning introduced in [ruby/uri#113](https://github.com/ruby/uri/pull/113) ([#685](https://github.com/haines/pg-aws_rds_iam/pull/685))
 
 ## [0.6.0] - 2024-10-30
 

diff --git a/lib/pg/aws_rds_iam/connection_info/uri.rb b/lib/pg/aws_rds_iam/connection_info/uri.rb
@@ -5,7 +5,14 @@ module AWS_RDS_IAM
     module ConnectionInfo
       class URI
         def self.match?(connection_string)
-          /\A#{::URI::ABS_URI_REF}\z/.match?(connection_string)
+          regexp =
+            if defined?(::URI::RFC2396_PARSER)
+              ::URI::RFC2396_PARSER.regexp[:ABS_URI_REF]
+            else
+              ::URI::ABS_URI_REF
+            end
+
+          /\A#{regexp}\z/.match?(connection_string)
         end
 
         attr_reader :auth_token_generator_name