celldee-bunny 0.0.1 → 0.0.2

data/README.markdown

@@ -1,11 +1,17 @@
-# bunny README
+# README
 
-This project was started to enable me to interact with RabbitMQ using Ruby. It has borrowed heavily from two projects:
+## 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.
  
-I will be creating tests, examples and generally tinkering, so please bear with me.
+*bunny* is being tested with RabbitMQ version 1.5.4 and version 0-8 of the AMQP specification.
  
 ## Quick Start
 
@@ -22,16 +28,16 @@ I will be creating tests, examples and generally tinkering, so please bear with
     end
 
     # declare a queue
-    q = Queue.new(b.client, 'test1')
+    q = b.queue('test1')
 
     # create a direct exchange
-    exchange = Exchange.new(b.client, :direct, 'test_ex')
+    exch = b.exchange(:direct, 'test_ex')
 
     # bind the queue to the exchange
-    q.bind(exchange)
+    q.bind(exch)
 
     # publish a message to the exchange
-    exchange.publish('Hello everybody!')
+    exch.publish('Hello everybody!')
 
     # get message from the queue
     msg = q.pop

data/examples/simple.rb

@@ -13,16 +13,16 @@ rescue Exception => e
 end
 
 # declare a queue
-q = Queue.new(b.client, 'test1')
+q = b.queue('test1')
 
 # create a direct exchange
-exchange = Exchange.new(b.client, :direct, 'test_ex')
+exch = b.exchange(:direct, 'test_ex')
 
 # bind the queue to the exchange
-q.bind(exchange)
+q.bind(exch)
 
 # publish a message to the exchange
-exchange.publish('Hello everybody!')
+exch.publish('Hello everybody!')
 
 # get message from the queue
 msg = q.pop

data/lib/amqp/client.rb

@@ -4,7 +4,7 @@ module AMQP
     RETRY_DELAY     = 10.0
 
     attr_reader   :status
-    attr_accessor :channel, :host, :logging, :port, :ticket
+    attr_accessor :channel, :host, :logging, :exchanges, :queues, :port, :ticket
 
     class ServerDown      < StandardError; end
     class ProtocolError   < StandardError; end
@@ -20,6 +20,14 @@ module AMQP
       @status = 'NOT CONNECTED'
     end
 
+		def exchanges
+			@exchanges ||= {}
+		end
+		
+		def queues
+			@queues ||= {}
+		end
+
     def send_frame(*args)
       args.each do |data|
         data.ticket  = ticket if ticket and data.respond_to?(:ticket=)

data/lib/bunny.rb

@@ -25,9 +25,13 @@ class Bunny
 	def status
 		client.status
 	end
+	
+	def exchange(type, name, opts = {})
+		client.exchanges[name] ||= Exchange.new(client, type, name, opts)
+	end
   
   def queue(name, opts = {})
-    queues[name] ||= Queue.new(client, name, opts)
+    client.queues[name] ||= Queue.new(client, name, opts)
   end
 
   def stop
@@ -35,23 +39,11 @@ class Bunny
   end
 
   def queues
-    @queues ||= {}
-  end
-
-  def direct(name = 'amq.direct', opts = {})
-    exchanges[name] ||= Exchange.new(client, :direct, name, opts)
-  end
-
-  def topic(name = 'amq.topic', opts = {})
-    exchanges[name] ||= Exchange.new(client, :topic, name, opts)
-  end
-
-  def headers(name = 'amq.match', opts = {})
-    exchanges[name] ||= Exchange.new(client, :headers, name, opts)
+    client.queues ||= {}
   end
 
   def exchanges
-    @exchanges ||= {}
+    client.exchanges ||= {}
   end
 
 end

data/lib/bunny/exchange.rb

@@ -7,7 +7,8 @@ class Exchange
   def initialize(client, type, name, opts = {})
     @client, @type, @name, @opts = client, type, name, opts
     @key = opts[:key]
-
+		@client.exchanges[@name] ||= self
+		
     unless name == "amq.#{type}" or name == ''
       client.send_frame(
         Protocol::Exchange::Declare.new(
@@ -38,6 +39,8 @@ class Exchange
   end
 
   def delete(opts = {})
+		client.exchanges.delete(name)
+		
     client.send_frame(
       Protocol::Exchange::Delete.new({ :exchange => name, :nowait => true }.merge(opts))
     )

data/lib/bunny/queue.rb

@@ -77,6 +77,8 @@
 	  end
 
 	  def delete(opts = {})
+			client.queues.delete(name)
+			
 	    client.send_frame(
 	      Protocol::Queue::Delete.new({ :queue => name, :nowait => true }.merge(opts))
 	    )

data/spec/bunny_spec.rb

@@ -9,22 +9,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 = Exchange.new(@b.client, :direct, 'test_exchange')
+		exch = @b.exchange(:direct, 'test_exchange')
 		exch.should be_an_instance_of Exchange
 		exch.name.should == 'test_exchange'
 		@b.exchanges.has_key?('test_exchange').should be true
 	end
-	
-	it "should be able to delete an exchange" do
-		exch = Exchange.new(@b.client, :direct, 'test_exchange')
-		exch.delete
-		@b.exchanges.has_key?('test_exchange').should be false
-	end
 
 	it "should be able to create a queue" do
 		q = @b.queue('test1')
@@ -33,23 +31,4 @@ describe Bunny do
 		@b.queues.has_key?('test1').should be true
   end
 
-	it "should be able to publish a message to a queue" do
-		q = @b.queue('test1')
-		q.publish('This is a test message')
-		q.message_count.should == 1
-	end
-
-	it "should be able to get a message from a queue" do
-		q = @b.queue('test1')
-		msg = q.pop
-		msg.should == 'This is a test message'
-		q.message_count.should == 0
-	end
-
-	it "should be able to delete a queue" do
-		q = @b.queue('test1')
-		q.delete
-		@b.queues.has_key?('test1').should be true
-	end
-
 end

data/spec/exchange_spec.rb

@@ -0,0 +1,51 @@
+# exchange_spec.rb
+
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib bunny]))
+
+describe Exchange do
+	
+	before(:each) do
+    @b = Bunny.new
+		@b.start
+	end
+	
+	after(:each) do
+		@b.stop
+	end
+	
+	it "should be able to be created as a direct exchange" do
+		exch = @b.exchange(:direct, 'direct_exchange')
+		exch.should be_an_instance_of Exchange
+		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 created as a topic exchange" do
+		exch = @b.exchange(:topic, 'topic_exchange')
+		exch.should be_an_instance_of Exchange
+		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 created as a fanout exchange" do
+		exch = @b.exchange(:fanout, 'fanout_exchange')
+		exch.should be_an_instance_of Exchange
+		exch.name.should == 'fanout_exchange'
+		exch.type.should == :fanout
+		@b.exchanges.has_key?('fanout_exchange').should be true
+	end
+	
+	it "should be able to publish a message" do
+		exch = @b.exchange(:direct, 'direct_exchange')
+		exch.publish('This is a published message')
+	end
+	
+	it "should be able to be deleted" do
+		exch = @b.exchange(:direct, 'direct_exchange')
+		exch.delete
+		@b.exchanges.has_key?('direct_exchange').should be false
+	end
+	
+end

data/spec/queue_spec.rb

@@ -0,0 +1,35 @@
+# queue_spec.rb
+
+require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib bunny]))
+
+describe Bunny do
+	
+	before(:each) do
+    @b = Bunny.new
+		@b.start
+	end
+	
+	after(:each) do
+		@b.stop
+	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" do
+		q = @b.queue('test1')
+		msg = q.pop
+		msg.should == 'This is a test message'
+		q.message_count.should == 0
+	end
+
+	it "should be able to be deleted" do
+		q = @b.queue('test1')
+		q.delete
+		@b.queues.has_key?('test1').should be false
+	end
+	
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: celldee-bunny
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Chris Duncan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-20 00:00:00 -07:00
+date: 2009-04-21 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -38,6 +38,8 @@ files:
 - lib/bunny.rb
 - examples/simple.rb
 - spec/bunny_spec.rb
+- spec/exchange_spec.rb
+- spec/queue_spec.rb
 - protocol/amqp-0.8.json
 - protocol/amqp-0.8.xml
 - protocol/codegen.rb
@@ -67,6 +69,6 @@ rubyforge_project:
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: TODO
+summary: Another synchronous Ruby AMQP client
 test_files: []