amqp-client 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e248898d176ad9c3d785226ed37c0335052ef701ee16a16bff483089be65dd8
-  data.tar.gz: 89b58399edb11b30b05db86e9e4b0a617438e3ed52e63b3e76ae3a4c8cb361fc
+  metadata.gz: baa9c2034e80f56aa375a7abb7394109d2f4e84e4a4c04ae8bcb053d299d6dcc
+  data.tar.gz: 7857e1d6ddf96a64df664956da02eac2098fe144a5d2eea1364bd14ba5d41b7c
 SHA512:
-  metadata.gz: 4500bec819ea9de9546f001eed682ac040ea3c2f93904dabb24afdbbda966d3352d8b1e33687a82c482ce835e7d650172dd906d9ef4ec2efc17f1dea31947314
-  data.tar.gz: 62ea49dc2782122146dd2613cd51b1c4132b3eef9d48c5573e9369b0af96042018f104a84cfe2aa2f173cf6d10f5ca3e427baa3ef61faed7029cd7328148a762
+  metadata.gz: 4deaecc1cdce66be71316e3046c5df0832c20a876ad0d3f5884c6e6313ece2d7fad8262f8ee83daad78500ca411648618642eb551c63279e8b84ec727d1f5633
+  data.tar.gz: 4136f5ce5c98610361a673f348fd531a93c34c7989275e7858bfc9694d7368adcbd17beb910fae30cd1fceb29163b7411d4ee0dc235f9c655bfdf960a9de4602

data/.github/workflows/main.yml

@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['2.6', '2.7', '3.0']
+        ruby: ['2.6', '2.7', '3.0', 'jruby', 'truffleruby']
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby
@@ -31,4 +31,5 @@ jobs:
         bundle install
         bundle exec rake
       env:
+        TESTOPTS: --exclude=/_tls$/
         AMQP_PORT: ${{ job.services.rabbitmq.ports[5672] }}

data/.rubocop_todo.yml

@@ -1,15 +1,27 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2021-09-06 19:39:47 UTC using RuboCop version 1.19.1.
+# on 2021-10-15 13:44:24 UTC using RuboCop version 1.19.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 18
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Layout/LineLength:
+  Max: 132
+
+# Offense count: 1
+Lint/RescueException:
+  Exclude:
+    - 'lib/amqp/client/connection.rb'
+
+# Offense count: 32
 # Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 179
+  Max: 175
 
 # Offense count: 1
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
@@ -22,27 +34,32 @@ Metrics/BlockLength:
 Metrics/BlockNesting:
   Max: 4
 
-# Offense count: 5
+# Offense count: 6
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 400
+  Max: 497
 
-# Offense count: 9
+# Offense count: 10
 # Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
-  Max: 44
+  Max: 46
 
-# Offense count: 40
+# Offense count: 67
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
 Metrics/MethodLength:
-  Max: 170
+  Max: 169
 
 # Offense count: 2
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ModuleLength:
-  Max: 500
+  Max: 486
+
+# Offense count: 1
+# Configuration parameters: CountKeywordArgs, MaxOptionalParameters.
+Metrics/ParameterLists:
+  Max: 13
 
-# Offense count: 4
+# Offense count: 5
 # Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:
-  Max: 22
+  Max: 23

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [1.1.2] - 2021-10-15
+
+- Added: Support for JRuby and TruffleRuby
+
 ## [1.1.1] - 2021-09-15
 
 - Added: Examples in the documentation

data/README.md

@@ -83,6 +83,8 @@ All maintained Ruby versions are supported.
 - 3.0
 - 2.7
 - 2.6
+- jruby
+- truffleruby
 
 ## Installation
 

data/lib/amqp/client/connection.rb

@@ -133,9 +133,13 @@ module AMQP
         warn "AMQP-Client blocked by broker: #{blocked}" if blocked
         @write_lock.synchronize do
           warn "AMQP-Client unblocked by broker" if blocked
-          @socket.write(*bytes)
+          if RUBY_ENGINE == "truffleruby"
+            bytes.each { |b| @socket.write b }
+          else
+            @socket.write(*bytes)
+          end
         end
-      rescue IOError, OpenSSL::OpenSSLError, SystemCallError => e
+      rescue *READ_EXCEPTIONS => e
         raise Error::ConnectionClosed.new(*@closed) if @closed
 
         raise Error, "Could not write to socket, #{e.message}"
@@ -152,12 +156,12 @@ module AMQP
         frame_start = String.new(capacity: 7)
         frame_buffer = String.new(capacity: frame_max)
         loop do
-          socket.read(7, frame_start)
+          socket.read(7, frame_start) || raise(IOError)
           type, channel_id, frame_size = frame_start.unpack("C S> L>")
           frame_max >= frame_size || raise(Error, "Frame size #{frame_size} larger than negotiated max frame size #{frame_max}")
 
           # read the frame content
-          socket.read(frame_size, frame_buffer)
+          socket.read(frame_size, frame_buffer) || raise(IOError)
 
           # make sure that the frame end is correct
           frame_end = socket.readchar.ord
@@ -167,7 +171,7 @@ module AMQP
           parse_frame(type, channel_id, frame_buffer) || return
         end
         nil
-      rescue IOError, OpenSSL::OpenSSLError, SystemCallError => e
+      rescue *READ_EXCEPTIONS => e
         @closed ||= [400, "read error: #{e.message}"]
         nil # ignore read errors
       ensure
@@ -177,13 +181,16 @@ module AMQP
           @write_lock.synchronize do
             @socket.close
           end
-        rescue IOError, OpenSSL::OpenSSLError, SystemCallError
+        rescue *READ_EXCEPTIONS
           nil
         end
       end
 
       private
 
+      READ_EXCEPTIONS = [IOError, OpenSSL::OpenSSLError, SystemCallError,
+                         RUBY_ENGINE == "jruby" ? java.lang.NullPointerException : nil].compact.freeze
+
       def parse_frame(type, channel_id, buf)
         case type
         when 1 # method frame
@@ -402,7 +409,7 @@ module AMQP
         loop do
           begin
             socket.readpartial(4096, buf)
-          rescue IOError, OpenSSL::OpenSSLError, SystemCallError => e
+          rescue *READ_EXCEPTIONS => e
             raise Error, "Could not establish AMQP connection: #{e.message}"
           end
 
@@ -444,10 +451,10 @@ module AMQP
           else raise Error, "Unexpected frame type: #{type}"
           end
         end
-      rescue StandardError => e
+      rescue Exception => e
         begin
           socket.close
-        rescue IOError, OpenSSL::OpenSSLError, SystemCallError
+        rescue *READ_EXCEPTIONS
           nil
         end
         raise e

data/lib/amqp/client/properties.rb

@@ -6,8 +6,10 @@ module AMQP
   class Client
     # Encode/decode AMQP Properties
     class Properties
-      def initialize(content_type: nil, content_encoding: nil, headers: nil, delivery_mode: nil, priority: nil, correlation_id: nil,
-                     reply_to: nil, expiration: nil, message_id: nil, timestamp: nil, type: nil, user_id: nil, app_id: nil)
+      # rubocop:disable Metrics/ParameterLists
+      def initialize(content_type: nil, content_encoding: nil, headers: nil, delivery_mode: nil,
+                     priority: nil, correlation_id: nil, reply_to: nil, expiration: nil,
+                     message_id: nil, timestamp: nil, type: nil, user_id: nil, app_id: nil)
         @content_type = content_type
         @content_encoding = content_encoding
         @headers = headers
@@ -22,6 +24,7 @@ module AMQP
         @user_id = user_id
         @app_id = app_id
       end
+      # rubocop:enable Metrics/ParameterLists
 
       # Properties as a Hash
       # @return [Hash] Properties

data/lib/amqp/client/version.rb

@@ -3,6 +3,6 @@
 module AMQP
   class Client
     # Version of the client library
-    VERSION = "1.1.1"
+    VERSION = "1.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amqp-client
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Carl Hörberg
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-15 00:00:00.000000000 Z
+date: 2021-10-15 00:00:00.000000000 Z
 dependencies: []
 description: Work in progress
 email: