bunny 0.4.4 → 0.5.1

data/lib/qrack/qrack08.rb

@@ -1,9 +1,9 @@
 $: << File.expand_path(File.dirname(__FILE__))
 
 require 'protocol/spec08'
-require 'protocol/protocol'
+require 'protocol/protocol08'
 
-require 'transport/buffer'
+require 'transport/buffer08'
 require 'transport/frame08'
 
 require 'qrack/client'
@@ -17,12 +17,4 @@ module Qrack
 	class BufferOverflowError < StandardError; end
   class InvalidTypeError < StandardError; end
 
-  # Qrack version number
-  VERSION = '0.0.1'
-
-  # Return the Qrack version
-  def self.version
-    VERSION
-  end
-
 end

data/lib/qrack/qrack09.rb

@@ -0,0 +1,20 @@
+$: << File.expand_path(File.dirname(__FILE__))
+
+require 'protocol/spec09'
+require 'protocol/protocol09'
+
+require 'transport/buffer09'
+require 'transport/frame09'
+
+require 'qrack/client'
+
+module Qrack
+	
+	include Protocol09
+	include Transport09
+	
+	# Errors
+	class BufferOverflowError < StandardError; end
+  class InvalidTypeError < StandardError; end
+
+end

data/lib/qrack/transport/buffer09.rb

@@ -0,0 +1,276 @@
+if [].map.respond_to? :with_index
+  class Array #:nodoc:
+    def enum_with_index
+      each.with_index
+    end
+  end
+else
+  require 'enumerator'
+end
+
+module Qrack
+	module Transport09 #:nodoc: all
+	  class Buffer
+
+	    def initialize data = ''
+	      @data = data
+	      @pos = 0
+	    end
+
+	    attr_reader :pos
+    
+	    def data
+	      @data.clone
+	    end
+	    alias :contents :data
+	    alias :to_s :data
+
+	    def << data
+	      @data << data.to_s
+	      self
+	    end
+    
+	    def length
+	      @data.length
+	    end
+    
+	    def empty?
+	      pos == length
+	    end
+    
+	    def rewind
+	      @pos = 0
+	    end
+    
+	    def read_properties *types
+	      types.shift if types.first == :properties
+      
+	      i = 0
+	      values = []
+
+	      while props = read(:short)
+	        (0..14).each do |n|
+	          # no more property types
+	          break unless types[i]
+          
+	          # if flag is set
+	          if props & (1<<(15-n)) != 0
+	            if types[i] == :bit
+	              # bit values exist in flags only
+	              values << true
+	            else
+	              # save type name for later reading
+	              values << types[i]
+	            end
+	          else
+	            # property not set or is false bit
+	            values << (types[i] == :bit ? false : nil)
+	          end
+
+	          i+=1
+	        end
+
+	        # bit(0) == 0 means no more property flags
+	        break unless props & 1 == 1
+	      end
+
+	      values.map do |value|
+	        value.is_a?(Symbol) ? read(value) : value
+	      end
+	    end
+
+	    def read *types
+	      if types.first == :properties
+	        return read_properties(*types)
+	      end
+
+	      values = types.map do |type|
+	        case type
+	        when :octet
+	          _read(1, 'C')
+	        when :short
+	          _read(2, 'n')
+	        when :long
+	          _read(4, 'N')
+	        when :longlong
+	          upper, lower = _read(8, 'NN')
+	          upper << 32 | lower
+	        when :shortstr
+	          _read read(:octet)
+	        when :longstr
+	          _read read(:long)
+	        when :timestamp
+	          Time.at read(:longlong)
+	        when :table
+	          t = Hash.new
+
+	          table = Buffer.new(read(:longstr))
+	          until table.empty?
+	            key, type = table.read(:shortstr, :octet)
+	            key = key.intern
+	            t[key] ||= case type
+	                       when 83 # 'S'
+	                         table.read(:longstr)
+	                       when 73 # 'I'
+	                         table.read(:long)
+	                       when 68 # 'D'
+	                         exp = table.read(:octet)
+	                         num = table.read(:long)
+	                         num / 10.0**exp
+	                       when 84 # 'T'
+	                         table.read(:timestamp)
+	                       when 70 # 'F'
+	                         table.read(:table)
+	                       end
+	          end
+
+	          t
+	        when :bit
+	          if (@bits ||= []).empty?
+	            val = read(:octet)
+	            @bits = (0..7).map{|i| (val & 1<<i) != 0 }
+	          end
+
+	          @bits.shift
+	        else
+	          raise Qrack::InvalidTypeError, "Cannot read data of type #{type}"
+	        end
+	      end
+      
+	      types.size == 1 ? values.first : values
+	    end
+    
+	    def write type, data
+	      case type
+	      when :octet
+	        _write(data, 'C')
+	      when :short
+	        _write(data, 'n')
+	      when :long
+	        _write(data, 'N')
+	      when :longlong
+	        lower =  data & 0xffffffff
+	        upper = (data & ~0xffffffff) >> 32
+	        _write([upper, lower], 'NN')
+	      when :shortstr
+	        data = (data || '').to_s
+	        _write([data.length, data], 'Ca*')
+	      when :longstr
+	        if data.is_a? Hash
+	          write(:table, data)
+	        else
+	          data = (data || '').to_s
+	          _write([data.length, data], 'Na*')
+	        end
+	      when :timestamp
+	        write(:longlong, data.to_i)
+	      when :table
+	        data ||= {}
+	        write :longstr, (data.inject(Buffer.new) do |table, (key, value)|
+	                          table.write(:shortstr, key.to_s)
+
+	                          case value
+	                          when String
+	                            table.write(:octet, 83) # 'S'
+	                            table.write(:longstr, value.to_s)
+	                          when Fixnum
+	                            table.write(:octet, 73) # 'I'
+	                            table.write(:long, value)
+	                          when Float
+	                            table.write(:octet, 68) # 'D'
+	                            # XXX there's gotta be a better way to do this..
+	                            exp = value.to_s.split('.').last.length
+	                            num = value * 10**exp
+	                            table.write(:octet, exp)
+	                            table.write(:long, num)
+	                          when Time
+	                            table.write(:octet, 84) # 'T'
+	                            table.write(:timestamp, value)
+	                          when Hash
+	                            table.write(:octet, 70) # 'F'
+	                            table.write(:table, value)
+	                          end
+
+	                          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
+	            byte
+	           })
+	         }
+	      when :properties
+	        values = []
+	        data.enum_with_index.inject(0) do |short, ((type, value), i)|
+	          n = i % 15
+	          last = i+1 == data.size
+
+	          if (n == 0 and i != 0) or last
+	            if data.size > i+1
+	              short |= 1<<0
+	            elsif last and value
+	              values << [type,value]
+	              short |= 1<<(15-n)
+	            end
+
+	            write(:short, short)
+	            short = 0
+	          end
+
+	          if value and !last
+	            values << [type,value] 
+	            short |= 1<<(15-n)
+	          end
+
+	          short
+	        end
+        
+	        values.each do |type, value|
+	          write(type, value) unless type == :bit
+	        end
+	      else
+	        raise Qrack::InvalidTypeError, "Cannot write data of type #{type}"
+	      end
+      
+	      self
+	    end
+
+	    def extract
+	      begin
+	        cur_data, cur_pos = @data.clone, @pos
+	        yield self
+	      rescue Qrack::BufferOverflowError
+	        @data, @pos = cur_data, cur_pos
+	        nil
+	      end
+	    end
+
+	    def _read(size, pack = nil)
+	      if @data.is_a?(Qrack::Client)
+	        raw = @data.read(size)
+	        return raw if raw.nil? or pack.nil? 
+	        return raw.unpack(pack).first
+	      end
+
+	      if @pos + size > length
+	        raise Qrack::BufferOverflowError
+	      else
+	        data = @data[@pos,size]
+	        @data[@pos,size] = ''
+	        if pack
+	          data = data.unpack(pack)
+	          data = data.pop if data.size == 1
+	        end
+	        data
+	      end
+	    end
+    
+	    def _write data, pack = nil
+	      data = [*data].pack(pack) if pack
+	      @data[@pos,0] = data
+	      @pos += data.length
+	    end
+	  end
+	end
+end

data/lib/qrack/transport/{frame091.rb → frame09.rb}

@@ -5,7 +5,7 @@
 # DO NOT EDIT! (edit ext/qparser.rb and config.yml instead, and run 'ruby qparser.rb')
 
 module Qrack
-  module Transport
+  module Transport09
     class Frame
 
       FOOTER = 206
@@ -29,7 +29,7 @@ module Qrack
       end
 
       def to_binary
-        buf = Transport::Buffer.new
+        buf = Transport09::Buffer.new
         buf.write :octet, id
         buf.write :short, channel
         buf.write :longstr, payload
@@ -49,10 +49,10 @@ module Qrack
       end
 
       def self.parse buf
-        buf = Transport::Buffer.new(buf) unless buf.is_a? Transport::Buffer
+        buf = Transport09::Buffer.new(buf) unless buf.is_a? Transport09::Buffer
         buf.extract do
           id, channel, payload, footer = buf.read(:octet, :short, :longstr, :octet)
-          Qrack::Transport.const_get(@types[id]).new(payload, channel) if footer == FOOTER
+          Qrack::Transport09.const_get(@types[id]).new(payload, channel) if footer == FOOTER
         end
       end
 
@@ -64,8 +64,8 @@ module Qrack
 	
       def initialize payload = nil, channel = 0
         super
-        unless @payload.is_a? Protocol::Class::Method or @payload.nil?
-          @payload = Protocol.parse(@payload)
+        unless @payload.is_a? Protocol09::Class::Method or @payload.nil?
+          @payload = Protocol09.parse(@payload)
         end
       end
     end
@@ -76,8 +76,8 @@ module Qrack
 
       def initialize payload = nil, channel = 0
         super
-        unless @payload.is_a? Protocol::Header or @payload.nil?
-          @payload = Protocol::Header.new(@payload)
+        unless @payload.is_a? Protocol09::Header or @payload.nil?
+          @payload = Protocol09::Header.new(@payload)
         end
       end
     end

data/spec/{bunny_spec.rb → spec_08/bunny_spec.rb}

@@ -6,15 +6,15 @@
 # If this is not the case, please change the 'Bunny.new' call below to include
 # the relevant arguments e.g. @b = Bunny.new(:user => 'john', :pass => 'doe', :host => 'foobar')
 
-require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib bunny]))
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. .. lib bunny]))
 
 describe Bunny do
-	
+
 	before(:each) do
     @b = Bunny.new
 		@b.start
 	end
-	
+
   it "should connect to an AMQP server" do
     @b.status.should == :connected
   end
@@ -36,5 +36,5 @@ describe Bunny do
 	it "should be able to set QoS" do
 		@b.qos.should == :qos_ok
 	end
-
+	
 end

data/spec/{exchange_spec.rb → spec_08/exchange_spec.rb}

@@ -6,15 +6,15 @@
 # If this is not the case, please change the 'Bunny.new' call below to include
 # the relevant arguments e.g. @b = Bunny.new(:user => 'john', :pass => 'doe', :host => 'foobar')
 
-require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib bunny]))
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. .. lib bunny]))
 
 describe Bunny do
-	
+
 	before(:each) do
     @b = Bunny.new
 		@b.start
 	end
-		
+
 	it "should raise an error if instantiated as non-existent type" do
 		lambda { @b.exchange('bogus_ex', :type => :bogus) }.should raise_error(Bunny::ProtocolError)
 	end
@@ -51,9 +51,6 @@ describe Bunny do
 		@b.exchanges.has_key?('amq.topic').should be true
 	end
 
-	
-=begin
-	#*** Uncomment these tests if your broker/server supports headers exchanges ***
 	it "should allow a default headers (amq.match) exchange to be instantiated without specifying :type" do
 		exch = @b.exchange('amq.match')
 		exch.should be_an_instance_of Bunny::Exchange
@@ -69,7 +66,6 @@ describe Bunny do
 		exch.type.should == :headers
 		@b.exchanges.has_key?('amq.headers').should be true
 	end
-=end
 	
 	it "should create an exchange as direct by default" do
 		exch = @b.exchange('direct_defaultex')
@@ -103,8 +99,6 @@ describe Bunny do
 		@b.exchanges.has_key?('fanout_exchange').should be true
 	end
 
-=begin
-	#*** Uncomment this test if your broker/server supports headers exchanges ***	
 	it "should be able to be instantiated as a headers exchange" do
 		exch = @b.exchange('headers_exchange', :type => :headers)
 		exch.should be_an_instance_of Bunny::Exchange
@@ -112,7 +106,6 @@ describe Bunny do
 		exch.type.should == :headers
 		@b.exchanges.has_key?('headers_exchange').should be true
 	end
-=end
 	
 	it "should ignore the :nowait option when instantiated" do
 		exch = @b.exchange('direct2_exchange', :nowait => true)