amqp 0.6.5 → 0.6.6

data/amqp.gemspec

@@ -1,11 +1,12 @@
 spec = Gem::Specification.new do |s|
   s.name = 'amqp'
-  s.version = '0.6.5'
-  s.date = '2009-10-27'
+  s.version = '0.6.6'
+  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'
 

data/lib/mq.rb

@@ -199,7 +199,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 +230,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
@@ -734,6 +741,20 @@ class MQ
 
   def prefetch(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.

data/lib/mq/exchange.rb

@@ -194,11 +194,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 +249,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,6 +415,11 @@ 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: amqp
 version: !ruby/object:Gem::Version 
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors: 
 - Aman Gupta
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-27 00:00:00 -07:00
+date: 2009-12-29 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +22,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.12.4
     version: 
-description: AMQP client implementation in Ruby/EventMachine
+description: An implementation of the AMQP protocol in Ruby/EventMachine for writing clients to the RabbitMQ message broker
 email: amqp@tmm1.net
 executables: []
 
@@ -114,8 +114,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.4
+rubyforge_project: amqp
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: AMQP client implementation in Ruby/EventMachine