amqp 0.9.10 → 1.0.0.pre1

data/docs/RabbitMQVersions.textile

@@ -2,10 +2,6 @@
 
 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,10 +2,6 @@
 
 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,10 +2,6 @@
 
 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,10 +2,6 @@
 
 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,10 +2,6 @@
 
 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/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", :mandatory => true)
+    exchange.publish("Routed via amq.fanout", :immediate => true, :mandatory => true)
   end
 
 

data/examples/issues/issue_121.rb

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+require "bundler"
+Bundler.setup
+
+$:.unshift(File.expand_path("../../../lib", __FILE__))
+
+
+
+require 'amqp'
+require 'amqp/extensions/rabbitmq'
+AMQP.start(:user => 'guest',:pass => 'guest',:vhost => '/') do |connection|
+  channel = AMQP::Channel.new(connection)
+  channel.queue("shuki_q",{:nowait => true,:passive=>false, :auto_delete=>false, :arguments=>{"x-expires"=>5600000}}) do |queue|
+    queue.bind('raw.shuki',:routing_key => 'ShukiesTukies')
+    puts "before subscribe"
+    queue.subscribe(:ack => true) do |header, payload|
+      puts "inside subscribe"
+      p header.class
+    end
+  end
+end

data/examples/patterns/request_reply/client.rb

@@ -19,7 +19,8 @@ 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)
+                                     :reply_to    => replies_queue.name,
+                                     :immediate   => true)
   end
 
 

data/examples/patterns/request_reply/server.rb

@@ -14,6 +14,7 @@ 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}")
+      exchange.publish("Message ##{i}", :immediate => true)
     end
   }
 

data/lib/amqp.rb

@@ -14,10 +14,3 @@ require "amqp/exchange"
 require "amqp/queue"
 require "amqp/channel"
 require "amqp/header"
-
-
-# Will be removed before 1.0.
-
-require "amqp/deprecated/mq"
-require "amqp/deprecated/rpc"
-require "amqp/deprecated/fork"

data/lib/amqp/channel.rb

@@ -7,7 +7,7 @@ require "amqp/queue"
 module AMQP
   # h2. What are AMQP channels
   #
-  # To quote {http://files.travis-ci.org/docs/amqp/0.9.1/AMQP091Specification.pdf AMQP 0.9.1 specification}:
+  # To quote {http://bit.ly/hw2ELX 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://files.travis-ci.org/docs/amqp/0.9.1/AMQP091Specification.pdf AMQP 0.9.1 specification (Section 2.2.5)
+  # @see http://bit.ly/hw2ELX AMQP 0.9.1 specification (Section 2.2.5)
   class Channel < AMQ::Client::Channel
 
     #
@@ -263,9 +263,6 @@ 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
 
@@ -289,9 +286,6 @@ 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
 
@@ -379,7 +373,7 @@ module AMQP
     # @see Channel#default_exchange
     # @see Exchange
     # @see Exchange#initialize
-    # @see http://files.travis-ci.org/docs/amqp/0.9.1/AMQP091Specification.pdf AMQP 0.9.1 specification (Section 3.1.3.1)
+    # @see http://bit.ly/hw2ELX AMQP 0.9.1 specification (Section 3.1.3.1)
     #
     # @return [Exchange]
     # @api public
@@ -432,7 +426,7 @@ module AMQP
     #
     #
     # @see Exchange
-    # @see http://files.travis-ci.org/docs/amqp/0.9.1/AMQP091Specification.pdf AMQP 0.9.1 specification (Section 2.1.2.4)
+    # @see http://bit.ly/hw2ELX AMQP 0.9.1 specification (Section 2.1.2.4)
     #
     # @return [Exchange]
     # @api public
@@ -487,7 +481,7 @@ module AMQP
     # @see Exchange
     # @see Exchange#initialize
     # @see Channel#default_exchange
-    # @see http://files.travis-ci.org/docs/amqp/0.9.1/AMQP091Specification.pdf AMQP 0.9.1 specification (Section 3.1.3.2)
+    # @see http://bit.ly/hw2ELX AMQP 0.9.1 specification (Section 3.1.3.2)
     #
     # @return [Exchange]
     # @api public
@@ -603,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://files.travis-ci.org/docs/amqp/0.9.1/AMQP091Specification.pdf AMQP 0.9.1 specification (Section 3.1.3.3)
+    # @see http://bit.ly/hw2ELX AMQP 0.9.1 specification (Section 3.1.3.3)
     #
     # @return [Exchange]
     # @api public
@@ -709,7 +703,7 @@ module AMQP
     # @see Exchange
     # @see Exchange#initialize
     # @see Channel#default_exchange
-    # @see http://files.travis-ci.org/docs/amqp/0.9.1/AMQP091Specification.pdf AMQP 0.9.1 specification (Section 3.1.3.3)
+    # @see http://bit.ly/hw2ELX AMQP 0.9.1 specification (Section 3.1.3.3)
     #
     # @return [Exchange]
     # @api public
@@ -810,7 +804,7 @@ module AMQP
     #
     # @see Queue
     # @see Queue#initialize
-    # @see http://files.travis-ci.org/docs/amqp/0.9.1/AMQP091Specification.pdf AMQP 0.9.1 specification (Section 2.1.4)
+    # @see http://bit.ly/hw2ELX AMQP 0.9.1 specification (Section 2.1.4)
     #
     # @return [Queue]
     # @api public
@@ -935,27 +929,16 @@ module AMQP
     #
     # @api public
     def once_open(&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
+      @channel_is_open_deferrable.callback(&block)
     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
 
@@ -974,7 +957,7 @@ module AMQP
     #
     # @param [Boolean] Desired flow state.
     #
-    # @see http://files.travis-ci.org/docs/amqp/0.9.1/AMQP091Reference.pdf AMQP 0.9.1 protocol documentation (Section 1.5.2.3.)
+    # @see http://bit.ly/htCzCX AMQP 0.9.1 protocol documentation (Section 1.5.2.3.)
     # @api public
     def flow(active = false, &block)
       super(active, &block)
@@ -1015,7 +998,7 @@ module AMQP
     # @api public
     # @see #reject
     # @see #recover
-    # @see http://files.travis-ci.org/docs/amqp/0.9.1/AMQP091Reference.pdf AMQP 0.9.1 protocol documentation (Section 1.8.3.13.)
+    # @see http://bit.ly/htCzCX 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)
@@ -1025,7 +1008,7 @@ module AMQP
     # @api public
     # @see #acknowledge
     # @see #recover
-    # @see http://files.travis-ci.org/docs/amqp/0.9.1/AMQP091Reference.pdf AMQP 0.9.1 protocol documentation (Section 1.8.3.14.)
+    # @see http://bit.ly/htCzCX 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)
@@ -1036,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://files.travis-ci.org/docs/amqp/0.9.1/AMQP091Reference.pdf AMQP 0.9.1 protocol documentation (Section 1.8.3.16.)
+    # @see http://bit.ly/htCzCX AMQP 0.9.1 protocol documentation (Section 1.8.3.16.)
     # @see #acknowledge
     # @api public
     def recover(requeue = true, &block)
@@ -1137,9 +1120,8 @@ 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

data/lib/amqp/client.rb

@@ -22,7 +22,7 @@ module AMQP
     # @see AMQP.connect
     # @api plugin
     #
-    # @see http://rubyamqp.info/articles/connecting_to_broker/ Connecting to The Broker documentation guide
+    # @see http://bit.ly/ks8MXK 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://rubyamqp.info/articles/connecting_to_broker/ Connecting to The Broker documentation guide
+    # @see http://bit.ly/ks8MXK 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/compatibility/ruby187_patchlevel_check.rb

@@ -7,15 +7,15 @@ if RUBY_VERSION =~ /^1.8.7/
   # looks like PATCHLEVEL was added after 1.8.7-p249 release :( MK.
   if (conf["PATCHLEVEL"] && conf["PATCHLEVEL"] == "249") || (conf["libdir"] =~ /1.8.7-p249/)
     raise <<-MESSAGE
-IMPORTANT: amqp gem 0.8.0+ does not support Ruby 1.8.7-p249 (this exact patch level. p174 and p334 are supported!)
+IMPORTANT: amqp gem 0.8.0+ does not support Ruby 1.8.7-p249 (this exact patch level. p174, p334 and later patch levels are supported!)
 because of a nasty Ruby bug (http://bit.ly/iONBmH). Refer to http://groups.google.com/group/ruby-amqp/browse_thread/thread/37d6dcc1aea1c102
 for more information, especially if you want to verify whether a particular Ruby patch level or version or build suffers from
 this issue.
 
-To reiterate: 1.8.7-p174 and 1.8.7-p334 are supported. The fix has been committed to MRI in December 2009. It's
+To reiterate: 1.8.7-p174, p334 and later patch levels are supported, see http://travis-ci.org/ruby-amqp/amqp. The fix was committed to MRI in December 2009. It's
 a good idea to upgrade, although downgrading to p174 is an option, too.
 
-To learn more (including the 0.8.x migration guide) at http://bit.ly/amqp-gem-docs and https://github.com/ruby-amqp.
+To learn more (including the 0.8.x migration guide) at http://bit.ly/rubyamqp and https://github.com/ruby-amqp.
     MESSAGE
   end
-end
+end

data/lib/amqp/connection.rb

@@ -192,7 +192,6 @@ 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://files.travis-ci.org/docs/amqp/0.9.1/AMQP091Reference.pdf AMQP 0.9.1 protocol documentation (Section 1.8.3.13.)
+    # @see http://bit.ly/htCzCX 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://files.travis-ci.org/docs/amqp/0.9.1/AMQP091Reference.pdf AMQP 0.9.1 protocol documentation (Section 1.8.3.14.)
+    # @see http://bit.ly/htCzCX 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/exceptions.rb

@@ -43,17 +43,8 @@ module AMQP
     def initialize(settings)
       @settings = settings
 
-      super("AMQP broker closed TCP connection before authentication succeeded: this usually means authentication failure due to misconfiguration. Settings are #{filtered_settings.inspect}")
+      super("AMQP broker closed TCP connection before authentication succeeded: this usually means authentication failure due to misconfiguration. Settings are #{settings.inspect}")
     end # initialize(settings)
-
-    def filtered_settings
-      filtered_settings = settings.dup
-      [:pass, :password].each do |sensitve_setting|
-        filtered_settings[sensitve_setting] &&= '[filtered]'
-      end
-
-      filtered_settings
-    end
   end # PossibleAuthenticationFailureError
 
 

data/lib/amqp/exchange.rb

@@ -134,9 +134,9 @@ module AMQP
   # @see Channel#topic
   # @see Channel#headers
   # @see Queue
-  # @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)
+  # @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)
   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://files.travis-ci.org/docs/amqp/0.9.1/AMQP091Specification.pdf AMQP 0.9.1 specification (Section 2.1.2.4)
+    # @see http://bit.ly/hw2ELX 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://files.travis-ci.org/docs/amqp/0.9.1/AMQP091Specification.pdf AMQP 0.9.1 specification (Section 3.1.3)
+    # @see http://bit.ly/hw2ELX 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://files.travis-ci.org/docs/amqp/0.9.1/AMQP091Specification.pdf AMQP 0.9.1 specification (Section 2.1.1)
+  # @see http://bit.ly/hw2ELX AMQP 0.9.1 specification (Section 2.1.1)
   # @see AMQP::Exchange
   class Queue < AMQ::Client::Queue
 
@@ -221,11 +221,7 @@ module AMQP
     #
     # @api public
     def once_declared(&block)
-      @declaration_deferrable.callback do
-        # guards against cases when deferred operations
-        # don't complete before the channel is closed
-        block.call if @channel.open?
-      end
+      @declaration_deferrable.callback(&block)
     end # once_declared(&block)
 
 
@@ -285,8 +281,14 @@ module AMQP
     # @api public
     # @see Queue#unbind
     def bind(exchange, opts = {}, &block)
-      @channel.once_open do
-        self.once_name_is_available do
+      if self.server_named?
+        @channel.once_open do
+          @declaration_deferrable.callback do
+            super(exchange, (opts[:key] || opts[:routing_key] || AMQ::Protocol::EMPTY_STRING), (opts[:nowait] || block.nil?), opts[:arguments], &block)
+          end
+        end
+      else
+        @channel.once_open do
           super(exchange, (opts[:key] || opts[:routing_key] || AMQ::Protocol::EMPTY_STRING), (opts[:nowait] || block.nil?), opts[:arguments], &block)
         end
       end
@@ -355,9 +357,7 @@ module AMQP
     # @see Queue#bind
     def unbind(exchange, opts = {}, &block)
       @channel.once_open do
-        self.once_name_is_available do
-          super(exchange, (opts[:key] || opts[:routing_key] || AMQ::Protocol::EMPTY_STRING), opts[:arguments], &block)
-        end
+        super(exchange, (opts[:key] || opts[:routing_key] || AMQ::Protocol::EMPTY_STRING), opts[:arguments], &block)
       end
     end
 
@@ -391,9 +391,7 @@ module AMQP
     # @see Queue#unbind
     def delete(opts = {}, &block)
       @channel.once_open do
-        self.once_name_is_available do
-          super(opts.fetch(:if_unused, false), opts.fetch(:if_empty, false), opts.fetch(:nowait, false), &block)
-        end
+        super(opts.fetch(:if_unused, false), opts.fetch(:if_empty, false), opts.fetch(:nowait, false), &block)
       end
 
       # backwards compatibility
@@ -418,9 +416,7 @@ module AMQP
     # @see Queue#unbind
     def purge(opts = {}, &block)
       @channel.once_open do
-        self.once_declared do
-          super(opts.fetch(:nowait, false), &block)
-        end
+        super(opts.fetch(:nowait, false), &block)
       end
 
       # backwards compatibility
@@ -481,17 +477,11 @@ module AMQP
         }
 
         @channel.once_open do
-          self.once_name_is_available do
-            # see AMQ::Client::Queue#get in amq-client
-            self.get(!opts.fetch(:ack, false), &shim)
-          end
+          # see AMQ::Client::Queue#get in amq-client
+          self.get(!opts.fetch(:ack, false), &shim)
         end
       else
-        @channel.once_open do
-          self.once_name_is_available do
-            self.get(!opts.fetch(:ack, false))
-          end
-        end
+        @channel.once_open { self.get(!opts.fetch(:ack, false)) }
       end
     end
 
@@ -729,9 +719,7 @@ module AMQP
       opts[:nowait] = false if (@on_confirm_subscribe = opts[:confirm])
 
       @channel.once_open do
-        self.once_name_is_available do
-          # guards against a pathological case race condition when a channel
-          # is opened and closed before delayed operations are completed.
+        self.once_declared do
           self.consume(!opts[:ack], opts[:exclusive], (opts[:nowait] || block.nil?), opts[:no_local], nil, &opts[:confirm])
 
           self.on_delivery(&block)
@@ -797,7 +785,7 @@ module AMQP
     # @api public
     def unsubscribe(opts = {}, &block)
       @channel.once_open do
-        self.once_name_is_available do
+        self.once_declared do
           if @default_consumer
             @default_consumer.cancel(opts.fetch(:nowait, true), &block); @default_consumer = nil
           end
@@ -824,14 +812,12 @@ module AMQP
       shim = Proc.new { |q, declare_ok| block.call(declare_ok.message_count, declare_ok.consumer_count) }
 
       @channel.once_open do
-        self.once_name_is_available do
-          # we do not use self.declare here to avoid caching of @passive since that will cause unexpected side-effects during automatic
-          # recovery process. MK.
-          @connection.send_frame(AMQ::Protocol::Queue::Declare.encode(@channel.id, @name, true, @opts[:durable], @opts[:exclusive], @opts[:auto_delete], false, @opts[:arguments]))
+        # we do not use self.declare here to avoid caching of @passive since that will cause unexpected side-effects during automatic
+        # recovery process. MK.
+        @connection.send_frame(AMQ::Protocol::Queue::Declare.encode(@channel.id, @name, true, @opts[:durable], @opts[:exclusive], @opts[:auto_delete], false, @opts[:arguments]))
 
-          self.append_callback(:declare, &shim)
-          @channel.queues_awaiting_declare_ok.push(self)
-        end
+        self.append_callback(:declare, &shim)
+        @channel.queues_awaiting_declare_ok.push(self)
       end
 
       self
@@ -897,16 +883,6 @@ module AMQP
       { :queue => name, :nowait => (block.nil? && !name.empty?) }.merge(opts)
     end
 
-    def once_name_is_available(&block)
-      if server_named?
-        self.once_declared do
-          block.call
-        end
-      else
-        block.call
-      end
-    end
-
     private
 
     # Default direct exchange that we use to publish messages directly to this queue.