bunny 2.19.0 → 2.22.0

data/lib/bunny.rb

@@ -53,17 +53,58 @@ module Bunny
   # Instantiates a new connection. The actual network
   # connection is started with {Bunny::Session#start}
   #
+  # @param [String, Hash] connection_string_or_opts Connection string or a hash of connection options
+  # @param [Hash] optz Extra options not related to connection
+  #
+  # @option connection_string_or_opts [String] :host ("127.0.0.1") Hostname or IP address to connect to
+  # @option connection_string_or_opts [Array<String>] :hosts (["127.0.0.1"]) list of hostname or IP addresses to select hostname from when connecting
+  # @option connection_string_or_opts [Array<String>] :addresses (["127.0.0.1:5672"]) list of addresses to select hostname and port from when connecting
+  # @option connection_string_or_opts [Integer] :port (5672) Port RabbitMQ listens on
+  # @option connection_string_or_opts [String] :username ("guest") Username
+  # @option connection_string_or_opts [String] :password ("guest") Password
+  # @option connection_string_or_opts [String] :vhost ("/") Virtual host to use
+  # @option connection_string_or_opts [Integer, Symbol] :heartbeat (:server) Heartbeat timeout to offer to the server. :server means use the value suggested by RabbitMQ. 0 means heartbeats and socket read timeouts will be disabled (not recommended).
+  # @option connection_string_or_opts [Integer] :network_recovery_interval (4) Recovery interval periodic network recovery will use. This includes initial pause after network failure.
+  # @option connection_string_or_opts [Boolean] :tls (false) Should TLS/SSL be used?
+  # @option connection_string_or_opts [String] :tls_cert (nil) Path to client TLS/SSL certificate file (.pem)
+  # @option connection_string_or_opts [String] :tls_key (nil) Path to client TLS/SSL private key file (.pem)
+  # @option connection_string_or_opts [Array<String>] :tls_ca_certificates Array of paths to TLS/SSL CA files (.pem), by default detected from OpenSSL configuration
+  # @option connection_string_or_opts [String] :verify_peer (true) Whether TLS peer verification should be performed
+  # @option connection_string_or_opts [Symbol] :tls_protocol (negotiated) What TLS version should be used (:TLSv1, :TLSv1_1, or :TLSv1_2)
+  # @option connection_string_or_opts [Integer] :channel_max (2047) Maximum number of channels allowed on this connection, minus 1 to account for the special channel 0.
+  # @option connection_string_or_opts [Integer] :continuation_timeout (15000) Timeout for client operations that expect a response (e.g. {Bunny::Queue#get}), in milliseconds.
+  # @option connection_string_or_opts [Integer] :connection_timeout (30) Timeout in seconds for connecting to the server.
+  # @option connection_string_or_opts [Integer] :read_timeout (30) TCP socket read timeout in seconds. If heartbeats are disabled this will be ignored.
+  # @option connection_string_or_opts [Integer] :write_timeout (30) TCP socket write timeout in seconds.
+  # @option connection_string_or_opts [Proc] :hosts_shuffle_strategy a callable that reorders a list of host strings, defaults to Array#shuffle
+  # @option connection_string_or_opts [Proc] :recovery_completed a callable that will be called when a network recovery is performed
+  # @option connection_string_or_opts [Logger] :logger The logger.  If missing, one is created using :log_file and :log_level.
+  # @option connection_string_or_opts [IO, String] :log_file The file or path to use when creating a logger.  Defaults to STDOUT.
+  # @option connection_string_or_opts [IO, String] :logfile DEPRECATED: use :log_file instead.  The file or path to use when creating a logger.  Defaults to STDOUT.
+  # @option connection_string_or_opts [Integer] :log_level The log level to use when creating a logger.  Defaults to LOGGER::WARN
+  # @option connection_string_or_opts [Boolean] :automatically_recover (true) Should automatically recover from network failures?
+  # @option connection_string_or_opts [Integer] :recovery_attempts (nil) Max number of recovery attempts, nil means forever
+  # @option connection_string_or_opts [Integer] :reset_recovery_attempts_after_reconnection (true) Should recovery attempt counter be reset after successful reconnection? When set to false, the attempt counter will last through the entire lifetime of the connection object.
+  # @option connection_string_or_opts [Proc] :recovery_attempt_started (nil) Will be called before every connection recovery attempt
+  # @option connection_string_or_opts [Proc] :recovery_completed (nil) Will be called after successful connection recovery
+  # @option connection_string_or_opts [Boolean] :recover_from_connection_close (true) Should this connection recover after receiving a server-sent connection.close (e.g. connection was force closed)?
+  # @option connection_string_or_opts [Object] :session_error_handler (Thread.current) Object which responds to #raise that will act as a session error handler. Defaults to Thread.current, which will raise asynchronous exceptions in the thread that created the session.
+  #
+  # @option optz [String] :auth_mechanism ("PLAIN") Authentication mechanism, PLAIN or EXTERNAL
+  # @option optz [String] :locale ("PLAIN") Locale RabbitMQ should use
+  # @option optz [String] :connection_name (nil) Client-provided connection name, if any. Note that the value returned does not uniquely identify a connection and cannot be used as a connection identifier in HTTP API requests.
+  #
   # @return [Bunny::Session]
   # @see Bunny::Session#start
   # @see http://rubybunny.info/articles/getting_started.html
   # @see http://rubybunny.info/articles/connecting.html
   # @api public
-  def self.new(connection_string_or_opts = ENV['RABBITMQ_URL'], opts = {})
-    if connection_string_or_opts.respond_to?(:keys) && opts.empty?
-      opts = connection_string_or_opts
+  def self.new(connection_string_or_opts = ENV['RABBITMQ_URL'], optz = {})
+    if connection_string_or_opts.respond_to?(:keys) && optz.empty?
+      optz = connection_string_or_opts
     end
 
-    conn = Session.new(connection_string_or_opts, opts)
+    conn = Session.new(connection_string_or_opts, optz)
     @default_connection ||= conn
 
     conn

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 2.19.0
+  version: 2.22.0
 platform: ruby
 authors:
 - Chris Duncan
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-25 00:00:00.000000000 Z
+date: 2023-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amq-protocol
@@ -54,7 +54,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.2
-description: Easy to use, feature complete Ruby client for RabbitMQ 3.3 and later
+description: Easy to use, feature complete Ruby client for RabbitMQ 3.9 and later
   versions.
 email:
 - michael.s.klishin@gmail.com
@@ -101,76 +101,6 @@ files:
 - lib/bunny/transport.rb
 - lib/bunny/version.rb
 - lib/bunny/versioned_delivery_tag.rb
-- spec/config/enabled_plugins
-- spec/config/rabbitmq.conf
-- spec/higher_level_api/integration/basic_ack_spec.rb
-- spec/higher_level_api/integration/basic_cancel_spec.rb
-- spec/higher_level_api/integration/basic_consume_spec.rb
-- spec/higher_level_api/integration/basic_consume_with_objects_spec.rb
-- spec/higher_level_api/integration/basic_get_spec.rb
-- spec/higher_level_api/integration/basic_nack_spec.rb
-- spec/higher_level_api/integration/basic_publish_spec.rb
-- spec/higher_level_api/integration/basic_qos_spec.rb
-- spec/higher_level_api/integration/basic_reject_spec.rb
-- spec/higher_level_api/integration/basic_return_spec.rb
-- spec/higher_level_api/integration/channel_close_spec.rb
-- spec/higher_level_api/integration/channel_open_spec.rb
-- spec/higher_level_api/integration/connection_recovery_spec.rb
-- spec/higher_level_api/integration/connection_spec.rb
-- spec/higher_level_api/integration/connection_stop_spec.rb
-- spec/higher_level_api/integration/consumer_cancellation_notification_spec.rb
-- spec/higher_level_api/integration/dead_lettering_spec.rb
-- spec/higher_level_api/integration/exchange_bind_spec.rb
-- spec/higher_level_api/integration/exchange_declare_spec.rb
-- spec/higher_level_api/integration/exchange_delete_spec.rb
-- spec/higher_level_api/integration/exchange_unbind_spec.rb
-- spec/higher_level_api/integration/exclusive_queue_spec.rb
-- spec/higher_level_api/integration/heartbeat_spec.rb
-- spec/higher_level_api/integration/message_properties_access_spec.rb
-- spec/higher_level_api/integration/predeclared_exchanges_spec.rb
-- spec/higher_level_api/integration/publisher_confirms_spec.rb
-- spec/higher_level_api/integration/publishing_edge_cases_spec.rb
-- spec/higher_level_api/integration/queue_bind_spec.rb
-- spec/higher_level_api/integration/queue_declare_spec.rb
-- spec/higher_level_api/integration/queue_delete_spec.rb
-- spec/higher_level_api/integration/queue_purge_spec.rb
-- spec/higher_level_api/integration/queue_unbind_spec.rb
-- spec/higher_level_api/integration/read_only_consumer_spec.rb
-- spec/higher_level_api/integration/sender_selected_distribution_spec.rb
-- spec/higher_level_api/integration/tls_connection_spec.rb
-- spec/higher_level_api/integration/toxiproxy_spec.rb
-- spec/higher_level_api/integration/tx_commit_spec.rb
-- spec/higher_level_api/integration/tx_rollback_spec.rb
-- spec/higher_level_api/integration/with_channel_spec.rb
-- spec/issues/issue100_spec.rb
-- spec/issues/issue141_spec.rb
-- spec/issues/issue202_spec.rb
-- spec/issues/issue224_spec.rb
-- spec/issues/issue465_spec.rb
-- spec/issues/issue549_spec.rb
-- spec/issues/issue609_spec.rb
-- spec/issues/issue78_spec.rb
-- spec/issues/issue83_spec.rb
-- spec/issues/issue97_attachment.json
-- spec/issues/issue97_spec.rb
-- spec/lower_level_api/integration/basic_cancel_spec.rb
-- spec/lower_level_api/integration/basic_consume_spec.rb
-- spec/spec_helper.rb
-- spec/stress/channel_close_stress_spec.rb
-- spec/stress/channel_open_stress_spec.rb
-- spec/stress/channel_open_stress_with_single_threaded_connection_spec.rb
-- spec/stress/concurrent_consumers_stress_spec.rb
-- spec/stress/concurrent_publishers_stress_spec.rb
-- spec/stress/connection_open_close_spec.rb
-- spec/stress/merry_go_round_spec.rb
-- spec/toxiproxy_helper.rb
-- spec/unit/bunny_spec.rb
-- spec/unit/concurrent/atomic_fixnum_spec.rb
-- spec/unit/concurrent/condition_spec.rb
-- spec/unit/concurrent/linked_continuation_queue_spec.rb
-- spec/unit/concurrent/synchronized_sorted_set_spec.rb
-- spec/unit/exchange_recovery_spec.rb
-- spec/unit/version_delivery_tag_spec.rb
 homepage: http://rubybunny.info
 licenses:
 - MIT
@@ -183,85 +113,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.5.0.dev
 signing_key:
 specification_version: 4
 summary: Popular easy to use Ruby client for RabbitMQ
-test_files:
-- spec/config/enabled_plugins
-- spec/config/rabbitmq.conf
-- spec/higher_level_api/integration/basic_ack_spec.rb
-- spec/higher_level_api/integration/basic_cancel_spec.rb
-- spec/higher_level_api/integration/basic_consume_spec.rb
-- spec/higher_level_api/integration/basic_consume_with_objects_spec.rb
-- spec/higher_level_api/integration/basic_get_spec.rb
-- spec/higher_level_api/integration/basic_nack_spec.rb
-- spec/higher_level_api/integration/basic_publish_spec.rb
-- spec/higher_level_api/integration/basic_qos_spec.rb
-- spec/higher_level_api/integration/basic_reject_spec.rb
-- spec/higher_level_api/integration/basic_return_spec.rb
-- spec/higher_level_api/integration/channel_close_spec.rb
-- spec/higher_level_api/integration/channel_open_spec.rb
-- spec/higher_level_api/integration/connection_recovery_spec.rb
-- spec/higher_level_api/integration/connection_spec.rb
-- spec/higher_level_api/integration/connection_stop_spec.rb
-- spec/higher_level_api/integration/consumer_cancellation_notification_spec.rb
-- spec/higher_level_api/integration/dead_lettering_spec.rb
-- spec/higher_level_api/integration/exchange_bind_spec.rb
-- spec/higher_level_api/integration/exchange_declare_spec.rb
-- spec/higher_level_api/integration/exchange_delete_spec.rb
-- spec/higher_level_api/integration/exchange_unbind_spec.rb
-- spec/higher_level_api/integration/exclusive_queue_spec.rb
-- spec/higher_level_api/integration/heartbeat_spec.rb
-- spec/higher_level_api/integration/message_properties_access_spec.rb
-- spec/higher_level_api/integration/predeclared_exchanges_spec.rb
-- spec/higher_level_api/integration/publisher_confirms_spec.rb
-- spec/higher_level_api/integration/publishing_edge_cases_spec.rb
-- spec/higher_level_api/integration/queue_bind_spec.rb
-- spec/higher_level_api/integration/queue_declare_spec.rb
-- spec/higher_level_api/integration/queue_delete_spec.rb
-- spec/higher_level_api/integration/queue_purge_spec.rb
-- spec/higher_level_api/integration/queue_unbind_spec.rb
-- spec/higher_level_api/integration/read_only_consumer_spec.rb
-- spec/higher_level_api/integration/sender_selected_distribution_spec.rb
-- spec/higher_level_api/integration/tls_connection_spec.rb
-- spec/higher_level_api/integration/toxiproxy_spec.rb
-- spec/higher_level_api/integration/tx_commit_spec.rb
-- spec/higher_level_api/integration/tx_rollback_spec.rb
-- spec/higher_level_api/integration/with_channel_spec.rb
-- spec/issues/issue100_spec.rb
-- spec/issues/issue141_spec.rb
-- spec/issues/issue202_spec.rb
-- spec/issues/issue224_spec.rb
-- spec/issues/issue465_spec.rb
-- spec/issues/issue549_spec.rb
-- spec/issues/issue609_spec.rb
-- spec/issues/issue78_spec.rb
-- spec/issues/issue83_spec.rb
-- spec/issues/issue97_attachment.json
-- spec/issues/issue97_spec.rb
-- spec/lower_level_api/integration/basic_cancel_spec.rb
-- spec/lower_level_api/integration/basic_consume_spec.rb
-- spec/spec_helper.rb
-- spec/stress/channel_close_stress_spec.rb
-- spec/stress/channel_open_stress_spec.rb
-- spec/stress/channel_open_stress_with_single_threaded_connection_spec.rb
-- spec/stress/concurrent_consumers_stress_spec.rb
-- spec/stress/concurrent_publishers_stress_spec.rb
-- spec/stress/connection_open_close_spec.rb
-- spec/stress/merry_go_round_spec.rb
-- spec/toxiproxy_helper.rb
-- spec/unit/bunny_spec.rb
-- spec/unit/concurrent/atomic_fixnum_spec.rb
-- spec/unit/concurrent/condition_spec.rb
-- spec/unit/concurrent/linked_continuation_queue_spec.rb
-- spec/unit/concurrent/synchronized_sorted_set_spec.rb
-- spec/unit/exchange_recovery_spec.rb
-- spec/unit/version_delivery_tag_spec.rb
+test_files: []

data/spec/config/enabled_plugins

@@ -1 +0,0 @@
-[rabbitmq_management, rabbitmq_consistent_hash_exchange].

data/spec/config/rabbitmq.conf

@@ -1,13 +0,0 @@
-listeners.tcp.1 = 0.0.0.0:5672
-
-listeners.ssl.default = 5671
-
-# mounted by docker-compose
-ssl_options.cacertfile = /spec/tls/ca_certificate.pem
-ssl_options.certfile   = /spec/tls/server_certificate.pem
-ssl_options.keyfile    = /spec/tls/server_key.pem
-
-ssl_options.verify               = verify_none
-ssl_options.fail_if_no_peer_cert = false
-
-loopback_users = none

data/spec/higher_level_api/integration/basic_ack_spec.rb

@@ -1,230 +0,0 @@
-require "spec_helper"
-
-describe Bunny::Channel, "#ack" do
-  let(:connection) do
-    c = Bunny.new(username: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed")
-    c.start
-    c
-  end
-
-  after :each do
-    connection.close if connection.open?
-  end
-
-  context "with a valid (known) delivery tag" do
-    it "acknowledges a message" do
-      ch = connection.create_channel
-      q  = ch.queue("bunny.basic.ack.manual-acks", exclusive: true)
-      x  = ch.default_exchange
-
-      x.publish("bunneth", routing_key: q.name)
-      sleep 0.5
-      expect(q.message_count).to eq 1
-      delivery_details, properties, content = q.pop(manual_ack: true)
-
-      ch.ack(delivery_details.delivery_tag, true)
-      ch.close
-
-      ch = connection.create_channel
-      q  = ch.queue("bunny.basic.ack.manual-acks", exclusive: true)
-      expect(q.message_count).to eq 0
-      ch.close
-    end
-  end
-
-  context "with a valid (known) delivery tag (multiple = true)" do
-    it "acknowledges a message" do
-      ch = connection.create_channel
-      q  = ch.queue("bunny.basic.ack.manual-acks", exclusive: true)
-      x  = ch.default_exchange
-
-      x.publish("bunneth", routing_key: q.name)
-      x.publish("bunneth", routing_key: q.name)
-      sleep 0.5
-      expect(q.message_count).to eq 2
-      delivery_details_1, _properties, _content = q.pop(manual_ack: true)
-      delivery_details_2, _properties, _content = q.pop(manual_ack: true)
-
-      ch.ack(delivery_details_2.delivery_tag, true)
-      ch.close
-
-      ch = connection.create_channel
-      q  = ch.queue("bunny.basic.ack.manual-acks", exclusive: true)
-      expect(q.message_count).to eq 0
-      ch.close
-    end
-  end
-
-  context "with a valid (known) delivery tag (multiple = false)" do
-    it "acknowledges a message" do
-      ch = connection.create_channel
-      q  = ch.queue("bunny.basic.ack.manual-acks", exclusive: true)
-      x  = ch.default_exchange
-
-      x.publish("bunneth", routing_key: q.name)
-      x.publish("bunneth", routing_key: q.name)
-      sleep 0.5
-      expect(q.message_count).to eq 2
-      delivery_details_1, _properties, _content = q.pop(manual_ack: true)
-      delivery_details_2, _properties, _content = q.pop(manual_ack: true)
-
-      ch.ack(delivery_details_2.delivery_tag, false)
-      ch.close
-
-      ch = connection.create_channel
-      q  = ch.queue("bunny.basic.ack.manual-acks", exclusive: true)
-      expect(q.message_count).to eq 1
-      ch.close
-    end
-  end
-
-  context "with a valid (known) delivery tag and automatic ack mode" do
-    it "results in a channel exception" do
-      ch = connection.create_channel
-      q  = ch.queue("bunny.basic.ack.manual-acks", exclusive: true)
-      x  = ch.default_exchange
-
-      q.subscribe(manual_ack: false) do |delivery_info, properties, payload|
-        ch.ack(delivery_info.delivery_tag, false)
-      end
-
-      x.publish("bunneth", routing_key: q.name)
-      sleep 0.5
-      expect do
-        q.message_count
-      end.to raise_error(Bunny::ChannelAlreadyClosed)
-    end
-  end
-
-  context "with an invalid (random) delivery tag" do
-    it "causes a channel-level error" do
-      ch = connection.create_channel
-      q  = ch.queue("bunny.basic.ack.unknown-delivery-tag", exclusive: true)
-      x  = ch.default_exchange
-
-      x.publish("bunneth", routing_key: q.name)
-      sleep 0.5
-      expect(q.message_count).to eq 1
-      _, _, content = q.pop(manual_ack: true)
-
-      ch.on_error do |ch, channel_close|
-        @channel_close = channel_close
-      end
-      ch.ack(82, true)
-      sleep 0.25
-
-      expect(@channel_close.reply_code).to eq AMQ::Protocol::PreconditionFailed::VALUE
-    end
-  end
-
-  context "with a valid (known) delivery tag" do
-    it "gets a depricated message warning for using :ack" do
-      ch = connection.create_channel
-      q  = ch.queue("bunny.basic.ack.manual-acks", exclusive: true)
-      x  = ch.default_exchange
-
-      x.publish("bunneth", routing_key: q.name)
-      sleep 0.5
-      expect(q.message_count).to eq 1
-
-      orig_stderr = $stderr
-      $stderr = StringIO.new
-
-      delivery_details, properties, content = q.pop(ack: true)
-
-      $stderr.rewind
-      expect($stderr.string.chomp).to eq("[DEPRECATION] `:ack` is deprecated.  Please use `:manual_ack` instead.\n[DEPRECATION] `:ack` is deprecated.  Please use `:manual_ack` instead.")
-
-      $stderr = orig_stderr
-
-      ch.ack(delivery_details.delivery_tag, true)
-      ch.close
-
-      ch = connection.create_channel
-      q  = ch.queue("bunny.basic.ack.manual-acks", exclusive: true)
-      expect(q.message_count).to eq 0
-      ch.close
-    end
-  end
-end
-
-describe Bunny::Channel, "#basic_ack" do
-  let(:connection) do
-    c = Bunny.new(username: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed")
-    c.start
-    c
-  end
-
-  after :each do
-    connection.close if connection.open?
-  end
-
-  context "with a valid (known) delivery tag (multiple = true)" do
-    it "acknowledges a message" do
-      ch = connection.create_channel
-      q  = ch.queue("bunny.basic.ack.manual-acks", exclusive: true)
-      x  = ch.default_exchange
-
-      x.publish("bunneth", routing_key: q.name)
-      x.publish("bunneth", routing_key: q.name)
-      sleep 0.5
-      expect(q.message_count).to eq 2
-      delivery_details_1, _properties, _content = q.pop(manual_ack: true)
-      delivery_details_2, _properties, _content = q.pop(manual_ack: true)
-
-      ch.basic_ack(delivery_details_2.delivery_tag.to_i, true)
-      ch.close
-
-      ch = connection.create_channel
-      q  = ch.queue("bunny.basic.ack.manual-acks", exclusive: true)
-      expect(q.message_count).to eq 0
-      ch.close
-    end
-  end
-
-  context "with a valid (known) delivery tag (multiple = false)" do
-    it "acknowledges a message" do
-      ch = connection.create_channel
-      q  = ch.queue("bunny.basic.ack.manual-acks", exclusive: true)
-      x  = ch.default_exchange
-
-      x.publish("bunneth", routing_key: q.name)
-      x.publish("bunneth", routing_key: q.name)
-      sleep 0.5
-      expect(q.message_count).to eq 2
-      delivery_details_1, _properties, _content = q.pop(manual_ack: true)
-      delivery_details_2, _properties, _content = q.pop(manual_ack: true)
-
-      ch.basic_ack(delivery_details_2.delivery_tag.to_i, false)
-      ch.close
-
-      ch = connection.create_channel
-      q  = ch.queue("bunny.basic.ack.manual-acks", exclusive: true)
-      expect(q.message_count).to eq 1
-      ch.close
-    end
-  end
-
-  context "with a valid (known) delivery tag (multiple = default)" do
-    it "acknowledges a message" do
-      ch = connection.create_channel
-      q  = ch.queue("bunny.basic.ack.manual-acks", exclusive: true)
-      x  = ch.default_exchange
-
-      x.publish("bunneth", routing_key: q.name)
-      x.publish("bunneth", routing_key: q.name)
-      sleep 0.5
-      expect(q.message_count).to eq 2
-      delivery_details_1, _properties, _content = q.pop(manual_ack: true)
-      delivery_details_2, _properties, _content = q.pop(manual_ack: true)
-
-      ch.basic_ack(delivery_details_2.delivery_tag.to_i)
-      ch.close
-
-      ch = connection.create_channel
-      q  = ch.queue("bunny.basic.ack.manual-acks", exclusive: true)
-      expect(q.message_count).to eq 1
-      ch.close
-    end
-  end
-end

data/spec/higher_level_api/integration/basic_cancel_spec.rb

@@ -1,142 +0,0 @@
-require "spec_helper"
-
-describe Bunny::Consumer, "#cancel" do
-  let(:connection) do
-    c = Bunny.new(username: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed")
-    c.start
-    c
-  end
-
-  after :each do
-    connection.close if connection.open?
-  end
-
-  context "with a non-blocking consumer" do
-    let(:queue_name) { "bunny.queues.#{rand}" }
-
-    it "cancels the consumer" do
-      delivered_data = []
-
-      t = Thread.new do
-        ch         = connection.create_channel
-        q          = ch.queue(queue_name, auto_delete: true, durable: false)
-        consumer = q.subscribe do |_, _, payload|
-          delivered_data << payload
-        end
-
-        expect(consumer.consumer_tag).not_to be_nil
-        cancel_ok = consumer.cancel
-        expect(cancel_ok.consumer_tag).to eq consumer.consumer_tag
-
-        ch.close
-      end
-      t.abort_on_exception = true
-      sleep 0.5
-
-      ch = connection.create_channel
-      ch.default_exchange.publish("", routing_key: queue_name)
-
-      sleep 0.7
-      expect(delivered_data).to be_empty
-    end
-  end
-
-
-  context "with a blocking consumer" do
-    let(:queue_name) { "bunny.queues.#{rand}" }
-
-    it "cancels the consumer" do
-      delivered_data = []
-      consumer       = nil
-
-      t = Thread.new do
-        ch         = connection.create_channel
-        q          = ch.queue(queue_name, auto_delete: true, durable: false)
-
-        consumer   = Bunny::Consumer.new(ch, q)
-        consumer.on_delivery do |_, _, payload|
-          delivered_data << payload
-        end
-
-        q.subscribe_with(consumer)
-      end
-      t.abort_on_exception = true
-      sleep 1.0
-
-      consumer.cancel
-      sleep 1.0
-
-      ch = connection.create_channel
-      ch.default_exchange.publish("", routing_key: queue_name)
-
-      sleep 0.7
-      expect(delivered_data).to be_empty
-    end
-  end
-
-  context "with a worker pool shutdown timeout configured" do
-    let(:queue_name) { "bunny.queues.#{rand}" }
-
-    it "processes the message if processing completes within the timeout" do
-      delivered_data = []
-      consumer       = nil
-
-      t = Thread.new do
-        ch         = connection.create_channel(nil, 1, false, 5)
-        q          = ch.queue(queue_name, auto_delete: true, durable: false)
-
-        consumer   = Bunny::Consumer.new(ch, q)
-        consumer.on_delivery do |_, _, payload|
-          sleep 2
-          delivered_data << payload
-        end
-
-        q.subscribe_with(consumer)
-      end
-      t.abort_on_exception = true
-      sleep 1.0
-
-      ch = connection.create_channel
-      ch.confirm_select
-      ch.default_exchange.publish("", routing_key: queue_name)
-      ch.wait_for_confirms
-      sleep 0.5
-
-      consumer.cancel
-      sleep 1.0
-
-      expect(delivered_data).to_not be_empty
-    end
-
-    it "kills the consumer if processing takes longer than the timeout" do
-      delivered_data = []
-      consumer       = nil
-
-      t = Thread.new do
-        ch         = connection.create_channel(nil, 1, false, 1)
-        q          = ch.queue(queue_name, auto_delete: true, durable: false)
-
-        consumer   = Bunny::Consumer.new(ch, q)
-        consumer.on_delivery do |_, _, payload|
-          sleep 3
-          delivered_data << payload
-        end
-
-        q.subscribe_with(consumer)
-      end
-      t.abort_on_exception = true
-      sleep 1.0
-
-      ch = connection.create_channel
-      ch.confirm_select
-      ch.default_exchange.publish("", routing_key: queue_name)
-      ch.wait_for_confirms
-      sleep 0.5
-
-      consumer.cancel
-      sleep 1.0
-
-      expect(delivered_data).to be_empty
-    end
-  end
-end