bunny 0.4.4 → 0.5.1

data/spec/{queue_spec.rb → spec_08/queue_spec.rb}

@@ -6,7 +6,7 @@
 # If this is not the case, please change the 'Bunny.new' call below to include
 # the relevant arguments e.g. @b = Bunny.new(:user => 'john', :pass => 'doe', :host => 'foobar')
 
-require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib bunny]))
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. .. lib bunny]))
 
 describe Bunny do
 	

data/spec/spec_09/bunny_spec.rb

@@ -0,0 +1,40 @@
+# bunny_spec.rb
+
+# Assumes that target message broker/server has a user called 'guest' with a password 'guest'
+# and that it is running on 'localhost'.
+
+# If this is not the case, please change the 'Bunny.new' call below to include
+# the relevant arguments e.g. @b = Bunny.new(:user => 'john', :pass => 'doe', :host => 'foobar')
+
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. .. lib bunny]))
+
+describe Bunny do
+	
+	before(:each) do
+    @b = Bunny.new(:spec => '09')
+		@b.start
+	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 Bunny::Exchange09
+		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 Bunny::Queue09
+		q.name.should == 'test1'
+		@b.queues.has_key?('test1').should be true
+  end
+
+	it "should be able to set QoS" do
+		@b.qos.should == :qos_ok
+	end
+
+end

data/spec/spec_09/exchange_spec.rb

@@ -0,0 +1,131 @@
+# exchange_spec.rb
+
+# Assumes that target message broker/server has a user called 'guest' with a password 'guest'
+# and that it is running on 'localhost'.
+
+# If this is not the case, please change the 'Bunny.new' call below to include
+# the relevant arguments e.g. @b = Bunny.new(:user => 'john', :pass => 'doe', :host => 'foobar')
+
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. .. lib bunny]))
+
+describe Bunny do
+	
+	before(:each) do
+    @b = Bunny.new(:spec => '09')
+		@b.start
+	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)
+	end
+	
+	it "should allow a default direct exchange to be instantiated by specifying :type" do
+		exch = @b.exchange('amq.direct', :type => :direct)
+		exch.should be_an_instance_of Bunny::Exchange09
+		exch.name.should == 'amq.direct'
+		exch.type.should == :direct
+		@b.exchanges.has_key?('amq.direct').should be true
+	end
+	
+	it "should allow a default direct exchange to be instantiated without specifying :type" do
+		exch = @b.exchange('amq.direct')
+		exch.should be_an_instance_of Bunny::Exchange09
+		exch.name.should == 'amq.direct'
+		exch.type.should == :direct
+		@b.exchanges.has_key?('amq.direct').should be true
+	end
+	
+	it "should allow a default fanout exchange to be instantiated without specifying :type" do
+		exch = @b.exchange('amq.fanout')
+		exch.should be_an_instance_of Bunny::Exchange09
+		exch.name.should == 'amq.fanout'
+		exch.type.should == :fanout
+		@b.exchanges.has_key?('amq.fanout').should be true
+	end
+	
+	it "should allow a default topic exchange to be instantiated without specifying :type" do
+		exch = @b.exchange('amq.topic')
+		exch.should be_an_instance_of Bunny::Exchange09
+		exch.name.should == 'amq.topic'
+		exch.type.should == :topic
+		@b.exchanges.has_key?('amq.topic').should be true
+	end
+
+	it "should allow a default headers (amq.match) exchange to be instantiated without specifying :type" do
+		exch = @b.exchange('amq.match')
+		exch.should be_an_instance_of Bunny::Exchange09
+		exch.name.should == 'amq.match'
+		exch.type.should == :headers
+		@b.exchanges.has_key?('amq.match').should be true
+	end
+	
+	it "should allow a default headers (amq.headers) exchange to be instantiated without specifying :type" do
+		exch = @b.exchange('amq.headers')
+		exch.should be_an_instance_of Bunny::Exchange09
+		exch.name.should == 'amq.headers'
+		exch.type.should == :headers
+		@b.exchanges.has_key?('amq.headers').should be true
+	end
+	
+	it "should create an exchange as direct by default" do
+		exch = @b.exchange('direct_defaultex')
+		exch.should be_an_instance_of Bunny::Exchange09
+		exch.name.should == 'direct_defaultex'
+		exch.type.should == :direct
+		@b.exchanges.has_key?('direct_defaultex').should be true
+	end
+	
+	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 Bunny::Exchange09
+		exch.name.should == 'direct_exchange'
+		exch.type.should == :direct
+		@b.exchanges.has_key?('direct_exchange').should be true
+	end
+	
+	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 Bunny::Exchange09
+		exch.name.should == 'topic_exchange'
+		exch.type.should == :topic
+		@b.exchanges.has_key?('topic_exchange').should be true
+	end
+	
+	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 Bunny::Exchange09
+		exch.name.should == 'fanout_exchange'
+		exch.type.should == :fanout
+		@b.exchanges.has_key?('fanout_exchange').should be true
+	end
+
+	it "should be able to be instantiated as a headers exchange" do
+		exch = @b.exchange('headers_exchange', :type => :headers)
+		exch.should be_an_instance_of Bunny::Exchange09
+		exch.name.should == 'headers_exchange'
+		exch.type.should == :headers
+		@b.exchanges.has_key?('headers_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')
+	end
+	
+	it "should be able to be deleted" do
+		exch = @b.exchange('direct_exchange')
+		res = exch.delete
+		res.should == :delete_ok
+		@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/spec_09/queue_spec.rb

@@ -0,0 +1,106 @@
+# queue_spec.rb
+
+# Assumes that target message broker/server has a user called 'guest' with a password 'guest'
+# and that it is running on 'localhost'.
+
+# If this is not the case, please change the 'Bunny.new' call below to include
+# the relevant arguments e.g. @b = Bunny.new(:user => 'john', :pass => 'doe', :host => 'foobar')
+
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. .. lib bunny]))
+
+describe Bunny do
+	
+	before(:each) do
+    @b = Bunny.new(:spec => '09')
+		@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).should == :bind_ok
+	end
+	
+	it "should be able to bind to an 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
+		exch = @b.exchange('direct_exch')
+		q = @b.queue('test0')
+		q.unbind(exch, :nowait => true).should == :unbind_ok
+	end
+	
+	it "should be able to unbind from an exchange" do
+		exch = @b.exchange('direct_exch')
+		q = @b.queue('test1')
+		q.unbind(exch).should == :unbind_ok
+	end
+
+	it "should be able to publish a message" do
+		q = @b.queue('test1')
+		q.publish('This is a test message')
+		q.message_count.should == 1
+	end
+	
+	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.should be_an_instance_of Hash
+		msg[:header].should be_an_instance_of Bunny::Protocol09::Header
+		msg[:payload].should == 'This is a test message'
+		msg[:delivery_details].should be_an_instance_of Hash
+		q.message_count.should == 0
+	end
+
+	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.should == 'This is another test message'
+		q.message_count.should == 0
+	end
+	
+	it "should be able to be purged to remove all of its messages" do
+		q = @b.queue('test1')
+		5.times {q.publish('This is another test message')}
+		q.message_count.should == 5
+		q.purge
+		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')
+		res = q.delete
+		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
+
+    @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.4.4
+  version: 0.5.1
 platform: ruby
 authors: 
 - Chris Duncan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-19 00:00:00 +01:00
+date: 2009-08-08 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -26,34 +26,50 @@ files:
 - README
 - Rakefile
 - bunny.gemspec
-- examples/simple.rb
-- examples/simple_ack.rb
-- examples/simple_consumer.rb
-- examples/simple_fanout.rb
-- examples/simple_publisher.rb
-- examples/simple_topic.rb
-- examples/simple_headers.rb
+- examples/simple_08.rb
+- examples/simple_ack_08.rb
+- examples/simple_consumer_08.rb
+- examples/simple_fanout_08.rb
+- examples/simple_publisher_08.rb
+- examples/simple_topic_08.rb
+- examples/simple_headers_08.rb
+- examples/simple_09.rb
+- examples/simple_ack_09.rb
+- examples/simple_consumer_09.rb
+- examples/simple_fanout_09.rb
+- examples/simple_publisher_09.rb
+- examples/simple_topic_09.rb
+- examples/simple_headers_09.rb
 - lib/bunny.rb
+- lib/bunny/channel08.rb
+- lib/bunny/channel09.rb
 - lib/bunny/client08.rb
-- lib/bunny/client091.rb
+- lib/bunny/client09.rb
 - lib/bunny/exchange08.rb
-- lib/bunny/exchange091.rb
+- lib/bunny/exchange09.rb
 - lib/bunny/queue08.rb
-- lib/bunny/queue091.rb
+- lib/bunny/queue09.rb
 - lib/qrack/client.rb
-- lib/qrack/protocol/protocol.rb
+- lib/qrack/protocol/protocol08.rb
+- lib/qrack/protocol/protocol09.rb
 - lib/qrack/protocol/spec08.rb
-- lib/qrack/protocol/spec091.rb
+- lib/qrack/protocol/spec09.rb
 - lib/qrack/qrack08.rb
-- lib/qrack/qrack091.rb
-- lib/qrack/transport/buffer.rb
+- lib/qrack/qrack09.rb
+- lib/qrack/transport/buffer08.rb
+- lib/qrack/transport/buffer09.rb
 - lib/qrack/transport/frame08.rb
-- lib/qrack/transport/frame091.rb
-- spec/bunny_spec.rb
-- spec/exchange_spec.rb
-- spec/queue_spec.rb
+- lib/qrack/transport/frame09.rb
+- spec/spec_08/bunny_spec.rb
+- spec/spec_08/exchange_spec.rb
+- spec/spec_08/queue_spec.rb
+- spec/spec_09/bunny_spec.rb
+- spec/spec_09/exchange_spec.rb
+- spec/spec_09/queue_spec.rb
 has_rdoc: true
 homepage: http://github.com/celldee/bunny/tree/master
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -75,9 +91,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: bunny-amqp
-rubygems_version: 1.3.1
+rubygems_version: 1.3.4
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A synchronous Ruby AMQP client that enables interaction with AMQP-compliant brokers/servers.
 test_files: []
 

data/lib/qrack/qrack091.rb

@@ -1,28 +0,0 @@
-$: << File.expand_path(File.dirname(__FILE__))
-
-require 'protocol/spec091'
-require 'protocol/protocol'
-
-require 'transport/buffer'
-require 'transport/frame091'
-
-require 'qrack/client'
-
-module Qrack
-	
-	include Protocol
-	include Transport
-	
-	# Errors
-	class BufferOverflowError < StandardError; end
-  class InvalidTypeError < StandardError; end
-
-  # Qrack version number
-  VERSION = '0.0.1'
-
-  # Return the Qrack version
-  def self.version
-    VERSION
-  end
-
-end