celldee-bunny 0.2.0 → 0.3.0

data/lib/bunny.rb

@@ -5,76 +5,34 @@ $:.unshift File.expand_path(File.dirname(__FILE__))
 	require file
 end
 
-# AMQP protocol and transport
-%w[spec protocol buffer frame].each do |file|
-	require 'engineroom/' + file
-end
+require 'bunny/client'
+require 'bunny/exchange'
+require 'bunny/queue'
 
-# Bunny API 
-%w[client exchange header queue].each do |file|
-	require 'bunny/' + file
-end
+require 'bunny/protocol/spec'
+require 'bunny/protocol/protocol'
 
-# Error and return message definitions
-require 'api_messages'
+require 'bunny/transport/buffer'
+require 'bunny/transport/frame'
 
-class Bunny
+module Bunny
+	
 	include Protocol
 	include Transport
-	include API
 
-	attr_reader :client
-
-	def initialize(opts = {})
-		@client = API::Client.new(opts)
-  end
-
-	def logging=(bool)
-		client.logging = bool
-	end
+	class ProtocolError < StandardError; end
+	class ServerDownError < StandardError; end
+	class BufferOverflowError < StandardError; end
+  class InvalidTypeError < StandardError; end
+	class ConnectionError < StandardError; end
+	class MessageError < StandardError; end
 	
-	def logging
-		client.logging
-	end
-
-	def start
-		client.start_session
-	end
-
-	def status
-		client.status
-	end
+	VERSION = '0.3.0'
 	
-	def exchange(name, opts = {})
-		client.exchanges[name] ||= API::Exchange.new(client, name, opts)
-	end
-  
-  def queue(name, opts = {})
-    client.queues[name] ||= API::Queue.new(client, name, opts)
-  end
-
-  def stop
-    client.close
-  end
-
-  def queues
-    client.queues ||= {}
-  end
+	# Returns the Bunny version number
 
-  def exchanges
-    client.exchanges ||= {}
-  end
-	
-	def host
-		client.host
-	end
-	
-	def vhost
-		client.vhost
-	end
-	
-	def port
-		client.port
+	def self.version
+		VERSION
 	end
-	
+
 end

data/spec/bunny_spec.rb

@@ -11,12 +11,12 @@ require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib bunny]))
 describe Bunny do
 	
 	before(:each) do
-    @b = Bunny.new
+    @b = Bunny::Client.new
 		@b.start
 	end
 	
   it "should connect to an AMQP server" do
-    @b.status.should == 'CONNECTED'
+    @b.status.should == :connected
   end
 
 	it "should be able to create an exchange" do

data/spec/exchange_spec.rb

@@ -11,12 +11,12 @@ require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib bunny]))
 describe Bunny::Exchange do
 	
 	before(:each) do
-    @b = Bunny.new
+    @b = Bunny::Client.new
 		@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(API::ProtocolError)
+		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
@@ -105,7 +105,7 @@ describe Bunny::Exchange do
 	it "should be able to be deleted" do
 		exch = @b.exchange('direct_exchange')
 		res = exch.delete
-		res.should == 'EXCHANGE DELETED'
+		res.should == :delete_ok
 		@b.exchanges.has_key?('direct_exchange').should be false
 	end
 	

data/spec/queue_spec.rb

@@ -11,7 +11,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib bunny]))
 describe Bunny::Queue do
 	
 	before(:each) do
-    @b = Bunny.new
+    @b = Bunny::Client.new
 		@b.start
 	end
 	
@@ -22,25 +22,25 @@ describe Bunny::Queue do
 	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 SUCCEEDED'
+		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 SUCCEEDED'
+		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 SUCCEEDED'
+		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 SUCCEEDED'
+		q.unbind(exch).should == :unbind_ok
 	end
 
 	it "should be able to publish a message" do
@@ -49,12 +49,13 @@ describe Bunny::Queue do
 		q.message_count.should == 1
 	end
 	
-	it "should be able to pop a message complete with header" 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.should be_an_instance_of Hash
-		msg[:header].should be_an_instance_of Protocol::Header
+		msg[:header].should be_an_instance_of Bunny::Protocol::Header
 		msg[:payload].should == 'This is a test message'
+		msg[:delivery_details].should be_an_instance_of Hash
 		q.message_count.should == 0
 	end
 
@@ -71,13 +72,13 @@ describe Bunny::Queue do
 		q.publish('This is another test message')
 		q.pop
 		msg = q.pop
-		msg.should == 'QUEUE EMPTY'
+		msg.should == :queue_empty
 	end
 
 	it "should be able to be deleted" do
 		q = @b.queue('test1')
 		res = q.delete
-		res.should == 'QUEUE DELETED'
+		res.should == :delete_ok
 		@b.queues.has_key?('test1').should be false
 	end
 	

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: celldee-bunny
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Chris Duncan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-01 00:00:00 -07:00
+date: 2009-05-10 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -19,38 +19,38 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README
 files: 
+- LICENSE
+- README
 - Rakefile
-- README.markdown
-- lib/api_messages.rb
-- lib/bunny.rb
-- lib/engineroom/buffer.rb
-- lib/engineroom/frame.rb
-- lib/engineroom/protocol.rb
-- lib/engineroom/spec.rb
-- lib/bunny/exchange.rb
-- lib/bunny/header.rb
-- lib/bunny/queue.rb
-- lib/bunny/client.rb
+- bunny.gemspec
 - examples/simple.rb
-- examples/simple_fanout.rb
+- examples/simple_ack.rb
 - examples/simple_consumer.rb
+- examples/simple_fanout.rb
 - examples/simple_publisher.rb
-- examples/simple_ack.rb
 - examples/simple_topic.rb
+- ext/amqp-0.8.json
+- ext/codegen.rb
+- lib/bunny.rb
+- lib/bunny/client.rb
+- lib/bunny/exchange.rb
+- lib/bunny/protocol/protocol.rb
+- lib/bunny/protocol/spec.rb
+- lib/bunny/queue.rb
+- lib/bunny/transport/buffer.rb
+- lib/bunny/transport/frame.rb
 - spec/bunny_spec.rb
 - spec/exchange_spec.rb
 - spec/queue_spec.rb
-- protocol/amqp-0.8.json
-- protocol/codegen.rb
 has_rdoc: true
 homepage: http://github.com/celldee/bunny
 post_install_message: 
 rdoc_options: 
-- --inline-source
-- --charset=UTF-8
+- --main
+- README
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -71,6 +71,6 @@ rubyforge_project: bunny-amqp
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: Another synchronous Ruby AMQP client
+summary: A synchronous Ruby AMQP client that enables interaction with AMQP-compliant brokers/servers.
 test_files: []
 

data/README.markdown

@@ -1,126 +0,0 @@
-# Bunny: A synchronous Ruby AMQP client
-
-Google Group: [http://groups.google.com/group/bunny-amqp](http://groups.google.com/group/bunny-amqp)
-
-Mailing List: [http://rubyforge.org/mailman/listinfo/bunny-amqp-devel](http://rubyforge.org/mailman/listinfo/bunny-amqp-devel)
-
-Rubyforge: [http://rubyforge.org/projects/bunny-amqp](http://rubyforge.org/projects/bunny-amqp)
-
-Twitter: [http://twitter.com/bunny_amqp](https://twitter.com/bunny_amqp)
-
-## Announcements
-
-Bunny v0.2.0 is now available. The highlights are -
-
-* Code has been re-organised enabling Bunny to play nicely with [amqp](http://github.com/tmm1/amqp) (thanks [Dan](http://github.com/danielsdeleo))
-* When instantiating a default exchange (one beginning with ‘amq.’) the type will be inferred from the name.
-* Fixed Queue#subscribe and included Queue#unsubscribe method. See examples/simple_consumer.rb for details
-
-## About
-
-*Bunny* is an [AMQP](http://www.amqp.org) (Advanced Message Queuing Protocol) client, written in Ruby, that is intended to allow you to interact with AMQP-compliant message brokers/servers such as [RabbitMQ](http://www.rabbitmq.com) in a synchronous fashion.
-
-It is based on a great deal of fabulous code from [amqp](http://github.com/tmm1/amqp) by Aman Gupta and [Carrot](http://github.com/famoseagle/carrot) by Amos Elliston.
-
-You can use *Bunny* to -
-
-* Create and delete exchanges
-* Create and delete queues
-* Publish and consume messages
- 
-*Bunny* is known to work with RabbitMQ version 1.5.4 and version 0-8 of the AMQP specification. If you want to try to use it with other AMQP message brokers/servers please let me know how you get on.
- 
-## Quick Start
-
-    require 'bunny'
-
-    b = Bunny.new(:logging => true)
-
-    # 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 connection
-    b.close
-
-## Bunny methods
-
-These are the Bunny methods that you will probably want to use -
-
-### Create a Bunny instance
-Bunny#new({_options_})
-
-### Start a communication session with the target server
-Bunny#start
-
-### Stop a communication session with the target server
-Bunny#stop
-
-### Create a Queue
-Bunny#queue(_**name**_, {_options_})
-
-### Create an Exchange
-Bunny#exchange(_**name**_, {_options_})
-
-### Return connection status ('CONNECTED' or 'NOT CONNECTED')
-Bunny#status               
-
-### Publish a message to an exchange
-Exchange#publish(_**data**_, {_options_})
-
-### Delete an exchange from the target server
-Exchange#delete({_options_})
-
-### Bind a queue to an exchange
-Queue#bind(_**exchange**_, {_options_})
-
-### Unbind a queue from an exchange
-Queue#unbind(_**exchange**_, {_options_})
-
-### Publish a message to a queue
-Queue#publish(_**data**_, {_options_})
-
-### Pop a message off of a queue
-Queue#pop({_options_})
-
-### Subscribe to a queue
-Queue#subscribe({_options_}, &blk)
-
-### Unsubscribe from a queue
-Queue#unsubscribe({_options_})
-
-### Return queue message count
-Queue#message_count
-
-### Return queue consumer count
-Queue#consumer_count
-
-### Return queue status (hash {:message count, :consumer_count})
-Queue#status
-
-### Delete a queue from the target server
-Queue#delete({_options_})
-
-### Acknowledge receipt of a message
-Queue#ack
-
-## 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](http://github.com/tmm1/amqp/tree/master)
-2. **carrot** by *famoseagle* [http://github.com/famoseagle/carrot/tree/master](http://github.com/famoseagle/carrot/tree/master)
-
-## LICENSE
-
-Copyright (c) 2009 Chris Duncan; Published under The MIT License, see License

data/lib/api_messages.rb

@@ -1,18 +0,0 @@
-module API
-	# return messages
-	CONNECTED = 'CONNECTED'
-	NOT_CONNECTED = 'NOT CONNECTED'
-	QUEUE_EMPTY = 'QUEUE EMPTY'
-	QUEUE_DELETED = 'QUEUE DELETED'
-	EXCHANGE_DELETED = 'EXCHANGE DELETED'
-	BIND_SUCCEEDED = 'BIND SUCCEEDED'
-	UNBIND_SUCCEEDED = 'UNBIND SUCCEEDED'
-
-	# specific error definitions
-	class ProtocolError < StandardError; end
-	class ServerDownError < StandardError; end
-	class BufferOverflowError < StandardError; end
-  class InvalidTypeError < StandardError; end
-	class ConnectionError < StandardError; end
-	class MessageError < StandardError; end
-end

data/lib/bunny/header.rb

@@ -1,30 +0,0 @@
-module API
-	class Header
-	
-		attr_reader :client
-	
-	  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
-
-	  # 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 inspect
-	    @header.inspect
-	  end
-	end
-end