bunny 0.0.8 → 0.0.9

data/README.markdown

@@ -2,6 +2,10 @@
 
 Google Group: [bunny-amqp](http://groups.google.com/group/bunny-amqp)
 
+Mailing List: [bunny-amqp-devel](http://rubyforge.org/mailman/listinfo/bunny-amqp-devel)
+
+Rubyforge: [bunny-amqp](http://bunny-amqp.rubyforge.org)
+
 ## Announcements
 
 **IMPORTANT**

data/lib/amqp.rb

@@ -6,6 +6,7 @@ module AMQP
 	# constants
 	CONNECTED = 'CONNECTED'
 	NOT_CONNECTED = 'NOT CONNECTED'
+	QUEUE_EMPTY = 'QUEUE EMPTY'
 
 	# specific error definitions
 	class ProtocolError   < StandardError; end

data/lib/bunny/exchange.rb

@@ -1,54 +1,65 @@
-class Exchange
+class Bunny
+	class Exchange
 	
-	include AMQP
+		include AMQP
 	
-  attr_reader :client, :type, :name, :opts, :key
+	  attr_reader :client, :type, :name, :opts, :key
 
-  def initialize(client, name, opts = {})
-		# check connection to server
-		raise 'Not connected to server' if client.status == NOT_CONNECTED
+	  def initialize(client, name, opts = {})
+			# check connection to server
+			raise '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
+	    @client, @name, @opts = client, name, opts
+			@type = opts[:type] || :direct
+			opts.delete(:type) unless opts[:type].nil?
+	    @key = opts[:key]
+			@client.exchanges[@name] ||= self
 		
-    unless name == "amq.#{type}" or name == ''
-      client.send_frame(
-        Protocol::Exchange::Declare.new(
-          { :exchange => name, :type => type, :nowait => true }.merge(opts)
-        )
-      )
-    end
-  end
-
-  def publish(data, opts = {})
-    out = []
-
-    out << Protocol::Basic::Publish.new(
-      { :exchange => name, :routing_key => opts.delete(:key) || key }.merge(opts)
-    )
-    data = data.to_s
-    out << Protocol::Header.new(
-      Protocol::Basic,
-      data.length, {
-        :content_type  => 'application/octet-stream',
-        :delivery_mode => (opts.delete(:persistent) ? 2 : 1),
-        :priority      => 0 
-      }.merge(opts)
-    )
-    out << Frame::Body.new(data)
-
-    client.send_frame(*out)
-  end
-
-  def delete(opts = {})	
-    client.send_frame(
-      Protocol::Exchange::Delete.new({ :exchange => name, :nowait => true }.merge(opts))
-    )
-
-		client.exchanges.delete(name)
-  end
+	    unless name == "amq.#{type}" or name == ''
+	      client.send_frame(
+	        Protocol::Exchange::Declare.new(
+	          { :exchange => name, :type => type, :nowait => false }.merge(opts)
+	        )
+	      )
 
+				raise ProtocolError,
+					"Error declaring exchange #{name}: type = #{type}" unless
+					client.next_method.is_a?(Protocol::Exchange::DeclareOk)
+	    end
+	  end
+
+	  def publish(data, opts = {})
+	    out = []
+
+	    out << Protocol::Basic::Publish.new(
+	      { :exchange => name, :routing_key => opts.delete(:key) || key }.merge(opts)
+	    )
+	    data = data.to_s
+	    out << Protocol::Header.new(
+	      Protocol::Basic,
+	      data.length, {
+	        :content_type  => 'application/octet-stream',
+	        :delivery_mode => (opts.delete(:persistent) ? 2 : 1),
+	        :priority      => 0 
+	      }.merge(opts)
+	    )
+	    out << Frame::Body.new(data)
+
+	    client.send_frame(*out)
+	  end
+
+	  def delete(opts = {})	
+	    client.send_frame(
+	      Protocol::Exchange::Delete.new({ :exchange => name, :nowait => false }.merge(opts))
+	    )
+
+			raise ProtocolError,
+				"Error deleting exchange #{name}" unless
+				client.next_method.is_a?(Protocol::Exchange::DeleteOk)
+
+			client.exchanges.delete(name)
+	  end
+
+	end
+	
 end

data/lib/bunny/header.rb

@@ -1,30 +1,32 @@
-class Header
+class Bunny
+	class Header
 	
-	include AMQP
+		include AMQP
 	
-	attr_reader :client
+		attr_reader :client
 	
-  def initialize(client, header_obj)
-    @client = client
-    @header = header_obj
-  end
+	  def initialize(client, header_obj)
+	    @client = client
+	    @header = header_obj
+	  end
 
-  # Acknowledges the receipt of this message with the server.
-  def ack
-    client.send(Protocol::Basic::Ack.new(:delivery_tag => properties[:delivery_tag]))
-  end
+	  # Acknowledges the receipt of this message with the server.
+	  def ack
+	    client.send(Protocol::Basic::Ack.new(:delivery_tag => properties[:delivery_tag]))
+	  end
 
-  # Reject this message (XXX currently unimplemented in rabbitmq)
-  # * :requeue => true | false (default false)
-  def reject(opts = {})
-    client.send(Protocol::Basic::Reject.new(opts.merge(:delivery_tag => properties[:delivery_tag])))
-  end
+	  # Reject this message (XXX currently unimplemented in rabbitmq)
+	  # * :requeue => true | false (default false)
+	  def reject(opts = {})
+	    client.send(Protocol::Basic::Reject.new(opts.merge(:delivery_tag => properties[:delivery_tag])))
+	  end
 
-  def method_missing(meth, *args, &blk)
-    @header.send(meth, *args, &blk)
-  end
+	  def method_missing(meth, *args, &blk)
+	    @header.send(meth, *args, &blk)
+	  end
 
-  def inspect
-    @header.inspect
-  end
+	  def inspect
+	    @header.inspect
+	  end
+	end
 end

data/lib/bunny/queue.rb

@@ -1,3 +1,4 @@
+class Bunny
 	class Queue
 		
 		include AMQP
@@ -13,8 +14,10 @@
 	    @opts   = opts
 	    @name   = name
 	    client.send_frame(
-	      Protocol::Queue::Declare.new({ :queue => name, :nowait => true }.merge(opts))
+	      Protocol::Queue::Declare.new({ :queue => name, :nowait => false }.merge(opts))
 	    )
+	
+			raise ProtocolError, "Error declaring queue #{name}" unless client.next_method.is_a?(Protocol::Queue::DeclareOk)
 	  end
 
 	  def pop(opts = {})
@@ -29,11 +32,19 @@
 																	 :no_ack => !opts.delete(:ack),
 																	 :nowait => true }.merge(opts))
 	    )
-	    method = client.next_method
-	    return unless method.is_a?(Protocol::Basic::GetOk)
+	
+			method = client.next_method
+			
+			if method.is_a?(Protocol::Basic::GetEmpty) then
+				return QUEUE_EMPTY
+			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
@@ -75,8 +86,12 @@
 	      Protocol::Queue::Bind.new({ :queue => name,
 		 																:exchange => exchange,
 		 																:routing_key => opts.delete(:key),
-		 																:nowait => true }.merge(opts))
+		 																:nowait => false }.merge(opts))
 	    )
+	
+			raise ProtocolError,
+				"Error binding queue #{name}" unless
+				client.next_method.is_a?(Protocol::Queue::BindOk)
 	  end
 
 	  def unbind(exchange, opts = {})
@@ -87,25 +102,35 @@
 	      Protocol::Queue::Unbind.new({ :queue => name,
 		 																	:exchange => exchange,
 		 																	:routing_key => opts.delete(:key),
-		 																	:nowait => true }.merge(opts)
+		 																	:nowait => false }.merge(opts)
 	      )
 	    )
+	
+			raise ProtocolError,
+				"Error unbinding queue #{name}" unless
+				client.next_method.is_a?(Protocol::Queue::UnbindOk)
 	  end
 
 	  def delete(opts = {})
 	    client.send_frame(
-	      Protocol::Queue::Delete.new({ :queue => name, :nowait => true }.merge(opts))
+	      Protocol::Queue::Delete.new({ :queue => name, :nowait => false }.merge(opts))
 	    )
 	
+			raise ProtocolError,
+				"Error deleting queue #{name}" unless
+				client.next_method.is_a?(Protocol::Queue::DeleteOk)
+	
 			client.queues.delete(name)
 	  end
 
 	private
 	  def exchange
-	    @exchange ||= Exchange.new(client, '', {:type => :direct, :key => name})
+	    @exchange ||= Bunny::Exchange.new(client, '', {:type => :direct, :key => name})
 	  end
 
 	  def bindings
 	    @bindings ||= {}
 	  end
-	end
+	end
+	
+end

data/spec/bunny_spec.rb

@@ -15,24 +15,20 @@ describe Bunny do
 		@b.start
 	end
 	
-	after(:each) do
-		@b.stop
-	end
-	
   it "should connect to an AMQP server" do
     @b.status.should == 'CONNECTED'
   end
 
 	it "should be able to create an exchange" do
 		exch = @b.exchange('test_exchange')
-		exch.should be_an_instance_of Exchange
+		exch.should be_an_instance_of Bunny::Exchange
 		exch.name.should == 'test_exchange'
 		@b.exchanges.has_key?('test_exchange').should be true
 	end
 
 	it "should be able to create a queue" do
 		q = @b.queue('test1')
-		q.should be_an_instance_of Queue
+		q.should be_an_instance_of Bunny::Queue
 		q.name.should == 'test1'
 		@b.queues.has_key?('test1').should be true
   end

data/spec/exchange_spec.rb

@@ -8,20 +8,20 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib bunny]))
 
-describe Exchange do
+describe Bunny::Exchange do
 	
 	before(:each) do
     @b = Bunny.new
 		@b.start
 	end
-	
-	after(:each) do
-		@b.stop
+		
+	it "should raise an error if instantiated as non-existent type" do
+		lambda { @b.exchange('bogus_ex', :type => :bogus) }.should raise_error(AMQP::ProtocolError)
 	end
 	
 	it "should be able to create a default direct exchange" do
 		exch = @b.exchange('direct_defaultex')
-		exch.should be_an_instance_of Exchange
+		exch.should be_an_instance_of Bunny::Exchange
 		exch.name.should == 'direct_defaultex'
 		exch.type.should == :direct
 		@b.exchanges.has_key?('direct_defaultex').should be true
@@ -29,7 +29,7 @@ describe Exchange do
 	
 	it "should be able to be instantiated as a direct exchange" do
 		exch = @b.exchange('direct_exchange', :type => :direct)
-		exch.should be_an_instance_of Exchange
+		exch.should be_an_instance_of Bunny::Exchange
 		exch.name.should == 'direct_exchange'
 		exch.type.should == :direct
 		@b.exchanges.has_key?('direct_exchange').should be true
@@ -37,7 +37,7 @@ describe Exchange do
 	
 	it "should be able to be instantiated as a topic exchange" do
 		exch = @b.exchange('topic_exchange', :type => :topic)
-		exch.should be_an_instance_of Exchange
+		exch.should be_an_instance_of Bunny::Exchange
 		exch.name.should == 'topic_exchange'
 		exch.type.should == :topic
 		@b.exchanges.has_key?('topic_exchange').should be true
@@ -45,7 +45,7 @@ describe Exchange do
 	
 	it "should be able to be instantiated as a fanout exchange" do
 		exch = @b.exchange('fanout_exchange', :type => :fanout)
-		exch.should be_an_instance_of Exchange
+		exch.should be_an_instance_of Bunny::Exchange
 		exch.name.should == 'fanout_exchange'
 		exch.type.should == :fanout
 		@b.exchanges.has_key?('fanout_exchange').should be true

data/spec/queue_spec.rb

@@ -15,8 +15,16 @@ describe Bunny do
 		@b.start
 	end
 	
-	after(:each) do
-		@b.stop
+	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 be able to unbind from an exchange" do
+		exch = @b.exchange('direct_exch')
+		q = @b.queue('test1')
+		q.unbind(exch)
 	end
 
 	it "should be able to publish a message" do
@@ -41,6 +49,14 @@ describe Bunny do
 		msg.should == 'This is another test message'
 		q.message_count.should == 0
 	end
+	
+	it "should return an empty message when popping an empty queue" do
+		q = @b.queue('test1')
+		q.publish('This is another test message')
+		q.pop
+		msg = q.pop
+		msg.should == 'QUEUE EMPTY'
+	end
 
 	it "should be able to be deleted" do
 		q = @b.queue('test1')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bunny
 version: !ruby/object:Gem::Version 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors: 
 - Chris Duncan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-24 00:00:00 +01:00
+date: 2009-04-25 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: bunny-amqp
 rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2