amq-protocol 2.3.3 → 2.8.0

data/lib/amq/protocol/table.rb

@@ -1,4 +1,5 @@
 # encoding: binary
+# frozen_string_literal: true
 
 require "amq/protocol/type_constants"
 require "amq/protocol/table_value_encoder"
@@ -14,6 +15,8 @@ module AMQ
 
       include TypeConstants
 
+      # Pack format string
+      PACK_UINT32_BE = 'N'.freeze
 
       #
       # API
@@ -27,16 +30,16 @@ module AMQ
 
 
       def self.encode(table)
-        buffer = String.new
+        buffer = +''
 
         table ||= {}
 
         table.each do |key, value|
           key = key.to_s # it can be a symbol as well
-          buffer << key.bytesize.chr + key
+          buffer << key.bytesize.chr << key
 
           case value
-          when Hash then
+          when Hash
             buffer << TYPE_HASH
             buffer << self.encode(value)
           else
@@ -44,15 +47,15 @@ module AMQ
           end
         end
 
-        [buffer.bytesize].pack(PACK_UINT32).force_encoding(buffer.encoding) + buffer
+        [buffer.bytesize].pack(PACK_UINT32_BE) << buffer
       end
 
 
 
 
       def self.decode(data)
-        table        = Hash.new
-        table_length = data.unpack(PACK_UINT32).first
+        table        = {}
+        table_length = data.unpack1(PACK_UINT32_BE)
 
         return table if table_length.zero?
 
@@ -86,19 +89,19 @@ module AMQ
                        when TYPE_BOOLEAN
                          v, offset = TableValueDecoder.decode_boolean(data, offset)
                          v
-                      when TYPE_BYTE  then
+                       when TYPE_BYTE
                          v, offset = TableValueDecoder.decode_byte(data, offset)
                          v
-                       when TYPE_SIGNED_16BIT then
+                       when TYPE_SIGNED_16BIT
                          v, offset = TableValueDecoder.decode_short(data, offset)
                          v
-                       when TYPE_SIGNED_64BIT then
+                       when TYPE_SIGNED_64BIT
                          v, offset = TableValueDecoder.decode_long(data, offset)
                          v
-                       when TYPE_32BIT_FLOAT then
+                       when TYPE_32BIT_FLOAT
                          v, offset = TableValueDecoder.decode_32bit_float(data, offset)
                          v
-                       when TYPE_64BIT_FLOAT then
+                       when TYPE_64BIT_FLOAT
                          v, offset = TableValueDecoder.decode_64bit_float(data, offset)
                          v
                        when TYPE_VOID
@@ -112,11 +115,11 @@ module AMQ
         end
 
         table
-      end # self.decode
+      end
 
 
       def self.length(data)
-        data.unpack(PACK_UINT32).first
+        data.unpack1(PACK_UINT32_BE)
       end
 
 
@@ -128,17 +131,17 @@ module AMQ
         end
 
         acc
-      end # self.hash_size(value)
+      end
 
 
       def self.decode_table_key(data, offset)
-        key_length = data.slice(offset, 1).unpack(PACK_CHAR).first
+        key_length = data.getbyte(offset)
         offset += 1
-        key = data.slice(offset, key_length)
+        key = data.byteslice(offset, key_length)
         offset += key_length
 
         [key, offset]
-      end # self.decode_table_key(data, offset)
+      end
 
 
 

data/lib/amq/protocol/table_value_decoder.rb

@@ -1,6 +1,6 @@
 # encoding: binary
+# frozen_string_literal: true
 
-require "amq/endianness"
 require "amq/protocol/type_constants"
 require "amq/protocol/float_32bit"
 
@@ -15,15 +15,23 @@ module AMQ
 
       include TypeConstants
 
+      # Pack format strings use explicit endianness (available as of Ruby 1.9.3)
+      PACK_UINT32_BE   = 'N'.freeze
+      PACK_INT64_BE    = 'q>'.freeze
+      PACK_INT16_BE    = 's>'.freeze
+      PACK_UINT64_BE   = 'Q>'.freeze
+      PACK_FLOAT32     = 'f'.freeze  # single precision float (native endian, matches encoder)
+      PACK_FLOAT64     = 'G'.freeze  # big-endian double precision float
+      PACK_UCHAR_UINT32 = 'CN'.freeze
 
       #
       # API
       #
 
       def self.decode_array(data, initial_offset)
-        array_length = data.slice(initial_offset, 4).unpack(PACK_UINT32).first
+        array_length = data.byteslice(initial_offset, 4).unpack1(PACK_UINT32_BE)
 
-        ary    = Array.new
+        ary    = []
         offset = initial_offset + 4
 
         while offset <= (initial_offset + array_length)
@@ -54,28 +62,28 @@ module AMQ
               when TYPE_BOOLEAN
                 v, offset = decode_boolean(data, offset)
                 v
-              when TYPE_BYTE then
+              when TYPE_BYTE
                 v, offset = decode_byte(data, offset)
                 v
-              when TYPE_SIGNED_16BIT then
+              when TYPE_SIGNED_16BIT
                 v, offset = decode_short(data, offset)
                 v
-              when TYPE_SIGNED_64BIT then
+              when TYPE_SIGNED_64BIT
                 v, offset = decode_long(data, offset)
                 v
-              when TYPE_32BIT_FLOAT then
+              when TYPE_32BIT_FLOAT
                 v, offset = decode_32bit_float(data, offset)
                 v
-              when TYPE_64BIT_FLOAT then
+              when TYPE_64BIT_FLOAT
                 v, offset = decode_64bit_float(data, offset)
                 v
               when TYPE_VOID
                 nil
               when TYPE_ARRAY
-                v, offset = TableValueDecoder.decode_array(data, offset)
+                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
@@ -83,113 +91,101 @@ module AMQ
 
 
         [ary, initial_offset + array_length + 4]
-      end # self.decode_array(data, initial_offset)
+      end
 
 
       def self.decode_string(data, offset)
-        length = data.slice(offset, 4).unpack(PACK_UINT32).first
+        length = data.byteslice(offset, 4).unpack1(PACK_UINT32_BE)
         offset += 4
-        v = data.slice(offset, length)
+        v = data.byteslice(offset, length)
         offset += length
 
         [v, offset]
-      end # self.decode_string(data, offset)
+      end
 
 
       def self.decode_integer(data, offset)
-        v = data.slice(offset, 4).unpack(PACK_UINT32).first
+        v = data.byteslice(offset, 4).unpack1(PACK_UINT32_BE)
         offset += 4
 
         [v, offset]
-      end # self.decode_integer(data, offset)
-
+      end
 
-      if AMQ::Endianness.big_endian?
-        def self.decode_long(data, offset)
-          v    = data.slice(offset, 8).unpack(PACK_INT64)
 
-          offset += 8
-          [v, offset]
-        end
-      else
-        def self.decode_long(data, offset)
-          slice = data.slice(offset, 8).bytes.to_a.reverse.map(&:chr).join
-          v     = slice.unpack(PACK_INT64).first
-
-          offset += 8
-          [v, offset]
-        end
+      def self.decode_long(data, offset)
+        v = data.byteslice(offset, 8).unpack1(PACK_INT64_BE)
+        offset += 8
+        [v, offset]
       end
 
 
       def self.decode_big_decimal(data, offset)
-        decimals, raw = data.slice(offset, 5).unpack(PACK_UCHAR_UINT32)
+        decimals, raw = data.byteslice(offset, 5).unpack(PACK_UCHAR_UINT32)
         offset += 5
         v = BigDecimal(raw.to_s) * (BigDecimal(TEN) ** -decimals)
 
         [v, offset]
-      end # self.decode_big_decimal(data, offset)
+      end
 
 
       def self.decode_time(data, offset)
-        timestamp = data.slice(offset, 8).unpack(PACK_UINT64_BE).last
+        timestamp = data.byteslice(offset, 8).unpack1(PACK_UINT64_BE)
         v = Time.at(timestamp)
         offset += 8
 
         [v, offset]
-      end # self.decode_time(data, offset)
+      end
 
 
       def self.decode_boolean(data, offset)
-        integer = data.slice(offset, 2).unpack(PACK_CHAR).first # 0 or 1
+        byte = data.getbyte(offset)
         offset += 1
-        [(integer == 1), offset]
-      end # self.decode_boolean(data, offset)
+        [(byte == 1), offset]
+      end
 
 
       def self.decode_32bit_float(data, offset)
-        v = data.slice(offset, 4).unpack(PACK_32BIT_FLOAT).first
+        v = data.byteslice(offset, 4).unpack1(PACK_FLOAT32)
         offset += 4
 
         [v, offset]
-      end # self.decode_32bit_float(data, offset)
+      end
 
 
       def self.decode_64bit_float(data, offset)
-        v = data.slice(offset, 8).unpack(PACK_64BIT_FLOAT).first
+        v = data.byteslice(offset, 8).unpack1(PACK_FLOAT64)
         offset += 8
 
         [v, offset]
-      end # self.decode_64bit_float(data, offset)
+      end
 
 
       def self.decode_value_type(data, offset)
-        [data.slice(offset, 1), offset + 1]
-      end # self.decode_value_type(data, offset)
-
+        [data.byteslice(offset, 1), offset + 1]
+      end
 
 
       def self.decode_hash(data, offset)
-        length = data.slice(offset, 4).unpack(PACK_UINT32).first
-        v = Table.decode(data.slice(offset, length + 4))
+        length = data.byteslice(offset, 4).unpack1(PACK_UINT32_BE)
+        v = Table.decode(data.byteslice(offset, length + 4))
         offset += 4 + length
 
         [v, offset]
-      end # self.decode_hash(data, offset)
+      end
 
 
       # Decodes/Converts a byte value from the data at the provided offset.
       #
-      # @param [Array] data - A big-endian ordered array of bytes.
-      # @param [Fixnum] offset - The offset which bytes the byte is consumed.
-      # @return [Array] - The Fixnum value and new offset pair.
+      # @param [String] data - Binary data string
+      # @param [Integer] offset - The offset from which to read the byte
+      # @return [Array] - The Integer value and new offset pair
       def self.decode_byte(data, offset)
-        [data.slice(offset, 1).unpack(PACK_CHAR).first, offset += 1]
+        [data.getbyte(offset), offset + 1]
       end
 
 
       def self.decode_short(data, offset)
-        v = AMQ::Hacks.unpack_int16_big_endian(data.slice(offset, 2)).first
+        v = data.byteslice(offset, 2).unpack1(PACK_INT16_BE)
         offset += 2
         [v, offset]
       end

data/lib/amq/protocol/table_value_encoder.rb

@@ -1,4 +1,5 @@
 # encoding: binary
+# frozen_string_literal: true
 
 require "amq/protocol/type_constants"
 require "date"
@@ -71,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/type_constants.rb

@@ -1,4 +1,5 @@
 # encoding: binary
+# frozen_string_literal: true
 
 module AMQ
   module Protocol

data/lib/amq/protocol/version.rb

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

data/lib/amq/protocol.rb

@@ -2,3 +2,4 @@
 
 require "amq/protocol/version"
 require "amq/protocol/client"
+require "amq/protocol/channel_close"

data/lib/amq/settings.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 require "amq/protocol/client"
 require "amq/uri"

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
@@ -27,7 +31,9 @@ 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
 
@@ -38,33 +44,40 @@ module AMQ
       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('/')
+        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] = ::CGI::unescape($1)
       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"
-            raise ArgumentError.new("The option '#{tls_option}' can only be used in URIs that use amqps schema")
+          if query_params[tls_option] && uri.scheme == "amqp"
+            raise ArgumentError, "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"
-            raise ArgumentError.new("The option '#{tls_option}' can only be used in URIs that use amqps schema")
+          if query_params[tls_option] && uri.scheme == "amqp"
+            raise ArgumentError, "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 +93,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.8.0
 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: 2026-04-26 00:00:00.000000000 Z
 dependencies: []
 description: |2
     amq-protocol is an AMQP 0.9.1 serialization library for Ruby. It is not a
@@ -22,32 +22,15 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- ".github/ISSUE_TEMPLATE.md"
-- ".github/workflows/ci.yml"
-- ".gitignore"
-- ".gitmodules"
-- ".rspec"
-- ".travis.yml"
 - ChangeLog.md
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
-- amq-protocol.gemspec
-- benchmarks/int_allocator.rb
-- benchmarks/pure/body_framing_with_256k_payload.rb
-- benchmarks/pure/body_framing_with_2k_payload.rb
-- codegen/__init__.py
-- codegen/amqp_0.9.1_changes.json
-- codegen/codegen.py
-- codegen/codegen_helpers.py
-- codegen/protocol.rb.pytemplate
-- generate.rb
 - lib/amq/bit_set.rb
 - lib/amq/endianness.rb
 - lib/amq/int_allocator.rb
 - lib/amq/pack.rb
 - lib/amq/protocol.rb
+- lib/amq/protocol/channel_close.rb
 - lib/amq/protocol/client.rb
 - lib/amq/protocol/constants.rb
 - lib/amq/protocol/exceptions.rb
@@ -60,30 +43,7 @@ files:
 - lib/amq/protocol/version.rb
 - lib/amq/settings.rb
 - lib/amq/uri.rb
-- profiling/README.md
-- profiling/stackprof/body_framing_with_2k_payload.rb
-- spec/amq/bit_set_spec.rb
-- spec/amq/int_allocator_spec.rb
-- spec/amq/pack_spec.rb
-- spec/amq/protocol/basic_spec.rb
-- spec/amq/protocol/blank_body_encoding_spec.rb
-- spec/amq/protocol/channel_spec.rb
-- spec/amq/protocol/confirm_spec.rb
-- spec/amq/protocol/connection_spec.rb
-- spec/amq/protocol/constants_spec.rb
-- spec/amq/protocol/exchange_spec.rb
-- spec/amq/protocol/frame_spec.rb
-- spec/amq/protocol/method_spec.rb
-- spec/amq/protocol/queue_spec.rb
-- spec/amq/protocol/table_spec.rb
-- spec/amq/protocol/tx_spec.rb
-- spec/amq/protocol/value_decoder_spec.rb
-- spec/amq/protocol/value_encoder_spec.rb
-- spec/amq/protocol_spec.rb
-- spec/amq/settings_spec.rb
-- spec/amq/uri_parsing_spec.rb
-- spec/spec_helper.rb
-homepage: http://github.com/ruby-amqp/amq-protocol
+homepage: https://github.com/ruby-amqp/amq-protocol
 licenses:
 - MIT
 metadata: {}
@@ -94,7 +54,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/.github/ISSUE_TEMPLATE.md

@@ -1,18 +0,0 @@
-## Does This Really Belong to GitHub issues?
-
-If you find a bug you understand well, poor default, incorrect or unclear piece of documentation,
-or missing feature, please [file an
-issue](http://github.com/ruby-amqp/bunny/issues) on GitHub.
-
-Please use [Bunny's mailing list](http://groups.google.com/group/ruby-amqp) for questions,
-investigations, and discussions. GitHub issues should be used for specific, well understood, actionable
-maintainers and contributors can work on.
-
-When filing an issue, please specify
-
- * Which Bunny and RabbitMQ versions are used
- * Recent RabbitMQ log file contents
- * Full exception stack traces
- * Steps to reproduce or a failing test case
-
-This would greatly help the maintainers help you.

data/.github/workflows/ci.yml

@@ -1,31 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches:
-      - "main"
-  pull_request:
-    branches:
-      - "main"
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        ruby-version:
-          - "3.4.2"
-          - "3.3.7"
-          - "3.2.7"
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Ruby ${{ matrix.ruby-version }}
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby-version }}
-      - name: Install dependencies
-        run: bundle install
-      - name: Run tests
-        run: bundle exec rspec -c

data/.gitignore

@@ -1,18 +0,0 @@
-/*.gem
-/.rvmrc
-/.ruby-version
-tmp
-*.pyc
-*.iml
-.idea
-/vendor/bundle
-/vendor/amq-*
-/coverage
-Gemfile.lock
-.rbx/*
-.Apple*
-.bundle/*
-bin/*
-*.bundle
-Makefile
-profiling/dumps/*

data/.gitmodules

@@ -1,3 +0,0 @@
-[submodule "codegen/rabbitmq-codegen"]
-	path = codegen/rabbitmq-codegen
-	url = git://github.com/rabbitmq/rabbitmq-codegen.git

data/.rspec

@@ -1 +0,0 @@
---require spec_helper

data/.travis.yml

@@ -1,17 +0,0 @@
-dist: bionic
-language: ruby
-bundler_args: --without development
-cache: bundler
-script: "bundle exec rspec spec"
-rvm:
-  - ruby-head
-  - "2.6.3"
-  - "2.5.5"
-  - "2.4.5"
-  - "2.3.8"
-notifications:
-  recipients:
-    - michael@rabbitmq.com
-matrix:
-  allow_failures:
-    - rvm: ruby-head

data/Gemfile

@@ -1,22 +0,0 @@
-# encoding: utf-8
-
-source "https://rubygems.org"
-
-
-group :development do
-  # excludes Windows, Rubinius and JRuby
-  gem "ruby-prof", :platforms => [:mri_19, :mri_20, :mri_21]
-
-  gem "rake"
-end
-
-group :test do
-  gem "rspec", ">= 3.8.0"
-  gem "rspec-its"
-  gem "simplecov"
-  gem 'bigdecimal'
-end
-
-group :development, :test do
-  gem "byebug"
-end