amqp 0.7.1 → 0.7.2

data/lib/amqp/connection.rb

@@ -81,6 +81,9 @@ module AMQP
   def self.start *args, &blk
     EM.run {
       @conn ||= connect *args
+      @conn.callback { AMQP.channel = AMQP::Channel.new(@conn) }
+
+      # callback passed to .start must come last
       @conn.callback(&blk) if blk
       @conn
     }
@@ -91,11 +94,13 @@ module AMQP
   end
 
   def self.stop
-    if @conn and not @closing
+    if @conn && !@closing
       @closing = true
       EM.next_tick do
+        AMQP.channel.close
         @conn.close {
           yield if block_given?
+          @channel = nil
           @conn = nil
           @closing = false
         }

data/lib/amqp/queue.rb

@@ -3,7 +3,7 @@
 module AMQP
   class Queue
     def self.add_default_options(name, opts, block)
-      { :queue => name, :nowait => block.nil? }.merge(opts)
+      { :queue => name, :nowait => (block.nil? && !name.empty?) }.merge(opts)
     end
 
     # Queues store and forward messages.  Queues can be configured in the server
@@ -66,11 +66,19 @@ module AMQP
     # method it will raise a channel or connection exception.
     #
     def initialize(mq, name, opts = {}, &block)
-      @mq = mq
-      @opts = self.class.add_default_options(name, opts, block)
+      raise ArgumentError, "queue name must not be nil. Use '' (empty string) for server-named queues." if name.nil?
+
+      @mq     = mq
+      @opts   = self.class.add_default_options(name, opts, block)
       @bindings ||= {}
-      @name = name unless name.empty?
       @status = @opts[:nowait] ? :unknown : :unfinished
+
+      if name.empty?
+        @mq.queues_awaiting_declare_ok.push(self)
+      else
+        @name = name
+      end
+
       @mq.callback {
         @mq.send Protocol::Queue::Declare.new(@opts)
       }
@@ -466,6 +474,9 @@ module AMQP
     end
 
     def reset
+      unsubscribe
+      cancelled
+
       @deferred_status = nil
       initialize @mq, @name, @opts
 

data/lib/amqp/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module AMQP
-  VERSION = '0.7.1'
+  VERSION = '0.7.2'
 end

data/lib/mq.rb

@@ -20,8 +20,7 @@ MQ should have been called Channel all along). No other AMQP client library we k
 of invents it's own terminology when it comes to AMQP entities, and amqp gem shouldn't,
 too.
 
-If you disagree with this really strongly, let us know by opening an issue at
-https://github.com/ruby-amqp/amqp/issues
+Learn more at http://bit.ly/amqp-gem-080-migration.
 
 Thank you for understanding. AMQP gem maintainers team.
 

data/spec/integration/authentication_spec.rb

@@ -7,20 +7,22 @@ describe "Authentication attempt" do
   # Environment
   #
 
-  include AMQP::Spec
-  include AMQP::SpecHelper
-
+  include EventedSpec::EMSpec
+  default_timeout 1
   em_before { AMQP.cleanup_state }
   em_after  { AMQP.cleanup_state }
 
-  describe "with default connection parameters" do
 
+  # Tests below use AMQP_OPTS for settings, if you really need to modify them,
+  # create amqp.yml file with new settings. (see spec/spec_helper)
+
+  # Also it assumes that guest/guest has access to /
+  describe "with default connection parameters" do
     #
     # Examples
     #
 
-    # assuming there is an account guest with password of "guest" that has
-    # access to / (default vhost)
+
     context "when guest/guest has access to /" do
       after :all do
         done
@@ -44,16 +46,16 @@ describe "Authentication attempt" do
     # Examples
     #
 
-    # assuming there is an account amqp_gem with password of "amqp_gem_password" that has
-    # access to /amqp_gem_testbed
-    context "when amqp_gem/amqp_gem_testbed has access to /amqp_gem_testbed" do
+    # assuming AMQP_OPTS are correct
+    # and SchadenFreude with random password doesn't have any access
+    context "when #{AMQP_OPTS[:username]} has access to #{AMQP_OPTS[:vhost]}" do
       after :all do
         done
       end
 
       context "and provided credentials are correct" do
         it "succeeds" do
-          connection = AMQP.connect :username => "amqp_gem", :password => "amqp_gem_password", :vhost => "/amqp_gem_testbed"
+          connection = AMQP.connect :username => AMQP_OPTS[:username], :password => AMQP_OPTS[:password], :vhost => AMQP_OPTS[:vhost]
 
           done(0.3) {
             connection.should be_connected
@@ -64,7 +66,7 @@ describe "Authentication attempt" do
 
       context "and provided credentials ARE INCORRECT" do
         it "fails" do
-          connection = AMQP.connect :user => "amqp_gem", :pass => Time.now.to_i.to_s, :vhost => "/amqp_gem_testbed"
+          connection = AMQP.connect :user => "SchadenFreude", :pass => Time.now.to_i.to_s, :vhost => AMQP_OPTS[:vhost]
 
           done(0.5) {
             connection.should_not be_connected
@@ -81,16 +83,16 @@ describe "Authentication attempt" do
     # Examples
     #
 
-    # assuming there is an account amqp_gem with password of "amqp_gem_password" that has
-    # access to /amqp_gem_testbed
-    context "when amqp_gem/amqp_gem_testbed has access to /amqp_gem_testbed" do
+    # assuming AMQP_OPTS are correct
+    # and SchadenFreude with random password doesn't have any access
+    context "when #{AMQP_OPTS[:username]} has access to #{AMQP_OPTS[:vhost]}" do
       after :all do
         done
       end
 
       context "and provided credentials are correct" do
         it "succeeds" do
-          connection = AMQP.connect "amqp://amqp_gem:amqp_gem_password@localhost/amqp_gem_testbed"
+          connection = AMQP.connect "amqp://#{AMQP_OPTS[:username]}:#{AMQP_OPTS[:password]}@localhost/#{URI::escape AMQP_OPTS[:vhost], /[^-_.!~*'()a-zA-Z\d]/n}"
 
           done(0.3) {
             connection.should be_connected
@@ -101,7 +103,7 @@ describe "Authentication attempt" do
 
       context "and provided credentials ARE INCORRECT" do
         it "succeeds" do
-          connection = AMQP.connect "amqp://amqp_gem:#{Time.now.to_i}@localhost/amqp_gem_testbed"
+          connection = AMQP.connect "amqp://schadenfreude:#{Time.now.to_i}@localhost"
 
           done(0.5) {
             connection.should_not be_connected

data/spec/integration/automatic_binding_for_default_direct_exchange_spec.rb

@@ -8,7 +8,7 @@ describe "Queue that was bound to default direct exchange thanks to Automatic Mo
   # Environment
   #
 
-  include AMQP::Spec
+  include EventedSpec::AMQPSpec
 
   default_timeout 2
 
@@ -16,8 +16,8 @@ describe "Queue that was bound to default direct exchange thanks to Automatic Mo
     @channel   = AMQP::Channel.new
     @channel.should be_open
 
-    @queue1    = @channel.queue("queue1")
-    @queue2    = @channel.queue("queue2")
+    @queue1    = @channel.queue("amqp-gem.automatic-binding.q1", :auto_delete => true)
+    @queue2    = @channel.queue("amqp-gem.automatic-binding.q2", :auto_delete => true)
 
     # Rely on default direct exchange binding, see section 2.1.2.4 Automatic Mode in AMQP 0.9.1 spec.
     @exchange = AMQP::Exchange.default(@channel)
@@ -48,14 +48,16 @@ describe "Queue that was bound to default direct exchange thanks to Automatic Mo
     end
 
     expected_number_of_messages.times do
-      @exchange.publish(dispatched_data,    :routing_key => @queue1.name)    
+      @exchange.publish(dispatched_data,    :routing_key => @queue1.name)
     end
 
     4.times do
       @exchange.publish("some white noise", :routing_key => "killa key")
     end
 
-    done(0.2) {
+    delayed(0.2) { @queue2.delete }
+
+    done(0.35) {
       number_of_received_messages.should == expected_number_of_messages
     }
   end # it

data/spec/integration/channel_close_spec.rb

@@ -3,7 +3,7 @@
 require "spec_helper"
 
 describe AMQP, "#close(&callback)" do
-  include AMQP::EMSpec
+  include EventedSpec::AMQPSpec
 
   default_timeout 5
 

data/spec/integration/exchange_declaration_spec.rb

@@ -8,7 +8,7 @@ describe AMQP do
   # Environment
   #
 
-  include AMQP::Spec
+  include EventedSpec::AMQPSpec
 
   default_timeout 10
 
@@ -26,6 +26,8 @@ describe AMQP do
       it 'declares a new direct exchange with that name' do
         @channel.direct('name').name.should == 'name'
 
+        @channel.direct('name').delete
+
         done
       end
 
@@ -35,6 +37,8 @@ describe AMQP do
         exchange.should_not be_durable
         exchange.should be_transient
 
+        exchange.delete
+
         done
       end
 
@@ -42,6 +46,7 @@ describe AMQP do
         exchange = @channel.direct('name')
 
         exchange.should_not be_auto_deleted
+        exchange.delete
 
         done
       end
@@ -59,9 +64,9 @@ describe AMQP do
     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
+          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
@@ -80,6 +85,9 @@ describe AMQP do
 
           exchange.should == original_exchange
 
+          original_exchange.delete
+          exchange.delete
+
           done
         end # it
       end
@@ -104,6 +112,8 @@ describe AMQP do
         exchange.should be_durable
         exchange.should_not be_transient
 
+        exchange.delete
+
         done
       end # it
     end # context
@@ -115,6 +125,8 @@ describe AMQP do
         exchange.should_not be_durable
         exchange.should be_transient
 
+        exchange.delete
+
         done
       end # it
     end # context
@@ -125,6 +137,7 @@ describe AMQP do
         exchange = @channel.direct("a new auto-deleted direct exchange", :auto_delete => true)
 
         exchange.should be_auto_deleted
+        exchange.delete
         done
       end # it
     end # context
@@ -135,6 +148,7 @@ describe AMQP do
         exchange = @channel.direct("a new non-auto-deleted direct exchange", :auto_delete => false)
 
         exchange.should_not be_auto_deleted
+        exchange.delete
         done
       end # it
     end # context
@@ -145,6 +159,7 @@ describe AMQP do
         exchange = @channel.direct("a new non-auto-deleted direct exchange", :auto_delete => false)
 
         exchange.should_not be_auto_deleted
+        exchange.delete
         done
       end # it
     end # context
@@ -152,12 +167,14 @@ describe AMQP 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)
+        exchange = @channel.direct("previously.declared.durable.direct.exchange", :durable => true)
 
         expect {
           @channel.direct("previously.declared.durable.direct.exchange", :durable => false)
         }.to raise_error(AMQP::IncompatibleOptionsError)
 
+        exchange.delete
+
         done
       end # it
     end # context
@@ -174,6 +191,7 @@ describe AMQP do
         exchange = @channel.fanout(name)
 
         exchange.name.should == name
+        exchange.delete
 
         done
       end
@@ -199,6 +217,9 @@ describe AMQP do
 
           exchange.should == original_exchange
 
+          original_exchange.delete
+          exchange.delete
+
           done
         end # it
       end
@@ -293,6 +314,8 @@ describe AMQP do
         exchange = @channel.topic(name)
         exchange.name.should == name
 
+        exchange.delete
+
         done
       end
     end # context
@@ -316,6 +339,8 @@ describe AMQP do
           exchange          = @channel.topic(name, :passive => true)
 
           exchange.should == original_exchange
+          original_exchange.delete
+          exchange.delete
 
           done
         end # it
@@ -341,6 +366,8 @@ describe AMQP do
         exchange.should be_durable
         exchange.should_not be_transient
 
+        exchange.delete
+
         done
       end # it
     end # context
@@ -352,6 +379,8 @@ describe AMQP do
         exchange.should_not be_durable
         exchange.should be_transient
 
+        exchange.delete
+
         done
       end # it
     end # context
@@ -372,6 +401,7 @@ describe AMQP do
         exchange = @channel.topic("a new non-auto-deleted topic exchange", :auto_delete => false)
 
         exchange.should_not be_auto_deleted
+        exchange.delete
         done
       end # it
     end # context
@@ -382,6 +412,7 @@ describe AMQP do
         exchange = @channel.topic("a new non-auto-deleted topic exchange", :auto_delete => false)
 
         exchange.should_not be_auto_deleted
+        exchange.delete
         done
       end # it
     end # context
@@ -395,13 +426,15 @@ describe AMQP do
       it "raises an exception" do
         channel = AMQP::Channel.new
 
-        channel.topic("previously.declared.durable.topic.exchange", :durable => true)
+        exchange = channel.topic("previously.declared.durable.topic.exchange", :durable => true)
         channel.should be_open
 
         expect {
           channel.topic("previously.declared.durable.topic.exchange", :durable => false)
         }.to raise_error(AMQP::IncompatibleOptionsError)
 
+        exchange.delete
+
         done
       end # it
     end # context
@@ -418,6 +451,7 @@ describe AMQP do
         exchange = @channel.headers(name)
 
         exchange.name.should == name
+        exchange.delete
 
         done
       end
@@ -446,6 +480,8 @@ describe AMQP do
           exchange          = @channel.headers(name, :passive => true)
 
           exchange.should == original_exchange
+          original_exchange.delete
+          exchange.delete
 
           done
         end # it
@@ -471,6 +507,8 @@ describe AMQP do
         exchange.should be_durable
         exchange.should_not be_transient
 
+        exchange.delete
+
         done
       end # it
     end # context
@@ -482,6 +520,8 @@ describe AMQP do
         exchange.should_not be_durable
         exchange.should be_transient
 
+        exchange.delete
+
         done
       end # it
     end # context
@@ -492,6 +532,7 @@ describe AMQP do
         exchange = @channel.headers("a new auto-deleted headers exchange", :auto_delete => true)
 
         exchange.should be_auto_deleted
+
         done
       end # it
     end # context
@@ -502,6 +543,8 @@ describe AMQP do
         exchange = @channel.headers("a new non-auto-deleted headers exchange", :auto_delete => false)
 
         exchange.should_not be_auto_deleted
+        exchange.delete
+
         done
       end # it
     end # context
@@ -512,6 +555,8 @@ describe AMQP do
         exchange = @channel.headers("a new non-auto-deleted headers exchange", :auto_delete => false)
 
         exchange.should_not be_auto_deleted
+        exchange.delete
+
         done
       end # it
     end # context
@@ -523,12 +568,14 @@ describe AMQP do
       end
 
       it "raises an exception" do
-        @channel.headers("previously.declared.durable.topic.exchange", :durable => true)
+        exchange = @channel.headers("previously.declared.durable.topic.exchange", :durable => true)
 
         expect {
           @channel.headers("previously.declared.durable.topic.exchange", :durable => false)
         }.to raise_error(AMQP::IncompatibleOptionsError)
 
+        exchange.delete
+
         done
       end # it
     end # context