amqp 0.7.0 → 0.7.1

data/protocol/codegen.rb

@@ -4,7 +4,7 @@ require 'rubygems'
 require 'json'
 
 name = 'amqp-0.8.json'
-path = File.dirname(__FILE__)+'/'+name
+path = File.join(File.dirname(__FILE__), name)
 s = JSON.parse(File.read(path))
 
 # require 'pp'

data/research/api.rb

@@ -31,11 +31,11 @@ AMQP.start do |amqp|
   end
 end
 
-def MQ.method_missing meth, *args, &blk
-  (Thread.current[:mq] ||= MQ.new).__send__(meth, *args, &blk)
+def AMQP::Channel.method_missing meth, *args, &blk
+  (Thread.current[:mq] ||= AMQP::Channel.new).__send__(meth, *args, &blk)
 end
 
-mq = MQ.new
+mq = AMQP::Channel.new
 mq.direct.publish('alkjsdf', :key => 'name')
 mq.topic # 'amq.topic'
 mq.topic('test').publish('some data', :key => 'stock.usd.*')

data/research/primes-forked.rb

@@ -23,7 +23,7 @@ def log(*args)
   p args
 end
 
-# MQ.logging = true
+# AMQP::Channel.logging = true
 
 # worker
 
@@ -39,10 +39,10 @@ end
         end
       end
 
-      MQ.queue('prime checker').subscribe { |info, num|
+      AMQP::Channel.queue('prime checker').subscribe { |info, num|
         log "prime checker #{Process.pid}", :prime?, num
         if Integer(num).prime?
-          MQ.queue(info.reply_to).publish(num, :reply_to => Process.pid)
+          AMQP::Channel.queue(info.reply_to).publish(num, :reply_to => Process.pid)
         end
       }
     }
@@ -51,7 +51,7 @@ end
 # controller
 
   EM.run {
-    MQ.queue('prime collector').subscribe { |info, prime|
+    AMQP::Channel.queue('prime collector').subscribe { |info, prime|
       log 'prime collector', :received, prime, :from, info.reply_to
       (@primes ||= []) << Integer(prime)
       EM.stop_event_loop if prime == '499'
@@ -59,7 +59,7 @@ end
 
     MAX.times do |i|
       EM.next_tick do
-        MQ.queue('prime checker').publish((i+1).to_s, :reply_to => 'prime collector')
+        AMQP::Channel.queue('prime checker').publish((i+1).to_s, :reply_to => 'prime collector')
       end
     end
   }

data/research/primes-processes.rb

@@ -11,7 +11,7 @@ EM.run {
     p args
   end
 
-  # MQ.logging = true
+  # AMQP::Channel.logging = true
 
   if ARGV[0] == 'worker'
 
@@ -23,24 +23,24 @@ EM.run {
       end
     end
 
-    MQ.queue('prime checker').subscribe { |info, num|
+    AMQP::Channel.queue('prime checker').subscribe { |info, num|
       log "prime checker #{Process.pid}", :prime?, num
       if Integer(num).prime?
-        MQ.queue(info.reply_to).publish(num, :reply_to => Process.pid)
+        AMQP::Channel.queue(info.reply_to).publish(num, :reply_to => Process.pid)
         EM.stop_event_loop if num == (MAX-1).to_s
       end
     }
 
   elsif ARGV[0] == 'controller'
 
-    MQ.queue('prime collector').subscribe { |info, prime|
+    AMQP::Channel.queue('prime collector').subscribe { |info, prime|
       log 'prime collector', :received, prime, :from, info.reply_to
       (@primes ||= []) << Integer(prime)
     }
 
     MAX.times do |i|
       EM.next_tick do
-        MQ.queue('prime checker').publish((i+1).to_s, :reply_to => 'prime collector')
+        AMQP::Channel.queue('prime checker').publish((i+1).to_s, :reply_to => 'prime collector')
       end
     end
 

data/research/primes-threaded.rb

@@ -9,7 +9,7 @@ def log(*args)
   p args
 end
 
-# MQ.logging = true
+# AMQP::Channel.logging = true
 
 EM.run {
 
@@ -23,12 +23,12 @@ EM.run {
     end
   end
 
-  MQ.queue('prime checker').subscribe { |info, num|
+  AMQP::Channel.queue('prime checker').subscribe { |info, num|
     EM.defer(proc {
 
       log "prime checker #{Process.pid}-#{Thread.current.object_id}", :prime?, num
       if Integer(num).prime?
-        MQ.queue(info.reply_to).publish(num, :reply_to => "#{Process.pid}-#{Thread.current.object_id}")
+        AMQP::Channel.queue(info.reply_to).publish(num, :reply_to => "#{Process.pid}-#{Thread.current.object_id}")
         EM.stop_event_loop if num == '499'
       end
 
@@ -37,14 +37,14 @@ EM.run {
 
   # controller
 
-  MQ.queue('prime collector').subscribe { |info, prime|
+  AMQP::Channel.queue('prime collector').subscribe { |info, prime|
     log 'prime collector', :received, prime, :from, info.reply_to
     (@primes ||= []) << Integer(prime)
   }
 
   MAX.times do |i|
     EM.next_tick do
-      MQ.queue('prime checker').publish((i+1).to_s, :reply_to => 'prime collector')
+      AMQP::Channel.queue('prime checker').publish((i+1).to_s, :reply_to => 'prime collector')
     end
   end
 

data/spec/integration/authentication_spec.rb

@@ -0,0 +1,114 @@
+# -*- coding: utf-8 -*-
+require "spec_helper"
+
+describe "Authentication attempt" do
+
+  #
+  # Environment
+  #
+
+  include AMQP::Spec
+  include AMQP::SpecHelper
+
+  em_before { AMQP.cleanup_state }
+  em_after  { AMQP.cleanup_state }
+
+  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
+      end
+
+      it "succeeds" do
+        connection = AMQP.connect
+
+        done(0.3) {
+          connection.should be_connected
+          connection.close
+        }
+      end # it
+    end # context
+  end # describe
+
+
+  describe "with explicitly given connection parameters" 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
+      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"
+
+          done(0.3) {
+            connection.should be_connected
+            connection.close
+          }
+        end # it
+      end # context
+
+      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"
+
+          done(0.5) {
+            connection.should_not be_connected
+          }
+        end # it
+      end
+    end # context
+  end
+
+
+  describe "with connection string" 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
+      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"
+
+          done(0.3) {
+            connection.should be_connected
+            connection.close
+          }
+        end # it
+      end # context
+
+      context "and provided credentials ARE INCORRECT" do
+        it "succeeds" do
+          connection = AMQP.connect "amqp://amqp_gem:#{Time.now.to_i}@localhost/amqp_gem_testbed"
+
+          done(0.5) {
+            connection.should_not be_connected
+            connection.close
+          }
+        end # it
+      end # context
+    end # context
+  end # describe
+end # describe "Authentication attempt"

data/spec/integration/automatic_binding_for_default_direct_exchange_spec.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# -*- coding: utf-8 -*-
 
 require 'spec_helper'
 
@@ -10,25 +10,30 @@ describe "Queue that was bound to default direct exchange thanks to Automatic Mo
 
   include AMQP::Spec
 
-  default_timeout 10
+  default_timeout 2
 
   amqp_before do
-    @channel   = MQ.new
+    @channel   = AMQP::Channel.new
+    @channel.should be_open
 
     @queue1    = @channel.queue("queue1")
     @queue2    = @channel.queue("queue2")
 
     # Rely on default direct exchange binding, see section 2.1.2.4 Automatic Mode in AMQP 0.9.1 spec.
-    @exchange = MQ::Exchange.default
+    @exchange = AMQP::Exchange.default(@channel)
   end
 
 
+  default_options AMQP_OPTS
+
 
   #
   # Examples
   #
 
   it "receives messages with routing key equals it's name" do
+    @exchange.channel.should == @channel
+
     number_of_received_messages = 0
     expected_number_of_messages = 3
     dispatched_data             = "to be received by queue1"
@@ -36,14 +41,6 @@ describe "Queue that was bound to default direct exchange thanks to Automatic Mo
     @queue1.subscribe do |payload|
       number_of_received_messages += 1
       payload.should == dispatched_data
-
-      if number_of_received_messages == expected_number_of_messages
-        $stdout.puts "Got all the messages I expected, wrapping up..."
-        done
-      else
-        n = expected_number_of_messages - number_of_received_messages
-        $stdout.puts "Still waiting for #{n} more message(s)"
-      end
     end # subscribe
 
     4.times do
@@ -57,5 +54,9 @@ describe "Queue that was bound to default direct exchange thanks to Automatic Mo
     4.times do
       @exchange.publish("some white noise", :routing_key => "killa key")
     end
+
+    done(0.2) {
+      number_of_received_messages.should == expected_number_of_messages
+    }
   end # it
 end # describe

data/spec/{unit/mq → integration}/channel_close_spec.rb

@@ -2,13 +2,13 @@
 
 require "spec_helper"
 
-describe MQ, "#close(&callback)" do
+describe AMQP, "#close(&callback)" do
   include AMQP::EMSpec
 
   default_timeout 5
 
   it "takes a callback which will run when we get back Channel.Close-Ok" do
-    MQ.new.close do |amq|
+    AMQP::Channel.new.close do |amq|
       done
     end
   end

data/spec/{unit/mq → integration}/exchange_declaration_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe MQ do
+describe AMQP do
 
   #
   # Environment
@@ -13,7 +13,7 @@ describe MQ do
   default_timeout 10
 
   amqp_before do
-    @channel = MQ.new
+    @channel = AMQP::Channel.new
   end
 
 
@@ -156,7 +156,7 @@ describe MQ do
 
         expect {
           @channel.direct("previously.declared.durable.direct.exchange", :durable => false)
-        }.to raise_error(MQ::IncompatibleOptionsError)
+        }.to raise_error(AMQP::IncompatibleOptionsError)
 
         done
       end # it
@@ -275,7 +275,7 @@ describe MQ do
 
         expect {
           @channel.fanout("previously.declared.durable.topic.exchange", :durable => false)
-        }.to raise_error(MQ::IncompatibleOptionsError)
+        }.to raise_error(AMQP::IncompatibleOptionsError)
 
         done
       end # it
@@ -388,12 +388,19 @@ describe MQ do
 
 
     context "when exchange is re-declared with parameters different from original declaration" do
-      xit "raises an exception" do
-        @channel.topic("previously.declared.durable.topic.exchange", :durable => true)
+      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)
-        }.to raise_error(MQ::IncompatibleOptionsError)
+          channel.topic("previously.declared.durable.topic.exchange", :durable => false)
+        }.to raise_error(AMQP::IncompatibleOptionsError)
 
         done
       end # it
@@ -417,9 +424,11 @@ describe MQ do
     end # context
 
     context "when exchange name is omitted" do
-      xit "uses amq.match" do
-        pending "Times out. MK."
+      amqp_after do
+        done
+      end
 
+      it "uses amq.match" do
         exchange = @channel.headers
         exchange.name.should == "amq.match"
         exchange.name.should_not == "amq.headers"
@@ -509,16 +518,19 @@ describe MQ do
 
 
     context "when exchange is re-declared with parameters different from original declaration" do
-      xit "raises an exception" do
-        pending "Times out. MK."
+      amqp_after do
+        done
+      end
+
+      it "raises an exception" do
         @channel.headers("previously.declared.durable.topic.exchange", :durable => true)
 
         expect {
           @channel.headers("previously.declared.durable.topic.exchange", :durable => false)
-        }.to raise_error(MQ::IncompatibleOptionsError)
+        }.to raise_error(AMQP::IncompatibleOptionsError)
 
         done
       end # it
     end # context
   end # describe
-end # describe MQ
+end # describe AMQP

data/spec/{unit/mq → integration}/queue_declaration_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe MQ do
+describe AMQP do
 
   #
   # Environment
@@ -13,7 +13,7 @@ describe MQ do
   default_timeout 5
 
   amqp_before do
-    @channel = MQ.new
+    @channel = AMQP::Channel.new
   end
 
 
@@ -88,10 +88,10 @@ describe MQ do
 
         expect {
           @channel.queue("previously.declared.durable.queue", :durable => false)
-        }.to raise_error(MQ::IncompatibleOptionsError)
+        }.to raise_error(AMQP::IncompatibleOptionsError)
 
         done
       end # it
     end # context
   end # describe
-end # describe MQ
+end # describe AMQP