amqp 1.0.0.pre2 → 1.0.0

data/docs/Exchanges.textile

@@ -2,6 +2,10 @@
 
 h1. Working with exchanges
 
+h2. This Documentation Has Moved to rubyamqp.info
+
+amqp gem documentation guides are now hosted on "rubyamqp.info":http://rubyamqp.info.
+
 
 h2. About this guide
 

data/docs/GettingStarted.textile

@@ -2,6 +2,10 @@
 
 h1. Getting started with the Ruby amqp gem
 
+h2. This Documentation Has Moved to rubyamqp.info
+
+amqp gem documentation guides are now hosted on "rubyamqp.info":http://rubyamqp.info.
+
 
 h2. About this guide
 

data/docs/PatternsAndUseCases.textile

@@ -1,8 +1,11 @@
 # @title Ruby AMQP gem: Patterns and Use Cases
 
-
 h1. Patterns and Use Cases
 
+h2. This Documentation Has Moved to rubyamqp.info
+
+amqp gem documentation guides are now hosted on "rubyamqp.info":http://rubyamqp.info.
+
 
 h2. About this guide
 

data/docs/Queues.textile

@@ -2,6 +2,10 @@
 
 h1. Working with queues
 
+h2. This Documentation Has Moved to rubyamqp.info
+
+amqp gem documentation guides are now hosted on "rubyamqp.info":http://rubyamqp.info.
+
 
 h2. About this guide
 

data/docs/RabbitMQVersions.textile

@@ -2,6 +2,10 @@
 
 h1. Ruby amqp gem and RabbitMQ versions compatibility
 
+h2. This Documentation Has Moved to rubyamqp.info
+
+amqp gem documentation guides are now hosted on "rubyamqp.info":http://rubyamqp.info.
+
 h2. About this guide
 
 This guide covers compatibility of the "Ruby amqp gem":http://github.com/ruby-amqp/amqp with various versions of "RabbitMQ":http://rabbitmq.com messaging broker.

data/docs/RunningTests.textile

@@ -2,6 +2,10 @@
 
 h1. Running amqp gem test suite
 
+h2. This Documentation Has Moved to rubyamqp.info
+
+amqp gem documentation guides are now hosted on "rubyamqp.info":http://rubyamqp.info.
+
 
 h2. About this guide
 

data/docs/TestingWithEventedSpec.textile

@@ -2,6 +2,10 @@
 
 h1. Testing AMQP applications
 
+h2. This Documentation Has Moved to rubyamqp.info
+
+amqp gem documentation guides are now hosted on "rubyamqp.info":http://rubyamqp.info.
+
 h2. About this guide
 
 This guide covers unit testing of amqp-based applications, primarily using "evented-spec":http://github.com/ruby-amqp/evented-spec.

data/docs/Troubleshooting.textile

@@ -2,6 +2,10 @@
 
 h1. Troubleshooting and debugging AMQP applications
 
+h2. This Documentation Has Moved to rubyamqp.info
+
+amqp gem documentation guides are now hosted on "rubyamqp.info":http://rubyamqp.info.
+
 
 h2. About this guide
 

data/docs/VendorSpecificExtensions.textile

@@ -2,6 +2,10 @@
 
 h1. Vendor-specific AMQP extensions support in amqp gem
 
+h2. This Documentation Has Moved to rubyamqp.info
+
+amqp gem documentation guides are now hosted on "rubyamqp.info":http://rubyamqp.info.
+
 h2. RabbitMQ extensions
 
 h2. Supported extensions

data/examples/error_handling/automatic_recovery_of_channel_and_queues.rb

@@ -46,5 +46,5 @@ AMQP.start(:host => "localhost") do |connection, open_ok|
   EM.add_timer(30, show_stopper)
 
 
-  puts "Connected, authenticated. To really exercise this example, shut AMQP broker down for a few seconds. If you don't it will exit gracefully in 30 seconds."
+  puts "Connected, authenticated. To really exercise this example, shut RabbitMQ down for a few seconds. If you don't it will exit gracefully in 30 seconds."
 end

data/examples/error_handling/automatically_recovering_hello_world_consumer.rb

@@ -47,5 +47,5 @@ AMQP.start(:host => ENV.fetch("BROKER_HOST", "localhost")) do |connection, open_
 
 
   puts "This example needs another script/app to publish messages to amq.fanout. See examples/error_handling/hello_world_producer.rb for example"
-  puts "Connected, authenticated. To really exercise this example, shut AMQP broker down for a few seconds. If you don't it will exit gracefully in 45 seconds."
+  puts "Connected, authenticated. To really exercise this example, shut RabbitMQ down for a few seconds. If you don't it will exit gracefully in 45 seconds."
 end

data/examples/error_handling/automatically_recovering_hello_world_consumer_that_uses_a_server_named_queue.rb

@@ -47,5 +47,5 @@ AMQP.start(:host => "localhost") do |connection, open_ok|
 
 
   puts "This example needs another script/app to publish messages to amq.fanout. See examples/error_handling/hello_world_producer.rb for example"
-  puts "Connected, authenticated. To really exercise this example, shut AMQP broker down for a few seconds. If you don't it will exit gracefully in 45 seconds."
+  puts "Connected, authenticated. To really exercise this example, shut RabbitMQ down for a few seconds. If you don't it will exit gracefully in 45 seconds."
 end

data/examples/error_handling/connection_level_exception.rb

@@ -10,7 +10,7 @@ require 'amqp'
 
 EventMachine.run do
   AMQP.connect(:host => '127.0.0.1', :port => 5672) do |connection|
-    puts "Connected to AMQP broker. Running #{AMQP::VERSION} version of the gem..."
+    puts "Connected to RabbitMQ. Running #{AMQP::VERSION} version of the gem..."
 
 
     connection.on_error do |conn, connection_close|

data/examples/error_handling/connection_level_exception_with_objects.rb

@@ -37,7 +37,7 @@ end
 EventMachine.run do
   manager = ConnectionManager.new
   manager.connect(:host => '127.0.0.1', :port => 5672) do |connection|
-    puts "Connected to AMQP broker. Running #{AMQP::VERSION} version of the gem..."
+    puts "Connected to RabbitMQ. Running #{AMQP::VERSION} version of the gem..."
 
     # send_frame is NOT part of the public API, but it is public for entities like AMQ::Client::Channel
     # and we use it here to trigger a connection-level exception. MK.

data/examples/error_handling/connection_loss_handler.rb

@@ -15,7 +15,8 @@ AMQP.start(:port     => 5672,
            :vhost    => "amq_client_testbed",
            :user     => "amq_client_gem",
            :password => "amq_client_gem_password",
-           :timeout        => 0.3,
+           :timeout    => 0.3,
+           :heartbeat  => 1.0,
            :on_tcp_connection_failure => Proc.new { |settings| puts "Failed to connect, this was NOT expected"; EM.stop }) do |connection, open_ok|
     connection.on_tcp_connection_loss do |cl, settings|
       puts "tcp_connection_loss handler kicks in"
@@ -28,8 +29,8 @@ AMQP.start(:port     => 5672,
     connection.close { EventMachine.stop }
   end
 
-  puts "Connected, authenticated. To really exercise this example, shut AMQP broker down for a few seconds. If you don't it will exit gracefully in 30 seconds."
+  puts "Connected, authenticated. To really exercise this example, shut RabbitMQ down for a few seconds. If you don't it will exit gracefully in 30 seconds."
 
   Signal.trap "INT",  show_stopper
-  EM.add_timer(30, show_stopper)
+  EM.add_timer(60, show_stopper)
 end

data/examples/error_handling/hello_world_producer.rb

@@ -39,7 +39,7 @@ AMQP.start(:host => ENV.fetch("BROKER_HOST", "localhost")) do |connection, open_
   EventMachine.add_periodic_timer(0.8) do
     puts "Publishing via amq.fanout..."
     # messages must be routable & there must be at least one consumer.
-    exchange.publish("Routed via amq.fanout", :immediate => true, :mandatory => true)
+    exchange.publish("Routed via amq.fanout", :mandatory => true)
   end
 
 

data/examples/error_handling/manual_connection_and_channel_recovery.rb

@@ -67,5 +67,5 @@ AMQP.start(:host => "localhost") do |connection, open_ok|
   EM.add_timer(30, show_stopper)
 
 
-  puts "Connected, authenticated. To really exercise this example, shut AMQP broker down for a few seconds. If you don't it will exit gracefully in 30 seconds."
+  puts "Connected, authenticated. To really exercise this example, shut RabbitMQ down for a few seconds. If you don't it will exit gracefully in 30 seconds."
 end

data/examples/extensions/rabbitmq/publisher_confirmations_with_transient_messages.rb

@@ -10,7 +10,7 @@ require "amqp/extensions/rabbitmq"
 
 EventMachine.run do
   connection = AMQP.connect(:host => '127.0.0.1')
-  puts "Connecting to AMQP broker. Running #{AMQP::VERSION} version of the gem..."
+  puts "Connecting to RabbitMQ. Running #{AMQP::VERSION} version of the gem..."
 
   AMQP::Channel.new(connection) do |channel|
     puts "Channel #{channel.id} is now open"

data/examples/extensions/rabbitmq/using_alternate_exchanges.rb

@@ -10,7 +10,7 @@ require 'amqp'
 
 EventMachine.run do
   connection = AMQP.connect(:host => '127.0.0.1')
-  puts "Connecting to AMQP broker. Running #{AMQP::VERSION} version of the gem..."
+  puts "Connecting to RabbitMQ. Running #{AMQP::VERSION} version of the gem..."
 
   channel   = AMQP::Channel.new(connection)
   queue     = channel.queue("amqpgem.examples.hello_world", :auto_delete => true)

data/examples/guides/getting_started/01_hello_world.rb

@@ -6,7 +6,7 @@ require "amqp"
 
 EventMachine.run do
   connection = AMQP.connect(:host => '127.0.0.1')
-  puts "Connected to AMQP broker. Running #{AMQP::VERSION} version of the gem..."
+  puts "Connected to RabbitMQ. Running #{AMQP::VERSION} version of the gem..."
 
   channel  = AMQP::Channel.new(connection)
   queue    = channel.queue("amqpgem.examples.helloworld", :auto_delete => true)

data/examples/guides/getting_started/02_hello_world_dslified.rb

@@ -6,7 +6,7 @@ require "amqp"
 
 EventMachine.run do
   AMQP.connect(:host => '127.0.0.1') do |connection|
-    puts "Connected to AMQP broker. Running #{AMQP::VERSION} version of the gem..."
+    puts "Connected to RabbitMQ. Running #{AMQP::VERSION} version of the gem..."
 
     channel  = AMQP::Channel.new(connection)
 

data/examples/hello_world.rb

@@ -10,7 +10,7 @@ require 'amqp'
 
 EventMachine.run do
   connection = AMQP.connect(:host => '127.0.0.1')
-  puts "Connected to AMQP broker. Running #{AMQP::VERSION} version of the gem..."
+  puts "Connected to RabbitMQ. Running #{AMQP::VERSION} version of the gem..."
 
   channel  = AMQP::Channel.new(connection)
   queue    = channel.queue("amqpgem.examples.hello_world", :auto_delete => true)

data/examples/hello_world_with_an_empty_string.rb

@@ -10,7 +10,7 @@ require 'amqp'
 
 EventMachine.run do
   connection = AMQP.connect(:host => '127.0.0.1')
-  puts "Connected to AMQP broker. Running #{AMQP::VERSION} version of the gem..."
+  puts "Connected to RabbitMQ. Running #{AMQP::VERSION} version of the gem..."
 
 
   connection.on_error do |conn, connection_close|

data/examples/hello_world_with_eventmachine_in_a_separate_thread.rb

@@ -17,7 +17,7 @@ end
 
 EventMachine.next_tick {
   connection = AMQP.connect(:host => '127.0.0.1')
-  puts "Connected to AMQP broker. Running #{AMQP::VERSION} version of the gem..."
+  puts "Connected to RabbitMQ. Running #{AMQP::VERSION} version of the gem..."
 
   channel  = AMQP::Channel.new(connection)
   queue    = channel.queue("amqpgem.examples.hello_world", :auto_delete => true)
@@ -34,4 +34,4 @@ EventMachine.next_tick {
   exchange.publish "Hello, world!", :routing_key => queue.name
 }
 
-t.join
+t.join

data/examples/hello_world_with_large_payload.rb

@@ -17,7 +17,7 @@ end
 
 EventMachine.next_tick {
   connection = AMQP.connect(:host => '127.0.0.1')
-  puts "Connected to AMQP broker. Running #{AMQP::VERSION} version of the gem..."
+  puts "Connected to RabbitMQ. Running #{AMQP::VERSION} version of the gem..."
 
   channel  = AMQP::Channel.new(connection)
   queue    = channel.queue("amqpgem.examples.hello_world", :auto_delete => true)
@@ -62,31 +62,31 @@ EventMachine.next_tick {
   A TCP segment consists of a segment header and a data section. The TCP header contains 10 mandatory fields, and an optional extension field (Options, pink background in table).
 
   The data section follows the header. Its contents are the payload data carried for the application. The length of the data section is not specified in the TCP segment header. It can be calculated by subtracting the combined length of the TCP header and the encapsulating IP segment header from the total IP segment length (specified in the IP segment header).
-  TCP Header Bit offset 	 0 	 1 	 2 	 3 	 4 	 5 	 6 	 7 	 8 	 9 	10 	11 	12 	13 	14 	15 	16 	17 	18 	19 	20 	21 	22 	23 	24 	25 	26 	27 	28 	29 	30 	31
-  0 	Source port 	Destination port
-  32 	Sequence number
-  64 	Acknowledgment number (if ACK set)
-  96 	Data offset 	Reserved 	C
+  TCP Header Bit offset          0       1       2       3       4       5       6       7       8       9      10      11      12      13      14      15      16      17      18      19      20      21      22      23      24      25      26      27      28      29      30      31
+  0     Source port     Destination port
+  32    Sequence number
+  64    Acknowledgment number (if ACK set)
+  96    Data offset     Reserved        C
   W
-  R 	E
+  R     E
   C
-  E 	U
+  E     U
   R
-  G 	A
+  G     A
   C
-  K 	P
+  K     P
   S
-  H 	R
+  H     R
   S
-  T 	S
+  T     S
   Y
-  N 	F
+  N     F
   I
-  N 	Window Size
-  128 	Checksum 	Urgent pointer (if URG set)
+  N     Window Size
+  128   Checksum        Urgent pointer (if URG set)
   160
-  ... 	Options (if Data Offset > 5)
-  ... 	padding
+  ...   Options (if Data Offset > 5)
+  ...   padding
 
       Source port (16 bits) – identifies the sending port
       Destination port (16 bits) – identifies the receiving port
@@ -337,17 +337,17 @@ EventMachine.next_tick {
       The checksum field is the 16 bit one's complement of the one's complement sum of all 16-bit words in the header and text. If a segment contains an odd number of header and text octets to be checksummed, the last octet is padded on the right with zeros to form a 16-bit word for checksum purposes. The pad is not transmitted as part of the segment. While computing the checksum, the checksum field itself is replaced with zeros.
 
   In other words, after appropriate padding, all 16-bit words are added using one's complement arithmetic. The sum is then bitwise complemented and inserted as the checksum field. A pseudo-header that mimics the IPv4 packet header used in the checksum computation is shown in the table below.
-  TCP pseudo-header (IPv4) Bit offset 	0–3 	4–7 	8–15 	16–31
-  0 	Source address
-  32 	Destination address
-  64 	Zeros 	Protocol 	TCP length
-  96 	Source port 	Destination port
-  128 	Sequence number
-  160 	Acknowledgement number
-  192 	Data offset 	Reserved 	Flags 	Window
-  224 	Checksum 	Urgent pointer
-  256 	Options (optional)
-  256/288+ 	 
+  TCP pseudo-header (IPv4) Bit offset   0–3     4–7     8–15    16–31
+  0     Source address
+  32    Destination address
+  64    Zeros   Protocol        TCP length
+  96    Source port     Destination port
+  128   Sequence number
+  160   Acknowledgement number
+  192   Data offset     Reserved        Flags   Window
+  224   Checksum        Urgent pointer
+  256   Options (optional)
+  256/288+       
   Data
 
 
@@ -359,24 +359,24 @@ EventMachine.next_tick {
       Any transport or other upper-layer protocol that includes the addresses from the IP header in its checksum computation must be modified for use over IPv6, to include the 128-bit IPv6 addresses instead of 32-bit IPv4 addresses.
 
   A pseudo-header that mimics the IPv6 header for computation of the checksum is shown below.
-  TCP pseudo-header (IPv6) Bit offset 	0 - 7 	8–15 	16–23 	24–31
-  0 	Source address
+  TCP pseudo-header (IPv6) Bit offset   0 - 7   8–15    16–23   24–31
+  0     Source address
   32
   64
   96
-  128 	Destination address
+  128   Destination address
   160
   192
   224
-  256 	TCP length
-  288 	Zeros 	Next header
-  320 	Source port 	Destination port
-  352 	Sequence number
-  384 	Acknowledgement number
-  416 	Data offset 	Reserved 	Flags 	Window
-  448 	Checksum 	Urgent pointer
-  480 	Options (optional)
-  480/512+ 	 
+  256   TCP length
+  288   Zeros   Next header
+  320   Source port     Destination port
+  352   Sequence number
+  384   Acknowledgement number
+  416   Data offset     Reserved        Flags   Window
+  448   Checksum        Urgent pointer
+  480   Options (optional)
+  480/512+       
   Data
 
 
@@ -396,4 +396,4 @@ EventMachine.next_tick {
   exchange.publish(payload, :routing_key => queue.name)
 }
 
-t.join
+t.join

data/examples/patterns/request_reply/client.rb

@@ -19,8 +19,7 @@ EventMachine.run do
     channel.default_exchange.publish("get.time",
                                      :routing_key => "amqpgem.examples.services.time",
                                      :message_id  => Kernel.rand(10101010).to_s,
-                                     :reply_to    => replies_queue.name,
-                                     :immediate   => true)
+                                     :reply_to    => replies_queue.name)
   end
 
 

data/examples/patterns/request_reply/server.rb

@@ -14,7 +14,6 @@ EventMachine.run do
     channel.default_exchange.publish(Time.now.to_s,
                                      :routing_key    => metadata.reply_to,
                                      :correlation_id => metadata.message_id,
-                                     :immediate      => true,
                                      :mandatory      => true)
 
     metadata.ack

data/examples/publishing/returned_messages.rb

@@ -22,7 +22,7 @@ AMQP.start(:host => '127.0.0.1') do |connection|
 
   EventMachine.add_timer(0.3) {
     10.times do |i|
-      exchange.publish("Message ##{i}", :immediate => true)
+      exchange.publish("Message ##{i}")
     end
   }
 

data/examples/queues/accessing_message_metadata.rb

@@ -10,7 +10,7 @@ require 'amqp'
 
 EventMachine.run do
   connection = AMQP.connect(:host => '127.0.0.1')
-  puts "Connected to AMQP broker. Running #{AMQP::VERSION} version of the gem..."
+  puts "Connected to RabbitMQ. Running #{AMQP::VERSION} version of the gem..."
 
   channel  = AMQP::Channel.new(connection)
   queue    = channel.queue("amqpgem.examples.hello_world", :auto_delete => true)

data/examples/queues/cancel_default_consumer.rb

@@ -10,7 +10,7 @@ require 'amqp'
 
 EventMachine.run do
   connection = AMQP.connect(:host => '127.0.0.1')
-  puts "Connected to AMQP broker. Running #{AMQP::VERSION} version of the gem..."
+  puts "Connected to RabbitMQ. Running #{AMQP::VERSION} version of the gem..."
 
   channel  = AMQP::Channel.new(connection)
   queue    = channel.queue("amqpgem.examples.hello_world", :auto_delete => true)

data/lib/amqp/channel.rb

@@ -7,7 +7,7 @@ require "amqp/queue"
 module AMQP
   # h2. What are AMQP channels
   #
-  # To quote {http://bit.ly/hw2ELX AMQP 0.9.1 specification}:
+  # To quote {http://files.travis-ci.org/docs/amqp/0.9.1/AMQP091Specification.pdf AMQP 0.9.1 specification}:
   #
   # AMQP is a multi-channelled protocol. Channels provide a way to multiplex
   # a heavyweight TCP/IP connection into several light weight connections.
@@ -137,10 +137,10 @@ module AMQP
   #
   # h2. RabbitMQ extensions.
   #
-  # AMQP gem supports several RabbitMQ extensions taht extend Channel functionality.
+  # AMQP gem supports several RabbitMQ extensions that extend Channel functionality.
   # Learn more in {file:docs/VendorSpecificExtensions.textile}
   #
-  # @see http://bit.ly/hw2ELX AMQP 0.9.1 specification (Section 2.2.5)
+  # @see http://files.travis-ci.org/docs/amqp/0.9.1/AMQP091Specification.pdf AMQP 0.9.1 specification (Section 2.2.5)
   class Channel < AMQ::Client::Channel
 
     #
@@ -263,6 +263,9 @@ module AMQP
     def auto_recover
       return unless auto_recovering?
 
+      @channel_is_open_deferrable.fail
+      @channel_is_open_deferrable = AMQ::Client::EventMachineClient::Deferrable.new
+
       self.open do
         @channel_is_open_deferrable.succeed
 
@@ -286,6 +289,9 @@ module AMQP
       @id    = self.class.next_channel_id
       self.class.release_channel_id(old_id)
 
+      @channel_is_open_deferrable.fail
+      @channel_is_open_deferrable = AMQ::Client::EventMachineClient::Deferrable.new
+
       self.open do
         @channel_is_open_deferrable.succeed
 
@@ -373,7 +379,7 @@ module AMQP
     # @see Channel#default_exchange
     # @see Exchange
     # @see Exchange#initialize
-    # @see http://bit.ly/hw2ELX AMQP 0.9.1 specification (Section 3.1.3.1)
+    # @see http://files.travis-ci.org/docs/amqp/0.9.1/AMQP091Specification.pdf AMQP 0.9.1 specification (Section 3.1.3.1)
     #
     # @return [Exchange]
     # @api public
@@ -426,7 +432,7 @@ module AMQP
     #
     #
     # @see Exchange
-    # @see http://bit.ly/hw2ELX AMQP 0.9.1 specification (Section 2.1.2.4)
+    # @see http://files.travis-ci.org/docs/amqp/0.9.1/AMQP091Specification.pdf AMQP 0.9.1 specification (Section 2.1.2.4)
     #
     # @return [Exchange]
     # @api public
@@ -481,7 +487,7 @@ module AMQP
     # @see Exchange
     # @see Exchange#initialize
     # @see Channel#default_exchange
-    # @see http://bit.ly/hw2ELX AMQP 0.9.1 specification (Section 3.1.3.2)
+    # @see http://files.travis-ci.org/docs/amqp/0.9.1/AMQP091Specification.pdf AMQP 0.9.1 specification (Section 3.1.3.2)
     #
     # @return [Exchange]
     # @api public
@@ -597,7 +603,7 @@ module AMQP
     # @see Exchange
     # @see Exchange#initialize
     # @see http://www.rabbitmq.com/faq.html#Binding-and-Routing RabbitMQ FAQ on routing & wildcards
-    # @see http://bit.ly/hw2ELX AMQP 0.9.1 specification (Section 3.1.3.3)
+    # @see http://files.travis-ci.org/docs/amqp/0.9.1/AMQP091Specification.pdf AMQP 0.9.1 specification (Section 3.1.3.3)
     #
     # @return [Exchange]
     # @api public
@@ -703,7 +709,7 @@ module AMQP
     # @see Exchange
     # @see Exchange#initialize
     # @see Channel#default_exchange
-    # @see http://bit.ly/hw2ELX AMQP 0.9.1 specification (Section 3.1.3.3)
+    # @see http://files.travis-ci.org/docs/amqp/0.9.1/AMQP091Specification.pdf AMQP 0.9.1 specification (Section 3.1.3.3)
     #
     # @return [Exchange]
     # @api public
@@ -804,7 +810,7 @@ module AMQP
     #
     # @see Queue
     # @see Queue#initialize
-    # @see http://bit.ly/hw2ELX AMQP 0.9.1 specification (Section 2.1.4)
+    # @see http://files.travis-ci.org/docs/amqp/0.9.1/AMQP091Specification.pdf AMQP 0.9.1 specification (Section 2.1.4)
     #
     # @return [Queue]
     # @api public
@@ -929,16 +935,27 @@ module AMQP
     #
     # @api public
     def once_open(&block)
-      @channel_is_open_deferrable.callback(&block)
+      @channel_is_open_deferrable.callback do
+        # guards against cases when deferred operations
+        # don't complete before the channel is closed
+        block.call if open?
+      end
     end # once_open(&block)
     alias once_opened once_open
 
+    # @return [Boolean]
+    # @api public
+    def closing?
+      self.status == :closing
+    end
+
     # Closes AMQP channel.
     #
     # @api public
     def close(reply_code = 200, reply_text = DEFAULT_REPLY_TEXT, class_id = 0, method_id = 0, &block)
+      self.status = :closing
       r = super(reply_code, reply_text, class_id, method_id, &block)
-    
+
       r
     end
 
@@ -957,7 +974,7 @@ module AMQP
     #
     # @param [Boolean] Desired flow state.
     #
-    # @see http://bit.ly/htCzCX AMQP 0.9.1 protocol documentation (Section 1.5.2.3.)
+    # @see http://files.travis-ci.org/docs/amqp/0.9.1/AMQP091Reference.pdf AMQP 0.9.1 protocol documentation (Section 1.5.2.3.)
     # @api public
     def flow(active = false, &block)
       super(active, &block)
@@ -998,7 +1015,7 @@ module AMQP
     # @api public
     # @see #reject
     # @see #recover
-    # @see http://bit.ly/htCzCX AMQP 0.9.1 protocol documentation (Section 1.8.3.13.)
+    # @see http://files.travis-ci.org/docs/amqp/0.9.1/AMQP091Reference.pdf AMQP 0.9.1 protocol documentation (Section 1.8.3.13.)
     def acknowledge(delivery_tag, multiple = false)
       super(delivery_tag, multiple)
     end # acknowledge(delivery_tag, multiple = false)
@@ -1008,7 +1025,7 @@ module AMQP
     # @api public
     # @see #acknowledge
     # @see #recover
-    # @see http://bit.ly/htCzCX AMQP 0.9.1 protocol documentation (Section 1.8.3.14.)
+    # @see http://files.travis-ci.org/docs/amqp/0.9.1/AMQP091Reference.pdf AMQP 0.9.1 protocol documentation (Section 1.8.3.14.)
     def reject(delivery_tag, requeue = true)
       super(delivery_tag, requeue)
     end # reject(delivery_tag, requeue = true)
@@ -1019,7 +1036,7 @@ module AMQP
     # @return [Channel]  self
     #
     # @note RabbitMQ as of 2.3.1 does not support basic.recover with requeue = false.
-    # @see http://bit.ly/htCzCX AMQP 0.9.1 protocol documentation (Section 1.8.3.16.)
+    # @see http://files.travis-ci.org/docs/amqp/0.9.1/AMQP091Reference.pdf AMQP 0.9.1 protocol documentation (Section 1.8.3.16.)
     # @see #acknowledge
     # @api public
     def recover(requeue = true, &block)
@@ -1120,8 +1137,9 @@ module AMQP
       super(method)
 
       self.class.error(method.reply_text)
+      self.class.release_channel_id(@id)
     end
-    
+
     # Overrides AMQ::Client::Channel version to also release the channel id
     #
     # @private