bunny 0.4.2 → 0.4.3

data/lib/bunny.rb

@@ -20,7 +20,7 @@ module Bunny
 	class ConnectionError < StandardError; end
 	class MessageError < StandardError; end
 	
-	VERSION = '0.4.2'
+	VERSION = '0.4.3'
 	
 	# Returns the Bunny version number
 
@@ -34,4 +34,18 @@ module Bunny
 		Bunny::Client.new(opts)
 	end
 
-end
+  def self.run(opts = {}, &block)
+    raise ArgumentError, 'Bunny#run requires a block' unless block
+
+    client = Bunny::Client.new(opts)
+    client.start
+
+    block.call(client)
+
+    client.stop
+
+		# Return success
+		:run_ok
+  end
+
+end

data/lib/bunny/client.rb

@@ -126,8 +126,16 @@ Queue
 
 =end
 		
-		def queue(name, opts = {})
-	    queues[name] ||= Bunny::Queue.new(self, name, opts)
+		def queue(name = nil, opts = {})
+      if name.is_a?(Hash)
+        opts = name
+        name = nil
+      end
+
+      return queues[name] if queues.has_key?(name)
+
+      queue = Bunny::Queue.new(self, name, opts)
+      queues[queue.name] = queue
 	  end
 	
 =begin rdoc
@@ -221,33 +229,49 @@ _Bunny_::_ProtocolError_ is raised. If successful, _Client_._status_ is set to <
 =end
 		
 		def start_session
-      @channel = 0
-      write(Qrack::Protocol::HEADER)
-      write([1, 1, Qrack::Protocol::VERSION_MAJOR, Qrack::Protocol::VERSION_MINOR].pack('C4'))
-      raise Bunny::ProtocolError, 'Connection initiation failed' unless next_method.is_a?(Qrack::Protocol::Connection::Start)
+      loop do
+				# Create/get socket
+				socket
+				
+        @channel = 0
+        write(Qrack::Protocol::HEADER)
+        write([1, 1, Qrack::Protocol::VERSION_MAJOR, Qrack::Protocol::VERSION_MINOR].pack('C4'))
+        raise Bunny::ProtocolError, 'Connection initiation failed' unless next_method.is_a?(Qrack::Protocol::Connection::Start)
 
-      send_frame(
-        Qrack::Protocol::Connection::StartOk.new(
-          {:platform => 'Ruby', :product => 'Bunny', :information => 'http://github.com/celldee/bunny', :version => VERSION},
-          'AMQPLAIN',
-          {:LOGIN => @user, :PASSWORD => @pass},
-          'en_US'
+        send_frame(
+          Qrack::Protocol::Connection::StartOk.new(
+            {:platform => 'Ruby', :product => 'Bunny', :information => 'http://github.com/celldee/bunny', :version => VERSION},
+            'AMQPLAIN',
+            {:LOGIN => @user, :PASSWORD => @pass},
+            'en_US'
+          )
         )
-      )
-			
-			method = next_method
-			raise Bunny::ProtocolError, "Connection failed - user: #{@user}, pass: #{@pass}" if method.nil?
 
-      if method.is_a?(Qrack::Protocol::Connection::Tune)
+        method = next_method
+        raise Bunny::ProtocolError, "Connection failed - user: #{@user}, pass: #{@pass}" if method.nil?
+
+        if method.is_a?(Qrack::Protocol::Connection::Tune)
+          send_frame(
+            Qrack::Protocol::Connection::TuneOk.new( :channel_max => 0, :frame_max => 131072, :heartbeat => 0)
+          )
+        end
+
         send_frame(
-          Qrack::Protocol::Connection::TuneOk.new( :channel_max => 0, :frame_max => 131072, :heartbeat => 0)
+          Qrack::Protocol::Connection::Open.new(:virtual_host => @vhost, :capabilities => '', :insist => @insist)
         )
-      end
 
-      send_frame(
-        Qrack::Protocol::Connection::Open.new(:virtual_host => @vhost, :capabilities => '', :insist => @insist)
-      )
-      raise Bunny::ProtocolError, 'Cannot open connection' unless next_method.is_a?(Qrack::Protocol::Connection::OpenOk)
+        case method = next_method
+        when Qrack::Protocol::Connection::OpenOk
+          break
+        when Qrack::Protocol::Connection::Redirect
+					raise Bunny::ConnectionError, "Cannot connect to the specified server - host: #{@host}, port: #{@port}" if @insist
+					
+          @host, @port = method.host.split(':')
+          close_socket
+        else
+          raise Bunny::ProtocolError, 'Cannot open connection'
+        end
+      end
 
       @channel = 1
       send_frame(Qrack::Protocol::Channel::Open.new)
@@ -297,7 +321,8 @@ the message, potentially then delivering it to an alternative subscriber.
 
     def send_command(cmd, *args)
       begin
-        socket.__send__(cmd, *args)
+				raise Bunny::ConnectionError, 'No connection - socket has not been created' if !@socket
+        @socket.__send__(cmd, *args)
       rescue Errno::EPIPE, IOError => e
         raise Bunny::ServerDownError, e.message
       end
@@ -341,4 +366,4 @@ the message, potentially then delivering it to an alternative subscriber.
     end
 
   end
-end
+end

data/lib/bunny/exchange.rb

@@ -110,7 +110,7 @@ nil
           :priority      => 0 
         }.merge(opts)
       )
-      out << Qrack::Transport::Frame::Body.new(data)
+      out << Qrack::Transport::Body.new(data)
 
       client.send_frame(*out)
     end

data/lib/bunny/queue.rb

@@ -19,18 +19,31 @@ Queues must be attached to at least one exchange in order to receive messages fr
 			
 	    @client = client
 	    @opts   = opts
-	    @name   = name
-			@delivery_tag = nil
+      @delivery_tag = nil
+
+      # Queues without a given name are named by the server and are generally
+      # bound to the process that created them.
+      if !name
+        opts = {
+          :passive => false,
+          :durable => false,
+          :exclusive => true,
+          :auto_delete => true
+        }.merge(opts)
+      end
 	
 			# ignore the :nowait option if passed, otherwise program will hang waiting for a
 			# response that will not be sent by the server
 			opts.delete(:nowait)
 			
 	    client.send_frame(
-	      Qrack::Protocol::Queue::Declare.new({ :queue => name, :nowait => false }.merge(opts))
+	      Qrack::Protocol::Queue::Declare.new({ :queue => name || '', :nowait => false }.merge(opts))
 	    )
 	
-			raise Bunny::ProtocolError, "Error declaring queue #{name}" unless client.next_method.is_a?(Qrack::Protocol::Queue::DeclareOk)
+      method = client.next_method
+			raise Bunny::ProtocolError, "Error declaring queue #{name}" unless method.is_a?(Qrack::Protocol::Queue::DeclareOk)
+
+      @name = method.queue
 	  end
 
 =begin rdoc
@@ -442,4 +455,4 @@ without any formal "undo" mechanism. If an error occurs raises _Bunny_::_Protoco
 	  end
 	end
 	
-end
+end

data/lib/qrack/protocol/protocol.rb

@@ -58,7 +58,7 @@ module Qrack
 	    end
     
 	    def to_frame channel = 0
-	      Transport::Frame::Method.new(self, channel)
+	      Transport::Method.new(self, channel)
 	    end
 	  end
 
@@ -110,7 +110,7 @@ module Qrack
 	    end
 
 	    def to_frame channel = 0
-	      Transport::Frame::Header.new(self, channel)
+	      Transport::Header.new(self, channel)
 	    end
 
 	    def == header

data/lib/qrack/transport/frame.rb

@@ -1,59 +1,41 @@
 
 #:stopdoc:
-# this file was autogenerated on Fri May 15 10:11:23 +0100 2009
+# this file was autogenerated on Fri Jun 04 10:11:23 +0100 2009
 #
 # DO NOT EDIT! (edit ext/qparser.rb and config.yml instead, and run 'ruby qparser.rb')
 
 module Qrack
   module Transport
     class Frame
-      def self.types
-        @types ||= {}
-      end
-
-      def self.Frame id
-        (@_base_frames ||= {})[id] ||= Class.new(Frame) do
-          class_eval %[
-            def self.inherited klass
-              klass.const_set(:ID, #{id})
-              Frame.types[#{id}] = klass
-            end
-          ]
-        end
-      end
+	
+      FOOTER = 206
+			ID = 0
 
-      class Method    < Frame( 1 ); end
-      class Header    < Frame( 2 ); end
-      class Body      < Frame( 3 ); end
-      class OobMethod < Frame( 4 ); end
-      class OobHeader < Frame( 5 ); end
-      class OobBody   < Frame( 6 ); end
-      class Trace     < Frame( 7 ); end
-      class Heartbeat < Frame( 8 ); end
+			@types = { 1 => 'Method',
+      					 2 => 'Header',
+      					 3 => 'Body',
+      					 4 => 'OobMethod',
+      					 5 => 'OobHeader',
+      					 6 => 'OobBody',
+      					 7 => 'Trace',
+      					 8 => 'Heartbeat'}
 
-      FOOTER = 206
-    end
-  end
-end
+      attr_accessor :channel, :payload
 
-module Qrack
-  module Transport
-    class Frame
       def initialize payload = nil, channel = 0
         @channel, @payload = channel, payload
       end
-      attr_accessor :channel, :payload
 
-      def id
-        self.class::ID
-      end
+			def id
+				self.class::ID
+			end
   
       def to_binary
         buf = Transport::Buffer.new
         buf.write :octet, id
         buf.write :short, channel
         buf.write :longstr, payload
-        buf.write :octet, Transport::Frame::FOOTER
+        buf.write :octet, FOOTER
         buf.rewind
         buf
       end
@@ -67,34 +49,64 @@ module Qrack
           eql and __send__(field) == frame.__send__(field)
         end
       end
-  
-      class Method
-        def initialize payload = nil, channel = 0
-          super
-          unless @payload.is_a? Protocol::Class::Method or @payload.nil?
-            @payload = Protocol.parse(@payload)
-          end
+
+			def self.parse buf
+        buf = Transport::Buffer.new(buf) unless buf.is_a? Transport::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
         end
       end
 
-      class Header
-        def initialize payload = nil, channel = 0
-          super
-          unless @payload.is_a? Protocol::Header or @payload.nil?
-            @payload = Protocol::Header.new(@payload)
-          end
+    end
+
+    class Method < Frame
+	
+			ID = 1
+			
+      def initialize payload = nil, channel = 0
+        super
+        unless @payload.is_a? Protocol::Class::Method or @payload.nil?
+          @payload = Protocol.parse(@payload)
         end
       end
+    end
 
-      class Body; end
-
-      def self.parse buf
-        buf = Transport::Buffer.new(buf) unless buf.is_a? Transport::Buffer
-        buf.extract do
-          id, channel, payload, footer = buf.read(:octet, :short, :longstr, :octet)
-          Transport::Frame.types[id].new(payload, channel) if footer == Transport::Frame::FOOTER
+    class Header < Frame
+	
+			ID = 2
+			
+      def initialize payload = nil, channel = 0
+        super
+        unless @payload.is_a? Protocol::Header or @payload.nil?
+          @payload = Protocol::Header.new(@payload)
         end
       end
     end
+
+  	class Body < Frame
+			ID = 3
+		end
+		
+		class OobMethod < Frame
+			ID = 4
+		end
+		
+    class OobHeader < Frame
+			ID = 5
+		end
+		
+    class OobBody < Frame
+			ID = 6
+		end
+		
+    class Trace < Frame
+			ID = 7
+		end
+		
+    class Heartbeat < Frame
+			ID = 8
+		end
+
   end
-end
+end

data/spec/queue_spec.rb

@@ -94,5 +94,13 @@ describe Bunny::Queue do
 		q = @b.queue('test0')
 		q.delete(:nowait => true)
 	end
+
+  it "should support server named queues" do
+    q = @b.queue
+    q.name.should_not == nil
+
+    @b.queue(q.name).should == q
+    q.delete
+  end
 	
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bunny
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors: 
 - Chris Duncan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-22 00:00:00 +01:00
+date: 2009-06-10 00:00:00 +01:00
 default_executable: 
 dependencies: []