amqp 0.5.5 → 0.5.9

data/README

@@ -7,6 +7,8 @@ Simple AMQP driver for Ruby/EventMachine
   http://groups.google.com/group/ruby-amqp
   http://lists.rabbitmq.com/pipermail/rabbitmq-discuss/2008-July/001417.html
 
+This library works with Ruby 1.8, Ruby 1.9 and JRuby.
+
 This library was tested primarily with RabbitMQ, although it should be compatible with any
 server implementing the AMQP 0-8 spec.
 
@@ -86,6 +88,7 @@ AMQP resources:
     http://hg.rabbitmq.com/rabbitmq-codegen/
 
   Erlang Exchange presentation on the implementation of RabbitMQ
+    http://skillsmatter.com/podcast/erlang/presenting-rabbitmq-an-erlang-based-implementatio-nof-amqp
     http://www.lshift.net/blog/2008/07/01/slides-from-our-erlang-exchange-talk
 
   Jonathan Conway's series on RabbitMQ and using it with Ruby/Merb
@@ -113,5 +116,8 @@ Messaging and distributed systems resources:
   Metaprotocol Taxonomy and Communications Patterns
     http://hessian.caucho.com/doc/metaprotocol-taxonomy.xtp
 
-  Joe Armstrong on Erlang messaging vs RPC:
+  Joe Armstrong on Erlang messaging vs RPC
     http://armstrongonsoftware.blogspot.com/2008/05/road-we-didnt-go-down.html
+
+  SEDA: scalable internet services using message queues
+    http://www.eecs.harvard.edu/~mdw/papers/seda-sosp01.pdf

data/examples/mq/logger.rb

@@ -1,74 +1,13 @@
 $:.unshift File.dirname(__FILE__) + '/../../lib'
 require 'mq'
+require 'mq/logger'
 
-class Logger
-  def initialize *args, &block
-    opts = args.pop if args.last.is_a? Hash
-    opts ||= {}
-    printer(block) if block
-    @log = []
-    @tags = ([:timestamp] + args).uniq
-  end
-
-  def log severity, *args
-    opts = args.pop if args.last.is_a? Hash and args.size != 1
-    opts ||= {}
-    data = args.shift
-
-    data = {:type => :exception,
-            :name => data.class.to_s.intern,
-            :backtrace => data.backtrace,
-            :message => data.message} if data.is_a? Exception
-        
-    (@tags + args).each do |tag|
-      tag = tag.to_sym
-      case tag
-      when :timestamp
-        opts.update :timestamp => Time.now.to_i
-      when :hostname
-        @hostname ||= { :hostname => `hostname`.strip }
-        opts.update @hostname
-      when :process
-        @process_id ||= { :process_id => Process.pid,
-                          :process_name => $0,
-                          :process_parent_id => Process.ppid,
-                          :thread_id => Thread.current.object_id }
-        opts.update :process => @process_id
-      else
-        (opts[:tags] ||= []) << tag
-      end
-    end
-    
-    opts.update(:severity => severity,
-                :data => data)
-    
-    print(opts)
-    MQ.queue('logger', :durable => true).publish(Marshal.dump(opts), :persistent => true)
-    opts
-  end
-  alias :method_missing :log
-
-  def print data = nil, &block
-    if block
-      @printer = block
-    elsif data.is_a? Proc
-      @printer = data
-    elsif @printer and data
-      @printer.call(data)
-    else
-      @printer
-    end
-  end
-  alias :printer :print
-end
+Logger = MQ::Logger
 
 EM.run{
-  # AMQP.logging = true
-  # MQ.logging = true
-
   if ARGV[0] == 'server'
 
-    MQ.queue('logger', :durable => true).subscribe{|msg|
+    MQ.queue('logger').bind(MQ.fanout('logging', :durable => true)).subscribe{|msg|
       msg = Marshal.load(msg)
       require 'pp'
       pp(msg)

data/examples/mq/stocks.rb

@@ -7,50 +7,52 @@ EM.run{
     p [ Time.now, *args ]
   end
 
-  # AMQP.logging = true
-
-  EM.add_periodic_timer(1){
-    puts
-
-    log :publishing, 'stock.usd.appl', price = 170+rand(1000)/100.0
-    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'})
-  }
+  def publish_stock_prices
+    mq = MQ.new
+    EM.add_periodic_timer(1){
+      puts
+
+      { :appl => 170+rand(1000)/100.0,
+        :msft => 22+rand(500)/100.0
+      }.each do |stock, price|
+        stock = "usd.#{stock}"
+
+        log :publishing, stock, price
+        mq.topic('stocks').publish(price, :key => stock)
+      end
+    }
+  end
 
-  Thread.new{
-    amq = MQ.new
-    amq.queue('apple stock').bind(amq.topic, :key => 'stock.usd.appl').subscribe{ |price|
+  def watch_appl_stock
+    mq = MQ.new
+    mq.queue('apple stock').bind(mq.topic('stocks'), :key => 'usd.appl').subscribe{ |price|
       log 'apple stock', price
     }
-  }
+  end
 
-  Thread.new{
-    amq = MQ.new
-    amq.queue('us stocks').bind(amq.topic, :key => 'stock.usd.*').subscribe{ |info, price|
-      log 'us stock', info.headers[:symbol], price
+  def watch_us_stocks
+    mq = MQ.new
+    mq.queue('us stocks').bind(mq.topic('stocks'), :key => 'usd.*').subscribe{ |info, price|
+      log 'us stock', info.routing_key, price
     }
-  }
+  end
+
+  publish_stock_prices
+  watch_appl_stock
+  watch_us_stocks
 
 }
 
 __END__
 
-[Thu Jul 17 14:51:07 -0700 2008, :publishing, "stock.usd.appl", 170.84]
-[Thu Jul 17 14:51:07 -0700 2008, :publishing, "stock.usd.msft", 23.68]
-[Thu Jul 17 14:51:07 -0700 2008, "apple stock", "170.84"]
-[Thu Jul 17 14:51:07 -0700 2008, "us stock", "appl", "170.84"]
-[Thu Jul 17 14:51:07 -0700 2008, "us stock", "msft", "23.68"]
-
-[Thu Jul 17 14:51:08 -0700 2008, :publishing, "stock.usd.appl", 173.61]
-[Thu Jul 17 14:51:08 -0700 2008, :publishing, "stock.usd.msft", 25.8]
-[Thu Jul 17 14:51:08 -0700 2008, "apple stock", "173.61"]
-[Thu Jul 17 14:51:08 -0700 2008, "us stock", "appl", "173.61"]
-[Thu Jul 17 14:51:08 -0700 2008, "us stock", "msft", "25.8"]
-
-[Thu Jul 17 14:51:09 -0700 2008, :publishing, "stock.usd.appl", 173.94]
-[Thu Jul 17 14:51:09 -0700 2008, :publishing, "stock.usd.msft", 24.88]
-[Thu Jul 17 14:51:09 -0700 2008, "apple stock", "173.94"]
-[Thu Jul 17 14:51:09 -0700 2008, "us stock", "appl", "173.94"]
-[Thu Jul 17 14:51:09 -0700 2008, "us stock", "msft", "24.88"]
+[Fri Aug 15 01:39:00 -0700 2008, :publishing, "usd.appl", 173.45]
+[Fri Aug 15 01:39:00 -0700 2008, :publishing, "usd.msft", 26.98]
+[Fri Aug 15 01:39:00 -0700 2008, "apple stock", "173.45"]
+[Fri Aug 15 01:39:00 -0700 2008, "us stock", "usd.appl", "173.45"]
+[Fri Aug 15 01:39:00 -0700 2008, "us stock", "usd.msft", "26.98"]
+
+[Fri Aug 15 01:39:01 -0700 2008, :publishing, "usd.appl", 179.72]
+[Fri Aug 15 01:39:01 -0700 2008, :publishing, "usd.msft", 26.56]
+[Fri Aug 15 01:39:01 -0700 2008, "apple stock", "179.72"]
+[Fri Aug 15 01:39:01 -0700 2008, "us stock", "usd.appl", "179.72"]
+[Fri Aug 15 01:39:01 -0700 2008, "us stock", "usd.msft", "26.56"]

data/lib/amqp.rb

@@ -1,5 +1,5 @@
 module AMQP
-  VERSION = '0.5.5'
+  VERSION = '0.5.9'
 
   DIR = File.expand_path(File.dirname(File.expand_path(__FILE__)))
   $:.unshift DIR
@@ -14,6 +14,8 @@ module AMQP
   class << self
     @logging = false
     attr_accessor :logging
+    attr_reader :conn
+    alias :connection :conn
   end
 
   def self.connect *args
@@ -22,9 +24,19 @@ module AMQP
 
   def self.settings
     @settings ||= {
+      # server address
+      :host => '127.0.0.1',
+      :port => PORT,
+
+      # login details
       :user => 'guest',
       :pass => 'guest',
       :vhost => '/',
+
+      # connection timeout
+      :timeout => nil,
+
+      # logging
       :logging => false
     }
   end
@@ -41,4 +53,12 @@ module AMQP
       }
     end
   end
+
+  def self.run *args
+    EM.run{
+      AMQP.start(*args).callback{
+        yield
+      }
+    }
+  end
 end

data/lib/amqp/client.rb

@@ -60,21 +60,34 @@ module AMQP
     def initialize opts = {}
       @settings = opts
       extend AMQP.client
+
+      @on_disconnect = proc{ raise Error, "Could not connect to server #{opts[:host]}:#{opts[:port]}" }
+
+      timeout @settings[:timeout] if @settings[:timeout]
+      errback{ @on_disconnect.call }
     end
 
     def connection_completed
       log 'connected'
+      @on_disconnect = proc{ raise Error, 'Disconnected from server' }
       @buf = Buffer.new
       send_data HEADER
       send_data [1, 1, VERSION_MAJOR, VERSION_MINOR].pack('C4')
     end
 
+    def unbind
+      log 'disconnected'
+      @on_disconnect.call unless $!
+    end
+
     def add_channel mq
-      channels[ key = (channels.keys.max || 0) + 1 ] = mq
-      key
+      (@_channel_mutex ||= Mutex.new).synchronize do
+        channels[ key = (channels.keys.max || 0) + 1 ] = mq
+        key
+      end
     end
 
-    def channels mq = nil
+    def channels
       @channels ||= {}
     end
   
@@ -111,8 +124,8 @@ module AMQP
       @on_disconnect = on_disconnect if on_disconnect
 
       callback{ |c|
-        if c.channels.keys.any?
-          c.channels.each do |_, mq|
+        if c.channels.any?
+          c.channels.each do |ch, mq|
             mq.close
           end
         else
@@ -123,16 +136,9 @@ module AMQP
         end
       }
     end
-
-    def unbind
-      log 'disconnected'
-    end
   
     def self.connect opts = {}
       opts = AMQP.settings.merge(opts)
-      opts[:host] ||= '127.0.0.1'
-      opts[:port] ||= PORT
-
       EM.connect opts[:host], opts[:port], self, opts
     end
   

data/lib/amqp/spec.rb

@@ -1,6 +1,6 @@
 
-# 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)
+# this file was autogenerated on Fri Aug 01 15:08:30 -0700 2008
+# using amqp-0.8.json    (mtime: Fri Aug 01 15:08:22 -0700 2008)
 #
 # DO NOT EDIT! (edit protocol/codegen.rb instead, and run `rake codegen`)
 
@@ -340,6 +340,8 @@ module AMQP
       class PurgeOk      < Method(  31, :purge_ok       ); end
       class Delete       < Method(  40, :delete         ); end
       class DeleteOk     < Method(  41, :delete_ok      ); end
+      class Unbind       < Method(  50, :unbind         ); end
+      class UnbindOk     < Method(  51, :unbind_ok      ); end
 
       class Declare
         short      :ticket
@@ -392,6 +394,17 @@ module AMQP
         long       :message_count
       end
 
+      class Unbind
+        short      :ticket
+        shortstr   :queue
+        shortstr   :exchange
+        shortstr   :routing_key
+        table      :arguments
+      end
+
+      class UnbindOk
+      end
+
     end
 
     class Basic

data/lib/mq.rb

@@ -43,7 +43,7 @@ class MQ
       if @body.length >= @header.size
         @header.properties.update(@method.arguments)
         @consumer.receive @header, @body
-        @body = ''
+        @body = @header = @consumer = @method = nil
       end
 
     when Frame::Method
@@ -70,25 +70,28 @@ class MQ
         @body = ''
         @consumer = queues[ method.consumer_tag ]
 
-
       when Protocol::Channel::Close
-        raise Error, "#{method.reply_text} in #{Protocol.classes[method.class_id].methods[method.method_id]}"
+        raise Error, "#{method.reply_text} in #{Protocol.classes[method.class_id].methods[method.method_id]} on #{@channel}"
 
       when Protocol::Channel::CloseOk
         @closing = false
         conn.callback{ |c|
-          c.channels.delete(@channel)
-          c.close unless c.channels.keys.any?
+          c.channels.delete @channel
+          c.close if c.channels.empty?
         }
       end
     end
   end
 
-  def send data
-    data.ticket = @ticket if @ticket and data.respond_to? :ticket
+  def send *args
     conn.callback{ |c|
-      log :sending, data
-      c.send data, :channel => @channel
+      (@_send_mutex ||= Mutex.new).synchronize do
+        args.each do |data|
+          data.ticket = @ticket if @ticket and data.respond_to? :ticket=
+          log :sending, data
+          c.send data, :channel => @channel
+        end
+      end
     }
   end
 
@@ -145,10 +148,11 @@ class MQ
   alias :conn :connection
 end
 
-# convenience wrapper for thread-local MQ object
+# convenience wrapper (read: HACK) for thread-local MQ object
 
 class MQ
   def MQ.default
+    # XXX clear this when connection is closed
     Thread.current[:mq] ||= MQ.new
   end
 

data/lib/mq/exchange.rb

@@ -18,16 +18,21 @@ class MQ
 
     def publish data, opts = {}
       @mq.callback{
-        @mq.send Protocol::Basic::Publish.new({ :exchange => name,
-                                                :routing_key => opts.delete(:key) || @key }.merge(opts))
+        out = []
+
+        out << 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 => (opts.delete(:persistent) ? 2 : 1),
-                                                         :priority => 0 }.merge(opts))
-        @mq.send Frame::Body.new(data)
+        out << Protocol::Header.new(Protocol::Basic,
+                                    data.length, { :content_type => 'application/octet-stream',
+                                                   :delivery_mode => (opts.delete(:persistent) ? 2 : 1),
+                                                   :priority => 0 }.merge(opts))
+
+        out << Frame::Body.new(data)
+
+        @mq.send *out
       }
       self
     end

data/lib/mq/logger.rb

@@ -0,0 +1,75 @@
+class MQ
+  class Logger
+    def initialize *args, &block
+      opts = args.pop if args.last.is_a? Hash
+      opts ||= {}
+
+      printer(block) if block
+
+      @prop = opts
+      @tags = ([:timestamp] + args).uniq
+    end
+
+    attr_reader :prop
+    alias :base :prop
+
+    def log severity, *args
+      opts = args.pop if args.last.is_a? Hash and args.size != 1
+      opts ||= {}
+      opts = @prop.clone.update(opts)
+
+      data = args.shift
+
+      data = {:type => :exception,
+              :name => data.class.to_s.intern,
+              :backtrace => data.backtrace,
+              :message => data.message} if data.is_a? Exception
+
+      (@tags + args).each do |tag|
+        tag = tag.to_sym
+        case tag
+        when :timestamp
+          opts.update :timestamp => Time.now
+        when :hostname
+          @hostname ||= { :hostname => `hostname`.strip }
+          opts.update @hostname
+        when :process
+          @process_id ||= { :process_id => Process.pid,
+                            :process_name => $0,
+                            :process_parent_id => Process.ppid,
+                            :thread_id => Thread.current.object_id }
+          opts.update :process => @process_id
+        else
+          (opts[:tags] ||= []) << tag
+        end
+      end
+
+      opts.update(:severity => severity,
+                  :msg => data)
+
+      print(opts)
+      MQ.fanout('logging', :durable => true).publish Marshal.dump(opts)
+
+      opts
+    end
+    alias :method_missing :log
+
+    def print data = nil, &block
+      if block
+        @printer = block
+      elsif data.is_a? Proc
+        @printer = data
+      elsif data
+        (pr = @printer || self.class.printer) and pr.call(data)
+      else
+        @printer
+      end
+    end
+    alias :printer :print
+    
+    def self.printer &block
+      @printer = block if block
+      @printer
+    end
+  end
+end

data/lib/mq/queue.rb

@@ -21,6 +21,25 @@ class MQ
       }
       self
     end
+
+    def unbind exchange, opts = {}
+      @mq.callback{
+        @mq.send Protocol::Queue::Unbind.new({ :queue => name,
+                                               :exchange => exchange.respond_to?(:name) ? exchange.name : exchange,
+                                               :routing_key => opts.delete(:key),
+                                               :nowait => true }.merge(opts))
+      }
+      self
+    end
+
+    def delete opts = {}
+      @mq.callback{
+        @mq.send Protocol::Queue::Delete.new({ :queue => name,
+                                               :nowait => true }.merge(opts))
+      }
+      @mq.queues.delete @name
+      nil
+    end
     
     def subscribe opts = {}, &blk
       @on_msg = blk

data/protocol/amqp-0.8.json

@@ -275,7 +275,18 @@
 			 "name": "delete"},
 			{"id": 41,
 			 "arguments": [{"type": "long", "name": "message-count"}],
-			 "name": "delete-ok"}],
+			 "name": "delete-ok"},
+			{"id": 50,
+			 "arguments": [{"type": "short", "name": "ticket"},
+				       {"type": "shortstr", "name": "queue"},
+				       {"type": "shortstr", "name": "exchange"},
+				       {"type": "shortstr", "name": "routing-key"},
+				       {"type": "table", "name": "arguments"}],
+			 "name": "unbind"},
+			{"id": 51,
+			 "arguments": [],
+			 "name": "unbind-ok"}
+			],
 	    "name": "queue"
 	},
 	{

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: amqp
 version: !ruby/object:Gem::Version 
-  version: 0.5.5
+  version: 0.5.9
 platform: ruby
 authors: 
 - Aman Gupta
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-01 00:00:00 -07:00
+date: 2008-09-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,6 +51,7 @@ files:
 - lib/ext/em.rb
 - lib/ext/emfork.rb
 - lib/mq/exchange.rb
+- lib/mq/logger.rb
 - lib/mq/queue.rb
 - lib/mq/rpc.rb
 - lib/mq.rb