bunny 0.4.4 → 0.5.1

data/Rakefile

@@ -1,6 +1,24 @@
-task :spec do
+desc "Run AMQP 0-8 rspec tests"
+task :spec08 do
 	require 'spec/rake/spectask'
-	Spec::Rake::SpecTask.new do |t|
+	puts "===== Running 0-8 tests ====="
+	Spec::Rake::SpecTask.new("spec08") do |t|
+		t.spec_files = FileList["spec/spec_08/*_spec.rb"]
 		t.spec_opts = ['--color']
 	end
-end
+end
+
+desc "Run AMQP 0-9 rspec tests"
+task :spec09 do
+	require 'spec/rake/spectask'
+	puts "===== Running 0-9 tests ====="
+	Spec::Rake::SpecTask.new("spec09") do |t|
+		t.spec_files = FileList["spec/spec_09/*_spec.rb"]
+		t.spec_opts = ['--color']
+	end
+end
+
+task :default => [ :spec08 ]
+
+desc "Run all rspec tests"
+task :all => [:spec08, :spec09]

data/bunny.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name = %q{bunny}
-  s.version = "0.4.4"
+  s.version = "0.5.1"
   s.authors = ["Chris Duncan"]
-  s.date = %q{2009-06-19}
+  s.date = %q{2009-08-08}
   s.description = %q{Another synchronous Ruby AMQP client}
   s.email = %q{celldee@gmail.com}
   s.rubyforge_project = %q{bunny-amqp}
@@ -15,30 +15,44 @@ Gem::Specification.new do |s|
 	 	"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"]
 end

data/examples/simple_09.rb

@@ -0,0 +1,30 @@
+# simple.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')
+
+$:.unshift File.dirname(__FILE__) + '/../lib'
+
+require 'bunny'
+
+b = Bunny.new(:logging => true, :spec => '09')
+
+# start a communication session with the amqp server
+b.start
+
+# declare a queue
+q = b.queue('test1')
+
+# publish a message to the queue
+q.publish('Hello everybody!')
+
+# get message from the queue
+msg = q.pop
+
+puts 'This is the message: ' + msg + "\n\n"
+
+# close the client connection
+b.stop

data/examples/simple_ack_09.rb

@@ -0,0 +1,33 @@
+# simple_ack.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')
+
+$:.unshift File.dirname(__FILE__) + '/../lib'
+
+require 'bunny'
+
+b = Bunny.new(:logging => true, :spec => '09')
+
+# start a communication session with the amqp server
+b.start
+
+# declare a queue
+q = b.queue('test1')
+
+# publish a message to the queue
+q.publish('Testing acknowledgements')
+
+# get message from the queue
+msg = q.pop(:ack => true)
+
+# acknowledge receipt of message
+q.ack
+
+puts 'This is the message: ' + msg + "\n\n"
+
+# close the client connection
+b.stop

data/examples/simple_consumer_09.rb

@@ -0,0 +1,55 @@
+# consumer.rb
+
+# N.B. To be used in conjunction with simple_publisher.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')
+
+# How this example works
+#=======================
+#
+# Open up two console windows start this program in one of them by typing -
+#
+# ruby simple_consumer.rb
+#
+# Then switch to the other console window and type -
+#
+# ruby simple_publisher.rb
+#
+# A message will be printed out by the simple_consumer and it will wait for the next message
+#
+# Run simple_publisher 3 more times. After the last run simple_consumer will stop.
+
+$:.unshift File.dirname(__FILE__) + '/../lib'
+
+require 'bunny'
+
+b = Bunny.new(:logging => true, :spec => '09')
+
+# start a communication session with the amqp server
+b.start
+
+# create/get queue
+q = b.queue('po_box')
+
+# create/get exchange
+exch = b.exchange('sorting_room')
+
+# bind queue to exchange
+q.bind(exch, :key => 'fred')
+
+# initialize counter
+i = 1
+
+# subscribe to queue
+q.subscribe(:consumer_tag => 'testtag1') do |msg|
+	puts i.to_s + ': ' + msg
+	i+=1
+	q.unsubscribe(:consumer_tag => 'testtag1') if i == 5
+end
+
+# close the connection
+b.stop

data/examples/simple_fanout_09.rb

@@ -0,0 +1,39 @@
+# fanout.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')
+
+$:.unshift File.dirname(__FILE__) + '/../lib'
+
+require 'bunny'
+
+b = Bunny.new(:logging => true, :spec => '09')
+
+# start a communication session with the amqp server
+b.start
+
+# declare queues
+q1 = b.queue('test_fan1')
+q2 = b.queue('test_fan2')
+
+# create a fanout exchange
+exch = b.exchange('test_fan', :type => :fanout)
+
+# bind the queues to the exchange
+q1.bind(exch)
+q2.bind(exch)
+
+# publish a message to the exchange
+exch.publish('This message will be fanned out')
+
+# get message from the queues
+msg = q1.pop
+puts 'This is the message from q1: ' + msg + "\n\n"
+msg = q2.pop
+puts 'This is the message from q2: ' + msg + "\n\n"
+
+# close the client connection
+b.stop

data/examples/simple_headers_09.rb

@@ -0,0 +1,40 @@
+# simple_headers.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')
+
+$:.unshift File.dirname(__FILE__) + '/../lib'
+
+require 'bunny'
+
+b = Bunny.new(:spec => '09')
+
+# start a communication session with the amqp server
+b.start
+
+# declare queues
+q = b.queue('header_q1')
+
+# create a headers exchange
+header_exch = b.exchange('header_exch', :type => :headers)
+
+# bind the queue to the exchange
+q.bind(header_exch, :arguments => {'h1'=>'a','x-match'=>'all'})
+
+# publish messages to the exchange
+header_exch.publish('Headers test msg 1', :headers => {'h1'=>'a'})
+header_exch.publish('Headers test msg 2', :headers => {'h1'=>'z'})
+
+
+# get messages from the queue - should only be msg 1 that got through
+msg = ""
+until msg == :queue_empty do
+	msg = q.pop
+	puts 'This is a message from the header_q1 queue: ' + msg + "\n" unless msg == :queue_empty
+end
+
+# close the client connection
+b.stop

data/examples/simple_publisher_09.rb

@@ -0,0 +1,27 @@
+# simple_publisher.rb
+
+# N.B. To be used in conjunction with simple_consumer.rb. See simple_consumer.rb for explanation.
+
+# 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')
+
+$:.unshift File.dirname(__FILE__) + '/../lib'
+
+require 'bunny'
+
+b = Bunny.new(:logging => true, :spec => '09')
+
+# start a communication session with the amqp server
+b.start
+
+# create/get exchange
+exch = b.exchange('sorting_room')
+
+# publish message to exchange
+exch.publish('This is a message from the publisher', :key => 'fred')
+
+# message should now be picked up by the consumer so we can stop
+b.stop

data/examples/simple_topic_09.rb

@@ -0,0 +1,59 @@
+# simple_topic.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')
+
+$:.unshift File.dirname(__FILE__) + '/../lib'
+
+require 'bunny'
+
+b = Bunny.new(:spec => '09')
+
+# start a communication session with the amqp server
+b.start
+
+# declare queues
+soccer = b.queue('topic_soccer')
+cricket = b.queue('topic_cricket')
+rugby = b.queue('topic_rugby')
+allsport = b.queue('topic_allsport')
+
+# create a topic exchange
+sports_results = b.exchange('sports_results', :type => :topic)
+
+# bind the queues to the exchange
+soccer.bind(sports_results, :key => 'soccer.*')
+cricket.bind(sports_results, :key => 'cricket.*')
+rugby.bind(sports_results, :key => 'rugby.*')
+allsport.bind(sports_results, :key => '*.result')
+
+# publish messages to the exchange
+sports_results.publish('Manchester United 1 : Hull City 4', :key => 'soccer.result')
+sports_results.publish('England beat Australia by 5 wickets in first test', :key => 'cricket.result')
+sports_results.publish('British Lions 15 : South Africa 12', :key => 'rugby.result')
+
+# get message from the queues
+
+# soccer queue got the soccer message
+msg = soccer.pop
+puts 'This is a message from the soccer q: ' + msg + "\n\n"
+
+# cricket queue got the cricket message
+msg = cricket.pop
+puts 'This is a message from the cricket q: ' + msg + "\n\n"
+
+# rugby queue got the rugby message
+msg = rugby.pop
+puts 'This is a message from the rugby q: ' + msg + "\n\n"
+
+# allsport queue got all of the messages
+until msg == :queue_empty do
+	msg = allsport.pop
+	puts 'This is a message from the allsport q: ' + msg + "\n\n" unless msg == :queue_empty
+end
+
+# close the client connection
+b.stop

data/lib/bunny.rb

@@ -12,7 +12,7 @@ module Bunny
 	class ConnectionError < StandardError; end
 	class MessageError < StandardError; end
 	
-	VERSION = '0.4.4'
+	VERSION = '0.5.1'
 	
 	# Returns the Bunny version number
 
@@ -25,9 +25,10 @@ module Bunny
 	def self.new(opts = {})
 		# Set up Bunny according to AMQP spec version required
 		spec_version = opts[:spec] || '08'
-		setup(spec_version)
+		setup(spec_version, opts)
 		
-		Bunny::Client.new(opts)
+		# Return client
+		@client
 	end
 	
 	# Runs a code block using a short-lived connection
@@ -37,14 +38,13 @@ module Bunny
 
 		# Set up Bunny according to AMQP spec version required
 		spec_version = opts[:spec] || '08'
-		setup(spec_version)
+		setup(spec_version, opts)
 		
-    client = Bunny::Client.new(opts)
-    client.start
+    @client.start
 
-    block.call(client)
+    block.call(@client)
 
-    client.stop
+    @client.stop
 
 		# Return success
 		:run_ok
@@ -52,20 +52,25 @@ module Bunny
 
 	private
 	
-	def self.setup(version)
-
+	def self.setup(version, opts)	
 		if version == '08'
 			# AMQP 0-8 specification
 			require 'qrack/qrack08'
 			require 'bunny/client08'
 			require 'bunny/exchange08'
 			require 'bunny/queue08'
+			require 'bunny/channel08'
+			
+			@client = Bunny::Client.new(opts)
 		else
 			# AMQP 0-9-1 specification
-			require 'qrack/qrack091'
-			require 'bunny/client091'
-			require 'bunny/exchange091'
-			require 'bunny/queue091'
+			require 'qrack/qrack09'
+			require 'bunny/client09'
+			require 'bunny/exchange09'
+			require 'bunny/queue09'
+			require 'bunny/channel09'
+			
+			@client = Bunny::Client09.new(opts)
 		end			
 		
 		include Qrack