bunny 3.1.0 → 3.3.0

data/LICENSE

@@ -0,0 +1,21 @@
+Copyright (c) 2009–2023 Chris Duncan, Jakub Stastny aka botanicus,
+Michael S. Klishin, Eric Lindvall, Stefan Kaes and contributors.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/bunny/channel.rb

@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 # frozen_string_literal: true
 
-require "thread"
-require "monitor"
 require "set"
 
 require "bunny/concurrent/atomic_fixnum"
@@ -112,8 +110,8 @@ module Bunny
   #     ch2 = conn.create_channel
   #     q   = "bunny.examples.recovery.q#{rand}"
   #
-  #     ch2.queue_declare(q, :durable => false)
-  #     ch2.queue_declare(q, :durable => true)
+  #     ch2.queue_declare(q, durable: false)
+  #     ch2.queue_declare(q, durable: true)
   #   rescue Bunny::PreconditionFailed => e
   #     puts "Channel-level exception! Code: #{e.channel_close.reply_code}, message: #{e.channel_close.reply_text}"
   #   ensure
@@ -521,11 +519,11 @@ module Bunny
     # @see http://rubybunny.info/articles/extensions.html RabbitMQ Extensions guide
     # @api public
     def queue(name = AMQ::Protocol::EMPTY_STRING, opts = {})
-      throw ArgumentError.new("queue name must not be nil") if name.nil?
+      raise ArgumentError, "queue name must not be nil" if name.nil?
 
       q = find_queue(name) || Bunny::Queue.new(self, name, opts)
 
-      record_queue(q)
+      record_queue(q) unless opts[:passive]
       register_queue(q)
     end
 
@@ -541,8 +539,8 @@ module Bunny
     # @see #queue
     # @api public
     def quorum_queue(name, opts = {})
-      throw ArgumentError.new("quorum queue name must not be nil") if name.nil?
-      throw ArgumentError.new("quorum queue name must not be empty (server-named QQs do not make sense)") if name.empty?
+      raise ArgumentError, "quorum queue name must not be nil" if name.nil?
+      raise ArgumentError, "quorum queue name must not be empty (server-named QQs do not make sense)" if name.empty?
 
       durable_queue(name, Bunny::Queue::Types::QUORUM, opts)
     end
@@ -563,8 +561,8 @@ module Bunny
     # @see #queue
     # @api public
     def stream(name, opts = {})
-      throw ArgumentError.new("stream name must not be nil") if name.nil?
-      throw ArgumentError.new("stream name must not be empty (server-named QQs do not make sense)") if name.empty?
+      raise ArgumentError, "stream name must not be nil" if name.nil?
+      raise ArgumentError, "stream name must not be empty (server-named QQs do not make sense)" if name.empty?
 
       durable_queue(name, Bunny::Queue::Types::STREAM, opts)
     end
@@ -585,15 +583,15 @@ module Bunny
     # @see #queue
     # @api public
     def delayed_queue(name, opts = {})
-      throw ArgumentError.new("delayed queue name must not be nil") if name.nil?
-      throw ArgumentError.new("delayed queue name must not be empty") if name.empty?
+      raise ArgumentError, "delayed queue name must not be nil" if name.nil?
+      raise ArgumentError, "delayed queue name must not be empty" if name.empty?
 
       args = opts[:arguments] || {}
       args[Bunny::Queue::XArgs::DELAYED_RETRY_TYPE] = opts[:delayed_retry_type] if opts[:delayed_retry_type]
       args[Bunny::Queue::XArgs::DELAYED_RETRY_MIN]  = opts[:delayed_retry_min]  if opts[:delayed_retry_min]
       args[Bunny::Queue::XArgs::DELAYED_RETRY_MAX]  = opts[:delayed_retry_max]  if opts[:delayed_retry_max]
 
-      final_opts = opts.merge(:arguments => args)
+      final_opts = opts.merge(arguments: args)
       final_opts.delete(:delayed_retry_type)
       final_opts.delete(:delayed_retry_min)
       final_opts.delete(:delayed_retry_max)
@@ -616,14 +614,14 @@ module Bunny
     # @see #queue
     # @api public
     def jms_queue(name, opts = {})
-      throw ArgumentError.new("JMS queue name must not be nil") if name.nil?
-      throw ArgumentError.new("JMS queue name must not be empty") if name.empty?
+      raise ArgumentError, "JMS queue name must not be nil" if name.nil?
+      raise ArgumentError, "JMS queue name must not be empty" if name.empty?
 
       args = opts[:arguments] || {}
       args[Bunny::Queue::XArgs::SELECTOR_FIELDS]          = opts[:selector_fields]          if opts[:selector_fields]
       args[Bunny::Queue::XArgs::SELECTOR_FIELD_MAX_BYTES] = opts[:selector_field_max_bytes] if opts[:selector_field_max_bytes]
 
-      final_opts = opts.merge(:arguments => args)
+      final_opts = opts.merge(arguments: args)
       final_opts.delete(:selector_fields)
       final_opts.delete(:selector_field_max_bytes)
 
@@ -642,16 +640,16 @@ module Bunny
     # @see #queue
     # @api public
     def durable_queue(name, type = "classic", opts = {})
-      throw ArgumentError.new("queue name must not be nil") if name.nil?
-      throw ArgumentError.new("queue name must not be empty (server-named durable queues do not make sense)") if name.empty?
+      raise ArgumentError, "queue name must not be nil" if name.nil?
+      raise ArgumentError, "queue name must not be empty (server-named durable queues do not make sense)" if name.empty?
 
-      final_opts = opts.merge({
-        :type        => type,
-        :durable     => true,
+      final_opts = opts.merge(
+        type:        type,
+        durable:     true,
         # exclusive or auto-delete QQs do not make much sense
-        :exclusive   => false,
-        :auto_delete => false
-      })
+        exclusive:   false,
+        auto_delete: false
+      )
       q = find_queue(name) || Bunny::Queue.new(self, name, final_opts)
 
       record_queue(q)
@@ -666,7 +664,7 @@ module Bunny
     # @api public
     def temporary_queue(opts = {})
       temporary_queue_opts = {
-        :exclusive => true
+        exclusive: true
       }
       queue("", opts.merge(temporary_queue_opts))
     end
@@ -773,11 +771,7 @@ module Bunny
       raise_if_no_longer_open!
       raise ArgumentError, "routing key cannot be longer than #{SHORTSTR_LIMIT} characters" if routing_key && routing_key.size > SHORTSTR_LIMIT
 
-      exchange_name = if exchange.respond_to?(:name)
-                        exchange.name
-                      else
-                        exchange
-                      end
+      exchange_name = exchange.is_a?(Bunny::Exchange) ? exchange.name : exchange
 
       mode = if opts.fetch(:persistent, true)
                2
@@ -848,11 +842,7 @@ module Bunny
       raise ArgumentError, "routing key cannot be longer than #{SHORTSTR_LIMIT} characters" if routing_key && routing_key.size > SHORTSTR_LIMIT
       return self if payloads.empty?
 
-      exchange_name = if exchange.respond_to?(:name)
-                        exchange.name
-                      else
-                        exchange
-                      end
+      exchange_name = exchange.is_a?(Bunny::Exchange) ? exchange.name : exchange
 
       mode = opts.fetch(:persistent, true) ? 2 : 1
       opts = opts.dup
@@ -922,12 +912,12 @@ module Bunny
     #   conn.start
     #   ch   = conn.create_channel
     #   # here we assume the queue already exists and has messages
-    #   delivery_info, properties, payload = ch.basic_get("bunny.examples.queue1", :manual_ack => true)
+    #   delivery_info, properties, payload = ch.basic_get("bunny.examples.queue1", manual_ack: true)
     #   ch.acknowledge(delivery_info.delivery_tag)
     # @see Bunny::Queue#pop
     # @see http://rubybunny.info/articles/queues.html Queues and Consumers guide
     # @api public
-    def basic_get(queue, opts = {:manual_ack => true})
+    def basic_get(queue, opts = { manual_ack: true })
       raise_if_no_longer_open!
 
       unless opts[:ack].nil?
@@ -1046,7 +1036,7 @@ module Bunny
     #
     #   ch    = conn.create_channel
     #   # we assume the queue exists and has messages
-    #   delivery_info, properties, payload = ch.basic_get("bunny.examples.queue3", :manual_ack => true)
+    #   delivery_info, properties, payload = ch.basic_get("bunny.examples.queue3", manual_ack: true)
     #   ch.basic_reject(delivery_info.delivery_tag, true)
     #
     # @see Bunny::Channel#basic_nack
@@ -1081,7 +1071,7 @@ module Bunny
     #
     #   ch    = conn.create_channel
     #   # we assume the queue exists and has messages
-    #   delivery_info, properties, payload = ch.basic_get("bunny.examples.queue3", :manual_ack => true)
+    #   delivery_info, properties, payload = ch.basic_get("bunny.examples.queue3", manual_ack: true)
     #   ch.basic_ack(delivery_info.delivery_tag.to_i)
     #
     # @example Ack multiple messages fetched via basic.get
@@ -1090,9 +1080,9 @@ module Bunny
     #
     #   ch    = conn.create_channel
     #   # we assume the queue exists and has messages
-    #   _, _, payload1 = ch.basic_get("bunny.examples.queue3", :manual_ack => true)
-    #   _, _, payload2 = ch.basic_get("bunny.examples.queue3", :manual_ack => true)
-    #   delivery_info, properties, payload3 = ch.basic_get("bunny.examples.queue3", :manual_ack => true)
+    #   _, _, payload1 = ch.basic_get("bunny.examples.queue3", manual_ack: true)
+    #   _, _, payload2 = ch.basic_get("bunny.examples.queue3", manual_ack: true)
+    #   delivery_info, properties, payload3 = ch.basic_get("bunny.examples.queue3", manual_ack: true)
     #   # ack all fetched messages up to payload3
     #   ch.basic_ack(delivery_info.delivery_tag.to_i, true)
     #
@@ -1141,7 +1131,7 @@ module Bunny
     #
     #   ch    = conn.create_channel
     #   # we assume the queue exists and has messages
-    #   delivery_info, properties, payload = ch.basic_get("bunny.examples.queue3", :manual_ack => true)
+    #   delivery_info, properties, payload = ch.basic_get("bunny.examples.queue3", manual_ack: true)
     #   ch.basic_nack(delivery_info.delivery_tag, false, true)
     #
     #
@@ -1151,9 +1141,9 @@ module Bunny
     #
     #   ch    = conn.create_channel
     #   # we assume the queue exists and has messages
-    #   _, _, payload1 = ch.basic_get("bunny.examples.queue3", :manual_ack => true)
-    #   _, _, payload2 = ch.basic_get("bunny.examples.queue3", :manual_ack => true)
-    #   delivery_info, properties, payload3 = ch.basic_get("bunny.examples.queue3", :manual_ack => true)
+    #   _, _, payload1 = ch.basic_get("bunny.examples.queue3", manual_ack: true)
+    #   _, _, payload2 = ch.basic_get("bunny.examples.queue3", manual_ack: true)
+    #   delivery_info, properties, payload3 = ch.basic_get("bunny.examples.queue3", manual_ack: true)
     #   # requeue all fetched messages up to payload3
     #   ch.basic_nack(delivery_info.delivery_tag, true, true)
     #
@@ -1189,11 +1179,7 @@ module Bunny
       raise_if_no_longer_open!
       maybe_start_consumer_work_pool!
 
-      queue_name = if queue.respond_to?(:name)
-                     queue.name
-                   else
-                     queue
-                   end
+      queue_name = queue.is_a?(Bunny::Queue) ? queue.name : queue
 
       # helps avoid race condition between basic.consume-ok and basic.deliver if there are messages
       # in the queue already. MK.
@@ -1366,7 +1352,7 @@ module Bunny
       args = opts[:arguments]
 
       result = self.queue_declare_without_recording_topology(name, opts)
-      self.record_queue_with(self, result.queue, is_server_named, durable, exclusive, auto_delete, args) unless passive
+      self.record_queue_with(self, result.queue, is_server_named, durable, auto_delete, exclusive, args) unless passive
 
       result
     end
@@ -1479,11 +1465,7 @@ module Bunny
     def queue_bind(name, exchange, opts = {})
       raise_if_no_longer_open!
 
-      exchange_name = if exchange.respond_to?(:name)
-                        exchange.name
-                      else
-                        exchange
-                      end
+      exchange_name = exchange.is_a?(Bunny::Exchange) ? exchange.name : exchange
       rk = (opts[:routing_key] || opts[:key])
       args = opts[:arguments]
 
@@ -1499,11 +1481,7 @@ module Bunny
     def queue_bind_without_recording_topology(name, exchange, opts = {})
       raise_if_no_longer_open!
 
-      exchange_name = if exchange.respond_to?(:name)
-                        exchange.name
-                      else
-                        exchange
-                      end
+      exchange_name = exchange.is_a?(Bunny::Exchange) ? exchange.name : exchange
 
       rk = (opts[:routing_key] || opts[:key])
       args = opts[:arguments]
@@ -1540,11 +1518,7 @@ module Bunny
     def queue_unbind(name, exchange, opts = {})
       raise_if_no_longer_open!
 
-      exchange_name = if exchange.respond_to?(:name)
-                        exchange.name
-                      else
-                        exchange
-                      end
+      exchange_name = exchange.is_a?(Bunny::Exchange) ? exchange.name : exchange
 
       rk = (opts[:routing_key] || opts[:key])
       args = opts[:arguments]
@@ -1693,16 +1667,8 @@ module Bunny
     def exchange_bind(source, destination, opts = {})
       result = self.exchange_bind_without_recording_topology(source, destination, opts)
 
-      source_name = if source.respond_to?(:name)
-                      source.name
-                    else
-                      source
-                    end
-      destination_name = if destination.respond_to?(:name)
-                           destination.name
-                         else
-                           destination
-                         end
+      source_name = source.is_a?(Bunny::Exchange) ? source.name : source
+      destination_name = destination.is_a?(Bunny::Exchange) ? destination.name : destination
       rk = (opts[:routing_key] || opts[:key])
       args = opts[:arguments]
       self.record_exchange_binding_with(self, source_name, destination_name, rk, args)
@@ -1716,17 +1682,9 @@ module Bunny
     def exchange_bind_without_recording_topology(source, destination, opts = {})
       raise_if_no_longer_open!
 
-      source_name = if source.respond_to?(:name)
-                      source.name
-                    else
-                      source
-                    end
+      source_name = source.is_a?(Bunny::Exchange) ? source.name : source
 
-      destination_name = if destination.respond_to?(:name)
-                           destination.name
-                         else
-                           destination
-                         end
+      destination_name = destination.is_a?(Bunny::Exchange) ? destination.name : destination
 
       rk = (opts[:routing_key] || opts[:key])
       args = opts[:arguments]
@@ -1764,17 +1722,9 @@ module Bunny
     def exchange_unbind(source, destination, opts = {})
       raise_if_no_longer_open!
 
-      source_name = if source.respond_to?(:name)
-                      source.name
-                    else
-                      source
-                    end
-
-      destination_name = if destination.respond_to?(:name)
-                           destination.name
-                         else
-                           destination
-                         end
+      source_name = source.is_a?(Bunny::Exchange) ? source.name : source
+
+      destination_name = destination.is_a?(Bunny::Exchange) ? destination.name : destination
 
       rk = (opts[:routing_key] || opts[:key])
       args = opts[:arguments]

data/lib/bunny/channel_id_allocator.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "thread"
-require "monitor"
 require "amq/int_allocator"
 
 module Bunny

data/lib/bunny/concurrent/atomic_fixnum.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require "set"
-require "thread"
-require "monitor"
 
 module Bunny
   module Concurrent

data/lib/bunny/concurrent/condition.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require "thread"
-require "monitor"
-
 module Bunny
   # @private
   module Concurrent

data/lib/bunny/concurrent/continuation_queue.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "thread"
-
 module Bunny
   module Concurrent
     # Continuation queue implementation for MRI and Rubinius

data/lib/bunny/concurrent/exception_accumulator.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "thread"
-
 module Bunny
   module Concurrent
     # A thread-safe exception accumulator that stores exceptions for later retrieval

data/lib/bunny/concurrent/synchronized_sorted_set.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "set"
-require "thread"
 
 module Bunny
   module Concurrent

data/lib/bunny/consumer.rb

@@ -111,7 +111,7 @@ module Bunny
     # @return [String] Name of the queue this consumer is on
     # @api public
     def queue_name
-      if @queue.respond_to?(:name)
+      if @queue.is_a?(Bunny::Queue)
         @queue.name
       else
         @queue

data/lib/bunny/consumer_work_pool.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "thread"
-
 module Bunny
   # Thread pool that dispatches consumer deliveries. Not supposed to be shared between channels
   # or threads.

data/lib/bunny/cruby/socket.rb

@@ -11,21 +11,10 @@ module Bunny
   module Socket
     attr_accessor :options
 
-    READ_RETRY_EXCEPTION_CLASSES = if defined?(IO::EAGAINWaitReadable)
-                                     # Ruby 2.1+
-                                     [Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitReadable,
-                                      IO::EAGAINWaitReadable, IO::EWOULDBLOCKWaitReadable]
-                                   else
-                                     # 2.0
-                                     [Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitReadable]
-                                   end
-    WRITE_RETRY_EXCEPTION_CLASSES = if defined?(IO::EAGAINWaitWritable)
-                                      [Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitWritable,
-                                       IO::EAGAINWaitWritable, IO::EWOULDBLOCKWaitWritable]
-                                    else
-                                      # 2.0
-                                      [Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitWritable]
-                                    end
+    READ_RETRY_EXCEPTION_CLASSES = [Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitReadable,
+                                    IO::EAGAINWaitReadable, IO::EWOULDBLOCKWaitReadable].freeze
+    WRITE_RETRY_EXCEPTION_CLASSES = [Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitWritable,
+                                     IO::EAGAINWaitWritable, IO::EWOULDBLOCKWaitWritable].freeze
 
     def self.open(host, port, options = {})
       socket = ::Socket.tcp(host, port, nil, nil,
@@ -39,7 +28,7 @@ module Bunny
         @__bunny_socket_eof_flag__ = false
       end
       socket.extend self
-      socket.options = { :host => host, :port => port }.merge(options)
+      socket.options = { host: host, port: port }.merge(options)
       socket
     rescue Errno::ETIMEDOUT
       raise ClientTimeout

data/lib/bunny/cruby/ssl_socket.rb

@@ -10,21 +10,10 @@ module Bunny
     # methods found in Bunny::Socket.
     class SSLSocket < OpenSSL::SSL::SSLSocket
 
-    READ_RETRY_EXCEPTION_CLASSES = if defined?(IO::EAGAINWaitReadable)
-                                     # Ruby 2.1+
-                                     [Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitReadable,
-                                      IO::EAGAINWaitReadable, IO::EWOULDBLOCKWaitReadable]
-                                   else
-                                     # 2.0
-                                     [Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitReadable]
-                                   end
-    WRITE_RETRY_EXCEPTION_CLASSES = if defined?(IO::EAGAINWaitWritable)
-                                      [Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitWritable,
-                                       IO::EAGAINWaitWritable, IO::EWOULDBLOCKWaitWritable]
-                                    else
-                                      # 2.0
-                                      [Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitWritable]
-                                    end
+    READ_RETRY_EXCEPTION_CLASSES = [Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitReadable,
+                                    IO::EAGAINWaitReadable, IO::EWOULDBLOCKWaitReadable].freeze
+    WRITE_RETRY_EXCEPTION_CLASSES = [Errno::EAGAIN, Errno::EWOULDBLOCK, IO::WaitWritable,
+                                     IO::EAGAINWaitWritable, IO::EWOULDBLOCKWaitWritable].freeze
 
       def initialize(*args)
         super

data/lib/bunny/delivery_info.rb

@@ -52,13 +52,13 @@ module Bunny
     # @return [Hash] Hash representation of this delivery info
     def to_hash
       @hash ||= {
-        :consumer_tag => @basic_deliver.consumer_tag,
-        :delivery_tag => @basic_deliver.delivery_tag,
-        :redelivered  => @basic_deliver.redelivered,
-        :exchange     => @basic_deliver.exchange,
-        :routing_key  => @basic_deliver.routing_key,
-        :consumer     => @consumer,
-        :channel      => @channel
+        consumer_tag: @basic_deliver.consumer_tag,
+        delivery_tag: @basic_deliver.delivery_tag,
+        redelivered:  @basic_deliver.redelivered,
+        exchange:     @basic_deliver.exchange,
+        routing_key:  @basic_deliver.routing_key,
+        consumer:     @consumer,
+        channel:      @channel
       }
     end
 

data/lib/bunny/exchange.rb

@@ -63,7 +63,7 @@ module Bunny
     # @example Publishing a messages to the tasks queue
     #   channel     = Bunny::Channel.new(connection)
     #   tasks_queue = channel.queue("tasks")
-    #   Bunny::Exchange.default(channel).publish("make clean", :routing_key => "tasks")
+    #   Bunny::Exchange.default(channel).publish("make clean", routing_key: "tasks")
     #
     # @see http://rubybunny.info/articles/exchanges.html Exchanges and Publishing guide
     # @see http://www.rabbitmq.com/resources/specs/amqp0-9-1.pdf AMQP 0.9.1 specification (Section 2.1.2.4)
@@ -72,7 +72,7 @@ module Bunny
     # @return [Exchange] An instance that corresponds to the default exchange (of type direct).
     # @api public
     def self.default(channel_or_connection)
-      self.new(channel_or_connection, :direct, AMQ::Protocol::EMPTY_STRING, :no_declare => true)
+      self.new(channel_or_connection, :direct, AMQ::Protocol::EMPTY_STRING, no_declare: true)
     end
 
     # @param [Bunny::Channel] channel Channel this exchange will use.
@@ -108,8 +108,9 @@ module Bunny
 
       # for basic.return dispatch and such
       @channel.register_exchange(self)
-      # for topology recovery
-      @channel.record_exchange(self)
+      # for topology recovery. A passive declaration does not own the exchange,
+      # so it must not overwrite what was recorded for it earlier
+      @channel.record_exchange(self) unless @options[:passive]
     end
 
     # @return [Boolean] true if this exchange was declared as durable (will survive broker restart).
@@ -271,15 +272,15 @@ module Bunny
     # @private
     def self.add_default_options(name, opts)
       # :nowait is always false for Bunny
-      h = { :queue => name, :nowait => false }.merge(opts)
+      h = { queue: name, nowait: false }.merge(opts)
 
       if name.empty?
         {
-          :passive     => false,
-          :durable     => false,
-          :auto_delete => false,
-          :internal    => false,
-          :arguments   => nil
+          passive:     false,
+          durable:     false,
+          auto_delete: false,
+          internal:    false,
+          arguments:   nil
         }.merge(h)
       else
         h

data/lib/bunny/framing.rb

@@ -3,7 +3,6 @@
 module Bunny
   # @private
   module Framing
-    ENCODINGS_SUPPORTED = defined? Encoding
     HEADER_SLICE = (0..6).freeze
     DATA_SLICE = (7..-1).freeze
     PAYLOAD_SLICE = (0..-2).freeze
@@ -18,7 +17,7 @@ module Bunny
           payload             = data[PAYLOAD_SLICE]
           frame_end           = data[-1, 1]
 
-          frame_end.force_encoding(AMQ::Protocol::Frame::FINAL_OCTET.encoding) if ENCODINGS_SUPPORTED
+          frame_end.force_encoding(AMQ::Protocol::Frame::FINAL_OCTET.encoding)
 
           # 1) the size is miscalculated
           if payload.bytesize != size

data/lib/bunny/get_response.rb

@@ -47,11 +47,11 @@ module Bunny
     # @return [Hash] Hash representation of this delivery info
     def to_hash
       @hash ||= {
-        :delivery_tag => @get_ok.delivery_tag,
-        :redelivered  => @get_ok.redelivered,
-        :exchange     => @get_ok.exchange,
-        :routing_key  => @get_ok.routing_key,
-        :channel      => @channel
+        delivery_tag: @get_ok.delivery_tag,
+        redelivered:  @get_ok.redelivered,
+        exchange:     @get_ok.exchange,
+        routing_key:  @get_ok.routing_key,
+        channel:      @channel
       }
     end
 

data/lib/bunny/heartbeat_sender.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "thread"
 require "amq/protocol/client"
 require "amq/protocol/frame"
 
@@ -31,7 +30,7 @@ module Bunny
         @interval = [(period / 2) - 1, 0.4].max
 
         @thread = Thread.new(&method(:run))
-        @thread.report_on_exception = false if @thread.respond_to?(:report_on_exception)
+        @thread.report_on_exception = false
       end
     end