amq-protocol 2.3.3 → 2.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49d61c5e0d929d97678b8c9f5b01c147c74f874a70481c7c24de865331ad8278
-  data.tar.gz: efaeca2672afb7b1cd8eceb809bd8be9fcbfbecceb2e1893187b6fc9dcd2d5ff
+  metadata.gz: 90852fae30dd15d9f1f6ee5f9c0d98e856c3efcbd4c11e7e824caf63a01360f7
+  data.tar.gz: a000c7b2f435fc08f2d9c90a765f81e0414ca1c3038fcab1915ff7bcd4bdb929
 SHA512:
-  metadata.gz: 12444b7175daf2d75f021e91eccb8782ebd11ec60855229bf82fa3e29792ba1ca8c96283723b8b5ffeaaf16ef6586b0b74948f605fb3526bed4146cff4030b0a
-  data.tar.gz: 7d8c26b0e7a501515c1a130410c66d54ad7811c4e7cee15b02d894a8f46feacdc08f8456672e13b35df1f1ca738223c49721e545829c088079e28f96ebada1d8
+  metadata.gz: 718a613e5a2355791ef4d07bd38676b005cb00cd54969183a31eeba96cc3439ba223a8d9636050aa9aaf2ac5ca63150d3e3c53ce3e4638b53191097183b47ba3
+  data.tar.gz: 598de750f0c0ba6c838f4d1f34b4fb24f05b0a580c6b8beb7804d4edae437c628c18ac56d8ef87afc78ad56876ca4baafcf051f90f1eea9bb0cf3d48e993ea66

data/ChangeLog.md

@@ -1,3 +1,17 @@
+## Changes between 2.3.4 and 2.3.5 (in development)
+
+No changes yet.
+
+
+## Changes between 2.3.3 and 2.3.4 (May 12, 2025)
+
+### (Forward) Compatibility with Ruby 3.5
+
+Contributed by @Earlopain.
+
+GitHub issue: [#80](https://github.com/ruby-amqp/amq-protocol/pull/80)
+
+
 ## Changes between 2.3.2 and 2.3.3 (February 17, 2025)
 
 ### Improved Compatibility with Ruby 3.4

data/lib/amq/protocol/version.rb

@@ -1,5 +1,5 @@
 module AMQ
   module Protocol
-    VERSION = "2.3.3"
+    VERSION = "2.3.4"
   end # Protocol
 end # AMQ

data/lib/amq/uri.rb

@@ -1,6 +1,10 @@
 # encoding: utf-8
 
-require "cgi"
+if RUBY_VERSION < "3.5"
+  require "cgi/util"
+else
+  require "cgi/escape"
+end
 require "uri"
 
 module AMQ
@@ -43,28 +47,33 @@ module AMQ
       end
 
       if uri.query
-        query_params = CGI::parse(uri.query)
-
-        normalized_query_params = Hash[query_params.map { |param, value| [param, value.one? ? value.first : value] }]
+        query_params = Hash.new { |hash, key| hash[key] = [] }
+        ::URI.decode_www_form(uri.query).each do |key, value|
+          query_params[key] << value
+        end
+        query_params.each do |key, value|
+          query_params[key] = value.one? ? value.first : value
+        end
+        query_params.default = nil
 
-        opts[:heartbeat] = normalized_query_params["heartbeat"].to_i
-        opts[:connection_timeout] = normalized_query_params["connection_timeout"].to_i
-        opts[:channel_max] = normalized_query_params["channel_max"].to_i
-        opts[:auth_mechanism] = normalized_query_params["auth_mechanism"]
+        opts[:heartbeat] = query_params["heartbeat"].to_i
+        opts[:connection_timeout] = query_params["connection_timeout"].to_i
+        opts[:channel_max] = query_params["channel_max"].to_i
+        opts[:auth_mechanism] = query_params["auth_mechanism"]
 
         %w(cacertfile certfile keyfile).each do |tls_option|
-          if normalized_query_params[tls_option] && uri.scheme == "amqp"
+          if query_params[tls_option] && uri.scheme == "amqp"
             raise ArgumentError.new("The option '#{tls_option}' can only be used in URIs that use amqps schema")
           else
-            opts[tls_option.to_sym] = normalized_query_params[tls_option]
+            opts[tls_option.to_sym] = query_params[tls_option]
           end
         end
 
         %w(verify fail_if_no_peer_cert).each do |tls_option|
-          if normalized_query_params[tls_option] && uri.scheme == "amqp"
+          if query_params[tls_option] && uri.scheme == "amqp"
             raise ArgumentError.new("The option '#{tls_option}' can only be used in URIs that use amqps schema")
           else
-            opts[tls_option.to_sym] = as_boolean(normalized_query_params[tls_option])
+            opts[tls_option.to_sym] = as_boolean(query_params[tls_option])
           end
         end
       end
@@ -80,7 +89,7 @@ module AMQ
     # Implementation
     #
 
-    # Normalizes values returned by CGI.parse.
+    # Normalizes values returned by URI.decode_www_form.
     # @private
     def self.as_boolean(val)
       case val

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amq-protocol
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.3.4
 platform: ruby
 authors:
 - Jakub Stastny
@@ -10,7 +10,7 @@ authors:
 - Mark Abramov
 bindir: bin
 cert_chain: []
-date: 2025-02-17 00:00:00.000000000 Z
+date: 2025-05-12 00:00:00.000000000 Z
 dependencies: []
 description: |2
     amq-protocol is an AMQP 0.9.1 serialization library for Ruby. It is not a