brontes3d-amqp 0.6.4.3 → 0.6.7.1

data/README.md

@@ -0,0 +1,143 @@
+What AMQP gem is
+===================
+
+Simple asynchronous AMQP driver for Ruby/EventMachine
+This library works with Ruby 1.8, Ruby 1.9, JRuby and Rubinius, and is licensed under [the Ruby License](http://www.ruby-lang.org/en/LICENSE.txt).
+
+This library was tested primarily with RabbitMQ, although it should be compatible with any
+server implementing the [AMQP 0-8 spec](http://www.amqp.org/confluence/download/attachments/720900/amqp0-8.pdf).
+
+Getting started
+===============
+
+To use examples with RabbitMQ, first [install the broker](http://www.rabbitmq.com/install.html). If you have Mercurial
+and Erlang/OTP installed, here is how to do it in 4 lines:
+
+    hg clone http://hg.rabbitmq.com/rabbitmq-codegen
+    hg clone http://hg.rabbitmq.com/rabbitmq-server
+    cd rabbitmq-server
+    make run
+
+Then have a look at the various bundled examples:
+
+    ruby examples/mq/pingpong.rb   # 1-1 communication using amq.direct
+    ruby examples/mq/clock.rb      # 1-N communication using amq.fanout
+    ruby examples/mq/stocks.rb     # 1-subscriber communication using amq.topic
+
+    ruby examples/mq/multiclock.rb # header based routing (new rabbitmq feature)
+    ruby examples/mq/ack.rb        # using ack
+    ruby examples/mq/pop.rb        # pop off messages one at a time
+
+    ruby examples/mq/hashtable.rb  # simple async rpc layer
+    ruby examples/mq/primes.rb 4   # parallelized prime number generation
+    ruby examples/mq/logger.rb     # simple logging api
+
+For high level API documentation see MQ class.
+For more details into the lower level AMQP client API, run the simple client example:
+
+    ruby examples/amqp/simple.rb   # low-level AMQP api
+    ruby examples/mq/internal.rb   # low-level Queue/Exchange api
+
+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.
+
+How to use AMQP gem with Ruby on Rails, Merb, Sinatra and other web frameworks
+==============================================================================
+
+To use AMQP gem from web applications, you would need to have EventMachine reactor running.
+If you use [Thin](http://code.macournoyer.com/thin/), you are set: Thin uses EventMachine under
+the hook.
+
+With other web servers, you need to start EventMachine reactor in it's own thread like this:
+
+    Thread.new { EM.run }
+
+because otherwise EventMachine will block current thread. Then connect to AMQP broker:
+
+    AMQP.connect(:host => "localhost", :user => "guest", :pass => "guest", :vhost => "/")
+
+In a Ruby on Rails app, probably the best place for this code is initializer
+(like config/initializers/amqp.rb). For Merb apps, it is config/init.rb. For
+Sinatra and pure Rack applications, place it next to other configuration
+code.
+
+Same separate thread technique can be used to make EventMachine play nicely with other
+libraries that would block current thread (like [File::Tail](http://rubygems.org/gems/file-tail)).
+
+AMQP gem mailing list
+==============================
+
+* [AMQP gem mailing list](http://groups.google.com/group/ruby-amqp)
+* [AMQP gem at GitHub](http://github.com/tmm1/amqp)
+* [AMQP gem at Gemcutter](http://rubygems.org/gems/amqp)
+
+Running specifications suite
+============================
+
+To run the test suite make sure you have [bacon](http://gemcutter.org/gems/bacon) gem installed and run:
+
+    rake spec
+
+The lib/amqp/spec.rb file is generated automatically based on the [AMQP specification](http://www.amqp.org/confluence/display/AMQP/AMQP+Specification). To generate it:
+
+    rake codegen
+
+Credits and more information
+============================
+
+(c) 2008—2010 [Aman Gupta](http://github.com/tmm1) (tmm1)
+
+This project was inspired by [py-amqplib](http://barryp.org/software/py-amqplib/), [rabbitmq](http://rabbitmq.com), [qpid](http://qpid.apache.org/) and [rubbyt](http://github.com/rubbyt/rubbyt).
+Special thanks to Dmitriy Samovskiy, Ben Hood and Tony Garnock-Jones.
+
+AMQP brokers
+------------
+
+ * [RabbitMQ](http://rabbitmq.com) (Rabbit Technologies, Erlang/OTP, MPL)
+ * [ZeroMQ](http://www.zeromq.org) (iMatix/FastMQ/Intel, C++, GPL3)
+ * [OpenAMQ](http://openamq.org) (iMatix, C, GPL2)
+ * [ActiveMQ](http://activemq.apache.org) (Apache Foundation, Java, Apache2)
+
+AMQP resources
+--------------
+
+ * Steve Vinoski [explains AMQP](http://steve.vinoski.net/pdf/IEEE-Advanced_Message_Queuing_Protocol.pdf) in his column, Towards Integration
+
+ * 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)
+
+ * Pieter Hintjens's [background to AMQP](http://www.openamq.org/doc:amqp-background)
+
+ * Barry Pederson's [py-amqplib](http://barryp.org/software/py-amqplib/)
+
+ * Ben Hood on [writing an AMQP client](http://hopper.squarespace.com/blog/2008/6/21/build-your-own-amqp-client.html)
+
+ * Dmitriy Samovskiy introduces [Ruby + QPid + RabbitMQ](http://somic-org.homelinux.org/blog/2008/06/24/ruby-amqp-rabbitmq-example/)
+
+ * Ben Hood's [as3-amqp](http://github.com/0x6e6562/as3-amqp) ([two](http://hopper.squarespace.com/blog/2008/7/4/server-side-as3.html), [three](http://hopper.squarespace.com/blog/2008/3/24/as3-amqp-client-first-cut.html))
+
+ * RabbitMQ's [AMQP protocol code generator](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) (and on the [LShift blog](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 and Merb: [One](http://jaikoo.com/2007/9/4/didn-t-you-get-the-memo), [Two](http://jaikoo.com/2008/2/29/friday-round-up-2008-02-29), [Three](http://jaikoo.com/2008/3/14/oh-hai-rabbitmq), [Four](http://jaikoo.com/2008/3/20/daemonize-rabbitmq)
+
+ * Open Enterprise's series on messaging middleware and AMQP: [Part 1](http://www1.interopsystems.com/analysis/can-amqp-break-ibms-mom-monopoly-part-1.html), [Part 2](http://www1.interopsystems.com/analysis/can-amqp-break-ibms-mom-monopoly-part-2.html), [Part 3](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](http://www.cs.vu.nl/~ast/publications/euteco-1988.pdf)
+
+ * [A Note on Distributed Computing](http://research.sun.com/techrep/1994/smli_tr-94-29.pdf)
+
+ * [Convenience Over Correctness](http://steve.vinoski.net/pdf/IEEE-Convenience_Over_Correctness.pdf)
+
+ * [Metaprotocol Taxonomy and Communications Patterns](http://hessian.caucho.com/doc/metaprotocol-taxonomy.xtp)
+
+ * 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/Rakefile

@@ -1,16 +1,22 @@
+desc "Generate AMQP specification classes"
 task :codegen do
   sh 'ruby protocol/codegen.rb > lib/amqp/spec.rb'
   sh 'ruby lib/amqp/spec.rb'
 end
 
+desc "Run spec suite (uses bacon gem)"
 task :spec do
   sh 'bacon lib/amqp.rb'
 end
 
+desc "Build the gem"
 task :gem do
   sh 'gem build *.gemspec'
 end
 
+desc "Synonym for gem"
 task :pkg => :gem
+desc "Synonym for gem"
 task :package => :gem
-task :default => :spec
+
+task :default => :spec

data/amqp.gemspec

@@ -1,17 +1,20 @@
+require File.expand_path('../lib/amqp/version', __FILE__)
+
 spec = Gem::Specification.new do |s|
   s.name = 'amqp'
-  s.version = '0.6.4.3'
-  s.date = '2009-01-09'
+  s.version = AMQP::VERSION
+  s.date = '2009-12-29'
   s.summary = 'AMQP client implementation in Ruby/EventMachine'
   s.email = "amqp@tmm1.net"
   s.homepage = "http://amqp.rubyforge.org/"
-  s.description = "AMQP client implementation in Ruby/EventMachine"
+  s.rubyforge_project = 'amqp'
+  s.description = "An implementation of the AMQP protocol in Ruby/EventMachine for writing clients to the RabbitMQ message broker"
   s.has_rdoc = true
   s.rdoc_options = '--include=examples'
 
   # ruby -rpp -e' pp `git ls-files`.split("\n").grep(/^(doc|README)/) '
   s.extra_rdoc_files = [
-    "README",
+    "README.md",
     "doc/EXAMPLE_01_PINGPONG",
     "doc/EXAMPLE_02_CLOCK",
     "doc/EXAMPLE_03_STOCKS",
@@ -26,7 +29,7 @@ spec = Gem::Specification.new do |s|
 
   # ruby -rpp -e' pp `git ls-files`.split("\n") '
   s.files = [
-    "README",
+    "README.md",
     "Rakefile",
     "amqp.gemspec",
     "amqp.todo",
@@ -50,6 +53,7 @@ spec = Gem::Specification.new do |s|
     "examples/mq/primes.rb",
     "examples/mq/stocks.rb",
     "lib/amqp.rb",
+    "lib/amqp/version.rb",
     "lib/amqp/buffer.rb",
     "lib/amqp/client.rb",
     "lib/amqp/frame.rb",
@@ -57,7 +61,6 @@ spec = Gem::Specification.new do |s|
     "lib/amqp/server.rb",
     "lib/amqp/spec.rb",
     "lib/ext/blankslate.rb",
-    "lib/ext/em.rb",
     "lib/ext/emfork.rb",
     "lib/mq.rb",
     "lib/mq/exchange.rb",

data/bacon/client.rb

@@ -1,5 +1,7 @@
 # this is the bacon spec for AMQP client
 # you can find other specs inline in frame.rb, buffer.rb and protocol.rb
+# to run just 1 test use:
+# bacon lib/amqp.rb --name "should ..."
 # this one couldn't be written in line because:
 # due to the load order 'AMQP' isn't completely defined yet when Client is loaded
 require 'mocha'
@@ -14,6 +16,7 @@ describe Client do
     AMQP.instance_eval{ @closing = false }
     Client.class_eval{ @retry_count = 0 }
     Client.class_eval{ @server_to_select = 0 }
+    EM.instance_eval{ @next_tick_queue = nil }
   end
   
   should 'reconnect on disconnect after connection_completed (use reconnect_timer)' do
@@ -71,7 +74,7 @@ describe Client do
     end
   end
   
-  should "use fallback servers on reconnect" do
+  should "use fallback servers on reconnect without connection_completed" do
     @times_connected = 0
     @connect_args = []
 
@@ -291,5 +294,24 @@ describe Client do
     @amqp_conn.should == @client
   end
   
+  should "send Heartbeat frames based on keepalive interval" do
+    @stuff_sent = []
+    EventMachine.stubs(:connect_server).returns(99).with do |arg1, arg2| 
+      EM.next_tick do
+        @client = EM.class_eval{ @conns }[99]
+        @amqp_conn = AMQP.class_eval{ @conn }
+        @client.stubs(:send).returns(true).with do |what_to_send|
+          @stuff_sent << what_to_send.class
+          true
+        end
+        @client.connection_completed
+      end
+      true
+    end
+    EM.next_tick{ EM.add_timer(0.5){ EM.stop_event_loop } }
+    AMQP.start(:host => 'nonexistanthost', :keepalive => 0.2)
+    @stuff_sent.should == [AMQP::Frame::Heartbeat, AMQP::Frame::Heartbeat]
+  end
+  
   
 end

data/lib/amqp.rb

@@ -1,16 +1,22 @@
-module AMQP
-  VERSION = '0.5.9'
-
-  DIR = File.expand_path(File.dirname(File.expand_path(__FILE__)))
-  $:.unshift DIR
-  
-  require 'ext/em'
-  require 'ext/blankslate'
-  
-  %w[ buffer spec protocol frame client ].each do |file|
-    require "amqp/#{file}"
+unless defined?(EM)
+  begin
+    require 'eventmachine'
+  rescue LoadError
+    require 'rubygems'
+    require 'eventmachine'
   end
+end
+
+library_root = File.expand_path("..", __FILE__)
+$LOAD_PATH << library_root unless $LOAD_PATH.include?(library_root)
+require 'ext/emfork'
+require 'ext/blankslate'
 
+%w[ version buffer spec protocol frame client ].each do |file|
+  require "amqp/#{file}"
+end
+
+module AMQP
   class << self
     @logging = false
     attr_accessor :logging
@@ -81,7 +87,7 @@ module AMQP
   # block. See the code examples in MQ for details.
   #
   def self.start *args, &blk
-    EM.run{
+    EM.run {
       @conn ||= connect *args
       @conn.callback(&blk) if blk
       @conn
@@ -91,11 +97,11 @@ module AMQP
   class << self
     alias :run :start
   end
-  
+
   def self.stop
     if @conn and not @closing
       @closing = true
-      @conn.close{
+      @conn.close {
         yield if block_given?
         @conn = nil
         @closing = false

data/lib/amqp/client.rb

@@ -95,6 +95,12 @@ module AMQP
       @buf = Buffer.new
       send_data HEADER
       send_data [1, 1, VERSION_MAJOR, VERSION_MINOR].pack('C4')
+      
+      if @settings[:keepalive]
+        EM.add_periodic_timer(@settings[:keepalive]) do
+          send Frame::Heartbeat.new
+        end
+      end
     end
 
     def connected?

data/lib/amqp/frame.rb

@@ -121,4 +121,4 @@ if $0 =~ /bacon/ or $0 == __FILE__
       copy.should == orig
     end
   end
-end
+end

data/lib/amqp/protocol.rb

@@ -8,9 +8,9 @@ module AMQP
       def initialize *args
         opts = args.pop if args.last.is_a? Hash
         opts ||= {}
-        
+
         @debug = 1 # XXX hack, p(obj) == '' if no instance vars are set
-        
+
         if args.size == 1 and args.first.is_a? Buffer
           buf = args.shift
         else
@@ -209,4 +209,4 @@ if $0 =~ /bacon/ or $0 == __FILE__
       Protocol::Header.new(orig.to_binary).should == orig
     end
   end
-end
+end

data/lib/amqp/server.rb

@@ -96,4 +96,4 @@ if __FILE__ == $0
   EM.run{
     AMQP::Server.start
   }
-end
+end

data/lib/amqp/version.rb

@@ -0,0 +1,10 @@
+# Generally this kind of guard is a sign of a bad require, and that is
+# arguably true here as well. amqp.gemspec requires this file, but later
+# we want people to be able to require 'amqp/version' without getting a warning.
+# On the other hand, we aren't in the load path when the gemspec is evaluated,
+# so we can't use a relative require there.
+unless defined?(::AMQP::VERSION)
+  module AMQP
+    VERSION = '0.6.7.1'
+  end
+end

data/lib/mq.rb

@@ -1,7 +1,6 @@
 #:main: README
 #
 
-$:.unshift File.expand_path(File.dirname(File.expand_path(__FILE__)))
 require 'amqp'
 
 class MQ
@@ -199,7 +198,7 @@ class MQ
         end
 
       when Protocol::Queue::DeclareOk
-        queues[ method.queue ].recieve_status method
+        queues[ method.queue ].receive_status method
 
       when Protocol::Basic::Deliver, Protocol::Basic::GetOk
         @method = method
@@ -230,6 +229,13 @@ class MQ
           c.channels.delete @channel
           c.close if c.channels.empty?
         }
+
+      when Protocol::Basic::ConsumeOk
+        if @consumer = consumers[ method.consumer_tag ]
+          @consumer.confirm_subscribe
+        else
+          MQ.error "Basic.ConsumeOk for invalid consumer tag: #{method.consumer_tag}"
+        end
       end
     end
   end
@@ -733,7 +739,22 @@ class MQ
   end
 
   def prefetch(size)
+    @prefetch_size = size
     send Protocol::Basic::Qos.new(:prefetch_size => 0, :prefetch_count => size, :global => false)
+    self
+  end
+
+  # Asks the broker to redeliver all unacknowledged messages on this
+  # channel.
+  #
+  # * requeue (default false)
+  # If this parameter is false, the message will be redelivered to the original recipient.
+  # If this flag is true, the server will attempt to requeue the message, potentially then
+  # delivering it to an alternative subscriber.
+  #
+  def recover requeue = false
+    send Protocol::Basic::Recover.new(:requeue => requeue)
+    self
   end
 
   # Returns a hash of all the exchange proxy objects.
@@ -786,6 +807,8 @@ class MQ
     qus = @queues
     @queues = {}
     qus.each{ |_,q| q.reset } if qus
+
+    prefetch(@prefetch_size) if @prefetch_size
   end
 
   private
@@ -820,4 +843,4 @@ class MQ
   def MQ.id
     Thread.current[:mq_id] ||= "#{`hostname`.strip}-#{Process.pid}-#{Thread.current.object_id}"
   end
-end
+end

data/lib/mq/exchange.rb

@@ -183,6 +183,16 @@ class MQ
     # not wait for a reply method.  If the server could not complete the
     # method it will raise a channel or connection exception.
     #
+    # * :no_declare => true | false (default false)
+    # If set, the exchange will not be declared to the
+    # AMQP broker at instantiation-time. This allows the AMQP
+    # client to send messages to exchanges that were
+    # already declared by someone else, e.g. if the client
+    # does not have sufficient privilege to declare (create)
+    # an exchange. Use with caution, as binding to an exchange
+    # with the no-declare option causes your system to become
+    # sensitive to the ordering of clients' actions!
+    #
     # == Exceptions
     # Doing any of these activities are illegal and will raise MQ:Error.
     # * redeclare an already-declared exchange to a different type
@@ -194,11 +204,13 @@ class MQ
       @mq.exchanges[@name = name] ||= self
       @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 == ''
+      unless name == "amq.#{type}" or name == '' or opts[:no_declare]
+        @mq.callback{
+          @mq.send Protocol::Exchange::Declare.new({ :exchange => name,
+                                                     :type => type,
+                                                     :nowait => true }.merge(opts))
+        }
+      end
     end
     attr_reader :name, :type, :key
 
@@ -247,13 +259,13 @@ class MQ
         out = []
 
         out << Protocol::Basic::Publish.new({ :exchange => name,
-                                              :routing_key => opts.delete(:key) || @key }.merge(opts))
+                                              :routing_key => opts[:key] || @key }.merge(opts))
 
         data = data.to_s
 
         out << Protocol::Header.new(Protocol::Basic,
                                     data.length, { :content_type => 'application/octet-stream',
-                                                   :delivery_mode => (opts.delete(:persistent) ? 2 : 1),
+                                                   :delivery_mode => (opts[:persistent] ? 2 : 1),
                                                    :priority => 0 }.merge(opts))
 
         out << Frame::Body.new(data)

data/lib/mq/queue.rb

@@ -113,7 +113,7 @@ class MQ
       @mq.callback{
         @mq.send Protocol::Queue::Bind.new({ :queue => name,
                                              :exchange => exchange,
-                                             :routing_key => opts.delete(:key),
+                                             :routing_key => opts[:key],
                                              :nowait => true }.merge(opts))
       }
       self
@@ -140,7 +140,7 @@ class MQ
       @mq.callback{
         @mq.send Protocol::Queue::Unbind.new({ :queue => name,
                                                :exchange => exchange,
-                                               :routing_key => opts.delete(:key),
+                                               :routing_key => opts[:key],
                                                :nowait => true }.merge(opts))
       }
       self
@@ -175,6 +175,16 @@ class MQ
       nil
     end
 
+    # Purge all messages from the queue.
+    #
+    def purge opts = {}
+      @mq.callback{
+        @mq.send Protocol::Queue::Purge.new({ :queue => name,
+                                              :nowait => true }.merge(opts))
+      }
+      nil
+    end
+
     # This method provides a direct access to the messages in a queue
     # using a synchronous dialogue that is designed for specific types of
     # application where synchronous functionality is more important than
@@ -240,7 +250,7 @@ class MQ
           q.push(self)
           @mq.send Protocol::Basic::Get.new({ :queue => name,
                                               :consumer_tag => name,
-                                              :no_ack => !opts.delete(:ack),
+                                              :no_ack => !opts[:ack],
                                               :nowait => true }.merge(opts))
         }
       }
@@ -296,6 +306,12 @@ class MQ
     # not wait for a reply method.  If the server could not complete the
     # method it will raise a channel or connection exception.
     #
+    # * :confirm => proc (default nil)
+    # If set, this proc will be called when the server confirms subscription
+    # to the queue with a ConsumeOk message. Setting this option will
+    # automatically set :nowait => false. This is required for the server
+    # to send a confirmation.
+    #
     def subscribe opts = {}, &blk
       @consumer_tag = "#{name}-#{Kernel.rand(999_999_999_999)}"
       @mq.consumers[@consumer_tag] = self
@@ -304,11 +320,12 @@ class MQ
 
       @on_msg = blk
       @on_msg_opts = opts
+      opts[:nowait] = false if (@on_confirm_subscribe = opts[:confirm])
 
       @mq.callback{
         @mq.send Protocol::Basic::Consume.new({ :queue => name,
                                                 :consumer_tag => @consumer_tag,
-                                                :no_ack => !opts.delete(:ack),
+                                                :no_ack => !opts[:ack],
                                                 :nowait => true }.merge(opts))
       }
       self
@@ -336,7 +353,6 @@ class MQ
     # method it will raise a channel or connection exception.
     #
     def unsubscribe opts = {}, &blk
-      @on_msg = nil
       @on_cancel = blk
       @mq.callback{
         @mq.send Protocol::Basic::Cancel.new({ :consumer_tag => @consumer_tag }.merge(opts))
@@ -391,7 +407,7 @@ class MQ
       self
     end
 
-    def recieve_status declare_ok
+    def receive_status declare_ok
       if @on_status
         m, c = declare_ok.message_count, declare_ok.consumer_count
         @on_status.call *(@on_status.arity == 1 ? [m] : [m, c])
@@ -399,10 +415,16 @@ class MQ
       end
     end
 
+    def confirm_subscribe
+      @on_confirm_subscribe.call if @on_confirm_subscribe
+      @on_confirm_subscribe = nil
+    end
+
     def cancelled
       @on_cancel.call if @on_cancel
       @on_cancel = @on_msg = nil
       @mq.consumers.delete @consumer_tag
+      @mq.queues.delete(@name) if @opts[:auto_delete]
       @consumer_tag = nil
     end
 

data/lib/mq/rpc.rb

@@ -30,14 +30,14 @@ class MQ
     #
     # Marshalling and unmarshalling the objects is handled internally. This
     # marshalling is subject to the same restrictions as defined in the
-    # Marshal[http://ruby-doc.org/core/classes/Marshal.html] standard 
+    # Marshal[http://ruby-doc.org/core/classes/Marshal.html] standard
     # library. See that documentation for further reference.
     #
-    # When the optional object is not passed, the returned rpc reference is 
-    # used to send messages and arguments to the queue. See #method_missing 
-    # which does all of the heavy lifting with the proxy. Some client 
-    # elsewhere must call this method *with* the optional block so that 
-    # there is a valid destination. Failure to do so will just enqueue 
+    # When the optional object is not passed, the returned rpc reference is
+    # used to send messages and arguments to the queue. See #method_missing
+    # which does all of the heavy lifting with the proxy. Some client
+    # elsewhere must call this method *with* the optional block so that
+    # there is a valid destination. Failure to do so will just enqueue
     # marshalled messages that are never consumed.
     #
     def initialize mq, queue, obj = nil
@@ -53,7 +53,7 @@ class MQ
                else
                  obj
                end
-        
+
         @mq.queue(queue).subscribe(:ack=>true){ |info, request|
           method, *args = ::Marshal.load(request)
           ret = @obj.__send__(method, *args)
@@ -67,7 +67,7 @@ class MQ
       else
         @callbacks ||= {}
         # XXX implement and use queue(nil)
-        @queue = @mq.queue(@name = "random identifier #{::Kernel.rand(999_999_999_999)}").subscribe{|info, msg|
+        @queue = @mq.queue(@name = "random identifier #{::Kernel.rand(999_999_999_999)}", :auto_delete => true).subscribe{|info, msg|
           if blk = @callbacks.delete(info.message_id)
             blk.call ::Marshal.load(msg)
           end
@@ -97,4 +97,4 @@ class MQ
       @remote.publish(::Marshal.dump([meth, *args]), :reply_to => blk ? @name : nil, :message_id => message_id)
     end
   end
-end
+end

metadata

@@ -1,35 +1,49 @@
 --- !ruby/object:Gem::Specification 
 name: brontes3d-amqp
 version: !ruby/object:Gem::Version 
-  version: 0.6.4.3
+  hash: 97
+  prerelease: false
+  segments: 
+  - 0
+  - 6
+  - 7
+  - 1
+  version: 0.6.7.1
 platform: ruby
 authors: 
 - Aman Gupta
+- Jacob Burkhart
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-01-09 00:00:00 -08:00
+date: 2010-06-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 39
+        segments: 
+        - 0
+        - 12
+        - 4
         version: 0.12.4
-    version: 
-description: AMQP client implementation in Ruby/EventMachine
-email: amqp@tmm1.net
+  type: :runtime
+  version_requirements: *id001
+description: An implementation of the AMQP protocol in Ruby/EventMachine for writing clients to the RabbitMQ message broker
+email: jacob@brontes3d.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- README
+- README.md
 - doc/EXAMPLE_01_PINGPONG
 - doc/EXAMPLE_02_CLOCK
 - doc/EXAMPLE_03_STOCKS
@@ -38,7 +52,7 @@ extra_rdoc_files:
 - doc/EXAMPLE_05_POP
 - doc/EXAMPLE_06_HASHTABLE
 files: 
-- README
+- README.md
 - Rakefile
 - amqp.gemspec
 - amqp.todo
@@ -62,6 +76,7 @@ files:
 - examples/mq/primes.rb
 - examples/mq/stocks.rb
 - lib/amqp.rb
+- lib/amqp/version.rb
 - lib/amqp/buffer.rb
 - lib/amqp/client.rb
 - lib/amqp/frame.rb
@@ -69,7 +84,6 @@ files:
 - lib/amqp/server.rb
 - lib/amqp/spec.rb
 - lib/ext/blankslate.rb
-- lib/ext/em.rb
 - lib/ext/emfork.rb
 - lib/mq.rb
 - lib/mq/exchange.rb
@@ -93,30 +107,38 @@ files:
 - research/primes-threaded.rb
 - bacon/client.rb
 has_rdoc: true
-homepage: http://amqp.rubyforge.org/
+homepage: http://github.com/brontes3d/amqp
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --include=examples
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.2.0
+rubyforge_project: amqp
+rubygems_version: 1.3.7
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: AMQP client implementation in Ruby/EventMachine
 test_files: []
 

data/README

@@ -1,128 +0,0 @@
-Simple AMQP driver for Ruby/EventMachine
-  (c) 2008 Aman Gupta (tmm1)
- 
-  http://github.com/tmm1/amqp
-  http://rubyforge.org/projects/amqp
-  http://hopper.squarespace.com/blog/2008/7/22/simple-amqp-library-for-ruby.html
-  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.
-
-To use with RabbitMQ, first run the server:
-
-  hg clone http://hg.rabbitmq.com/rabbitmq-codegen
-  hg clone http://hg.rabbitmq.com/rabbitmq-server
-  cd rabbitmq-server
-  make run
-
-To get started, refer to the various bundled examples:
-
-  ruby examples/mq/pingpong.rb   # 1-1 communication using amq.direct
-  ruby examples/mq/clock.rb      # 1-N communication using amq.fanout
-  ruby examples/mq/stocks.rb     # 1-subscriber communication using amq.topic
-
-  ruby examples/mq/multiclock.rb # header based routing (new rabbitmq feature)
-  ruby examples/mq/ack.rb        # using ack
-  ruby examples/mq/pop.rb        # pop off messages one at a time
-
-  ruby examples/mq/hashtable.rb  # simple async rpc layer
-  ruby examples/mq/primes.rb 4   # parallelized prime number generation
-  ruby examples/mq/logger.rb     # simple logging api
-
-For more details into the lower level AMQP client API, run the simple client example:
-
-  ruby examples/amqp/simple.rb   # low-level AMQP api
-  ruby examples/mq/internal.rb   # low-level Queue/Exchange api
-
-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
-
-The lib/amqp/spec.rb file is generated automatically based on the AMQP specification. To generate it:
-
-  rake codegen
-
-This project was inspired by py-amqplib, rabbitmq, qpid and rubbyt.
-Special thanks to Dmitriy Samovskiy, Ben Hood and Tony Garnock-Jones.
-
-AMQP resources:
-
-  Servers:
-    RabbitMQ (Rabbit Technologies, Erlang/OTP, MPL) - http://rabbitmq.com
-    ZeroMQ   (iMatix/FastMQ/Intel, C++, GPL3)       - http://www.zeromq.org
-    OpenAMQ  (iMatix, C, GPL2)                      - http://openamq.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
-
-  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
-
-  Pieter Hintjens's background to AMQP
-    http://www.openamq.org/doc:amqp-background
-
-  Barry Pederson's py-amqplib
-    http://barryp.org/software/py-amqplib/
-
-  Ben Hood on writing an AMQP client
-    http://hopper.squarespace.com/blog/2008/6/21/build-your-own-amqp-client.html
-
-  Dmitriy Samovskiy introduces Ruby + QPid + RabbitMQ
-    http://somic-org.homelinux.org/blog/2008/06/24/ruby-amqp-rabbitmq-example/
-
-  Ben Hood's as3-amqp
-    http://github.com/0x6e6562/as3-amqp
-    http://hopper.squarespace.com/blog/2008/7/4/server-side-as3.html
-    http://hopper.squarespace.com/blog/2008/3/24/as3-amqp-client-first-cut.html
-
-  RabbitMQ's protocol code generator
-    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
-    http://jaikoo.com/2008/3/20/daemonize-rabbitmq
-    http://jaikoo.com/2008/3/14/oh-hai-rabbitmq
-    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
-    http://www.cs.vu.nl/~ast/publications/euteco-1988.pdf
-
-  A Note on Distributed Computing
-    http://research.sun.com/techrep/1994/smli_tr-94-29.pdf
-
-  Convenience Over Correctness
-    http://steve.vinoski.net/pdf/IEEE-Convenience_Over_Correctness.pdf
-
-  Metaprotocol Taxonomy and Communications Patterns
-    http://hessian.caucho.com/doc/metaprotocol-taxonomy.xtp
-
-  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/lib/ext/em.rb

@@ -1,51 +0,0 @@
-begin
-  require 'eventmachine'
-rescue LoadError
-  require 'rubygems'
-  require 'eventmachine'
-end
-
-#:stopdoc:
-
-if EM::VERSION < '0.12.2'
-    
-  def EventMachine::run blk=nil, tail=nil, &block
-    @tails ||= []
-    tail and @tails.unshift(tail)
-
-    if reactor_running?
-      (b = blk || block) and b.call # next_tick(b)
-    else
-      @conns = {}
-      @acceptors = {}
-      @timers = {}
-      begin
-        @reactor_running = true
-        initialize_event_machine
-        (b = blk || block) and add_timer(0, b)
-        run_machine
-      ensure
-        release_machine
-        @reactor_running = false
-      end
-
-      until @tails.empty?
-        @tails.pop.call
-      end
-    end
-  end
-
-  def EventMachine::fork_reactor &block
-    Kernel.fork do
-      if self.reactor_running?
-        self.stop_event_loop
-        self.release_machine
-        self.instance_variable_set( '@reactor_running', false )
-      end
-      self.run block
-    end
-  end
-
-end
-
-require 'ext/emfork'