amqp 0.9.8 → 0.9.9

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/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.
@@ -140,7 +140,7 @@ module AMQP
   # AMQP gem supports several RabbitMQ extensions taht 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
 
     #
@@ -373,7 +373,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 +426,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 +481,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 +597,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 +703,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 +804,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
@@ -957,7 +957,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 +998,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 +1008,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 +1019,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,6 +1120,7 @@ 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

data/lib/amqp/client.rb

@@ -22,7 +22,7 @@ module AMQP
     # @see AMQP.connect
     # @api plugin
     #
-    # @see http://bit.ly/ks8MXK Connecting to The Broker documentation guide
+    # @see http://rubyamqp.info/articles/connecting_to_broker/ Connecting to The Broker documentation guide
     def self.connect(connection_string_or_options = {}, options = {}, &block)
       opts = case connection_string_or_options
              when String then
@@ -82,7 +82,7 @@ module AMQP
     #
     # @raise [ArgumentError] When connection URI schema is not amqp or amqps, or the path contains multiple segments
     #
-    # @see http://bit.ly/ks8MXK Connecting to The Broker documentation guide
+    # @see http://rubyamqp.info/articles/connecting_to_broker/ Connecting to The Broker documentation guide
     # @api public
     def self.parse_connection_uri(connection_string)
       AMQ::Client::Settings.parse_amqp_url(connection_string)

data/lib/amqp/connection.rb

@@ -192,6 +192,7 @@ module AMQP
   # @option connection_options_or_string [String]  :username ("guest") Username to use. Also can be specified as :user.
   # @option connection_options_or_string [String]  :password ("guest") Password to use. Also can be specified as :pass.
   # @option connection_options_or_string [Hash]  :ssl TLS (SSL) parameters to use.
+  # @option connection_options_or_string [Fixnum] :heartbeat (0) Connection heartbeat, in seconds. 0 means no heartbeat. Can also be configured server-side starting with RabbitMQ 3.0.
   # @option connection_options_or_string [#call]  :on_tcp_connection_failure A callable object that will be run if connection to server fails
   # @option connection_options_or_string [#call]  :on_possible_authentication_failure A callable object that will be run if authentication fails (see Authentication failure section)
   #

data/lib/amqp/consumer.rb

@@ -139,7 +139,7 @@ module AMQP
     # @return [Consumer]  self
     #
     # @api public
-    # @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)
       super(delivery_tag)
     end # acknowledge(delivery_tag)
@@ -148,7 +148,7 @@ module AMQP
     # @return [Consumer]  self
     #
     # @api public
-    # @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)

data/lib/amqp/exchange.rb

@@ -134,9 +134,9 @@ module AMQP
   # @see Channel#topic
   # @see Channel#headers
   # @see Queue
-  # @see http://bit.ly/hw2ELX AMQP 0.9.1 specification (Section 2.1.1)
-  # @see http://bit.ly/hw2ELX AMQP 0.9.1 specification (Section 2.1.5)
-  # @see http://bit.ly/hw2ELX AMQP 0.9.1 specification (Section 3.1.3)
+  # @see http://files.travis-ci.org/docs/amqp/0.9.1/AMQP091Specification.pdf AMQP 0.9.1 specification (Section 2.1.1)
+  # @see http://files.travis-ci.org/docs/amqp/0.9.1/AMQP091Specification.pdf AMQP 0.9.1 specification (Section 2.1.5)
+  # @see http://files.travis-ci.org/docs/amqp/0.9.1/AMQP091Specification.pdf AMQP 0.9.1 specification (Section 3.1.3)
   class Exchange < AMQ::Client::Exchange
 
     #
@@ -162,7 +162,7 @@ module AMQP
     #   AMQP::Exchange.default(channel).publish("make clean", routing_key => "tasks")
     #
     # @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)
     # @note Do not confuse default exchange with amq.direct: amq.direct is a pre-defined direct
     #       exchange that doesn't have any special routing semantics.
     # @return [Exchange] An instance that corresponds to the default exchange (of type direct).
@@ -292,7 +292,7 @@ module AMQP
     # @see Channel#topic
     # @see Channel#headers
     # @see Queue
-    # @see http://bit.ly/hw2ELX AMQP 0.9.1 specification (Section 3.1.3)
+    # @see http://files.travis-ci.org/docs/amqp/0.9.1/AMQP091Specification.pdf AMQP 0.9.1 specification (Section 3.1.3)
     #
     # @return [Exchange]
     # @api public

data/lib/amqp/queue.rb

@@ -116,7 +116,7 @@ module AMQP
   #       persistence.
   #
   #
-  # @see http://bit.ly/hw2ELX AMQP 0.9.1 specification (Section 2.1.1)
+  # @see http://files.travis-ci.org/docs/amqp/0.9.1/AMQP091Specification.pdf AMQP 0.9.1 specification (Section 2.1.1)
   # @see AMQP::Exchange
   class Queue < AMQ::Client::Queue
 

data/lib/amqp/session.rb

@@ -110,7 +110,7 @@ module AMQP
 
 
     # Properly close connection with AMQ broker, as described in
-    # section 2.2.4 of the {http://bit.ly/hw2ELX AMQP 0.9.1 specification}.
+    # section 2.2.4 of the {http://files.travis-ci.org/docs/amqp/0.9.1/AMQP091Specification.pdf AMQP 0.9.1 specification}.
     #
     # @api  plugin
     # @see  #close_connection
@@ -129,19 +129,19 @@ module AMQP
     # Server properties (product information, platform, et cetera)
     #
     # @return [Hash]
-    # @see http://bit.ly/htCzCX AMQP 0.9.1 protocol documentation (Section 1.4.2.1.3)
+    # @see http://files.travis-ci.org/docs/amqp/0.9.1/AMQP091Reference.pdf AMQP 0.9.1 protocol documentation (Section 1.4.2.1.3)
     attr_reader :server_properties
 
     # Server capabilities (usually used to detect AMQP 0.9.1 extensions like basic.nack, publisher
     # confirms and so on)
     #
     # @return [Hash]
-    # @see http://bit.ly/htCzCX AMQP 0.9.1 protocol documentation (Section 1.4.2.1.3)
+    # @see http://files.travis-ci.org/docs/amqp/0.9.1/AMQP091Reference.pdf AMQP 0.9.1 protocol documentation (Section 1.4.2.1.3)
     attr_reader :server_capabilities
 
     # Locales server supports
     #
-    # @see http://bit.ly/htCzCX AMQP 0.9.1 protocol documentation (Section 1.4.2.1.3)
+    # @see http://files.travis-ci.org/docs/amqp/0.9.1/AMQP091Reference.pdf AMQP 0.9.1 protocol documentation (Section 1.4.2.1.3)
     attr_reader :server_locales
 
     # @return [AMQP::Broker] Broker this connection is established with

data/lib/amqp/version.rb

@@ -6,5 +6,5 @@ module AMQP
   #
   # @see AMQ::Protocol::VERSION
   # @return [String] AMQP gem version
-  VERSION = '0.9.8'
+  VERSION = '0.9.9'
 end

data/spec/integration/exchange_declaration_spec.rb

@@ -127,27 +127,14 @@ describe AMQP::Channel do
     end # context
 
 
-    context "when exchange name was specified as a blank string" do
-      it 'returns direct exchange with server-generated name' do
-        pending <<-EOF
-      This has to be fixed in RabbitMQ first
-      https://bugzilla.rabbitmq.com/show_bug.cgi?id=23509
-    EOF
-        @channel.direct("") do |exchange|
-          exchange.name.should_not be_empty
-          done
-        end
-      end
-    end # context
-
-
     context "when passive option is used" do
       context "and exchange with given name already exists" do
         it "silently returns" do
-          name = "a_new_direct_exchange declared at #{Time.now.to_i}"
+          name    = "a_new_direct_exchange declared at #{Time.now.to_i}"
+          channel = AMQP::Channel.new
 
-          original_exchange = @channel.direct(name)
-          exchange          = @channel.direct(name, :passive => true)
+          original_exchange = channel.direct(name)
+          exchange          = channel.direct(name, :passive => true)
 
           exchange.should == original_exchange
 
@@ -157,13 +144,16 @@ describe AMQP::Channel do
 
       context "and exchange with given name DOES NOT exist" do
         it "raises an exception" do
-          pending "Not yet supported"
+          channel = AMQP::Channel.new
+          channel.on_error do |ch, channel_close|
+            @error_code = channel_close.reply_code
+          end
 
-          expect {
-            exchange = @channel.direct("direct exchange declared at #{Time.now.to_i}", :passive => true)
-          }.to raise_error
+          exchange = channel.direct("direct exchange declared at #{Time.now.to_i}", :passive => true)
 
-          done
+          done(0.5) {
+            @error_code.should == 404
+          }
         end # it
       end # context
     end # context
@@ -223,27 +213,16 @@ describe AMQP::Channel do
 
     context "when exchange is re-declared with parameters different from original declaration" do
       it "raises an exception" do
-        @channel.direct("previously.declared.durable.direct.exchange", :durable => true)
+        channel = AMQP::Channel.new
+        channel.direct("previously.declared.durable.direct.exchange", :durable => true)
 
         expect {
-          @channel.direct("previously.declared.durable.direct.exchange", :durable => false)
+          channel.direct("previously.declared.durable.direct.exchange", :durable => false)
         }.to raise_error(AMQP::IncompatibleOptionsError)
 
         done
       end # it
     end # context
-
-    context "when exchange is re-declared with irrelevent parameters different from original declaration" do
-      it "doesn't raise an exception" do
-        @channel.direct("previously.declared.durable.direct.exchange", :durable => true)
-
-        expect {
-          @channel.direct("previously.declared.durable.direct.exchange", :durable => true, :header => {:random => 'stuff' })
-        }.to_not raise_error(AMQP::IncompatibleOptionsError)
-
-        done
-      end # it
-    end # context
   end # describe
 
 
@@ -287,12 +266,17 @@ describe AMQP::Channel do
       end
 
       context "and exchange with given name DOES NOT exist" do
-        it "raises an exception" do
-          pending "Not yet supported"
+        it "results in a channel exception" do
+          channel = AMQP::Channel.new
+          channel.on_error do |ch, channel_close|
+            @error_code = channel_close.reply_code
+          end
 
-          expect {
-            exchange = @channel.fanout("fanout exchange declared at #{Time.now.to_i}", :passive => true)
-          }.to raise_error
+          exchange = channel.fanout("fanout exchange declared at #{Time.now.to_i}", :passive => true)
+
+          done(0.5) {
+            @error_code.should == 404
+          }
 
           done
         end # it
@@ -354,10 +338,11 @@ describe AMQP::Channel do
 
     context "when exchange is re-declared with parameters different from original declaration" do
       it "raises an exception" do
-        @channel.fanout("previously.declared.durable.topic.exchange", :durable => true)
+        channel = AMQP::Channel.new
+        channel.fanout("previously.declared.durable.topic.exchange", :durable => true)
 
         expect {
-          @channel.fanout("previously.declared.durable.topic.exchange", :durable => false)
+          channel.fanout("previously.declared.durable.topic.exchange", :durable => false)
         }.to raise_error(AMQP::IncompatibleOptionsError)
 
         done
@@ -377,7 +362,7 @@ describe AMQP::Channel do
         exchange.name.should == name
 
         done
-      end
+      end # it
     end # context
 
     context "when exchange name is omitted" do
@@ -387,7 +372,7 @@ describe AMQP::Channel do
         exchange.name.should_not == "amq.topic2"
 
         done
-      end
+      end # it
     end # context
 
     context "when passive option is used" do
@@ -402,20 +387,23 @@ describe AMQP::Channel do
 
           done
         end # it
-      end
+      end # context
 
       context "and exchange with given name DOES NOT exist" do
-        it "raises an exception" do
-          pending "Not yet supported"
+        it "results in a channel exception" do
+          channel = AMQP::Channel.new
+          channel.on_error do |ch, channel_close|
+            @error_code = channel_close.reply_code
+          end
 
-          expect {
-            exchange = @channel.topic("topic exchange declared at #{Time.now.to_i}", :passive => true)
-          }.to raise_error
+          exchange = channel.topic("topic exchange declared at #{Time.now.to_i}", :passive => true)
 
-          done
+          done(0.5) {
+            @error_code.should == 404
+          }
         end # it
       end # context
-    end # context
+    end
 
 
     context "when exchange is declared as durable" do
@@ -470,16 +458,14 @@ describe AMQP::Channel do
     end # context
 
 
-    context "when exchange is re-declared with parameters different from original declaration" do
+    context "when exchange is re-declared with parameters different from the original declaration" do
       amqp_after do
         done
       end
 
       it "raises an exception" do
         channel = AMQP::Channel.new
-
         channel.topic("previously.declared.durable.topic.exchange", :durable => true)
-        channel.should be_open
 
         expect {
           channel.topic("previously.declared.durable.topic.exchange", :durable => false)
@@ -498,7 +484,8 @@ describe AMQP::Channel do
       let(:name) { "new.headers.exchange" }
 
       it "declares a new headers exchange with that name" do
-        exchange = @channel.headers(name)
+        channel  = AMQP::Channel.new
+        exchange = channel.headers(name)
 
         exchange.name.should == name
 
@@ -512,7 +499,8 @@ describe AMQP::Channel do
       end
 
       it "uses amq.match" do
-        exchange = @channel.headers
+        channel  = AMQP::Channel.new
+        exchange = channel.headers
         exchange.name.should == "amq.match"
         exchange.name.should_not == "amq.headers"
 
@@ -523,10 +511,11 @@ describe AMQP::Channel do
     context "when passive option is used" do
       context "and exchange with given name already exists" do
         it "silently returns" do
-          name = "a_new_headers_exchange declared at #{Time.now.to_i}"
+          name    = "a_new_headers_exchange declared at #{Time.now.to_i}"
+          channel = AMQP::Channel.new
 
-          original_exchange = @channel.headers(name)
-          exchange          = @channel.headers(name, :passive => true)
+          original_exchange = channel.headers(name)
+          exchange          = channel.headers(name, :passive => true)
 
           exchange.should == original_exchange
 
@@ -536,13 +525,16 @@ describe AMQP::Channel do
 
       context "and exchange with given name DOES NOT exist" do
         it "raises an exception" do
-          pending "Not yet supported"
+          channel = AMQP::Channel.new
+          channel.on_error do |ch, channel_close|
+            @error_code = channel_close.reply_code
+          end
 
-          expect {
-            exchange = @channel.headers("headers exchange declared at #{Time.now.to_i}", :passive => true)
-          }.to raise_error
+          exchange = channel.headers("headers exchange declared at #{Time.now.to_i}", :passive => true)
 
-          done
+          done(0.5) {
+            @error_code.should == 404
+          }
         end # it
       end # context
     end # context
@@ -550,7 +542,8 @@ describe AMQP::Channel do
 
     context "when exchange is declared as durable" do
       it "returns a new durable headers exchange" do
-        exchange = @channel.headers("a_new_durable_headers_exchange", :durable => true)
+        channel  = AMQP::Channel.new
+        exchange = channel.headers("a_new_durable_headers_exchange", :durable => true)
         exchange.should be_durable
         exchange.should_not be_transient
 
@@ -561,7 +554,8 @@ describe AMQP::Channel do
 
     context "when exchange is declared as non-durable" do
       it "returns a new NON-durable headers exchange" do
-        exchange = @channel.headers("a_new_non_durable_headers_exchange", :durable => false)
+        channel  = AMQP::Channel.new
+        exchange = channel.headers("a_new_non_durable_headers_exchange", :durable => false)
         exchange.should_not be_durable
         exchange.should be_transient
 
@@ -572,7 +566,8 @@ describe AMQP::Channel do
 
     context "when exchange is declared as auto-deleted" do
       it "returns a new auto-deleted headers exchange" do
-        exchange = @channel.headers("a new auto-deleted headers exchange", :auto_delete => true)
+        channel  = AMQP::Channel.new
+        exchange = channel.headers("a new auto-deleted headers exchange", :auto_delete => true)
 
         exchange.should be_auto_deleted
         done
@@ -582,7 +577,8 @@ describe AMQP::Channel do
 
     context "when exchange is declared as auto-deleted" do
       it "returns a new auto-deleted headers exchange" do
-        exchange = @channel.headers("a new non-auto-deleted headers exchange", :auto_delete => false)
+        channel  = AMQP::Channel.new
+        exchange = channel.headers("a new non-auto-deleted headers exchange", :auto_delete => false)
 
         exchange.should_not be_auto_deleted
         done
@@ -592,7 +588,8 @@ describe AMQP::Channel do
 
     context "when exchange is declared without explicit :nowait parameter" do
       it "is declared with :nowait by default" do
-        exchange = @channel.headers("a new non-auto-deleted headers exchange", :auto_delete => false)
+        channel  = AMQP::Channel.new
+        exchange = channel.headers("a new non-auto-deleted headers exchange", :auto_delete => false)
 
         exchange.should_not be_auto_deleted
         done
@@ -606,43 +603,15 @@ describe AMQP::Channel do
       end
 
       it "raises an exception" do
-        @channel.headers("previously.declared.durable.headers.exchange", :durable => true)
+        channel = AMQP::Channel.new
+        channel.headers("previously.declared.durable.headers.exchange", :durable => true)
 
         expect {
-          @channel.headers("previously.declared.durable.headers.exchange", :durable => false)
+          channel.headers("previously.declared.durable.headers.exchange", :durable => false)
         }.to raise_error(AMQP::IncompatibleOptionsError)
 
         done
       end # it
     end # context
-
-
-    context "when exchange is re-declared with parameters different from original declaration on two separate channels" do
-      it "raises an exception" do
-        channel2 = AMQP::Channel.new
-        @channel.headers("previously.declared.durable.headers.exchange", :durable => true)
-
-        channel2.on_error do |ch, channel_close|
-          puts "reply_text: #{channel_close.reply_text}, reply_code: #{channel_close.reply_code}"
-          done
-        end
-        channel2.headers("previously.declared.durable.headers.exchange", :durable => false)
-      end # it
-    end # context
-
-
-
-    context "when exchange is re-declared with type different from original declaration on two separate channels" do
-      it "raises an exception" do
-        channel2 = AMQP::Channel.new
-        @channel.topic("previously.declared.durable.topic.exchange", :durable => true)
-
-        channel2.on_error do |ch, channel_close|
-          puts "reply_text: #{channel_close.reply_text}, reply_code: #{channel_close.reply_code}"
-          done
-        end
-        channel2.headers("previously.declared.durable.topic.exchange", :durable => true)
-      end # it
-    end # context
   end # describe
 end # describe AMQP