Queue#status should push the queue onto declare-ok 'wait list', fixes #…

…94

examples/issues/issue_94.rb

@@ -1,12 +1,11 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 
-if defined?(Bundler)
-  Bundler.setup
-else
-  require "rubygems"
-end
-gem 'amqp', "0.7.2"
+require "bundler"
+Bundler.setup
+
+$:.unshift(File.expand_path("../../../lib", __FILE__))
+
 require "amqp"
 
 puts "Running amqp gem #{AMQP::VERSION}"
@@ -16,7 +15,7 @@
   exchange = channel.direct("")
   queue    = channel.queue("indexer_queue", { :durable => true })
 
-  EM.add_periodic_timer(5) {
+  EM.add_periodic_timer(1) {
     queue.status do |num_messages, num_consumers|
       puts "msgs:#{num_messages}"
     end

lib/amqp/queue.rb

@@ -427,6 +427,7 @@ def status(opts = {}, &blk)
 
       @on_status = blk
       @mq.callback {
+        @mq.queues_awaiting_declare_ok.push(self)
         @mq.send Protocol::Queue::Declare.new({ :queue => name,
                                                 :passive => true }.merge(opts))
       }

spec/integration/queue_status_spec.rb

@@ -0,0 +1,44 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe AMQP::Queue do
+
+  #
+  # Environment
+  #
+
+  include EventedSpec::AMQPSpec
+
+  default_timeout 5
+
+
+
+  #
+  # Examples
+  #
+
+  describe "#status" do
+    it "yields # of messages & consumers to the callback" do
+      events  = []
+      channel = AMQP::Channel.new
+
+      queue1 = channel.queue("", :auto_delete => true)
+      queue2 = channel.queue("amqpgem.tests.a.named.queue", :auto_delete => true)
+
+      EventMachine.add_timer(1.0) do
+        queue1.status do |m, c|
+          events << :queue1_declare_ok
+        end
+        queue2.status do |m, c|
+          events << :queue2_declare_ok
+        end        
+      end
+
+      done(2.0) {
+        events.should include(:queue1_declare_ok)
+        events.should include(:queue2_declare_ok)
+      }
+    end
+  end
+end