bunny 0.4.4 → 0.5.1

data/lib/bunny/{exchange091.rb → exchange09.rb}

@@ -29,7 +29,7 @@ specification that applies to your target broker/server.
 
 =end
   
-  class Exchange
+  class Exchange09
 
     attr_reader :client, :type, :name, :opts, :key
 
@@ -58,14 +58,15 @@ specification that applies to your target broker/server.
       
       unless name == "amq.#{type}" or name == ''
         client.send_frame(
-          Qrack::Protocol::Exchange::Declare.new(
-            { :exchange => name, :type => type, :nowait => false }.merge(opts)
+          Qrack::Protocol09::Exchange::Declare.new(
+            { :exchange => name, :type => type, :nowait => false,
+	 						:reserved_1 => 0, :reserved_2 => false, :reserved_3 => false }.merge(opts)
           )
         )
 
         raise Bunny::ProtocolError,
           "Error declaring exchange #{name}: type = #{type}" unless
-          client.next_method.is_a?(Qrack::Protocol::Exchange::DeclareOk)
+          client.next_method.is_a?(Qrack::Protocol09::Exchange::DeclareOk)
       end
     end
 
@@ -98,19 +99,19 @@ nil
     def publish(data, opts = {})
       out = []
 
-      out << Qrack::Protocol::Basic::Publish.new(
-        { :exchange => name, :routing_key => opts.delete(:key) || key }.merge(opts)
+      out << Qrack::Protocol09::Basic::Publish.new(
+        { :exchange => name, :routing_key => opts.delete(:key) || key, :reserved_1 => 0 }.merge(opts)
       )
       data = data.to_s
-      out << Qrack::Protocol::Header.new(
-        Qrack::Protocol::Basic,
+      out << Qrack::Protocol09::Header.new(
+        Qrack::Protocol09::Basic,
         data.length, {
           :content_type  => 'application/octet-stream',
           :delivery_mode => (opts.delete(:persistent) ? 2 : 1),
           :priority      => 0 
         }.merge(opts)
       )
-      out << Qrack::Transport::Body.new(data)
+      out << Qrack::Transport09::Body.new(data)
 
       client.send_frame(*out)
     end
@@ -140,12 +141,12 @@ if successful. If an error occurs raises _Bunny_::_ProtocolError_.
       opts.delete(:nowait)
       
       client.send_frame(
-        Qrack::Protocol::Exchange::Delete.new({ :exchange => name, :nowait => false }.merge(opts))
+        Qrack::Protocol09::Exchange::Delete.new({ :exchange => name, :nowait => false, :reserved_1 => 0 }.merge(opts))
       )
 
       raise Bunny::ProtocolError,
         "Error deleting exchange #{name}" unless
-        client.next_method.is_a?(Qrack::Protocol::Exchange::DeleteOk)
+        client.next_method.is_a?(Qrack::Protocol09::Exchange::DeleteOk)
 
       client.exchanges.delete(name)
       

data/lib/bunny/queue08.rb

@@ -44,6 +44,7 @@ Queues must be attached to at least one exchange in order to receive messages fr
 			raise Bunny::ProtocolError, "Error declaring queue #{name}" unless method.is_a?(Qrack::Protocol::Queue::DeclareOk)
 
       @name = method.queue
+			client.queues[@name] = self
 	  end
 
 =begin rdoc

data/lib/bunny/{queue091.rb → queue09.rb}

@@ -9,7 +9,7 @@ Queues must be attached to at least one exchange in order to receive messages fr
 
 =end
 
-	class Queue
+	class Queue09
 	  attr_reader :name, :client
 	  attr_accessor :delivery_tag
 
@@ -28,7 +28,8 @@ Queues must be attached to at least one exchange in order to receive messages fr
           :passive => false,
           :durable => false,
           :exclusive => true,
-          :auto_delete => true
+          :auto_delete => true,
+					:reserved_1 => 0
         }.merge(opts)
       end
 	
@@ -37,13 +38,14 @@ Queues must be attached to at least one exchange in order to receive messages fr
 			opts.delete(:nowait)
 			
 	    client.send_frame(
-	      Qrack::Protocol::Queue::Declare.new({ :queue => name || '', :nowait => false }.merge(opts))
+	      Qrack::Protocol09::Queue::Declare.new({ :queue => name || '', :nowait => false, :reserved_1 => 0 }.merge(opts))
 	    )
 	
       method = client.next_method
-			raise Bunny::ProtocolError, "Error declaring queue #{name}" unless method.is_a?(Qrack::Protocol::Queue::DeclareOk)
+			raise Bunny::ProtocolError, "Error declaring queue #{name}" unless method.is_a?(Qrack::Protocol09::Queue::DeclareOk)
 
       @name = method.queue
+			client.queues[@name] = self
 	  end
 
 =begin rdoc
@@ -68,7 +70,7 @@ ask to confirm a single message or a set of messages up to and including a speci
 			self.delivery_tag = 1 if self.delivery_tag.nil?
 			
       client.send_frame(
-        Qrack::Protocol::Basic::Ack.new({:delivery_tag => delivery_tag, :multiple => false}.merge(opts))
+        Qrack::Protocol09::Basic::Ack.new({:delivery_tag => delivery_tag, :multiple => false}.merge(opts))
       )
 
 			# reset delivery tag
@@ -107,17 +109,18 @@ a hash <tt>{:delivery_tag, :redelivered, :exchange, :routing_key, :message_count
 			ack = opts.delete(:ack)
 			
 	    client.send_frame(
-	      Qrack::Protocol::Basic::Get.new({ :queue => name,
+	      Qrack::Protocol09::Basic::Get.new({ :queue => name,
 																	 :consumer_tag => name,
 																	 :no_ack => !ack,
-																	 :nowait => true }.merge(opts))
+																	 :nowait => true,
+																	 :reserved_1 => 0 }.merge(opts))
 	    )
 	
 			method = client.next_method
 			
-			if method.is_a?(Qrack::Protocol::Basic::GetEmpty) then
+			if method.is_a?(Qrack::Protocol09::Basic::GetEmpty) then
 				return :queue_empty
-			elsif	!method.is_a?(Qrack::Protocol::Basic::GetOk)
+			elsif	!method.is_a?(Qrack::Protocol09::Basic::GetOk)
 				raise Bunny::ProtocolError, "Error getting message from queue #{name}"
 			end
 			
@@ -185,7 +188,7 @@ Returns hash {:message_count, :consumer_count}.
  
 	  def status
 	    client.send_frame(
-	      Qrack::Protocol::Queue::Declare.new({ :queue => name, :passive => true })
+	      Qrack::Protocol09::Queue::Declare.new({ :queue => name, :passive => true, :reserved_1 => 0 })
 	    )
 	    method = client.next_method
 	    {:message_count => method.message_count, :consumer_count => method.consumer_count}
@@ -236,20 +239,21 @@ If <tt>:header => false</tt> only message payload is returned.
 			ack = opts.delete(:ack)
 			
 			client.send_frame(
-				Qrack::Protocol::Basic::Consume.new({ :queue => name,
-																	 		 :consumer_tag => consumer_tag,
-																	 		 :no_ack => !ack,
-																	 		 :nowait => false }.merge(opts))
+				Qrack::Protocol09::Basic::Consume.new({ :reserved_1 => 0,
+																			 					:queue => name,
+																	 		 					:consumer_tag => consumer_tag,
+																	 		 					:no_ack => !ack,
+																	 		 					:nowait => false }.merge(opts))
 			)
 			
 			raise Bunny::ProtocolError,
 				"Error subscribing to queue #{name}" unless
-				client.next_method.is_a?(Qrack::Protocol::Basic::ConsumeOk)
+				client.next_method.is_a?(Qrack::Protocol09::Basic::ConsumeOk)
 			
 			while true
 				method = client.next_method
 
-				break if method.is_a?(Qrack::Protocol::Basic::CancelOk)
+				break if method.is_a?(Qrack::Protocol09::Basic::CancelOk)
 			
 				# get delivery tag to use for acknowledge
 				self.delivery_tag = method.delivery_tag if ack
@@ -285,7 +289,7 @@ the server will not send any more messages for that consumer.
 			# response from the server causing an error
 			opts.delete(:nowait)
 			
-      client.send_frame( Qrack::Protocol::Basic::Cancel.new({ :consumer_tag => consumer_tag }.merge(opts)))
+      client.send_frame( Qrack::Protocol09::Basic::Cancel.new({ :consumer_tag => consumer_tag }.merge(opts)))
 			
     end
 
@@ -315,15 +319,16 @@ bound to the direct exchange '' by default. If error occurs, a _Bunny_::_Protoco
 			
 	    bindings[exchange] = opts
 	    client.send_frame(
-	      Qrack::Protocol::Queue::Bind.new({ :queue => name,
+	      Qrack::Protocol09::Queue::Bind.new({ :queue => name,
 		 																:exchange => exchange,
 		 																:routing_key => opts.delete(:key),
-		 																:nowait => false }.merge(opts))
+		 																:nowait => false,
+		 																:reserved_1 => 0 }.merge(opts))
 	    )
 	
 			raise Bunny::ProtocolError,
 				"Error binding queue #{name}" unless
-				client.next_method.is_a?(Qrack::Protocol::Queue::BindOk)
+				client.next_method.is_a?(Qrack::Protocol09::Queue::BindOk)
 				
 			# return message
 			:bind_ok
@@ -356,16 +361,17 @@ Removes a queue binding from an exchange. If error occurs, a _Bunny_::_ProtocolE
 	    bindings.delete(exchange)
 
 	    client.send_frame(
-	      Qrack::Protocol::Queue::Unbind.new({ :queue => name,
+	      Qrack::Protocol09::Queue::Unbind.new({ :queue => name,
 		 																	:exchange => exchange,
 		 																	:routing_key => opts.delete(:key),
-		 																	:nowait => false }.merge(opts)
+		 																	:nowait => false,
+		 																	:reserved_1 => 0 }.merge(opts)
 	      )
 	    )
 	
 			raise Bunny::ProtocolError,
 				"Error unbinding queue #{name}" unless
-				client.next_method.is_a?(Qrack::Protocol::Queue::UnbindOk)
+				client.next_method.is_a?(Qrack::Protocol09::Queue::UnbindOk)
 				
 			# return message
 			:unbind_ok
@@ -400,12 +406,12 @@ from queues if successful. If an error occurs raises _Bunny_::_ProtocolError_.
 			opts.delete(:nowait)
 			
 	    client.send_frame(
-	      Qrack::Protocol::Queue::Delete.new({ :queue => name, :nowait => false }.merge(opts))
+	      Qrack::Protocol09::Queue::Delete.new({ :queue => name, :nowait => false, :reserved_1 => 0 }.merge(opts))
 	    )
 	
 			raise Bunny::ProtocolError,
 				"Error deleting queue #{name}" unless
-				client.next_method.is_a?(Qrack::Protocol::Queue::DeleteOk)
+				client.next_method.is_a?(Qrack::Protocol09::Queue::DeleteOk)
 	
 			client.queues.delete(name)
 			
@@ -435,10 +441,10 @@ without any formal "undo" mechanism. If an error occurs raises _Bunny_::_Protoco
 		opts.delete(:nowait)
 		
     client.send_frame(
-      Qrack::Protocol::Queue::Purge.new({ :queue => name, :nowait => false }.merge(opts))
+      Qrack::Protocol09::Queue::Purge.new({ :queue => name, :nowait => false, :reserved_1 => 0 }.merge(opts))
     )
 
-		raise Bunny::ProtocolError, "Error purging queue #{name}" unless client.next_method.is_a?(Qrack::Protocol::Queue::PurgeOk)
+		raise Bunny::ProtocolError, "Error purging queue #{name}" unless client.next_method.is_a?(Qrack::Protocol09::Queue::PurgeOk)
 		
 		# return confirmation
 		:purge_ok
@@ -447,7 +453,11 @@ without any formal "undo" mechanism. If an error occurs raises _Bunny_::_Protoco
 
 	private
 	  def exchange
-	    @exchange ||= Bunny::Exchange.new(client, '', {:type => :direct, :key => name})
+	    @exchange ||= Bunny::Exchange09.new(client, '', { :type => :direct,
+		 																									:key => name,
+		 																									:reserved_1 => 0,
+																											:reserved_2 => false,
+																											:reserved_3 => false})
 	  end
 
 	  def bindings

data/lib/qrack/client.rb

@@ -1,5 +1,12 @@
 module Qrack
 	# Client ancestor class
 	class Client
+		
+		CONNECT_TIMEOUT = 1.0
+    RETRY_DELAY     = 10.0
+
+    attr_reader   :status, :host, :vhost, :port, :logging, :spec
+    attr_accessor :channel, :logfile, :exchanges, :queues, :channels
+
 	end
 end

data/lib/qrack/protocol/{protocol.rb → protocol08.rb}

@@ -6,8 +6,6 @@ module Qrack
 	      opts = args.pop if args.last.is_a? Hash
 	      opts ||= {}
       
-	      @debug = 1 # XXX hack, p(obj) == '' if no instance vars are set
-      
 	      if args.size == 1 and args.first.is_a? Transport::Buffer
 	        buf = args.shift
 	      else
@@ -120,8 +118,7 @@ module Qrack
 	    end
 
 	    def method_missing meth, *args, &blk
-	      @properties.has_key?(meth) || @klass.properties.find{|_,name| name == meth } ? @properties[meth] :
-	                                                                                     super
+	      @properties.has_key?(meth) || @klass.properties.find{|_,name| name == meth } ? @properties[meth] : super
 	    end
 	  end
 

data/lib/qrack/protocol/protocol09.rb

@@ -0,0 +1,133 @@
+module Qrack
+	module Protocol09
+	  #:stopdoc:
+	  class Class::Method
+	    def initialize *args
+	      opts = args.pop if args.last.is_a? Hash
+	      opts ||= {}
+      
+	      if args.size == 1 and args.first.is_a? Transport09::Buffer
+	        buf = args.shift
+	      else
+	        buf = nil
+	      end
+
+	      self.class.arguments.each do |type, name|
+	        val = buf ? buf.read(type) :
+	                    args.shift || opts[name] || opts[name.to_s]
+	        instance_variable_set("@#{name}", val)
+	      end
+	    end
+
+	    def arguments
+	      self.class.arguments.inject({}) do |hash, (type, name)|
+	        hash.update name => instance_variable_get("@#{name}")
+	      end
+	    end
+
+	    def to_binary
+	      buf = Transport09::Buffer.new
+	      buf.write :short, self.class.parent.id
+	      buf.write :short, self.class.id
+
+	      bits = []
+
+	      self.class.arguments.each do |type, name|
+	        val = instance_variable_get("@#{name}")
+	        if type == :bit
+	          bits << (val || false)
+	        else
+	          unless bits.empty?
+	            buf.write :bit, bits
+	            bits = []
+	          end
+	          buf.write type, val
+	        end
+	      end
+
+	      buf.write :bit, bits unless bits.empty?
+	      buf.rewind
+
+	      buf
+	    end
+    
+	    def to_s
+	      to_binary.to_s
+	    end
+    
+	    def to_frame channel = 0
+	      Transport09::Method.new(self, channel)
+	    end
+	  end
+
+	  class Header
+	    def initialize *args
+	      opts = args.pop if args.last.is_a? Hash
+	      opts ||= {}
+      
+	      first = args.shift
+      
+	      if first.is_a? ::Class and first.ancestors.include? Protocol09::Class
+	        @klass = first
+	        @size = args.shift || 0
+	        @weight = args.shift || 0
+	        @properties = opts
+
+	      elsif first.is_a? Transport09::Buffer or first.is_a? String
+	        buf = first
+	        buf = Transport09::Buffer.new(buf) unless buf.is_a? Transport09::Buffer
+        
+	        @klass = Protocol09.classes[buf.read(:short)]
+	        @weight = buf.read(:short)
+	        @size = buf.read(:longlong)
+
+	        props = buf.read(:properties, *klass.properties.map{|type,_| type })
+	        @properties = Hash[*klass.properties.map{|_,name| name }.zip(props).reject{|k,v| v.nil? }.flatten]
+
+	      else
+	        raise ArgumentError, 'Invalid argument'
+	      end
+      
+	    end
+	    attr_accessor :klass, :size, :weight, :properties
+    
+	    def to_binary
+	      buf = Transport09::Buffer.new
+	      buf.write :short, klass.id
+	      buf.write :short, weight # XXX rabbitmq only supports weight == 0
+	      buf.write :longlong, size
+	      buf.write :properties, (klass.properties.map do |type, name|
+	                               [ type, properties[name] || properties[name.to_s] ]
+	                             end)
+	      buf.rewind
+	      buf
+	    end
+    
+	    def to_s
+	      to_binary.to_s
+	    end
+
+	    def to_frame channel = 0
+	      Transport09::Header.new(self, channel)
+	    end
+
+	    def == header
+	      [ :klass, :size, :weight, :properties ].inject(true) do |eql, field|
+	        eql and __send__(field) == header.__send__(field)
+	      end
+	    end
+
+	    def method_missing meth, *args, &blk
+	      @properties.has_key?(meth) || @klass.properties.find{|_,name| name == meth } ? @properties[meth] :
+	                                                                                     super
+	    end
+	  end
+
+	  def self.parse buf
+	    buf = Transport09::Buffer.new(buf) unless buf.is_a? Transport09::Buffer
+	    class_id, method_id = buf.read(:short, :short)
+	    classes[class_id].methods[method_id].new(buf)
+	  end
+
+	end
+end

data/lib/qrack/protocol/{spec091.rb → spec09.rb}

@@ -6,7 +6,7 @@
 # DO NOT EDIT! (edit ext/qparser.rb and config.yml instead, and run 'ruby qparser.rb')
 
 module Qrack
-  module Protocol
+  module Protocol09
     HEADER        = "AMQP".freeze
     VERSION_MAJOR = 0
     VERSION_MINOR = 9
@@ -75,7 +75,7 @@ module Qrack
 
           def arguments() @arguments ||= [] end
 
-          def parent() Protocol.const_get(self.to_s[/Protocol::(.+?)::/,1]) end
+          def parent() Protocol09.const_get(self.to_s[/Protocol09::(.+?)::/,1]) end
           def id()     self::ID end
           def name()   self::NAME end
         end
@@ -113,8 +113,8 @@ module Qrack
           def self.inherited klass
             klass.const_set(:ID, #{id})
             klass.const_set(:NAME, :#{name.to_s})
-            Protocol.classes[#{id}] = klass
-            Protocol.classes[klass::NAME] = klass
+            Protocol09.classes[#{id}] = klass
+            Protocol09.classes[klass::NAME] = klass
           end
         ]
       end
@@ -123,7 +123,7 @@ module Qrack
 end
 
 module Qrack
-  module Protocol
+  module Protocol09
     class Connection   < Class(  10, :connection   ); end
     class Channel      < Class(  20, :channel      ); end
     class Exchange     < Class(  40, :exchange     ); end