amq-protocol 2.3.2 → 2.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3952d1aea112b833a87bc1dc5f4a48b30b3203cc6916ea94e6489a233e4f07e
-  data.tar.gz: a9c2c60ac42dfbf18fcfc9c91ab146c5db2501c51ab96047129f0d3e17c6d51d
+  metadata.gz: 90852fae30dd15d9f1f6ee5f9c0d98e856c3efcbd4c11e7e824caf63a01360f7
+  data.tar.gz: a000c7b2f435fc08f2d9c90a765f81e0414ca1c3038fcab1915ff7bcd4bdb929
 SHA512:
-  metadata.gz: 2e20cc9579e2fd2d6750d0ca1201786ab73635a21d5783ef2f14a115dbcfe524b3561abd7a835c0f925c638c5164f72139a717b0c43b1303470295d3fa06494c
-  data.tar.gz: da6ecba234868b2a2bd5035cb1df2f5687e8b58e886f64bd1b99530419767ce53f30c6f89ec11395e91d163fbe5ee2e1a54dd3686735d6a51bf936b85f93bda0
+  metadata.gz: 718a613e5a2355791ef4d07bd38676b005cb00cd54969183a31eeba96cc3439ba223a8d9636050aa9aaf2ac5ca63150d3e3c53ce3e4638b53191097183b47ba3
+  data.tar.gz: 598de750f0c0ba6c838f4d1f34b4fb24f05b0a580c6b8beb7804d4edae437c628c18ac56d8ef87afc78ad56876ca4baafcf051f90f1eea9bb0cf3d48e993ea66

data/.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,18 @@
+## 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

@@ -0,0 +1,31 @@
+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/ChangeLog.md

@@ -1,7 +1,32 @@
-## Changes between 2.3.2 and 2.3.3 (unreleased)
+## 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
+
+Contribiuted by @BenTalagan.
+
+GitHub issue: [#79](https://github.com/ruby-amqp/amq-protocol/pull/79)
+
+### Support Binary-Encoded Frozen Strings for Payloads
+
+Contribiuted by @djrodgerspryor.
+
+GitHub issue: [#78](https://github.com/ruby-amqp/amq-protocol/pull/78)
+
+
 ## Changes between 2.3.1 and 2.3.2 (July 10th, 2020)
 
 ### Safer Encoding Handling When Serialising Message Properties and Headers

data/Gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+
 group :development do
   # excludes Windows, Rubinius and JRuby
   gem "ruby-prof", :platforms => [:mri_19, :mri_20, :mri_21]
@@ -13,6 +14,7 @@ group :test do
   gem "rspec", ">= 3.8.0"
   gem "rspec-its"
   gem "simplecov"
+  gem 'bigdecimal'
 end
 
 group :development, :test do

data/codegen/protocol.rb.pytemplate

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # encoding: binary
+# frozen_string_literal: true
 
 # THIS IS AN AUTOGENERATED FILE, DO NOT MODIFY
 # IT DIRECTLY ! FOR CHANGES, PLEASE UPDATE FILES
@@ -142,7 +143,7 @@ module AMQ
       % for f in klass.fields:
       # <% i = klass.fields.index(f) %>1 << ${15 - i}
       def self.encode_${f.ruby_name}(value)
-        buffer = ''
+        buffer = +''
         % for line in helpers.genSingleEncode(spec, "value", f.domain):
         ${line}
         % endfor

data/lib/amq/protocol/client.rb

@@ -1,4 +1,5 @@
 # encoding: binary
+# frozen_string_literal: true
 
 # THIS IS AN AUTOGENERATED FILE, DO NOT MODIFY
 # IT DIRECTLY ! FOR CHANGES, PLEASE UPDATE FILES
@@ -174,7 +175,7 @@ module AMQ
 
         # 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.force_encoding("ASCII-8BIT") if RUBY_VERSION.to_f >= 1.9 && body.encoding != Encoding::BINARY
 
         array = Array.new
         while body && !body.empty?
@@ -1389,7 +1390,7 @@ module AMQ
 
       # 1 << 15
       def self.encode_content_type(value)
-        buffer = ''
+        buffer = +''
         buffer << value.to_s.bytesize.chr
         buffer << value.to_s
         [0, 0x8000, buffer]
@@ -1397,7 +1398,7 @@ module AMQ
 
       # 1 << 14
       def self.encode_content_encoding(value)
-        buffer = ''
+        buffer = +''
         buffer << value.to_s.bytesize.chr
         buffer << value.to_s
         [1, 0x4000, buffer]
@@ -1405,28 +1406,28 @@ module AMQ
 
       # 1 << 13
       def self.encode_headers(value)
-        buffer = ''
+        buffer = +''
         buffer << AMQ::Protocol::Table.encode(value)
         [2, 0x2000, buffer]
       end
 
       # 1 << 12
       def self.encode_delivery_mode(value)
-        buffer = ''
+        buffer = +''
         buffer << [value].pack(PACK_CHAR)
         [3, 0x1000, buffer]
       end
 
       # 1 << 11
       def self.encode_priority(value)
-        buffer = ''
+        buffer = +''
         buffer << [value].pack(PACK_CHAR)
         [4, 0x0800, buffer]
       end
 
       # 1 << 10
       def self.encode_correlation_id(value)
-        buffer = ''
+        buffer = +''
         buffer << value.to_s.bytesize.chr
         buffer << value.to_s
         [5, 0x0400, buffer]
@@ -1434,7 +1435,7 @@ module AMQ
 
       # 1 << 9
       def self.encode_reply_to(value)
-        buffer = ''
+        buffer = +''
         buffer << value.to_s.bytesize.chr
         buffer << value.to_s
         [6, 0x0200, buffer]
@@ -1442,7 +1443,7 @@ module AMQ
 
       # 1 << 8
       def self.encode_expiration(value)
-        buffer = ''
+        buffer = +''
         buffer << value.to_s.bytesize.chr
         buffer << value.to_s
         [7, 0x0100, buffer]
@@ -1450,7 +1451,7 @@ module AMQ
 
       # 1 << 7
       def self.encode_message_id(value)
-        buffer = ''
+        buffer = +''
         buffer << value.to_s.bytesize.chr
         buffer << value.to_s
         [8, 0x0080, buffer]
@@ -1458,14 +1459,14 @@ module AMQ
 
       # 1 << 6
       def self.encode_timestamp(value)
-        buffer = ''
+        buffer = +''
         buffer << AMQ::Pack.pack_uint64_big_endian(value)
         [9, 0x0040, buffer]
       end
 
       # 1 << 5
       def self.encode_type(value)
-        buffer = ''
+        buffer = +''
         buffer << value.to_s.bytesize.chr
         buffer << value.to_s
         [10, 0x0020, buffer]
@@ -1473,7 +1474,7 @@ module AMQ
 
       # 1 << 4
       def self.encode_user_id(value)
-        buffer = ''
+        buffer = +''
         buffer << value.to_s.bytesize.chr
         buffer << value.to_s
         [11, 0x0010, buffer]
@@ -1481,7 +1482,7 @@ module AMQ
 
       # 1 << 3
       def self.encode_app_id(value)
-        buffer = ''
+        buffer = +''
         buffer << value.to_s.bytesize.chr
         buffer << value.to_s
         [12, 0x0008, buffer]
@@ -1489,7 +1490,7 @@ module AMQ
 
       # 1 << 2
       def self.encode_cluster_id(value)
-        buffer = ''
+        buffer = +''
         buffer << value.to_s.bytesize.chr
         buffer << value.to_s
         [13, 0x0004, buffer]

data/lib/amq/protocol/version.rb

@@ -1,5 +1,5 @@
 module AMQ
   module Protocol
-    VERSION = "2.3.2"
+    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
@@ -34,7 +38,7 @@ module AMQ
       opts[:scheme] = uri.scheme
       opts[:user]   = ::CGI::unescape(uri.user) if uri.user
       opts[:pass]   = ::CGI::unescape(uri.password) if uri.password
-      opts[:host]   = uri.host if uri.host
+      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{^/(.*)}
@@ -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

data/spec/amq/protocol/table_spec.rb

@@ -1,4 +1,3 @@
-require 'bigdecimal'
 require 'time'
 
 module AMQ

data/spec/amq/uri_parsing_spec.rb

@@ -30,7 +30,7 @@ RSpec.describe AMQ::URI do
           let(:uri) { "amqp://" }
 
           # Note that according to the ABNF, the host component may not be absent, but it may be zero-length.
-          it "falls back to default nil host" do
+          it "falls back to a blank value" do
             expect(subject[:host]).to be_nil
           end
         end

metadata

@@ -1,17 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: amq-protocol
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.4
 platform: ruby
 authors:
 - Jakub Stastny
 - Michael S. Klishin
 - Theo Hultberg
 - Mark Abramov
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-10 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
@@ -23,6 +22,8 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
+- ".github/ISSUE_TEMPLATE.md"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".gitmodules"
 - ".rspec"
@@ -86,7 +87,6 @@ homepage: http://github.com/ruby-amqp/amq-protocol
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -101,8 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: AMQP 0.9.1 encoding & decoding library.
 test_files: []