amqp 0.5.0 → 0.5.1

data/README

@@ -1,4 +1,7 @@
-Simple AMQP client for Ruby/EventMachine.
+Simple AMQP driver for Ruby/EventMachine.
+
+This library was tested primarily with RabbitMQ, although it should be compatible with any
+server implementing the AMQP 0-8 spec.
 
 To use with RabbitMQ, first run the server:
 
@@ -7,11 +10,22 @@ To use with RabbitMQ, first run the server:
   cd rabbitmq-server
   make run
 
-Then run the example client:
+To get started, refer to the various bundled examples:
+
+  ruby examples/pingpong.rb   # 1-1 communication using amq.direct
+  ruby examples/clock.rb      # 1-N communication using amq.fanout
+  ruby examples/stocks.rb     # 1-subscriber communication using amq.topic
+  ruby examples/hashtable.rb  # simple async rpc layer
+  ruby examples/primes.rb 4   # parallelized prime number generation
+
+For more details into the lower level AMQP client API, run the simple client example:
 
   ruby examples/simple.rb
 
-To run the specs:
+Or refer to protocol/doc.txt, which enumerates packets sent between a server and client
+during a typical session, in both binary and decoded formats.
+
+To run the test suite:
 
   rake spec
 
@@ -24,7 +38,25 @@ Special thanks to Dmitriy Samovskiy, Ben Hood and Tony Garnock-Jones.
 
 Other AMQP resources:
 
-  Barry Pederson's py-amqplib: http://barryp.org/software/py-amqplib/
-  Ben Hood's article on writing an AMQP article: http://hopper.squarespace.com/blog/2008/6/21/build-your-own-amqp-client.html
-  Dmitriy Samovskiy's introduction to ruby+rabbitmq: http://somic-org.homelinux.org/blog/2008/06/24/ruby-amqp-rabbitmq-example/
-  Ben Hood's AMQP client in AS3: http://github.com/0x6e6562/as3-amqp
+  Servers:
+    RabbitMQ (Rabbit Technologies, Erlang/OTP, MPL)  http://rabbitmq.com
+    OpenAMP  (iMatrix, C, GPL2)                      http://openamq.org
+    ActiveMQ (Apache Foundation, Java, apache2)      http://activemq.apache.org/
+
+  John O'Hara's article on the history of AMQP:
+    http://www.acmqueue.org/modules.php?name=Content&pa=showpage&pid=485
+
+  Barry Pederson's py-amqplib:
+    http://barryp.org/software/py-amqplib/
+
+  Ben Hood's article on writing an AMQP client:
+    http://hopper.squarespace.com/blog/2008/6/21/build-your-own-amqp-client.html
+
+  Dmitriy Samovskiy's introduction to Ruby+QPid+RabbitMQ:
+    http://somic-org.homelinux.org/blog/2008/06/24/ruby-amqp-rabbitmq-example/
+
+  Ben Hood's AMQP client in AS3:
+    http://github.com/0x6e6562/as3-amqp
+
+  RabbitMQ's protocol code generator:
+    http://hg.rabbitmq.com/rabbitmq-codegen/

data/examples/clock.rb

@@ -9,18 +9,21 @@ EM.run{
 
   # AMQP.logging = true
 
+  clock = MQ.new.fanout('clock')
   EM.add_periodic_timer(1){
     puts
 
     log :publishing, time = Time.now
-    MQ.new.fanout('clock').publish(Marshal.dump(time))
+    clock.publish(Marshal.dump(time))
   }
 
-  MQ.new.queue('every second').bind('clock').subscribe{ |time|
+  amq = MQ.new
+  amq.queue('every second').bind(amq.fanout('clock')).subscribe{ |time|
     log 'every second', :received, Marshal.load(time)
   }
 
-  MQ.new.queue('every 5 seconds').bind('clock').subscribe{ |time|
+  amq = MQ.new
+  amq.queue('every 5 seconds').bind(amq.fanout('clock')).subscribe{ |time|
     time = Marshal.load(time)
     log 'every 5 seconds', :received, time if time.strftime('%S').to_i%5 == 0
   }

data/examples/pingpong.rb

@@ -10,44 +10,36 @@ EM.run{
   # AMQP.logging = true
 
   amq = MQ.new
-  amq.queue('one').subscribe{ |headers, msg|
-    log 'one', :received, msg, :from => headers.reply_to
+  EM.add_periodic_timer(1){
+    puts
 
-    if headers.reply_to
-      msg[1] = 'o'
+    log :sending, 'ping'
+    amq.queue('one').publish('ping')
+  }
 
-      log 'one', :sending, msg, :to => headers.reply_to
-      amq.direct.publish(msg, :key => headers.reply_to)
-    else
-      puts
-    end
+  amq = MQ.new
+  amq.queue('one').subscribe{ |msg|
+    log 'one', :received, msg, :sending, 'pong'
+    amq.queue('two').publish('pong')
   }
   
   amq = MQ.new
   amq.queue('two').subscribe{ |msg|
     log 'two', :received, msg
-    puts
-  }
-
-  amq = MQ.new
-  amq.direct.publish('ding', :key => 'one')
-  EM.add_periodic_timer(1){
-    log :sending, 'ping', :to => 'one', :from => 'two'
-    amq.direct.publish('ping', :key => 'one', :reply_to => 'two')
   }
 
 }
 
 __END__
 
-[Thu Jul 17 21:23:55 -0700 2008, "one", :received, "ding", {:from=>nil}]
+[Sun Jul 20 03:52:24 -0700 2008, :sending, "ping"]
+[Sun Jul 20 03:52:24 -0700 2008, "one", :received, "ping", :sending, "pong"]
+[Sun Jul 20 03:52:24 -0700 2008, "two", :received, "pong"]
 
-[Thu Jul 17 21:23:56 -0700 2008, :sending, "ping", {:from=>"two", :to=>"one"}]
-[Thu Jul 17 21:23:56 -0700 2008, "one", :received, "ping", {:from=>"two"}]
-[Thu Jul 17 21:23:56 -0700 2008, "one", :sending, "pong", {:to=>"two"}]
-[Thu Jul 17 21:23:56 -0700 2008, "two", :received, "pong"]
+[Sun Jul 20 03:52:25 -0700 2008, :sending, "ping"]
+[Sun Jul 20 03:52:25 -0700 2008, "one", :received, "ping", :sending, "pong"]
+[Sun Jul 20 03:52:25 -0700 2008, "two", :received, "pong"]
 
-[Thu Jul 17 21:23:57 -0700 2008, :sending, "ping", {:from=>"two", :to=>"one"}]
-[Thu Jul 17 21:23:57 -0700 2008, "one", :received, "ping", {:from=>"two"}]
-[Thu Jul 17 21:23:57 -0700 2008, "one", :sending, "pong", {:to=>"two"}]
-[Thu Jul 17 21:23:57 -0700 2008, "two", :received, "pong"]
+[Sun Jul 20 03:52:26 -0700 2008, :sending, "ping"]
+[Sun Jul 20 03:52:26 -0700 2008, "one", :received, "ping", :sending, "pong"]
+[Sun Jul 20 03:52:26 -0700 2008, "two", :received, "pong"]

data/examples/primes-forked.rb

@@ -0,0 +1,63 @@
+$:.unshift File.dirname(__FILE__) + '/../lib'
+require 'mq'
+
+MAX = 5000
+
+def EM.fork &blk
+  raise if reactor_running?
+
+  unless @forks
+    at_exit{
+      @forks.each{ |pid| Process.kill('KILL', pid) }
+    }
+  end
+
+  (@forks ||= []) << Kernel.fork do
+    EM.run(&blk)
+  end
+end
+
+def log *args
+  p args
+end
+
+# MQ.logging = true
+
+# worker
+
+  workers = ARGV[0] ? (Integer(ARGV[0]) rescue 2) : 2
+
+  workers.times do
+    EM.fork{
+      log "prime checker", Process.pid, :started
+
+      class Fixnum
+        def prime?
+          ('1' * self) !~ /^1?$|^(11+?)\1+$/
+        end
+      end
+
+      MQ.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)
+        end
+      }
+    }
+  end
+
+# controller
+
+  EM.run{
+    MQ.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'
+    }
+
+    MAX.times do |i|
+      EM.next_tick do
+        MQ.queue('prime checker').publish((i+1).to_s, :reply_to => 'prime collector')
+      end
+    end
+  }

data/examples/primes-processes.rb

@@ -0,0 +1,135 @@
+$:.unshift File.dirname(__FILE__) + '/../lib'
+require 'mq'
+
+MAX = 500
+
+EM.run{
+
+  def log *args
+    p args
+  end
+
+  # MQ.logging = true
+
+  if ARGV[0] == 'worker'
+
+    log "prime checker #{Process.pid}", :started
+
+    class Fixnum
+      def prime?
+        ('1' * self) !~ /^1?$|^(11+?)\1+$/
+      end
+    end
+
+    MQ.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)
+        EM.stop_event_loop if num == (MAX-1).to_s
+      end
+    }
+
+  elsif ARGV[0] == 'controller'
+
+    MQ.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')
+      end
+    end
+
+  else # run n workers and 1 controller as an example
+
+    workers = ARGV[0] ? (Integer(ARGV[0]) rescue 2) : 2
+
+    ([ :worker ] * workers + [ :controller ]).each do |type|
+      log :spawning, "`ruby #{$0} #{type}`"
+
+      EM.popen("ruby #{$0} #{type}") do |c|
+        def c.receive_data data
+          puts data
+        end
+
+        def c.unbind
+          EM.stop_event_loop
+        end
+      end
+    end
+
+  end
+}
+
+__END__
+
+["prime checker", :started, {:pid=>1958}]
+["prime checker", :started, {:pid=>1957}]
+["prime checker", :started, {:pid=>1956}]
+["prime checker", :prime?, "1", {:pid=>1958}]
+["prime checker", :prime?, "2", {:pid=>1957}]
+["prime collector", :received, "2", {:from_pid=>"1957"}]
+["prime checker", :prime?, "3", {:pid=>1956}]
+["prime collector", :received, "3", {:from_pid=>"1956"}]
+["prime checker", :prime?, "4", {:pid=>1958}]
+["prime checker", :prime?, "5", {:pid=>1957}]
+["prime collector", :received, "5", {:from_pid=>"1957"}]
+["prime checker", :prime?, "6", {:pid=>1956}]
+["prime checker", :prime?, "7", {:pid=>1958}]
+["prime collector", :received, "7", {:from_pid=>"1958"}]
+["prime checker", :prime?, "8", {:pid=>1957}]
+["prime checker", :prime?, "9", {:pid=>1956}]
+["prime checker", :prime?, "10", {:pid=>1958}]
+["prime checker", :prime?, "11", {:pid=>1957}]
+["prime collector", :received, "11", {:from_pid=>"1957"}]
+["prime checker", :prime?, "12", {:pid=>1956}]
+["prime checker", :prime?, "13", {:pid=>1958}]
+["prime collector", :received, "13", {:from_pid=>"1958"}]
+["prime checker", :prime?, "14", {:pid=>1957}]
+["prime checker", :prime?, "15", {:pid=>1956}]
+["prime checker", :prime?, "16", {:pid=>1958}]
+["prime checker", :prime?, "17", {:pid=>1957}]
+["prime collector", :received, "17", {:from_pid=>"1957"}]
+["prime checker", :prime?, "18", {:pid=>1956}]
+["prime checker", :prime?, "19", {:pid=>1958}]
+["prime collector", :received, "19", {:from_pid=>"1958"}]
+["prime checker", :prime?, "20", {:pid=>1957}]
+["prime checker", :prime?, "21", {:pid=>1956}]
+["prime checker", :prime?, "22", {:pid=>1958}]
+["prime checker", :prime?, "23", {:pid=>1957}]
+["prime collector", :received, "23", {:from_pid=>"1957"}]
+["prime checker", :prime?, "24", {:pid=>1956}]
+["prime checker", :prime?, "25", {:pid=>1958}]
+["prime checker", :prime?, "26", {:pid=>1957}]
+["prime checker", :prime?, "27", {:pid=>1956}]
+["prime checker", :prime?, "28", {:pid=>1958}]
+["prime checker", :prime?, "29", {:pid=>1957}]
+["prime collector", :received, "29", {:from_pid=>"1957"}]
+["prime checker", :prime?, "30", {:pid=>1956}]
+["prime checker", :prime?, "31", {:pid=>1958}]
+["prime collector", :received, "31", {:from_pid=>"1958"}]
+["prime checker", :prime?, "32", {:pid=>1957}]
+["prime checker", :prime?, "33", {:pid=>1956}]
+["prime checker", :prime?, "34", {:pid=>1958}]
+["prime checker", :prime?, "35", {:pid=>1957}]
+["prime checker", :prime?, "36", {:pid=>1956}]
+["prime checker", :prime?, "37", {:pid=>1958}]
+["prime collector", :received, "37", {:from_pid=>"1958"}]
+["prime checker", :prime?, "38", {:pid=>1957}]
+["prime checker", :prime?, "39", {:pid=>1956}]
+["prime checker", :prime?, "40", {:pid=>1958}]
+["prime checker", :prime?, "41", {:pid=>1957}]
+["prime collector", :received, "41", {:from_pid=>"1957"}]
+["prime checker", :prime?, "42", {:pid=>1956}]
+["prime checker", :prime?, "43", {:pid=>1958}]
+["prime collector", :received, "43", {:from_pid=>"1958"}]
+["prime checker", :prime?, "44", {:pid=>1957}]
+["prime checker", :prime?, "45", {:pid=>1956}]
+["prime checker", :prime?, "46", {:pid=>1958}]
+["prime checker", :prime?, "47", {:pid=>1957}]
+["prime collector", :received, "47", {:from_pid=>"1957"}]
+["prime checker", :prime?, "48", {:pid=>1956}]
+["prime checker", :prime?, "49", {:pid=>1958}]
+["prime checker", :prime?, "50", {:pid=>1957}]

data/examples/primes-simple.rb

@@ -0,0 +1,19 @@
+MAX = 1000
+
+class Fixnum
+  def prime?
+    ('1' * self) !~ /^1?$|^(11+?)\1+$/
+  end
+end
+
+class PrimeChecker
+  def is_prime? number
+    number.prime?
+  end
+end
+
+prime_checker = PrimeChecker.new
+
+(10_000...(10_000+MAX)).each do |n|
+  prime_checker.is_prime? n
+end

data/examples/primes-threaded.rb

@@ -0,0 +1,49 @@
+$:.unshift File.dirname(__FILE__) + '/../lib'
+require 'mq'
+
+MAX = 500
+
+def log *args
+  p args
+end
+
+# MQ.logging = true
+
+EM.run{
+
+  # worker
+
+  log "prime checker", Process.pid, :started
+
+  class Fixnum
+    def prime?
+      ('1' * self) !~ /^1?$|^(11+?)\1+$/
+    end
+  end
+
+  MQ.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}")
+        EM.stop_event_loop if num == '499'
+      end
+      
+    })
+  }
+
+  # controller
+
+  MQ.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')
+    end
+  end
+
+}

data/examples/primes.rb

@@ -0,0 +1,99 @@
+$:.unshift File.dirname(__FILE__) + '/../lib'
+require 'mq'
+
+# check MAX numbers for prime-ness
+MAX = 1000
+
+# logging
+def log *args
+  p args
+end
+
+# spawn workers
+workers = ARGV[0] ? (Integer(ARGV[0]) rescue 1) : 1
+EM.fork(workers) do
+
+  log MQ.id, :started
+
+  class Fixnum
+    def prime?
+      ('1' * self) !~ /^1?$|^(11+?)\1+$/
+    end
+  end
+
+  class PrimeChecker
+    def is_prime? number
+      log "prime checker #{MQ.id}", :prime?, number
+      number.prime?
+    end
+  end
+
+  MQ.rpc('prime checker', PrimeChecker.new)
+
+end
+
+# use workers to check which numbers are prime
+EM.run{
+  
+  prime_checker = MQ.rpc('prime checker')
+
+  (10_000...(10_000+MAX)).each do |num|
+    log :checking, num
+
+    prime_checker.is_prime?(num) { |is_prime|
+      log :prime?, num, is_prime
+      (@primes||=[]) << num if is_prime
+      
+      if (@responses = (@responses || 0) + 1) == MAX
+        log :primes=, @primes
+        EM.stop_event_loop
+      end
+    }
+
+  end
+  
+}
+
+__END__
+
+$ uname -a
+Linux gc 2.6.24-ARCH #1 SMP PREEMPT Sun Mar 30 10:50:22 CEST 2008 x86_64 Intel(R) Xeon(R) CPU X3220 @ 2.40GHz GenuineIntel GNU/Linux
+
+$ cat /proc/cpuinfo | grep processor | wc -l
+4
+
+$ time ruby primes-simple.rb 
+
+real  0m16.055s
+user  0m16.052s
+sys 0m0.000s
+
+$ time ruby primes.rb 1 >/dev/null
+
+real  0m18.278s
+user  0m0.993s
+sys 0m0.027s
+
+$ time ruby primes.rb 2 >/dev/null
+
+real  0m17.316s
+user  0m0.967s
+sys 0m0.053s
+
+$ time ruby primes.rb 4 >/dev/null
+
+real  0m8.229s
+user  0m1.010s
+sys 0m0.030s
+
+$ time ruby primes.rb 8 >/dev/null
+
+real  0m5.893s
+user  0m1.023s
+sys 0m0.050s
+
+$ time ruby primes.rb 16 >/dev/null
+
+real  0m5.601s
+user  0m0.990s
+sys 0m0.043s

data/examples/stocks.rb

@@ -13,7 +13,7 @@ EM.run{
     puts
 
     log :publishing, 'stock.usd.appl', price = 170+rand(1000)/100.0
-    MQ.topic(:key => 'stock.usd.appl').publish(price, :headers => {:symbol => 'appl'})
+    MQ.topic.publish(price, :key => 'stock.usd.appl', :headers => {:symbol => 'appl'})
 
     log :publishing, 'stock.usd.msft', price = 22+rand(500)/100.0
     MQ.topic.publish(price, :key => 'stock.usd.msft', :headers => {:symbol => 'msft'})

data/lib/amqp/buffer.rb

@@ -1,4 +1,12 @@
-require 'enumerator'
+if [].map.respond_to? :with_index
+  class Array
+    def enum_with_index
+      each.with_index
+    end
+  end
+else
+  require 'enumerator'
+end
 
 module AMQP
   class Buffer
@@ -102,17 +110,17 @@ module AMQP
             key, type = table.read(:shortstr, :octet)
             key = key.intern
             t[key] ||= case type
-                       when ?S
+                       when 83 # 'S'
                          table.read(:longstr)
-                       when ?I
+                       when 73 # 'I'
                          table.read(:long)
-                       when ?D
+                       when 68 # 'D'
                          exp = table.read(:octet)
                          num = table.read(:long)
                          num / 10.0**exp
-                       when ?T
+                       when 84 # 'T'
                          table.read(:timestamp)
-                       when ?F
+                       when 70 # 'F'
                          table.read(:table)
                        end
           end
@@ -164,23 +172,23 @@ module AMQP
 
                           case value
                           when String
-                            table.write(:octet, ?S)
+                            table.write(:octet, 83) # 'S'
                             table.write(:longstr, value.to_s)
                           when Fixnum
-                            table.write(:octet, ?I)
+                            table.write(:octet, 73) # 'I'
                             table.write(:long, value)
                           when Float
-                            table.write(:octet, ?D)
+                            table.write(:octet, 68) # 'D'
                             # XXX there's gotta be a better way to do this..
-                            exp = value.to_s.gsub(/^.+\./,'').length
+                            exp = value.to_s.split('.').last.length
                             num = value * 10**exp
                             table.write(:octet, exp)
                             table.write(:long, num)
                           when Time
-                            table.write(:octet, ?T)
+                            table.write(:octet, 84) # 'T'
                             table.write(:timestamp, value)
                           when Hash
-                            table.write(:octet, ?F)
+                            table.write(:octet, 70) # 'F'
                             table.write(:table, value)
                           end
 

data/lib/amqp/client.rb

@@ -73,7 +73,7 @@ module AMQP
   
     def receive_data data
       @buf << data
-      # log 'receive_data', data
+      log 'receive_data', data
 
       while frame = Frame.parse(@buf)
         log 'receive', frame
@@ -95,7 +95,7 @@ module AMQP
     end
 
     def send_data data
-      # log 'send_data', data
+      log 'send_data', data
       super
     end
 

data/lib/amqp/spec.rb

@@ -1,4 +1,9 @@
 
+# this file was autogenerated on Sun Jul 20 04:06:05 -0700 2008
+# using amqp-0.8.json    (mtime: Wed Jul 16 12:10:42 -0700 2008)
+#
+# DO NOT EDIT! (edit protocol/codegen.rb instead, and run `rake codegen`)
+
 module AMQP
   HEADER        = "AMQP".freeze
   VERSION_MAJOR = 8

data/lib/emfork.rb

@@ -0,0 +1,67 @@
+EMFORK = $0 == __FILE__
+
+if EMFORK
+  require 'rubygems'
+end
+
+require 'eventmachine'
+
+# helper to fork off EM reactors
+def EM.fork num = 1, &blk
+  unless @forks
+    trap('CHLD'){
+      pid = Process.wait
+      p [:pid, pid, :died] if EMFORK
+      block = @forks.delete(pid)
+      EM.fork(1, &block)
+    }
+
+    trap('EXIT'){
+      p [:pid, Process.pid, :exit] if EMFORK
+      @forks.keys.each{ |pid|
+        p [:pid, Process.pid, :killing, pid] if EMFORK
+        Process.kill('USR1', pid)
+      }
+    }
+    
+    @forks = {}
+  end
+
+  num.times do
+    pid = EM.fork_reactor do
+      p [:pid, Process.pid, :started] if EMFORK
+
+      trap('USR1'){ EM.stop_event_loop }
+      trap('CHLD'){}
+      trap('EXIT'){}
+
+      blk.call
+    end
+
+    @forks[pid] = blk
+    p [:children, EM.forks] if EMFORK
+  end
+end
+
+def EM.forks
+  @forks.keys
+end
+
+if EMFORK
+  p 'starting reactor'
+
+  trap('INT'){ EM.stop_event_loop }
+
+  EM.run{
+    p [:parent, Process.pid]
+
+    EM.fork(2){
+      EM.add_periodic_timer(1) do
+        p [:fork, Process.pid, :ping]
+      end
+    }
+
+  }
+
+  p 'reactor stopped'
+end

data/lib/mq.rb

@@ -1,11 +1,14 @@
 $:.unshift File.expand_path(File.dirname(File.expand_path(__FILE__)))
 require 'amqp'
 
-unless defined?(BlankSlate)
-  class BlankSlate < BasicObject; end if defined?(BasicObject)
+class MQ
+  %w[ exchange queue rpc ].each do |file|
+    require "mq/#{file}"
+  end
 
-  class BlankSlate
-    instance_methods.each { |m| undef_method m unless m =~ /^__/ }
+  class << self
+    @logging = false
+    attr_accessor :logging
   end
 end
 
@@ -13,129 +16,6 @@ class MQ
   include AMQP
   include EM::Deferrable
 
-  class Exchange
-    include AMQP
-
-    def initialize mq, type, name, opts = {}
-      if name.is_a? Hash
-        opts = name
-        name = "amq.#{type}"
-      end
-
-      @mq = mq
-      @type, @name = type, name
-      @key = opts[:key]
-
-      @mq.callback{
-        @mq.send Protocol::Exchange::Declare.new({ :exchange => name,
-                                                   :type => type,
-                                                   :nowait => true }.merge(opts))
-      } unless name == "amq.#{type}"
-    end
-    attr_reader :name, :type, :key
-
-    def publish data, opts = {}
-      @mq.callback{
-        @mq.send Protocol::Basic::Publish.new({ :exchange => name,
-                                                :routing_key => opts.delete(:key) || @key }.merge(opts))
-        
-        data = data.to_s
-
-        @mq.send Protocol::Header.new(Protocol::Basic,
-                                          data.length, { :content_type => 'application/octet-stream',
-                                                         :delivery_mode => 1,
-                                                         :priority => 0 }.merge(opts))
-        @mq.send Frame::Body.new(data)
-      }
-      self
-    end
-  end
-  
-  class Queue
-    include AMQP
-    
-    def initialize mq, name, opts = {}
-      @mq = mq
-      @name = name
-      @mq.callback{
-        @mq.send Protocol::Queue::Declare.new({ :queue => name,
-                                                :nowait => true }.merge(opts))
-      }
-      bind(@mq.direct, :key => name)
-    end
-    attr_reader :name
-
-    def bind exchange, opts = {}
-      @mq.callback{
-        @mq.send Protocol::Queue::Bind.new({ :queue => name,
-                                             :exchange => exchange.respond_to?(:name) ? exchange.name : exchange,
-                                             :routing_key => opts.delete(:key),
-                                             :nowait => true }.merge(opts))
-      }
-      self
-    end
-    
-    def subscribe opts = {}, &blk
-      @on_msg = blk
-      @mq.callback{
-        @mq.send Protocol::Basic::Consume.new({ :queue => name,
-                                                :consumer_tag => name,
-                                                :no_ack => true,
-                                                :nowait => true }.merge(opts))
-      }
-      self
-    end
-
-    def receive headers, body
-      if @on_msg
-        @on_msg.call *(@on_msg.arity == 1 ? [body] : [headers, body])
-      end
-    end
-  end
-
-  class RPC < BlankSlate
-    def initialize mq, queue, obj = nil
-      @mq = mq
-
-      if obj
-        @obj = case obj
-               when Class
-                 obj.new
-               when Module
-                 (::Class.new do include(obj) end).new
-               else
-                 obj
-               end
-        
-        @mq.queue(queue).subscribe{ |info, request|
-          method, *args = Marshal.load(request)
-          ret = @obj.__send__(method, *args)
-
-          if info.reply_to
-            @mq.direct.publish(Marshal.dump(ret), :key => info.reply_to, :message_id => info.message_id)
-          end
-        }
-      else
-        @callbacks ||= {}
-        @queue = @mq.queue(@name = 'some random identifier for me').subscribe{|info, msg|
-          ret = Marshal.load(msg)
-          if blk = @callbacks.delete(info.message_id)
-            blk.call(ret)
-          end
-        }
-        @exchange = @mq.direct(:key => queue)
-      end
-    end
-
-    def method_missing meth, *args, &blk
-      message_id = "random message id #{rand(999_999_999_999)}"
-      @callbacks[message_id] = blk if blk
-      @exchange.publish(Marshal.dump([meth, *args]), :reply_to => blk ? @name : nil, :message_id => message_id)
-    end
-  end
-end
-
-class MQ
   def initialize
     conn.callback{ |c|
       @channel = c.add_channel(self)
@@ -145,6 +25,8 @@ class MQ
   attr_reader :channel
   
   def process_frame frame
+    log :received, frame
+
     case frame
     when Frame::Header
       @header = frame.payload
@@ -180,6 +62,7 @@ class MQ
   def send data
     data.ticket = @ticket if @ticket and data.respond_to? :ticket
     conn.callback{ |c|
+      log :sending, data
       c.send data, :channel => @channel
     }
   end
@@ -202,6 +85,14 @@ class MQ
 
   private
   
+  def log *args
+    return unless MQ.logging
+    pp args
+    puts
+  end
+
+  # keep track of proxy objects
+  
   def exchanges
     @exchanges ||= {}
   end
@@ -214,16 +105,29 @@ class MQ
     @rcps ||= {}
   end
 
+  # create a class level connection on demand
+
   def connection
     @@connection ||= AMQP.start
   end
   alias :conn :connection
+end
+
+# convenience wrapper for thread-local MQ object
+
+class MQ
+  def MQ.default
+    Thread.current[:mq] ||= MQ.new
+  end
 
   def MQ.method_missing meth, *args, &blk
     MQ.default.__send__(meth, *args, &blk)
   end
-  
-  def MQ.default
-    Thread.current[:mq] ||= MQ.new
+end
+
+# unique identifier
+class MQ
+  def MQ.id
+    Thread.current[:mq_id] ||= "#{`hostname`.strip}-#{Process.pid}-#{Thread.current.object_id}"
   end
 end

data/lib/mq/exchange.rb

@@ -0,0 +1,36 @@
+class MQ
+  class Exchange
+    include AMQP
+
+    def initialize mq, type, name, opts = {}
+      @mq = mq
+      @type, @name = type, name
+      @key = opts[:key]
+
+      @mq.callback{
+        @mq.send Protocol::Exchange::Declare.new({ :exchange => name,
+                                                   :type => type,
+                                                   :nowait => true }.merge(opts))
+      } unless name == "amq.#{type}" or name == ''
+    end
+    attr_reader :name, :type, :key
+
+    def publish data, opts = {}
+      @mq.callback{
+        EM.next_tick do
+          @mq.send Protocol::Basic::Publish.new({ :exchange => name,
+                                                  :routing_key => opts.delete(:key) || @key }.merge(opts))
+        
+          data = data.to_s
+
+          @mq.send Protocol::Header.new(Protocol::Basic,
+                                            data.length, { :content_type => 'application/octet-stream',
+                                                           :delivery_mode => 1,
+                                                           :priority => 0 }.merge(opts))
+          @mq.send Frame::Body.new(data)
+        end
+      }
+      self
+    end
+  end
+end

data/lib/mq/queue.rb

@@ -0,0 +1,52 @@
+class MQ
+  class Queue
+    include AMQP
+    
+    def initialize mq, name, opts = {}
+      @mq = mq
+      @name = name
+      @mq.callback{
+        @mq.send Protocol::Queue::Declare.new({ :queue => name,
+                                                :nowait => true }.merge(opts))
+      }
+    end
+    attr_reader :name
+
+    def bind exchange, opts = {}
+      @mq.callback{
+        @mq.send Protocol::Queue::Bind.new({ :queue => name,
+                                             :exchange => exchange.respond_to?(:name) ? exchange.name : exchange,
+                                             :routing_key => opts.delete(:key),
+                                             :nowait => true }.merge(opts))
+      }
+      self
+    end
+    
+    def subscribe opts = {}, &blk
+      @on_msg = blk
+      @mq.callback{
+        @mq.send Protocol::Basic::Consume.new({ :queue => name,
+                                                :consumer_tag => name,
+                                                :no_ack => true,
+                                                :nowait => true }.merge(opts))
+      }
+      self
+    end
+
+    def publish data, opts = {}
+      exchange.publish(data, opts)
+    end
+
+    def receive headers, body
+      if @on_msg
+        @on_msg.call *(@on_msg.arity == 1 ? [body] : [headers, body])
+      end
+    end
+  
+    private
+    
+    def exchange
+      @exchange ||= Exchange.new(@mq, :direct, '', :key => name)
+    end
+  end
+end

data/lib/mq/rpc.rb

@@ -0,0 +1,51 @@
+require 'emfork'
+
+unless defined?(BlankSlate)
+  class BlankSlate < BasicObject; end if defined?(BasicObject)
+
+  class BlankSlate
+    instance_methods.each { |m| undef_method m unless m =~ /^__/ }
+  end
+end
+
+class MQ
+  class RPC < BlankSlate
+    def initialize mq, queue, obj = nil
+      @mq = mq
+
+      if obj
+        @obj = case obj
+               when ::Class
+                 obj.new
+               when ::Module
+                 (::Class.new do include(obj) end).new
+               else
+                 obj
+               end
+        
+        @mq.queue(queue).subscribe{ |info, request|
+          method, *args = ::Marshal.load(request)
+          ret = @obj.__send__(method, *args)
+
+          if info.reply_to
+            @mq.queue(info.reply_to).publish(::Marshal.dump(ret), :key => info.reply_to, :message_id => info.message_id)
+          end
+        }
+      else
+        @callbacks ||= {}
+        @queue = @mq.queue(@name = 'some random identifier for me').subscribe{|info, msg|
+          if blk = @callbacks.delete(info.message_id)
+            blk.call ::Marshal.load(msg)
+          end
+        }
+        @remote = @mq.queue(queue)
+      end
+    end
+
+    def method_missing meth, *args, &blk
+      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)
+    end
+  end
+end

data/protocol/codegen.rb

@@ -1,7 +1,9 @@
 require 'rubygems'
 require 'json'
 
-s = JSON.parse(File.read(File.dirname(__FILE__)+'/amqp-0.8.json'))
+name = 'amqp-0.8.json'
+path = File.dirname(__FILE__)+'/'+name
+s = JSON.parse(File.read(path))
 
 # require 'pp'
 # pp(s)
@@ -10,6 +12,11 @@ s = JSON.parse(File.read(File.dirname(__FILE__)+'/amqp-0.8.json'))
 require 'erb'
 
 puts ERB.new(%q[
+  # this file was autogenerated on <%= Time.now.to_s %>
+  # using <%= name.ljust(16) %> (mtime: <%= File.mtime(path) %>)
+  #
+  # DO NOT EDIT! (edit protocol/codegen.rb instead, and run `rake codegen`)
+
   module AMQP
     HEADER        = <%= s['name'].dump %>.freeze
     VERSION_MAJOR = <%= s['major-version'] %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: amqp
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Aman Gupta
@@ -9,10 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-17 00:00:00 -07:00
+date: 2008-07-21 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: eventmachine
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.12.1
+    version: 
 description: AMQP client implementation in Ruby/EventMachine
 email: amqp@tmm1.net
 executables: []
@@ -22,9 +31,15 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- README
 - examples/clock.rb
 - examples/hashtable.rb
 - examples/pingpong.rb
+- examples/primes-forked.rb
+- examples/primes-processes.rb
+- examples/primes-simple.rb
+- examples/primes-threaded.rb
+- examples/primes.rb
 - examples/simple.rb
 - examples/stocks.rb
 - lib/amqp/buffer.rb
@@ -33,12 +48,15 @@ files:
 - lib/amqp/protocol.rb
 - lib/amqp/spec.rb
 - lib/amqp.rb
+- lib/emfork.rb
+- lib/mq/exchange.rb
+- lib/mq/queue.rb
+- lib/mq/rpc.rb
 - lib/mq.rb
 - protocol/amqp-0.8.json
 - protocol/codegen.rb
 - protocol/doc.txt
 - protocol/amqp-0.8.xml
-- README
 has_rdoc: false
 homepage: http://amqp.rubyforge.org/
 post_install_message: