bunny 0.0.9 → 0.1.0

data/README.markdown

@@ -113,9 +113,6 @@ Queue#consumer_count
 ### Return queue status (array of message count and consumer_count)
 Queue#status
 
-### Send an acknowledge message to the server
-Queue#ack
-
 ### Delete a queue from the target server
 Queue#delete({_options_})
 

data/lib/amqp.rb

@@ -9,8 +9,10 @@ module AMQP
 	QUEUE_EMPTY = 'QUEUE EMPTY'
 
 	# specific error definitions
-	class ProtocolError   < StandardError; end
-	class ServerDown      < StandardError; end
-	class Overflow < StandardError; end
-  class InvalidType < StandardError; end
+	class ProtocolError < StandardError; end
+	class ServerDownError < StandardError; end
+	class BufferOverflowError < StandardError; end
+  class InvalidTypeError < StandardError; end
+	class ConnectionError < StandardError; end
+	class MessageError < StandardError; end
 end

data/lib/amqp/buffer.rb

@@ -132,7 +132,7 @@ module AMQP
 
           @bits.shift
         else
-          raise InvalidType, "Cannot read data of type #{type}"
+          raise InvalidTypeError, "Cannot read data of type #{type}"
         end
       end
       
@@ -229,7 +229,7 @@ module AMQP
           write(type, value) unless type == :bit
         end
       else
-        raise InvalidType, "Cannot write data of type #{type}"
+        raise InvalidTypeError, "Cannot write data of type #{type}"
       end
       
       self
@@ -239,7 +239,7 @@ module AMQP
       begin
         cur_data, cur_pos = @data.clone, @pos
         yield self
-      rescue Overflow
+      rescue BufferOverflowError
         @data, @pos = cur_data, cur_pos
         nil
       end
@@ -253,7 +253,7 @@ module AMQP
       end
 
       if @pos + size > length
-        raise Overflow
+        raise BufferOverflowError
       else
         data = @data[@pos,size]
         @data[@pos,size] = ''

data/lib/amqp/client.rb

@@ -129,7 +129,7 @@ module AMQP
       begin
         socket.__send__(cmd, *args)
       rescue Errno::EPIPE, IOError => e
-        raise ServerDown, e.message
+        raise ServerDownError, e.message
       end
     end
 
@@ -147,7 +147,7 @@ module AMQP
         end
         @status   = CONNECTED
       rescue SocketError, SystemCallError, IOError, Timeout::Error => e
-        raise ServerDown, e.message
+        raise ServerDownError, e.message
       end
 
       @socket

data/lib/bunny/exchange.rb

@@ -7,14 +7,17 @@ class Bunny
 
 	  def initialize(client, name, opts = {})
 			# check connection to server
-			raise 'Not connected to server' if client.status == NOT_CONNECTED
+			raise ConnectionError, 'Not connected to server' if client.status == NOT_CONNECTED
 		
 	    @client, @name, @opts = client, name, opts
 			@type = opts[:type] || :direct
-			opts.delete(:type) unless opts[:type].nil?
 	    @key = opts[:key]
 			@client.exchanges[@name] ||= self
-		
+			
+			# 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)
+			
 	    unless name == "amq.#{type}" or name == ''
 	      client.send_frame(
 	        Protocol::Exchange::Declare.new(
@@ -48,7 +51,11 @@ class Bunny
 	    client.send_frame(*out)
 	  end
 
-	  def delete(opts = {})	
+	  def delete(opts = {})
+			# 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(
 	      Protocol::Exchange::Delete.new({ :exchange => name, :nowait => false }.merge(opts))
 	    )

data/lib/bunny/queue.rb

@@ -8,11 +8,16 @@ class Bunny
 
 	  def initialize(client, name, opts = {})
 			# check connection to server
-			raise 'Not connected to server' if client.status == NOT_CONNECTED
+			raise ConnectionError, 'Not connected to server' if client.status == NOT_CONNECTED
 			
 	    @client = client
 	    @opts   = opts
 	    @name   = name
+	
+			# 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(
 	      Protocol::Queue::Declare.new({ :queue => name, :nowait => false }.merge(opts))
 	    )
@@ -21,9 +26,7 @@ class Bunny
 	  end
 
 	  def pop(opts = {})
-	    self.delivery_tag = nil
-	
-			# do we want the header?
+			# do we want the message header?
 			hdr = opts.delete(:header)
 			
 	    client.send_frame(
@@ -40,25 +43,15 @@ class Bunny
 			elsif	!method.is_a?(Protocol::Basic::GetOk)
 				raise ProtocolError, "Error getting message from queue #{name}"
 			end
-
-	    self.delivery_tag = method.delivery_tag
-
-			return QUEUE_EMPTY unless !self.delivery_tag.nil?
 			
 	    header = client.next_payload
 	    msg    = client.next_payload
-	    raise 'unexpected length' if msg.length < header.size
+	    raise MessageError, 'unexpected length' if msg.length < header.size
 
 			hdr ? {:header => header, :payload => msg} : msg
 			
 	  end
 
-	  def ack
-	    client.send_frame(
-	      Protocol::Basic::Ack.new(:delivery_tag => delivery_tag)
-	    )
-	  end
-
 	  def publish(data, opts = {})
 	    exchange.publish(data, opts)
 	  end
@@ -81,6 +74,11 @@ class Bunny
 
 	  def bind(exchange, opts = {})
 	    exchange           = exchange.respond_to?(:name) ? exchange.name : exchange
+	
+			# 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)
+			
 	    bindings[exchange] = opts
 	    client.send_frame(
 	      Protocol::Queue::Bind.new({ :queue => name,
@@ -112,6 +110,10 @@ class Bunny
 	  end
 
 	  def delete(opts = {})
+			# 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(
 	      Protocol::Queue::Delete.new({ :queue => name, :nowait => false }.merge(opts))
 	    )

data/spec/exchange_spec.rb

@@ -51,6 +51,10 @@ describe Bunny::Exchange do
 		@b.exchanges.has_key?('fanout_exchange').should be true
 	end
 	
+	it "should ignore the :nowait option when instantiated" do
+		exch = @b.exchange('direct2_exchange', :nowait => true)
+	end
+	
 	it "should be able to publish a message" do
 		exch = @b.exchange('direct_exchange')
 		exch.publish('This is a published message')
@@ -62,4 +66,9 @@ describe Bunny::Exchange do
 		@b.exchanges.has_key?('direct_exchange').should be false
 	end
 	
+	it "should ignore the :nowait option when deleted" do
+		exch = @b.exchange('direct2_exchange')
+		exch.delete(:nowait => true)
+	end
+	
 end

data/spec/queue_spec.rb

@@ -8,19 +8,35 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib bunny]))
 
-describe Bunny do
+describe Bunny::Queue do
 	
 	before(:each) do
     @b = Bunny.new
 		@b.start
 	end
 	
+	it "should ignore the :nowait option when instantiated" do
+		q = @b.queue('test0', :nowait => true)
+	end
+	
+	it "should ignore the :nowait option when binding to an exchange" do
+		exch = @b.exchange('direct_exch')
+		q = @b.queue('test0')
+		q.bind(exch, :nowait => true)
+	end
+	
 	it "should be able to bind to an exchange" do
 		exch = @b.exchange('direct_exch')
 		q = @b.queue('test1')
 		q.bind(exch)
 	end
 	
+	it "should ignore the :nowait option when unbinding from an exchange" do
+		exch = @b.exchange('direct_exch')
+		q = @b.queue('test0')
+		q.unbind(exch, :nowait => true)
+	end
+	
 	it "should be able to unbind from an exchange" do
 		exch = @b.exchange('direct_exch')
 		q = @b.queue('test1')
@@ -64,4 +80,9 @@ describe Bunny do
 		@b.queues.has_key?('test1').should be false
 	end
 	
+	it "should ignore the :nowait option when deleted" do
+		q = @b.queue('test0')
+		q.delete(:nowait => true)
+	end
+	
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bunny
 version: !ruby/object:Gem::Version 
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors: 
 - Chris Duncan