bunny 2.7.4 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67acdd00ad8e7f36b89bcf6043cca832b5ee9ed8
-  data.tar.gz: 3fcc3fedbafc611804bf76f0be43e211f8292f75
+  metadata.gz: 4233cd136f781586c6c21f3e6abae2052a0aefdf
+  data.tar.gz: 359da718cb420fadb31d4f67f9b23557d1d03ddf
 SHA512:
-  metadata.gz: f730e0dd7c1777043f3fa31b3316df10bb7d12f880d4d0d48cff481d8ab199f667f5399a4de7a059b61a3ad520739448d12ca7f8eca87b90f6bef897f4ca2add
-  data.tar.gz: eeff99bc77bb6b95c0c4f84704c699166fd1ca0c29a21c78dde60ca545042f85cf7f5115c58fbc8575f614063ccccd10239ef9bd42a9bb43343e101470679c8d
+  metadata.gz: c4c5f6c2ae11023b9fe6a45b66fdb7b97f2aa07b89ba7f39cf6d5a2f2c27c7dce1bdc9e3a303d41c1ef067268247617f9e19618e0ac8b58a846ca1452307c050
+  data.tar.gz: df6aeb03ba7a97a8b864d471bf76eccdf29415bf11db84e8ec9034636de65377ecb1e7bdc9cb4475ad944164d714586a5cc144ab52d1539e08f8761f152b2fbe

data/ChangeLog.md

@@ -1,18 +1,15 @@
-## Changes between Bunny 2.7.4 and 2.7.5 (unreleased)
+## Changes between Bunny 2.7.0 and 2.8.0 (unreleased)
 
-No changes yet.
+This release has **minor breaking public API changes**.
 
+### `Bunny::Channel#close` on a Closed Channel Now Raises a Sensible Exception
 
-## Changes between Bunny 2.7.3 and 2.7.4 (Jan 9th, 2018)
+`Bunny::Channel#close` on an already closed channel will now raise a sensible exception.
+If the channel was closed due to a channel-level protocol exception, that exception will
+be mentioned.
 
-### amq-protocol Dependency
-
-This version depends on amq-protocol `2.2.x`.
-
-GitHub issue: [#538](https://github.com/ruby-amqp/bunny/issues/538).
-
-
-## Changes between Bunny 2.7.2 and 2.7.3 (Dec 19th, 2017)
+GitHub issue: [#528](https://github.com/ruby-amqp/bunny/issues/528), see [9df7cb](https://github.com/ruby-amqp/bunny/commit/9df7cb04d9ff12b1af62a11e239fd81e5472c872) for
+details.
 
 ### JRuby 9K Compatibility
 
@@ -20,7 +17,7 @@ A JRuby 9K compatibility issue was corrected by Marian Posăceanu.
 Note that JRuby users are recommended to use [March Hare](http://rubymarchhare.info/), a JRuby-oriented client, instead
 of Bunny.
 
-GitHub issue: [#529](https://github.com/ruby-amqp/bunny/pull/529)
+GitHub issue: [bunny#529](https://github.com/ruby-amqp/bunny/pull/529)
 
 ### Connection Exceptions are Logged as Warning with Automatic Recovery
 
@@ -29,26 +26,16 @@ and not errors.
 
 Contributed by Merten Falk.
 
-GitHub issue: [#531](https://github.com/ruby-amqp/bunny/pull/531)
-
-
-## Changes between Bunny 2.7.1 and 2.7.2 (Nov 4th, 2017)
-
-### Heartbeat Value Supports `:server` and `"server"`
-
-Heartbeat value of `:server` now can be specified as a string.
-
-Contributed by Tyrone.
-
+GitHub issue: [bunny#531](https://github.com/ruby-amqp/bunny/pull/531)
 
-### Reading a Frame without Payload Could Result in a `Bunny::NoFinalOctetError`
+### Server Heartbeat Value as a String
 
-Reading a frame without payload (e.g. a heartbeat frame) could result in a `Bunny::NoFinalOctetError`
-with mostly idle connections.
+It is now possible to specify a server-defined heartbeat value as a string (`"server"`), not just
+a symbol. This makes it easier to load settings from YAML files.
 
-GitHub issue: [#521](https://github.com/ruby-amqp/bunny/issues/521).
+Contributed by Tyrone Wilson.
 
-Contributed by GPif.
+GitHub issue: [bunny#524](https://github.com/ruby-amqp/bunny/pull/524)
 
 
 ## Changes between Bunny 2.7.0 and 2.7.1 (Sep 25th, 2017)

data/Gemfile

@@ -50,4 +50,4 @@ def custom_gem(name, options = Hash.new)
   end
 end
 
-custom_gem "amq-protocol", "~> 2.2.0"
+custom_gem "amq-protocol", git: "https://github.com/ruby-amqp/amq-protocol", branch: "master"

data/bunny.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.email = ["michael.s.klishin@gmail.com"]
 
   # Dependencies
-  s.add_dependency "amq-protocol", "~> 2.2.0"
+  s.add_dependency "amq-protocol", ">= 2.2.0"
 
   # Files.
   s.has_rdoc = true

data/lib/bunny/channel.rb

@@ -233,6 +233,9 @@ module Bunny
     # {Bunny::Queue}, {Bunny::Exchange} and {Bunny::Consumer} instances.
     # @api public
     def close
+      # see bunny#528
+      raise_if_no_longer_open!
+
       @connection.close_channel(self)
       @status = :closed
       @work_pool.shutdown
@@ -1940,7 +1943,13 @@ module Bunny
 
     # @private
     def raise_if_no_longer_open!
-      raise ChannelAlreadyClosed.new("cannot use a channel that was already closed! Channel id: #{@id}", self) if closed?
+      if closed?
+        if @last_channel_error
+          raise ChannelAlreadyClosed.new("cannot use a closed channel! Channel id: #{@id}, closed due to a server-reported channel error: #{@last_channel_error.message}", self)
+        else
+          raise ChannelAlreadyClosed.new("cannot use a closed channel! Channel id: #{@id}", self)
+        end
+      end
     end
 
     # @private

data/lib/bunny/queue.rb

@@ -158,7 +158,9 @@ module Bunny
     # @option opts [Boolean] :ack (false) [DEPRECATED] Use :manual_ack instead
     # @option opts [Boolean] :manual_ack (false) Will this consumer use manual acknowledgements?
     # @option opts [Boolean] :exclusive (false) Should this consumer be exclusive for this queue?
-    # @option opts [Boolean] :block (false) Should the call block calling thread?
+    # @option opts [Boolean] :block (false) Should the call block the calling thread? This option can be useful for keeping the main thread of
+    #                                       a script alive. It is incompatible with automatic connection recovery
+    #                                       and is not generally recommended.
     # @option opts [#call] :on_cancellation Block to execute when this consumer is cancelled remotely (e.g. via the RabbitMQ Management plugin)
     # @option opts [String] :consumer_tag Unique consumer identifier. It is usually recommended to let Bunny generate it for you.
     # @option opts [Hash] :arguments ({}) Additional (optional) arguments, typically used by RabbitMQ extensions

data/lib/bunny/version.rb

@@ -2,5 +2,5 @@
 
 module Bunny
   # @return [String] Version of the library
-  VERSION = "2.7.4"
+  VERSION = "2.8.0"
 end

data/spec/higher_level_api/integration/channel_close_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Bunny::Channel, "when closed" do
+describe Bunny::Channel do
   let(:connection) do
     c = Bunny.new(username: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed")
     c.start
@@ -11,15 +11,52 @@ describe Bunny::Channel, "when closed" do
     connection.close
   end
 
-  it "releases the id" do
-    ch = connection.create_channel
-    n = ch.number
+  context "when closed" do
+    it "releases the id" do
+      ch = connection.create_channel
+      n = ch.number
 
-    expect(ch).to be_open
-    ch.close
-    expect(ch).to be_closed
+      expect(ch).to be_open
+      ch.close
+      expect(ch).to be_closed
 
-    # a new channel with the same id can be created
-    connection.create_channel(n)
+      # a new channel with the same id can be created
+      connection.create_channel(n)
+    end
+  end
+
+  context "when double closed" do
+    # bunny#528
+    it "raises a meaningful exception" do
+      ch = connection.create_channel
+
+      expect(ch).to be_open
+      ch.close
+      expect(ch).to be_closed
+
+      expect { ch.close }.to raise_error(Bunny::ChannelAlreadyClosed)
+    end
+  end
+
+  context "when double closed after a channel-level protocol exception" do
+    # bunny#528
+    it "raises a meaningful exception" do
+      ch = connection.create_channel
+
+      s  = "bunny-temp-q-#{rand}"
+
+      expect(ch).to be_open
+      ch.queue_declare(s, durable: false, exclusive: true)
+
+      expect do
+        ch.queue_declare(s, durable: true, exclusive: false)
+      end.to raise_error(Bunny::PreconditionFailed)
+
+      # channel.close is sent and handled concurrently with the test
+      sleep 1
+      expect(ch).to be_closed
+
+      expect { ch.close }.to raise_error(Bunny::ChannelAlreadyClosed)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 2.7.4
+  version: 2.8.0
 platform: ruby
 authors:
 - Chris Duncan
@@ -12,20 +12,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-09 00:00:00.000000000 Z
+date: 2017-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amq-protocol
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.0
 description: Easy to use, feature complete Ruby client for RabbitMQ 3.3 and later
@@ -232,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Popular easy to use Ruby client for RabbitMQ