amqp 0.5.3 → 0.5.5

data/README

@@ -51,7 +51,7 @@ AMQP resources:
     RabbitMQ (Rabbit Technologies, Erlang/OTP, MPL) - http://rabbitmq.com
     ZeroMQ   (iMatrix/FastMQ/Intel, C++, GPL3)      - http://www.zeromq.org
     OpenAMQ  (iMatrix, C, GPL2)                     - http://openamq.org
-    ActiveMQ (Apache Foundation, Java, apache2)     - http://activemq.apache.org/
+    ActiveMQ (Apache Foundation, Java, apache2)     - http://activemq.apache.org
 
   Steve Vinoski explains AMQP in his column, Towards Integration
     http://steve.vinoski.net/pdf/IEEE-Advanced_Message_Queuing_Protocol.pdf
@@ -59,6 +59,9 @@ AMQP resources:
   John O'Hara on the history of AMQP
     http://www.acmqueue.org/modules.php?name=Content&pa=showpage&pid=485
 
+  Dmitriy's presentation on RabbitMQ/AMQP
+    http://somic-org.homelinux.org/blog/2008/07/31/slides-for-my-amqprabbitmq-talk/
+
   ZeroMQ's analysis of the messaging technology market
     http://www.zeromq.org/whitepapers:market-analysis
 
@@ -91,6 +94,11 @@ AMQP resources:
     http://jaikoo.com/2008/2/29/friday-round-up-2008-02-29
     http://jaikoo.com/2007/9/4/didn-t-you-get-the-memo
 
+  Open Enterprise's series on messaging middleware and AMQP
+    http://www1.interopsystems.com/analysis/can-amqp-break-ibms-mom-monopoly-part-1.html
+    http://www1.interopsystems.com/analysis/can-amqp-break-ibms-mom-monopoly-part-2.html
+    http://www1.interopsystems.com/analysis/can-amqp-break-ibms-mom-monopoly-part-3.html
+
 Messaging and distributed systems resources:
 
   A Critique of the Remote Procedure Call Paradigm

data/examples/amqp/simple.rb

@@ -72,6 +72,8 @@ module SimpleClient
   end
 end
 
-AMQP.logging = true
-AMQP.client = SimpleClient
-AMQP.start
+EM.run{
+  AMQP.logging = true
+  AMQP.client = SimpleClient
+  AMQP.start
+}

data/examples/mq/logger.rb

@@ -98,7 +98,7 @@ EM.run{
     log = Logger.new(:webserver, :timestamp, :hostname, &log.printer)
     log.info 'Request for /', :GET, :session => 'abc'
 
-    AMQP.stop
+    AMQP.stop{ EM.stop_event_loop }
 
   end
 }

data/examples/mq/simple.rb

@@ -3,14 +3,17 @@ require 'mq'
 require 'pp'
 
 EM.run do
+
+  # connect to the amqp server
+  connection = AMQP.connect(:host => 'dev.rabbitmq.com', :logging => false)
   
   # open a channel on the AMQP connection
-  channel = MQ.new
+  channel = MQ.new(connection)
 
   # declare a queue on the channel
   queue = MQ::Queue.new(channel, 'queue name')
 
-  # use the default fanout exchange
+  # create a fanout exchange
   exchange = MQ::Exchange.new(channel, :fanout, 'all queues')
 
   # bind the queue to the exchange
@@ -19,10 +22,10 @@ EM.run do
   # publish a message to the exchange
   exchange.publish('hello world')
 
-  # subscribe to messages from the queue 
+  # subscribe to messages in the queue
   queue.subscribe do |headers, msg|
     pp [:got, headers, msg]
-    AMQP.stop
+    connection.close{ EM.stop_event_loop }
   end
   
 end
@@ -30,12 +33,17 @@ end
 __END__
 
 [:got,
- #<AMQP::Protocol::Header:0x118a438
+ #<AMQP::Protocol::Header:0x1186270
   @klass=AMQP::Protocol::Basic,
   @properties=
    {:priority=>0,
+    :exchange=>"all queues",
+    :consumer_tag=>"queue name",
+    :delivery_tag=>1,
     :delivery_mode=>1,
-    :content_type=>"application/octet-stream"},
+    :redelivered=>false,
+    :content_type=>"application/octet-stream",
+    :routing_key=>""},
   @size=11,
   @weight=0>,
  "hello world"]

data/lib/amqp.rb

@@ -1,5 +1,5 @@
 module AMQP
-  VERSION = '0.5.3'
+  VERSION = '0.5.5'
 
   DIR = File.expand_path(File.dirname(File.expand_path(__FILE__)))
   $:.unshift DIR
@@ -14,42 +14,31 @@ module AMQP
   class << self
     @logging = false
     attr_accessor :logging
-    attr_reader :stopping
+  end
+
+  def self.connect *args
+    Client.connect *args
   end
 
   def self.settings
     @settings ||= {
       :user => 'guest',
       :pass => 'guest',
-      :vhost => '/'
+      :vhost => '/',
+      :logging => false
     }
   end
 
   def self.start *args
-    @conn ||= Client.connect *args
+    @conn ||= connect *args
   end
   
-  def self.stop stop_reactor = true, &on_stop
+  def self.stop
     if @conn
-      @conn.callback{ |c|
-        if c.channels.keys.any?
-          c.channels.each do |_, mq|
-            mq.close
-          end
-        else
-          c.close
-        end
-      }
-      @on_stop = proc{
+      @conn.close{
+        yield if block_given?
         @conn = nil
-        on_stop.call if on_stop
-        EM.stop_event_loop if stop_reactor
       }
     end
   end
-  
-  def self.stopped
-    @on_stop.call if @on_stop
-    @on_stop = nil
-  end
 end

data/lib/amqp/client.rb

@@ -33,13 +33,13 @@ module AMQP
                                               :insist => false)
 
         when Protocol::Connection::OpenOk
-          @dfr.succeed(self)
+          succeed(self)
 
         when Protocol::Connection::Close
           raise Error, "#{method.reply_text} in #{Protocol.classes[method.class_id].methods[method.method_id]}"
 
         when Protocol::Connection::CloseOk
-          AMQP.stopped
+          @on_disconnect.call if @on_disconnect
         end
       end
     end
@@ -55,8 +55,9 @@ module AMQP
   end
 
   module Client
-    def initialize dfr, opts = {}
-      @dfr = dfr
+    include EM::Deferrable
+
+    def initialize opts = {}
       @settings = opts
       extend AMQP.client
     end
@@ -96,6 +97,7 @@ module AMQP
       channel = opts[:channel] ||= 0
       data = data.to_frame(channel) unless data.is_a? Frame
       data.channel = channel
+
       log 'send', data
       send_data data.to_s
     end
@@ -105,11 +107,21 @@ module AMQP
     #   super
     # end
 
-    def close
-      send Protocol::Connection::Close.new(:reply_code => 200,
-                                           :reply_text => 'Goodbye',
-                                           :class_id => 0,
-                                           :method_id => 0)
+    def close &on_disconnect
+      @on_disconnect = on_disconnect if on_disconnect
+
+      callback{ |c|
+        if c.channels.keys.any?
+          c.channels.each do |_, mq|
+            mq.close
+          end
+        else
+          send Protocol::Connection::Close.new(:reply_code => 200,
+                                               :reply_text => 'Goodbye',
+                                               :class_id => 0,
+                                               :method_id => 0)
+        end
+      }
     end
 
     def unbind
@@ -118,22 +130,16 @@ module AMQP
   
     def self.connect opts = {}
       opts = AMQP.settings.merge(opts)
-      opts[:host] ||= 'localhost'
+      opts[:host] ||= '127.0.0.1'
       opts[:port] ||= PORT
 
-      dfr = EM::DefaultDeferrable.new
-      
-      EM.run{
-        EM.connect opts[:host], opts[:port], self, dfr, opts
-      }
-      
-      dfr
+      EM.connect opts[:host], opts[:port], self, opts
     end
   
     private
   
     def log *args
-      return unless AMQP.logging
+      return unless @settings[:logging] or AMQP.logging
       require 'pp'
       pp args
       puts

data/lib/mq.rb

@@ -18,7 +18,11 @@ class MQ
   include AMQP
   include EM::Deferrable
 
-  def initialize
+  def initialize connection = nil
+    raise 'MQ can only be used from within EM.run{}' unless EM.reactor_running?
+
+    @connection = connection || AMQP.start
+
     conn.callback{ |c|
       @channel = c.add_channel(self)
       send Protocol::Channel::Open.new
@@ -137,12 +141,7 @@ class MQ
     puts
   end
 
-  # create a class level connection on demand
-
-  def connection
-    raise 'MQ can only be used within EM.run{}' unless EM.reactor_running?
-    @@connection ||= AMQP.start
-  end
+  attr_reader :connection
   alias :conn :connection
 end
 

data/lib/mq/rpc.rb

@@ -24,7 +24,8 @@ class MQ
         }
       else
         @callbacks ||= {}
-        @queue = @mq.queue(@name = 'some random identifier for me').subscribe{|info, msg|
+        # XXX implement and use queue(nil)
+        @queue = @mq.queue(@name = "random identifier #{::Kernel.rand(999_999_999_999)}").subscribe{|info, msg|
           if blk = @callbacks.delete(info.message_id)
             blk.call ::Marshal.load(msg)
           end
@@ -34,6 +35,7 @@ class MQ
     end
 
     def method_missing meth, *args, &blk
+      # XXX use uuids instead
       message_id = "random message id #{::Kernel.rand(999_999_999_999)}"
       @callbacks[message_id] = blk if blk
       @remote.publish(::Marshal.dump([meth, *args]), :reply_to => blk ? @name : nil, :message_id => message_id)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: amqp
 version: !ruby/object:Gem::Version 
-  version: 0.5.3
+  version: 0.5.5
 platform: ruby
 authors: 
 - Aman Gupta
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-29 00:00:00 -07:00
+date: 2008-08-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency