amqp 0.7.0.pre → 0.7.0

data/lib/amqp.rb

@@ -1,6 +1,8 @@
+# encoding: utf-8
+
 require File.expand_path('../ext/em', __FILE__)
 require File.expand_path('../ext/blankslate', __FILE__)
-  
+
 %w[ version buffer spec protocol frame client ].each do |file|
   require File.expand_path("../amqp/#{file}", __FILE__)
 end
@@ -76,7 +78,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
@@ -86,15 +88,17 @@ module AMQP
   class << self
     alias :run :start
   end
-  
+
   def self.stop
     if @conn and not @closing
       @closing = true
-      @conn.close{
-        yield if block_given?
-        @conn = nil
-        @closing = false
-      }
+      EM.next_tick do
+        @conn.close {
+          yield if block_given?
+          @conn = nil
+          @closing = false
+        }
+      end
     end
   end
 

data/lib/amqp/buffer.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 if [].map.respond_to? :with_index
   class Array #:nodoc:
     def enum_with_index
@@ -12,14 +14,14 @@ module AMQP
   class Buffer #:nodoc: all
     class Overflow < StandardError; end
     class InvalidType < StandardError; end
-    
-    def initialize data = ''
+
+    def initialize(data = '')
       @data = data
       @pos = 0
     end
 
     attr_reader :pos
-    
+
     def data
       @data.clone
     end
@@ -30,22 +32,22 @@ module AMQP
       @data << data.to_s
       self
     end
-    
+
     def length
       @data.bytesize
     end
-    
+
     def empty?
       pos == length
     end
-    
+
     def rewind
       @pos = 0
     end
-    
-    def read_properties *types
+
+    def read_properties(*types)
       types.shift if types.first == :properties
-      
+
       i = 0
       values = []
 
@@ -53,9 +55,9 @@ module AMQP
         (0..14).each do |n|
           # no more property types
           break unless types[i]
-          
+
           # if flag is set
-          if props & (1<<(15-n)) != 0
+          if props & (1 << (15-n)) != 0
             if types[i] == :bit
               # bit values exist in flags only
               values << true
@@ -68,7 +70,7 @@ module AMQP
             values << (types[i] == :bit ? false : nil)
           end
 
-          i+=1
+          i += 1
         end
 
         # bit(0) == 0 means no more property flags
@@ -80,7 +82,7 @@ module AMQP
       end
     end
 
-    def read *types
+    def read(*types)
       if types.first == :properties
         return read_properties(*types)
       end
@@ -129,7 +131,7 @@ module AMQP
         when :bit
           if (@bits ||= []).empty?
             val = read(:octet)
-            @bits = (0..7).map{|i| (val & 1<<i) != 0 }
+            @bits = (0..7).map { |i| (val & 1 << i) != 0 }
           end
 
           @bits.shift
@@ -137,11 +139,11 @@ module AMQP
           raise InvalidType, "Cannot read data of type #{type}"
         end
       end
-      
+
       types.size == 1 ? values.first : values
     end
-    
-    def write type, data
+
+    def write(type, data)
       case type
       when :octet
         _write(data, 'C')
@@ -195,9 +197,9 @@ module AMQP
                           table
                         end)
       when :bit
-        [*data].to_enum(:each_slice, 8).each{|bits|
-          write(:octet, bits.enum_with_index.inject(0){ |byte, (bit, i)|
-            byte |= 1<<i if bit
+        [*data].to_enum(:each_slice, 8).each { |bits|
+          write(:octet, bits.enum_with_index.inject(0) { |byte, (bit, i)|
+            byte |= 1 << i if bit
             byte
            })
          }
@@ -209,10 +211,10 @@ module AMQP
 
           if (n == 0 and i != 0) or last
             if data.size > i+1
-              short |= 1<<0
+              short |= 1 << 0
             elsif last and value
-              values << [type,value]
-              short |= 1<<(15-n)
+              values << [type, value]
+              short |= 1 << (15-n)
             end
 
             write(:short, short)
@@ -220,20 +222,20 @@ module AMQP
           end
 
           if value and !last
-            values << [type,value] 
-            short |= 1<<(15-n)
+            values << [type, value]
+            short |= 1 << (15-n)
           end
 
           short
         end
-        
+
         values.each do |type, value|
           write(type, value) unless type == :bit
         end
       else
         raise InvalidType, "Cannot write data of type #{type}"
       end
-      
+
       self
     end
 
@@ -247,12 +249,12 @@ module AMQP
       end
     end
 
-    def _read size, pack = nil
+    def _read(size, pack = nil)
       if @pos + size > length
         raise Overflow
       else
-        data = @data[@pos,size]
-        @data[@pos,size] = ''
+        data = @data[@pos, size]
+        @data[@pos, size] = ''
         if pack
           data = data.unpack(pack)
           data = data.pop if data.size == 1
@@ -260,136 +262,11 @@ module AMQP
         data
       end
     end
-    
-    def _write data, pack = nil
+
+    def _write(data, pack = nil)
       data = [*data].pack(pack) if pack
-      @data[@pos,0] = data
+      @data[@pos, 0] = data
       @pos += data.bytesize
     end
   end
 end
-
-if $0 =~ /bacon/ or $0 == __FILE__
-  require 'bacon'
-  include AMQP
-
-  describe Buffer do
-    before do
-      @buf = Buffer.new
-    end
-
-    should 'have contents' do
-      @buf.contents.should == ''
-    end
-
-    should 'initialize with data' do
-      @buf = Buffer.new('abc')
-      @buf.contents.should == 'abc'
-    end
-
-    should 'append raw data' do
-      @buf << 'abc'
-      @buf << 'def'
-      @buf.contents.should == 'abcdef'
-    end
-
-    should 'append other buffers' do
-      @buf << Buffer.new('abc')
-      @buf.data.should == 'abc'
-    end
-
-    should 'have a position' do
-      @buf.pos.should == 0
-    end
-
-    should 'have a length' do
-      @buf.length.should == 0
-      @buf << 'abc'
-      @buf.length.should == 3
-    end
-
-    should 'know the end' do
-      @buf.empty?.should == true
-    end
-
-    should 'read and write data' do
-      @buf._write('abc')
-      @buf.rewind
-      @buf._read(2).should == 'ab'
-      @buf._read(1).should == 'c'
-    end
-
-    should 'raise on overflow' do
-      lambda{ @buf._read(1) }.should.raise Buffer::Overflow
-    end
-
-    should 'raise on invalid types' do
-      lambda{ @buf.read(:junk) }.should.raise Buffer::InvalidType
-      lambda{ @buf.write(:junk, 1) }.should.raise Buffer::InvalidType
-    end
-  
-    { :octet => 0b10101010,
-      :short => 100,
-      :long => 100_000_000,
-      :longlong => 666_555_444_333_222_111,
-      :shortstr => 'hello',
-      :longstr => 'bye'*500,
-      :timestamp => time = Time.at(Time.now.to_i),
-      :table => { :this => 'is', :a => 'hash', :with => {:nested => 123, :and => time, :also => 123.456} },
-      :bit => true
-    }.each do |type, value|
-
-      should "read and write a #{type}" do
-        @buf.write(type, value)
-        @buf.rewind
-        @buf.read(type).should == value
-        @buf.should.be.empty
-      end
-
-    end
-    
-    should 'read and write multiple bits' do
-      bits = [true, false, false, true, true, false, false, true, true, false]
-      @buf.write(:bit, bits)
-      @buf.write(:octet, 100)
-      
-      @buf.rewind
-      
-      bits.map do
-        @buf.read(:bit)
-      end.should == bits
-      @buf.read(:octet).should == 100
-    end
-
-    should 'read and write properties' do
-      properties = ([
-        [:octet, 1],
-        [:shortstr, 'abc'],
-        [:bit, true],
-        [:bit, false],
-        [:shortstr, nil],
-        [:timestamp, nil],
-        [:table, { :a => 'hash' }],
-      ]*5).sort_by{rand}
-      
-      @buf.write(:properties, properties)
-      @buf.rewind
-      @buf.read(:properties, *properties.map{|type,_| type }).should == properties.map{|_,value| value }
-      @buf.should.be.empty
-    end
-
-    should 'do transactional reads with #extract' do
-      @buf.write :octet, 8
-      orig = @buf.to_s
-
-      @buf.rewind
-      @buf.extract do |b|
-        b.read :octet
-        b.read :short
-      end
-
-      @buf.pos.should == 0
-      @buf.data.should == orig
-    end
-  end
-end

data/lib/amqp/client.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require File.expand_path('../frame', __FILE__)
 
 require 'uri'
@@ -6,7 +8,9 @@ module AMQP
   class Error < StandardError; end
 
   module BasicClient
-    def process_frame frame
+    attr_reader :broker
+
+    def process_frame(frame)
       if mq = channels[frame.channel]
         mq.process_frame(frame)
         return
@@ -16,9 +20,10 @@ module AMQP
       when Frame::Method
         case method = frame.payload
         when Protocol::Connection::Start
+          @broker = method
           send Protocol::Connection::StartOk.new({:platform => 'Ruby/EventMachine',
                                                   :product => 'AMQP',
-                                                  :information => 'http://github.com/tmm1/amqp',
+                                                  :information => 'http://github.com/ruby-amqp/amqp',
                                                   :version => VERSION},
                                                  'AMQPLAIN',
                                                  {:LOGIN => @settings[:user],
@@ -34,6 +39,8 @@ module AMQP
                                               :capabilities => '',
                                               :insist => @settings[:insist])
 
+          @on_disconnect = method(:disconnected)
+
         when Protocol::Connection::OpenOk
           succeed(self)
 
@@ -60,14 +67,16 @@ module AMQP
   module Client
     include EM::Deferrable
 
-    def initialize opts = {}
+    def initialize(opts = {})
       @settings = opts
       extend AMQP.client
 
-      @on_disconnect ||= proc{ raise Error, "Could not connect to server #{opts[:host]}:#{opts[:port]}" }
+      @_channel_mutex = Mutex.new
+
+      @on_disconnect ||= proc { raise Error, "Could not connect to server #{opts[:host]}:#{opts[:port]}" }
 
       timeout @settings[:timeout] if @settings[:timeout]
-      errback{ @on_disconnect.call } unless @reconnecting
+      errback { @on_disconnect.call } unless @reconnecting
 
       @connected = false
     end
@@ -75,9 +84,8 @@ module AMQP
     def connection_completed
       start_tls if @settings[:ssl]
       log 'connected'
-      # @on_disconnect = proc{ raise Error, 'Disconnected from server' }
+      # @on_disconnect = proc { raise Error, 'Disconnected from server' }
       unless @closing
-        @on_disconnect = method(:disconnected)
         @reconnecting = false
       end
 
@@ -96,11 +104,11 @@ module AMQP
     def unbind
       log 'disconnected'
       @connected = false
-      EM.next_tick{ @on_disconnect.call }
+      EM.next_tick { @on_disconnect.call }
     end
 
-    def add_channel mq
-      (@_channel_mutex ||= Mutex.new).synchronize do
+    def add_channel(mq)
+      @_channel_mutex.synchronize do
         channels[ key = (channels.keys.max || 0) + 1 ] = mq
         key
       end
@@ -110,7 +118,7 @@ module AMQP
       @channels ||= {}
     end
 
-    def receive_data data
+    def receive_data(data)
       # log 'receive_data', data
       @buf << data
 
@@ -120,12 +128,12 @@ module AMQP
       end
     end
 
-    def process_frame frame
+    def process_frame(frame)
       # this is a stub meant to be
       # replaced by the module passed into initialize
     end
 
-    def send data, opts = {}
+    def send(data, opts = {})
       channel = opts[:channel] ||= 0
       data = data.to_frame(channel) unless data.is_a? Frame
       data.channel = channel
@@ -141,16 +149,16 @@ module AMQP
     # end
     #:startdoc:
 
-    def close &on_disconnect
+    def close(&on_disconnect)
       if on_disconnect
         @closing = true
-        @on_disconnect = proc{
+        @on_disconnect = proc {
           on_disconnect.call
           @closing = false
         }
       end
 
-      callback{ |c|
+      callback { |c|
         if c.channels.any?
           c.channels.each do |ch, mq|
             mq.close
@@ -164,10 +172,14 @@ module AMQP
       }
     end
 
-    def reconnect force = false
+    def closing?
+      @closing
+    end
+
+    def reconnect(force = false)
       if @reconnecting and not force
         # wait 1 second after first reconnect attempt, in between each subsequent attempt
-        EM.add_timer(1){ reconnect(true) }
+        EM.add_timer(1) { reconnect(true) }
         return
       end
 
@@ -179,7 +191,7 @@ module AMQP
 
         mqs = @channels
         @channels = {}
-        mqs.each{ |_,mq| mq.reset } if mqs
+        mqs.each { |_, mq| mq.reset } if mqs
       end
 
       log 'reconnecting'
@@ -199,7 +211,7 @@ module AMQP
       EM.connect opts[:host], opts[:port], self, opts
     end
 
-    def connection_status &blk
+    def connection_status(&blk)
       @connection_status = blk
     end
 
@@ -210,7 +222,7 @@ module AMQP
       reconnect
     end
 
-    def log *args
+    def log(*args)
       return unless @settings[:logging] or AMQP.logging
       require 'pp'
       pp args
@@ -226,7 +238,7 @@ module AMQP
       opts[:vhost] = URI.unescape(uri.path) if uri.path
       opts[:host] = uri.host if uri.host
       opts[:port] = uri.port ? uri.port :
-                      {"amqp"=>5672, "amqps"=>5671}[uri.scheme]
+                      {"amqp" => 5672, "amqps" => 5671}[uri.scheme]
       opts[:ssl] = uri.scheme == "amqps"
       return opts
     end