tmm1-amqp 0.6.1 → 0.6.3

data/amqp.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'amqp'
-  s.version = '0.6.1'
+  s.version = '0.6.3'
   s.date = '2009-01-09'
   s.summary = 'AMQP client implementation in Ruby/EventMachine'
   s.email = "amqp@tmm1.net"

data/lib/amqp.rb

@@ -38,7 +38,10 @@ module AMQP
       :timeout => nil,
 
       # logging
-      :logging => false
+      :logging => false,
+
+      # ssl
+      :ssl => false
     }
   end
 

data/lib/amqp/client.rb

@@ -9,7 +9,7 @@ module AMQP
         mq.process_frame(frame)
         return
       end
-      
+
       case frame
       when Frame::Method
         case method = frame.payload
@@ -49,7 +49,7 @@ module AMQP
   def self.client
     @client ||= BasicClient
   end
-  
+
   def self.client= mod
     mod.__send__ :include, AMQP
     @client = mod
@@ -66,22 +66,34 @@ module AMQP
 
       timeout @settings[:timeout] if @settings[:timeout]
       errback{ @on_disconnect.call } unless @reconnecting
+
+      @connected = false
     end
 
     def connection_completed
+      start_tls if @settings[:ssl]
       log 'connected'
       # @on_disconnect = proc{ raise Error, 'Disconnected from server' }
       unless @closing
-        @on_disconnect = method(:reconnect)
+        @on_disconnect = method(:disconnected)
         @reconnecting = false
       end
+
+      @connected = true
+      @connection_status.call(:connected) if @connection_status
+
       @buf = Buffer.new
       send_data HEADER
       send_data [1, 1, VERSION_MAJOR, VERSION_MINOR].pack('C4')
     end
 
+    def connected?
+      @connected
+    end
+
     def unbind
       log 'disconnected'
+      @connected = false
       EM.next_tick{ @on_disconnect.call }
     end
 
@@ -95,7 +107,7 @@ module AMQP
     def channels
       @channels ||= {}
     end
-  
+
     def receive_data data
       # log 'receive_data', data
       @buf << data
@@ -110,7 +122,7 @@ module AMQP
       # this is a stub meant to be
       # replaced by the module passed into initialize
     end
-  
+
     def send data, opts = {}
       channel = opts[:channel] ||= 0
       data = data.to_frame(channel) unless data.is_a? Frame
@@ -176,9 +188,18 @@ module AMQP
       opts = AMQP.settings.merge(opts)
       EM.connect opts[:host], opts[:port], self, opts
     end
-  
+
+    def connection_status &blk
+      @connection_status = blk
+    end
+
     private
-  
+
+    def disconnected
+      @connection_status.call(:disconnected) if @connection_status
+      reconnect
+    end
+
     def log *args
       return unless @settings[:logging] or AMQP.logging
       require 'pp'

data/lib/ext/emfork.rb

@@ -46,7 +46,7 @@ def EM.fork num = 1, &blk
 end
 
 def EM.forks
-  @forks.keys
+  @forks ? @forks.keys : []
 end
 
 if EMFORK

data/lib/mq.rb

@@ -145,7 +145,7 @@ class MQ
       send Protocol::Channel::Open.new
     }
   end
-  attr_reader :channel
+  attr_reader :channel, :connection
   
   # May raise a MQ::Error exception when the frame payload contains a
   # Protocol::Channel::Close object. 
@@ -732,6 +732,10 @@ class MQ
     end
   end
 
+  def prefetch(size)
+    send Protocol::Basic::Qos.new(:prefetch_size => 0, :prefetch_count => size, :global => false)
+  end
+
   # Returns a hash of all the exchange proxy objects.
   #
   # Not typically called by client code.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tmm1-amqp
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.6.3
 platform: ruby
 authors: 
 - Aman Gupta