fotonauts-amqp 0.6.1 → 0.6.4

data/amqp.gemspec

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

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,6 +66,8 @@ module AMQP
 
       timeout @settings[:timeout] if @settings[:timeout]
       errback{ @on_disconnect.call } unless @reconnecting
+
+      @connected = false
     end
 
     def connection_completed
@@ -73,16 +75,25 @@ module AMQP
       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
 
@@ -96,7 +107,7 @@ module AMQP
     def channels
       @channels ||= {}
     end
-  
+
     def receive_data data
       # log 'receive_data', data
       @buf << data
@@ -111,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
@@ -177,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/amqp/protocol.rb

@@ -32,7 +32,7 @@ module AMQP
 
       def to_binary
         buf = Buffer.new
-        buf.write :short, self.class.parent.id
+        buf.write :short, self.class.section.id
         buf.write :short, self.class.id
 
         bits = []

data/lib/amqp/spec.rb

@@ -1,6 +1,6 @@
 
 #:stopdoc:
-# this file was autogenerated on Sat Jan 03 14:05:57 -0600 2009
+# this file was autogenerated on Thu Jul 09 15:17:33 -0700 2009
 # using amqp-0.8.json    (mtime: Sat Jan 03 08:58:13 -0600 2009)
 #
 # DO NOT EDIT! (edit protocol/codegen.rb instead, and run `rake codegen`)
@@ -96,9 +96,9 @@ module AMQP
           
           def arguments() @arguments ||= [] end
 
-          def parent() Protocol.const_get(self.to_s[/Protocol::(.+?)::/,1]) end
-          def id()     self::ID end
-          def name()   self::NAME end
+          def section() Protocol.const_get(self.to_s[/Protocol::(.+?)::/,1]) end
+          def id()      self::ID end
+          def name()    self::NAME end
         end
 
         def == b
@@ -117,8 +117,8 @@ module AMQP
             def self.inherited klass
               klass.const_set(:ID, #{id})
               klass.const_set(:NAME, :#{name.to_s})
-              klass.parent.methods[#{id}] = klass
-              klass.parent.methods[klass::NAME] = klass
+              klass.section.methods[#{id}] = klass
+              klass.section.methods[klass::NAME] = klass
             end
           ]
         end

data/protocol/codegen.rb

@@ -90,9 +90,9 @@ puts ERB.new(%q[
             
             def arguments() @arguments ||= [] end
 
-            def parent() Protocol.const_get(self.to_s[/Protocol::(.+?)::/,1]) end
-            def id()     self::ID end
-            def name()   self::NAME end
+            def section() Protocol.const_get(self.to_s[/Protocol::(.+?)::/,1]) end
+            def id()      self::ID end
+            def name()    self::NAME end
           end
 
           def == b
@@ -111,8 +111,8 @@ puts ERB.new(%q[
               def self.inherited klass
                 klass.const_set(:ID, #{id})
                 klass.const_set(:NAME, :#{name.to_s})
-                klass.parent.methods[#{id}] = klass
-                klass.parent.methods[klass::NAME] = klass
+                klass.section.methods[#{id}] = klass
+                klass.section.methods[klass::NAME] = klass
               end
             ]
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fotonauts-amqp
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.6.4
 platform: ruby
 authors: 
 - Aman Gupta
@@ -93,6 +93,7 @@ files:
 - research/primes-threaded.rb
 has_rdoc: true
 homepage: http://amqp.rubyforge.org/
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --include=examples
@@ -113,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: AMQP client implementation in Ruby/EventMachine