celldee-bunny 0.0.2 → 0.0.3

data/README.markdown

@@ -1,17 +1,18 @@
 # README
 
-## Acknowledgements
-
-This project has borrowed heavily from the following two projects and owes their respective creators and collaborators a whole lot of gratitude:
- 
-1. **amqp** by *tmm1* (http://github.com/tmm1/amqp/tree/master)
-2. **carrot** by *famoseagle* (http://github.com/famoseagle/carrot/tree/master)
-
 ## About
 
 *bunny* is an AMQP client, written in Ruby, that is intended to allow you to interact with AMQP-compliant message brokers/servers such as RabbitMQ in a synchronous fashion.
+
+You can use *bunny* to -
+
+* Create and delete exchanges
+* Create and delete queues
+* Publish and consume messages
  
 *bunny* is being tested with RabbitMQ version 1.5.4 and version 0-8 of the AMQP specification.
+
+There is a Google Group for discussing bunny - [bunny-amqp](http://groups.google.com/group/bunny-amqp)
  
 ## Quick Start
 
@@ -44,6 +45,13 @@ This project has borrowed heavily from the following two projects and owes their
 
     puts 'This is the message: ' + msg + "\n\n"
 
+## Acknowledgements
+
+This project has borrowed heavily from the following two projects and owes their respective creators and collaborators a whole lot of gratitude:
+
+1. **amqp** by *tmm1* [http://github.com/tmm1/amqp/tree/master](http://github.com/tmm1/amqp/tree/master)
+2. **carrot** by *famoseagle* [http://github.com/famoseagle/carrot/tree/master](http://github.com/famoseagle/carrot/tree/master)
+
 ## LICENSE
 
 Copyright (c) 2009 Chris Duncan; Published under The MIT License, see License

data/lib/bunny/queue.rb

@@ -16,8 +16,15 @@
 
 	  def pop(opts = {})
 	    self.delivery_tag = nil
+	
+			# do we want the header?
+			hdr = opts.delete(:header)
+			
 	    client.send_frame(
-	      Protocol::Basic::Get.new({ :queue => name, :consumer_tag => name, :no_ack => !opts.delete(:ack), :nowait => true }.merge(opts))
+	      Protocol::Basic::Get.new({ :queue => name,
+																	 :consumer_tag => name,
+																	 :no_ack => !opts.delete(:ack),
+																	 :nowait => true }.merge(opts))
 	    )
 	    method = client.next_method
 	    return unless method.is_a?(Protocol::Basic::GetOk)
@@ -28,7 +35,12 @@
 	    msg    = client.next_payload
 	    raise 'unexpected length' if msg.length < header.size
 
-	    msg
+			if hdr
+				[header, msg]
+			else
+	    	msg
+			end
+			
 	  end
 
 	  def ack
@@ -61,7 +73,10 @@
 	    exchange           = exchange.respond_to?(:name) ? exchange.name : exchange
 	    bindings[exchange] = opts
 	    client.send_frame(
-	      Protocol::Queue::Bind.new({ :queue => name, :exchange => exchange, :routing_key => opts.delete(:key), :nowait => true }.merge(opts))
+	      Protocol::Queue::Bind.new({ :queue => name,
+		 																:exchange => exchange,
+		 																:routing_key => opts.delete(:key),
+		 																:nowait => true }.merge(opts))
 	    )
 	  end
 
@@ -70,8 +85,10 @@
 	    bindings.delete(exchange)
 
 	    client.send_frame(
-	      Protocol::Queue::Unbind.new({
-	        :queue => name, :exchange => exchange, :routing_key => opts.delete(:key), :nowait => true }.merge(opts)
+	      Protocol::Queue::Unbind.new({ :queue => name,
+		 																	:exchange => exchange,
+		 																	:routing_key => opts.delete(:key),
+		 																	:nowait => true }.merge(opts)
 	      )
 	    )
 	  end

metadata

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