bunny 0.5.3 → 0.6.0

data/spec/spec_08/queue_spec.rb

@@ -8,7 +8,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__), %w[.. .. lib bunny]))
 
-describe Bunny do
+describe 'Queue' do
 	
 	before(:each) do
     @b = Bunny.new
@@ -25,7 +25,13 @@ describe Bunny do
 		q.bind(exch, :nowait => true).should == :bind_ok
 	end
 	
-	it "should be able to bind to an exchange" do
+	it "should raise an error when trying to bind to a non-existent exchange" do
+		q = @b.queue('test1')
+		lambda {q.bind('bogus')}.should raise_error(Bunny::ForcedChannelCloseError)
+		@b.channel.active.should == false
+	end
+	
+	it "should be able to bind to an existing exchange" do
 		exch = @b.exchange('direct_exch')
 		q = @b.queue('test1')
 		q.bind(exch).should == :bind_ok
@@ -37,7 +43,13 @@ describe Bunny do
 		q.unbind(exch, :nowait => true).should == :unbind_ok
 	end
 	
-	it "should be able to unbind from an exchange" do
+	it "should raise an error if unbinding from a non-existent exchange" do
+		q = @b.queue('test1')
+		lambda {q.unbind('bogus')}.should raise_error(Bunny::ForcedChannelCloseError)
+		@b.channel.active.should == false
+	end
+	
+	it "should be able to unbind from an existing exchange" do
 		exch = @b.exchange('direct_exch')
 		q = @b.queue('test1')
 		q.unbind(exch).should == :unbind_ok
@@ -51,7 +63,7 @@ describe Bunny do
 	
 	it "should be able to pop a message complete with header and delivery details" do
 		q = @b.queue('test1')
-		msg = q.pop(:header => true)
+		msg = q.pop()
 		msg.should be_an_instance_of(Hash)
 		msg[:header].should be_an_instance_of(Bunny::Protocol::Header)
 		msg[:payload].should == 'This is a test message'
@@ -62,7 +74,7 @@ describe Bunny do
 	it "should be able to pop a message and just get the payload" do
 		q = @b.queue('test1')
 		q.publish('This is another test message')
-		msg = q.pop
+		msg = q.pop[:payload]
 		msg.should == 'This is another test message'
 		q.message_count.should == 0
 	end
@@ -71,15 +83,28 @@ describe Bunny do
 		q = @b.queue('test1')
 		lg_msg = 'z' * 142000
 		q.publish(lg_msg)
-		msg = q.pop
+		msg = q.pop[:payload]
 		msg.should == lg_msg
 	end
 	
-	it "should be able to be purged to remove all of its messages" do
+	it "should be able call a block when popping a message" do
+		q = @b.queue('test1')
+		q.publish('This is another test message')
+		q.pop { |msg| msg[:payload].should == 'This is another test message' }
+		q.pop { |msg| msg[:payload].should == :queue_empty }
+	end
+	
+	it "should raise an error if purge fails" do
 		q = @b.queue('test1')
 		5.times {q.publish('This is another test message')}
 		q.message_count.should == 5
-		q.purge
+		lambda {q.purge(:queue => 'bogus')}.should raise_error(Bunny::ForcedChannelCloseError)
+	end
+	
+	it "should be able to be purged to remove all of its messages" do
+		q = @b.queue('test1')
+		q.message_count.should == 5
+		q.purge.should == :purge_ok
 		q.message_count.should == 0
 	end
 	
@@ -87,7 +112,7 @@ describe Bunny do
 		q = @b.queue('test1')
 		q.publish('This is another test message')
 		q.pop
-		msg = q.pop
+		msg = q.pop[:payload]
 		msg.should == :queue_empty
 	end
 	
@@ -95,9 +120,8 @@ describe Bunny do
 		q = @b.queue('test1')
 		5.times {q.publish('Yet another test message')}
 		q.message_count.should == 5
-		q.subscribe(:message_max => 0){|msg| x = 1}
+		q.subscribe(:message_max => 0)
 		q.message_count.should == 5
-		q.unsubscribe.should == :unsubscribe_ok
 		q.purge.should == :purge_ok
 	end
 	
@@ -105,10 +129,60 @@ describe Bunny do
 		q = @b.queue('test1')
 		5.times {q.publish('Yet another test message')}
 		q.message_count.should == 5
-		q.subscribe(:message_max => 5){|msg| x = 1}
-		q.unsubscribe.should == :unsubscribe_ok
+		q.subscribe(:message_max => 5)
 	end
 
+	it "should stop subscription after processing message_max messages < total in queue" do
+		q = @b.queue('test1')
+		@b.qos()
+		10.times {q.publish('Yet another test message')}
+		q.message_count.should == 10
+		q.subscribe(:message_max => 5, :ack => true)
+		q.message_count.should == 5
+		q.purge.should == :purge_ok
+	end
+
+	it "should raise an error when delete fails" do
+		q = @b.queue('test1')
+		lambda {q.delete(:queue => 'bogus')}.should raise_error(Bunny::ForcedChannelCloseError)
+		@b.channel.active.should == false
+	end
+
+  it "should pass correct block parameters through on subscribe" do
+    q = @b.queue('test1')
+    q.publish("messages pop\'n")
+
+    q.subscribe do |msg|
+      msg[:header].should be_an_instance_of Qrack::Protocol::Header
+      msg[:payload].should == "messages pop'n"
+      msg[:delivery_details].should_not be_nil
+
+      q.unsubscribe
+			break
+    end
+
+  end
+
+  it "should finish processing subscription messages if break is called in block" do
+    q = @b.queue('test1')
+    q.publish('messages in my quezen')
+
+    q.subscribe do |msg|
+      msg[:payload].should == 'messages in my quezen'
+      q.unsubscribe
+			break
+    end
+
+    5.times {|i| q.publish("#{i}")}
+		q.subscribe do |msg|
+		  if msg[:payload] == '4'
+				q.unsubscribe 
+				break
+			end
+		end
+
+  end
+
 	it "should be able to be deleted" do
 		q = @b.queue('test1')
 		res = q.delete

data/spec/spec_09/bunny_spec.rb

@@ -35,7 +35,7 @@ describe Bunny do
 	end
 	
 	it "should raise an error if trying to switch to a non-existent channel" do
-		lambda { @b.switch_channel(5)}.should raise_error(RuntimeError)
+		lambda { @b.switch_channel(5) }.should raise_error(RuntimeError)
 	end
 
 	it "should be able to create an exchange" do
@@ -52,6 +52,12 @@ describe Bunny do
 		@b.queues.has_key?('test1').should be(true)
   end
 
+	# Current RabbitMQ has not implemented some functionality
+	it "should raise an error if setting of QoS fails" do
+		lambda { @b.qos(:global => true) }.should raise_error(Bunny::ForcedConnectionCloseError)
+		@b.status.should == :not_connected
+	end
+
 	it "should be able to set QoS" do
 		@b.qos.should == :qos_ok
 	end

data/spec/spec_09/connection_spec.rb

@@ -0,0 +1,12 @@
+# connection_spec.rb
+
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. .. lib bunny]))
+
+describe Bunny do
+	
+	it "should raise an error if the wrong user name or password is used" do
+		b = Bunny.new(:spec => '0.9', :user => 'wrong')
+		lambda { b.start}.should raise_error(Bunny::ProtocolError)	
+	end
+	
+end

data/spec/spec_09/exchange_spec.rb

@@ -8,7 +8,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__), %w[.. .. lib bunny]))
 
-describe Bunny do
+describe 'Exchange' do
 	
 	before(:each) do
     @b = Bunny.new(:spec => '09')
@@ -16,7 +16,8 @@ describe Bunny do
 	end
 		
 	it "should raise an error if instantiated as non-existent type" do
-		lambda { @b.exchange('bogus_ex', :type => :bogus) }.should raise_error(Bunny::ProtocolError)
+		lambda { @b.exchange('bogus_ex', :type => :bogus) }.should raise_error(Bunny::ForcedConnectionCloseError)
+		@b.status.should == :not_connected
 	end
 	
 	it "should allow a default direct exchange to be instantiated by specifying :type" do
@@ -124,13 +125,28 @@ describe Bunny do
   end
 	
 	it "should be able to return an undeliverable message" do
-		exch = @b.exchange('')
+		exch = @b.exchange('return_exch')
 		exch.publish('This message should be undeliverable', :immediate => true)
 		ret_msg = @b.returned_message
 		ret_msg.should be_an_instance_of(Hash)
 		ret_msg[:payload].should == 'This message should be undeliverable'
 	end
 	
+	it "should be able to return a message that exceeds maximum frame size" do
+		exch = @b.exchange('return_exch')
+		lg_msg = 'z' * 142000
+		exch.publish(lg_msg, :immediate => true)
+		ret_msg = @b.returned_message
+		ret_msg.should be_an_instance_of(Hash)
+		ret_msg[:payload].should == lg_msg
+	end
+	
+	it "should report an error if delete fails" do
+		exch = @b.exchange('direct_exchange')
+		lambda { exch.delete(:exchange => 'bogus_ex') }.should raise_error(Bunny::ForcedChannelCloseError)
+		@b.channel.active.should == false
+	end
+	
 	it "should be able to be deleted" do
 		exch = @b.exchange('direct_exchange')
 		res = exch.delete

data/spec/spec_09/queue_spec.rb

@@ -8,7 +8,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__), %w[.. .. lib bunny]))
 
-describe Bunny do
+describe 'Queue' do
 	
 	before(:each) do
     @b = Bunny.new(:spec => '09')
@@ -25,18 +25,30 @@ describe Bunny do
 		q.bind(exch, :nowait => true).should == :bind_ok
 	end
 	
-	it "should be able to bind to an exchange" do
+	it "should raise an error when trying to bind to a non-existent exchange" do
+		q = @b.queue('test1')
+		lambda {q.bind('bogus')}.should raise_error(Bunny::ForcedChannelCloseError)
+		@b.channel.active.should == false
+	end
+	
+	it "should be able to bind to an existing exchange" do
 		exch = @b.exchange('direct_exch')
 		q = @b.queue('test1')
 		q.bind(exch).should == :bind_ok
 	end
 
-	it "should ignore the :nowait option when unbinding from an exchange" do
+	it "should ignore the :nowait option when unbinding from an existing exchange" do
 		exch = @b.exchange('direct_exch')
 		q = @b.queue('test0')
 		q.unbind(exch, :nowait => true).should == :unbind_ok
 	end
 	
+	it "should raise an error if unbinding from a non-existent exchange" do
+		q = @b.queue('test1')
+		lambda {q.unbind('bogus')}.should raise_error(Bunny::ForcedChannelCloseError)
+		@b.channel.active.should == false
+	end
+	
 	it "should be able to unbind from an exchange" do
 		exch = @b.exchange('direct_exch')
 		q = @b.queue('test1')
@@ -51,7 +63,7 @@ describe Bunny do
 	
 	it "should be able to pop a message complete with header and delivery details" do
 		q = @b.queue('test1')
-		msg = q.pop(:header => true)
+		msg = q.pop()
 		msg.should be_an_instance_of(Hash)
 		msg[:header].should be_an_instance_of(Bunny::Protocol09::Header)
 		msg[:payload].should == 'This is a test message'
@@ -62,7 +74,7 @@ describe Bunny do
 	it "should be able to pop a message and just get the payload" do
 		q = @b.queue('test1')
 		q.publish('This is another test message')
-		msg = q.pop
+		msg = q.pop[:payload]
 		msg.should == 'This is another test message'
 		q.message_count.should == 0
 	end
@@ -71,15 +83,28 @@ describe Bunny do
 		q = @b.queue('test1')
 		lg_msg = 'z' * 142000
 		q.publish(lg_msg)
-		msg = q.pop
+		msg = q.pop[:payload]
 		msg.should == lg_msg
 	end
 	
-	it "should be able to be purged to remove all of its messages" do
+	it "should be able call a block when popping a message" do
+		q = @b.queue('test1')
+		q.publish('This is another test message')
+		q.pop { |msg| msg[:payload].should == 'This is another test message' }
+		q.pop { |msg| msg[:payload].should == :queue_empty }
+	end
+	
+	it "should raise an error if purge fails" do
 		q = @b.queue('test1')
 		5.times {q.publish('This is another test message')}
 		q.message_count.should == 5
-		q.purge
+		lambda {q.purge(:queue => 'bogus')}.should raise_error(Bunny::ForcedChannelCloseError)
+	end
+	
+	it "should be able to be purged to remove all of its messages" do
+		q = @b.queue('test1')
+		q.message_count.should == 5
+		q.purge.should == :purge_ok
 		q.message_count.should == 0
 	end
 	
@@ -87,17 +112,16 @@ describe Bunny do
 		q = @b.queue('test1')
 		q.publish('This is another test message')
 		q.pop
-		msg = q.pop
+		msg = q.pop[:payload]
 		msg.should == :queue_empty
 	end
-	
+
 	it "should stop subscription without processing messages if max specified is 0" do
 		q = @b.queue('test1')
 		5.times {q.publish('Yet another test message')}
 		q.message_count.should == 5
-		q.subscribe(:message_max => 0){|msg| x = 1}
+		q.subscribe(:message_max => 0)
 		q.message_count.should == 5
-		q.unsubscribe.should == :unsubscribe_ok
 		q.purge.should == :purge_ok
 	end
 	
@@ -105,8 +129,57 @@ describe Bunny do
 		q = @b.queue('test1')
 		5.times {q.publish('Yet another test message')}
 		q.message_count.should == 5
-		q.subscribe(:message_max => 5){|msg| x = 1}
-		q.unsubscribe.should == :unsubscribe_ok
+		q.subscribe(:message_max => 5)
+	end
+	
+	it "should stop subscription after processing message_max messages < total in queue" do
+		q = @b.queue('test1')
+		@b.qos()
+		10.times {q.publish('Yet another test message')}
+		q.message_count.should == 10
+		q.subscribe(:message_max => 5, :ack => true)
+		q.message_count.should == 5
+		q.purge.should == :purge_ok
+	end
+	
+	it "should raise an error when delete fails" do
+		q = @b.queue('test1')
+		lambda {q.delete(:queue => 'bogus')}.should raise_error(Bunny::ForcedChannelCloseError)
+		@b.channel.active.should == false
+	end
+
+	it "should pass correct block parameters through on subscribe" do
+    q = @b.queue('test1')
+    q.publish("messages pop\'n")
+
+    q.subscribe do |msg|
+      msg[:header].should be_an_instance_of Qrack::Protocol09::Header
+      msg[:payload].should == "messages pop'n"
+      msg[:delivery_details].should_not be_nil
+
+      q.unsubscribe
+			break
+    end
+
+	end
+
+	it "should finish processing subscription messages if break is called in block" do
+	  q = @b.queue('test1')
+	  q.publish('messages in my quezen')
+
+	  q.subscribe do |msg|
+	    msg[:payload].should == 'messages in my quezen'
+	    q.unsubscribe
+			break
+	  end
+
+	  5.times {|i| q.publish("#{i}")}
+		q.subscribe do |msg|
+		  if msg[:payload] == '4'
+				q.unsubscribe 
+				break
+			end
+		end
 	end
 
 	it "should be able to be deleted" do
@@ -115,18 +188,18 @@ describe Bunny do
 		res.should == :delete_ok
 		@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
 
-  it "should support server named queues" do
-    q = @b.queue
-    q.name.should_not == nil
+	it "should support server named queues" do
+	  q = @b.queue
+	  q.name.should_not == nil
 
-    @b.queue(q.name).should == q
-    q.delete
-  end
+	  @b.queue(q.name).should == q
+	  q.delete
+	end
 	
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bunny
 version: !ruby/object:Gem::Version 
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors: 
 - Chris Duncan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-07 00:00:00 +01:00
+date: 2009-10-05 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -20,10 +20,10 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README
+- README.rdoc
 files: 
 - LICENSE
-- README
+- README.rdoc
 - Rakefile
 - bunny.gemspec
 - examples/simple_08.rb
@@ -49,9 +49,12 @@ files:
 - lib/bunny/exchange09.rb
 - lib/bunny/queue08.rb
 - lib/bunny/queue09.rb
+- lib/bunny/subscription08.rb
+- lib/bunny/subscription09.rb
 - lib/qrack/client.rb
 - lib/qrack/channel.rb
 - lib/qrack/queue.rb
+- lib/qrack/subscription.rb
 - lib/qrack/protocol/protocol08.rb
 - lib/qrack/protocol/protocol09.rb
 - lib/qrack/protocol/spec08.rb
@@ -65,9 +68,11 @@ files:
 - spec/spec_08/bunny_spec.rb
 - spec/spec_08/exchange_spec.rb
 - spec/spec_08/queue_spec.rb
+- spec/spec_08/connection_spec.rb
 - spec/spec_09/bunny_spec.rb
 - spec/spec_09/exchange_spec.rb
 - spec/spec_09/queue_spec.rb
+- spec/spec_09/connection_spec.rb
 has_rdoc: true
 homepage: http://github.com/celldee/bunny/tree/master
 licenses: []
@@ -75,7 +80,7 @@ licenses: []
 post_install_message: 
 rdoc_options: 
 - --main
-- README
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -93,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: bunny-amqp
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A synchronous Ruby AMQP client that enables interaction with AMQP-compliant brokers/servers.