amq-protocol 2.7.0 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c88e7605bb8cf664993429123aab42370d5f8772f6ae70792ad2e64fd16051a
-  data.tar.gz: 74c708d7dcf7fa7a136728e845b306b7ee4d5ce56c248cbaf24659d3a3de4b9b
+  metadata.gz: 26124906b35c821e2d416aee1eac743185d3419e11adc00650811afbdc505153
+  data.tar.gz: 351ddaddb2d40f50fa758813548cae68f73142c3a2e4c2409e63e12a498d9e01
 SHA512:
-  metadata.gz: d6a6442583dfdb00958f6860df51a0fdfea871ff7defb3a459bbffd8e197217e6b611a034466ea41b0a2adb1203c4b873f9e81a60b27858dd4498f105eda6e48
-  data.tar.gz: 8859c61e44da33a17515ac51953178f2d55824b230677da2d750c8acc9ee0a3818a858800ba705a8a2c6115709375f7777970a0506acc61847362a7871b7fd8d
+  metadata.gz: f052ec8349b5d783e191b80301ab4d517ee3521be7643eb150805ead5c889fc4e6db05c7883b9a510662b6c6846539a5b2fe6ff7a3372ead22b6ddb9c2db7476
+  data.tar.gz: 1fe1329bd16dd74002277aba7f796533b6206df8125d307b7668f7132c0200b8398b1aedb9ce5c732fc71fad5413e82fa2fb3b9f938062652b35ac9efe4e964a

data/ChangeLog.md

@@ -1,3 +1,39 @@
+## Changes between 2.8.0 and 2.9.0 (Aug 26, 2026)
+
+### amq-protocol Now Requires Ruby 3.2
+
+Ruby 3.0 and 3.1 are end of life. The URI parser now uses
+`URI.decode_uri_component`, which Ruby 3.2 provides.
+
+
+### URI Components Are Percent-Decoded, Not Form-Decoded
+
+`AMQ::URI.parse` decoded the username, password and virtual host with
+`CGI.unescape`, so a password such as `pa+ss` was parsed as `pa ss` and failed
+to authenticate. They are now percent-decoded; use `%20` where a `+` used to
+mean a space.
+
+Contributed by @eglitobias.
+
+GitHub issue: [#89](https://github.com/ruby-amqp/amq-protocol/pull/89)
+
+
+## Changes between 2.7.0 and 2.8.0 (Apr 25, 2026)
+
+### Performance Improvements in Frame Decoding and Encoding
+
+Replacing `x == nil` with `x.nil?` in the frame layer hot path yields a
+consistent **+15–18% throughput improvement** in `Frame.decode_header`
+(called on every received frame) and **+12–14%** in `HeartbeatFrame.encode`,
+across Ruby 3.3, 3.4, and 4.0.
+
+See benchmarks/BENCHMARKS.md for instructions on how to reproduce these numbers on your machine.
+
+Contributed by @eglitobias.
+
+GitHub issue: [#86](https://github.com/ruby-amqp/amq-protocol/pull/86)
+
+
 ## Changes between 2.6.0 and 2.7.0 (Mar 31, 2026)
 
 ### Channel.Close Predicates Now Return True Boolean
@@ -42,7 +78,7 @@ Optimized encoding and decoding hot paths:
  * Switched to `unpack1` instead of `unpack().first` throughout
  * Use `byteslice` instead of `slice` for binary string operations
  * Use `getbyte` for single byte access (4x faster than alternatives)
- * Adopted `frozen_string_literal` pragma
+ * Adopted the `frozen_string_literal` pragma
 
 The improvements on Ruby 3.4 are very meaningful:
 

data/README.md

@@ -9,6 +9,8 @@ needs for you, including RabbitMQ extensions to AMQP 0.9.1.
 
 ## Supported Ruby Versions
 
+ * amq-protocol `2.9.0` requires Ruby 3.2 or later
+ * amq-protocol `2.8.0` requires Ruby 3.0 or later
  * amq-protocol `2.3.4` has fixes for Ruby 3.5 compatibility
  * amq-protocol `2.3.3` has fixes for Ruby 3.4 compatibility
  * amq-protocol `2.3.0` only supports Ruby 2.2+.

data/lib/amq/bit_set.rb

@@ -113,7 +113,7 @@ module AMQ
 
     def check_range(i)
       if i < 0 || i >= @nbits
-        raise IndexError.new("Cannot access bit #{i} from a BitSet with #{@nbits} bits")
+        raise IndexError, "Cannot access bit #{i} from a BitSet with #{@nbits} bits"
       end
     end # check_range
   end # BitSet

data/lib/amq/int_allocator.rb

@@ -26,13 +26,12 @@ module AMQ
     # @param [Integer] hi    Upper boundary of the integer range available for allocation
     # @raise [ArgumentError] if upper boundary is not greater than the lower one
     def initialize(lo, hi)
-      raise ArgumentError.new "upper boundary must be greater than the lower one (given: hi = #{hi}, lo = #{lo})" unless hi > lo
+      raise ArgumentError, "upper boundary must be greater than the lower one (given: hi = #{hi}, lo = #{lo})" unless hi > lo
 
       @hi = hi
       @lo = lo
 
       @number_of_bits = hi - lo
-      @range          = Range.new(1, @number_of_bits)
       @free_set       = BitSet.new(@number_of_bits)
     end # initialize(hi, lo)
 
@@ -47,7 +46,7 @@ module AMQ
 
       if n = @free_set.next_clear_bit
 
-        if n < @hi - 1 then
+        if n < @hi - 1
           @free_set.set(n)
           n + 1
         else

data/lib/amq/protocol/client.rb

@@ -173,9 +173,7 @@ module AMQ
         limit        = frame_size - 8
         return [BodyFrame.new(body, channel)] if body.bytesize < limit
 
-        # Otherwise String#slice on 1.9 will operate with code points,
-        # and we need bytes. MK.
-        body.force_encoding("ASCII-8BIT") if RUBY_VERSION.to_f >= 1.9 && body.encoding != Encoding::BINARY
+        body.force_encoding("ASCII-8BIT") if body.encoding != Encoding::BINARY
 
         array = Array.new
         while body && !body.empty?

data/lib/amq/protocol/frame.rb

@@ -23,8 +23,8 @@ module AMQ
 
       # The channel number is 0 for all frames which are global to the connection and 1-65535 for frames that refer to specific channels.
       def self.encode_to_array(type, payload, channel)
-        raise RuntimeError.new("Channel has to be 0 or an integer in range 1..65535 but was #{channel.inspect}") unless CHANNEL_RANGE.include?(channel)
-        raise RuntimeError.new("Payload can't be nil") if payload.nil?
+        raise RuntimeError, "Channel has to be 0 or an integer in range 1..65535 but was #{channel.inspect}" unless CHANNEL_RANGE.include?(channel)
+        raise RuntimeError, "Payload can't be nil" if payload.nil?
         components = []
         components << [find_type(type), channel, payload.bytesize].pack(PACK_CHAR_UINT16_UINT32)
         components << encoded_payload(payload)
@@ -47,13 +47,13 @@ module AMQ
       end
 
       def self.find_type(type)
-        type_id = if Symbol === type then TYPES[type] else type end
-        raise FrameTypeError.new(TYPES_OPTIONS) if type == nil || !TYPES_REVERSE.has_key?(type_id)
+        type_id = type.is_a?(Symbol) ? TYPES[type] : type
+        raise FrameTypeError, TYPES_OPTIONS if type.nil? || !TYPES_REVERSE.key?(type_id)
         type_id
       end
 
       def self.decode(*)
-        raise NotImplementedError.new <<-EOF
+        raise NotImplementedError, <<-EOF
 You are supposed to redefine this method, because it's dependent on used IO adapter.
 
 This functionality is part of the https://github.com/ruby-amqp/amq-client library.
@@ -62,12 +62,12 @@ This functionality is part of the https://github.com/ruby-amqp/amq-client librar
 
       # Optimized header decode using unpack1 for single values where appropriate
       def self.decode_header(header)
-        raise EmptyResponseError if header == nil || header.empty?
+        raise EmptyResponseError if header.nil? || header.empty?
 
         # Use unpack for multiple values - this is the optimal approach
         type_id, channel, size = header.unpack(PACK_CHAR_UINT16_UINT32)
         type = TYPES_REVERSE[type_id]
-        raise FrameTypeError.new(TYPES_OPTIONS) unless type
+        raise FrameTypeError, TYPES_OPTIONS unless type
         [type, channel, size]
       end
 

data/lib/amq/protocol/table_value_decoder.rb

@@ -83,7 +83,7 @@ module AMQ
                 v, offset = decode_array(data, offset)
                 v
               else
-                raise ArgumentError.new("unsupported type in a table value: #{type.inspect}, do not know how to decode!")
+                raise ArgumentError, "unsupported type in a table value: #{type.inspect}, do not know how to decode!"
               end
 
           ary << i

data/lib/amq/protocol/table_value_encoder.rb

@@ -72,7 +72,7 @@ module AMQ
               accumulator << [0, value.to_i].pack(PACK_UCHAR_UINT32)
             end
           else
-            raise ArgumentError.new("Unsupported value #{value.inspect} of type #{value.class.name}")
+            raise ArgumentError, "Unsupported value #{value.inspect} of type #{value.class.name}"
           end # if
         end # case
 

data/lib/amq/protocol/version.rb

@@ -1,5 +1,5 @@
 module AMQ
   module Protocol
-    VERSION = "2.7.0"
+    VERSION = "2.9.0"
   end # Protocol
 end # AMQ

data/lib/amq/uri.rb

@@ -1,10 +1,5 @@
 # encoding: utf-8
 
-if RUBY_VERSION < "3.5"
-  require "cgi/util"
-else
-  require "cgi/escape"
-end
 require "uri"
 
 module AMQ
@@ -31,19 +26,23 @@ module AMQ
 
     def self.parse(connection_string)
       uri = ::URI.parse(connection_string)
-      raise ArgumentError.new("Connection URI must use amqp or amqps schema (example: amqp://bus.megacorp.internal:5766), learn more at http://bit.ly/ks8MXK") unless %w{amqp amqps}.include?(uri.scheme)
+      unless %w{amqp amqps}.include?(uri.scheme)
+        raise ArgumentError, "Connection URI must use amqp or amqps schema (example: amqp://bus.megacorp.internal:5766), learn more at http://bit.ly/ks8MXK"
+      end
 
       opts = DEFAULTS.dup
 
       opts[:scheme] = uri.scheme
-      opts[:user]   = ::CGI::unescape(uri.user) if uri.user
-      opts[:pass]   = ::CGI::unescape(uri.password) if uri.password
+      opts[:user]   = ::URI.decode_uri_component(uri.user) if uri.user
+      opts[:pass]   = ::URI.decode_uri_component(uri.password) if uri.password
       opts[:host]   = uri.host if uri.host and uri.host != ""
       opts[:port]   = uri.port || AMQP_DEFAULT_PORTS[uri.scheme]
       opts[:ssl]    = uri.scheme.to_s.downcase =~ /amqps/i # TODO: rename to tls
       if uri.path =~ %r{^/(.*)}
-        raise ArgumentError.new("#{uri} has multiple-segment path; please percent-encode any slashes in the vhost name (e.g. /production => %2Fproduction). Learn more at http://bit.ly/amqp-gem-and-connection-uris") if $1.index('/')
-        opts[:vhost] = ::CGI::unescape($1)
+        if $1.index('/')
+          raise ArgumentError, "#{uri} has multiple-segment path; please percent-encode any slashes in the vhost name (e.g. /production => %2Fproduction). Learn more at http://bit.ly/amqp-gem-and-connection-uris"
+        end
+        opts[:vhost] = ::URI.decode_uri_component($1)
       end
 
       if uri.query
@@ -63,7 +62,7 @@ module AMQ
 
         %w(cacertfile certfile keyfile).each do |tls_option|
           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")
+            raise ArgumentError, "The option '#{tls_option}' can only be used in URIs that use amqps schema"
           else
             opts[tls_option.to_sym] = query_params[tls_option]
           end
@@ -71,7 +70,7 @@ module AMQ
 
         %w(verify fail_if_no_peer_cert).each do |tls_option|
           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")
+            raise ArgumentError, "The option '#{tls_option}' can only be used in URIs that use amqps schema"
           else
             opts[tls_option.to_sym] = as_boolean(query_params[tls_option])
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amq-protocol
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.9.0
 platform: ruby
 authors:
 - Jakub Stastny
@@ -43,7 +43,7 @@ files:
 - lib/amq/protocol/version.rb
 - lib/amq/settings.rb
 - lib/amq/uri.rb
-homepage: http://github.com/ruby-amqp/amq-protocol
+homepage: https://github.com/ruby-amqp/amq-protocol
 licenses:
 - MIT
 metadata: {}
@@ -54,14 +54,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 4.0.16
 specification_version: 4
 summary: AMQP 0.9.1 encoding & decoding library.
 test_files: []