arvicco-amqp 0.6.10 → 0.6.11

data/HISTORY

@@ -13,3 +13,7 @@
 == 0.6.10 / 2010-11-04
 
 * Bacon tests converted to Rspec
+
+== 0.6.11 / 2010-11-04
+
+* AMQP class behavior specified

data/README.md

@@ -17,7 +17,8 @@ This fork of AMQP contains following improvements:
  * MQ::Exchange#publish raises error if no connection to broker.
  * MQ::Queue only wraps headers with new MQ::Headers if they are not nil. This allows pops to tell more easily when they've requested a message from an empty queue. See (https://github.com/tmm1/amqp/issues#issue/22)
  * Support for receiving Headers with zero-size data packets. Such contents with no body frames are totally legit if indicated header size is zero.
-# * Support for AMQP::Protocol::Basic::Return method. See (https://github.com/tmm1/amqp/issues#issue/1).
+
+TODO: * Support for AMQP::Protocol::Basic::Return method. See (https://github.com/tmm1/amqp/issues#issue/1).
 
 Getting started
 ===============
@@ -86,7 +87,7 @@ AMQP gem resources
 Running specifications suite
 ============================
 
-To run the test suite make sure you have [bacon](http://gemcutter.org/gems/bacon) gem installed and run:
+To run the test suite make sure you have [Rspec2](http://gemcutter.org/gems/rspec) gem installed and run:
 
     rake spec
 

data/TODO

@@ -27,4 +27,6 @@
 - handle connection.redirect during connect (for rabbitmq in distributed mode) [or just set insist to true]
 
 - add amq.queue('name').size{ |num| "#{num} messages in the queue" } (send declare passive, look at declare-ok response)
-- clean up MQ.default on disconnect
+- clean up MQ.default on disconnect
+
+- add proper handling of Basic::Return (:immediate and :mandatory flags)

data/VERSION

@@ -1 +1 @@
-0.6.10
+0.6.11

data/lib/amqp/client.rb

@@ -132,13 +132,6 @@ module AMQP
       send_data data.to_s
     end
 
-    #:stopdoc:
-    # def send_data data
-    #   log 'send_data', data
-    #   super
-    # end
-    #:startdoc:
-
     def close &on_disconnect
       if on_disconnect
         @closing = true

data/lib/mq.rb

@@ -15,7 +15,8 @@ class MQ
   end
 
   # Raised whenever an illegal operation is attempted.
-  class Error < StandardError; end
+  class Error < StandardError;
+  end
 end
 
 # The top-level class for building AMQP clients. This class contains several
@@ -140,13 +141,14 @@ class MQ
 
     @connection = connection || AMQP.start
 
-    conn.callback{ |c|
+    conn.callback { |c|
       @channel = c.add_channel(self)
       send Protocol::Channel::Open.new
     }
   end
+
   attr_reader :channel, :connection
-  
+
   # May raise a MQ::Error exception when the frame payload contains a
   # Protocol::Channel::Close object. 
   #
@@ -160,86 +162,89 @@ class MQ
     log :received, frame
 
     case frame
-    when Frame::Header
-      @header = frame.payload
-      @body = ''
-      check_content_completion
-
-    when Frame::Body
-      @body << frame.payload
-      check_content_completion
-
-    when Frame::Method
-      case method = frame.payload
-      when Protocol::Channel::OpenOk
-        send Protocol::Access::Request.new(:realm => '/data',
-                                           :read => true,
-                                           :write => true,
-                                           :active => true,
-                                           :passive => true)
-
-      when Protocol::Access::RequestOk
-        @ticket = method.ticket
-        callback{
-          send Protocol::Channel::Close.new(:reply_code => 200,
-                                            :reply_text => 'bye',
-                                            :method_id => 0,
-                                            :class_id => 0)
-        } if @closing
-        succeed
-
-      when Protocol::Basic::CancelOk
-        if @consumer = consumers[ method.consumer_tag ]
-          @consumer.cancelled
-        else
-          MQ.error "Basic.CancelOk for invalid consumer tag: #{method.consumer_tag}"
-        end
-
-      when Protocol::Queue::DeclareOk
-        queues[ method.queue ].receive_status method
-
-      when Protocol::Basic::Deliver, Protocol::Basic::GetOk
-        @method = method
-        @header = nil
+      when Frame::Header
+        @header = frame.payload
         @body = ''
-
-        if method.is_a? Protocol::Basic::GetOk
-          @consumer = get_queue{|q| q.shift }
-          MQ.error "No pending Basic.GetOk requests" unless @consumer
-        else
-          @consumer = consumers[ method.consumer_tag ]
-          MQ.error "Basic.Deliver for invalid consumer tag: #{method.consumer_tag}" unless @consumer
-        end
-
-      when Protocol::Basic::GetEmpty
-        if @consumer = get_queue{|q| q.shift }
-          @consumer.receive nil, nil
-        else
-          MQ.error "Basic.GetEmpty for invalid consumer"
+        check_content_completion
+
+      when Frame::Body
+        @body << frame.payload
+        check_content_completion
+
+      when Frame::Method
+        case method = frame.payload
+          when Protocol::Channel::OpenOk
+            send Protocol::Access::Request.new(:realm => '/data',
+                                               :read => true,
+                                               :write => true,
+                                               :active => true,
+                                               :passive => true)
+
+          when Protocol::Access::RequestOk
+            @ticket = method.ticket
+            callback {
+              send Protocol::Channel::Close.new(:reply_code => 200,
+                                                :reply_text => 'bye',
+                                                :method_id => 0,
+                                                :class_id => 0)
+            } if @closing
+            succeed
+
+          when Protocol::Basic::CancelOk
+            if @consumer = consumers[method.consumer_tag]
+              @consumer.cancelled
+            else
+              MQ.error "Basic.CancelOk for invalid consumer tag: #{method.consumer_tag}"
+            end
+
+          when Protocol::Queue::DeclareOk
+            queues[method.queue].receive_status method
+
+          when Protocol::Basic::GetOk
+            @method = method
+            @header = nil
+            @body = ''
+
+            @consumer = get_queue { |q| q.shift }
+            MQ.error "No pending Basic.GetOk requests" unless @consumer
+
+          when Protocol::Basic::Deliver
+            @method = method
+            @header = nil
+            @body = ''
+
+            @consumer = consumers[method.consumer_tag]
+            MQ.error "Basic.Deliver for invalid consumer tag: #{method.consumer_tag}" unless @consumer
+
+          when Protocol::Basic::GetEmpty
+            if @consumer = get_queue { |q| q.shift }
+              @consumer.receive nil, nil
+            else
+              MQ.error "Basic.GetEmpty for invalid consumer"
+            end
+
+          when Protocol::Channel::Close
+            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 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
-
-      when Protocol::Channel::Close
-        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 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
 
   def send *args
-    conn.callback{ |c|
+    conn.callback { |c|
       (@_send_mutex ||= Mutex.new).synchronize do
         args.each do |data|
           data.ticket = @ticket if @ticket and data.respond_to? :ticket=
@@ -770,8 +775,8 @@ class MQ
 
   def get_queue
     if block_given?
-      (@get_queue_mutex ||= Mutex.new).synchronize{
-        yield( @get_queue ||= [] )
+      (@get_queue_mutex ||= Mutex.new).synchronize {
+        yield(@get_queue ||= [])
       }
     end
   end
@@ -799,11 +804,11 @@ class MQ
 
     exs = @exchanges
     @exchanges = {}
-    exs.each{ |_,e| e.reset } if exs
+    exs.each { |_, e| e.reset } if exs
 
     qus = @queues
     @queues = {}
-    qus.each{ |_,q| q.reset } if qus
+    qus.each { |_, q| q.reset } if qus
 
     prefetch(@prefetch_size) if @prefetch_size
   end
@@ -816,7 +821,7 @@ class MQ
 
   def check_content_completion
     if @body.length >= @header.size
-      @header.properties.update(@method.arguments)
+      @header.properties.update(@method.arguments) if @method
       @consumer.receive @header, @body if @consumer
       @body = @header = @consumer = @method = nil
     end

data/lib/mq/queue.rb

@@ -108,7 +108,7 @@ class MQ
     #
     def bind exchange, opts = {}
       exchange = exchange.respond_to?(:name) ? exchange.name : exchange
-      @bindings[exchange] = opts
+      @bindings[exchange] = opts.clone
 
       @mq.callback{
         @mq.send Protocol::Queue::Bind.new({ :queue => name,

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: arvicco-amqp
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 6
-  - 10
-  version: 0.6.10
+  - 11
+  version: 0.6.11
 platform: ruby
 authors: 
 - Aman Gupta