celldee-bunny 0.0.5 → 0.0.6

data/README.markdown

@@ -31,20 +31,17 @@ There is a Google Group for discussing bunny - [bunny-amqp](http://groups.google
     # declare a queue
     q = b.queue('test1')
 
-    # create a direct exchange
-    exch = b.exchange(:direct, 'test_ex')
-
-    # bind the queue to the exchange
-    q.bind(exch)
-
-    # publish a message to the exchange
-    exch.publish('Hello everybody!')
+    # 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
+
 ## Acknowledgements
 
 This project has borrowed heavily from the following two projects and owes their respective creators and collaborators a whole lot of gratitude:

data/lib/amqp.rb

@@ -2,4 +2,14 @@ module AMQP
 	%w[ spec buffer protocol frame client ].each do |file|
     require "amqp/#{file}"
   end
+
+	# constants
+	CONNECTED = 'CONNECTED'
+	NOT_CONNECTED = 'NOT CONNECTED'
+
+	# specific error definitions
+	class ProtocolError   < StandardError; end
+	class ServerDown      < StandardError; end
+	class Overflow < StandardError; end
+  class InvalidType < StandardError; end
 end

data/lib/amqp/buffer.rb

@@ -10,8 +10,6 @@ end
 
 module AMQP
   class Buffer #:nodoc: all
-    class Overflow < StandardError; end
-    class InvalidType < StandardError; end
     
     def initialize data = ''
       @data = data

data/lib/amqp/client.rb

@@ -6,9 +6,6 @@ module AMQP
     attr_reader   :status
     attr_accessor :channel, :host, :logging, :exchanges, :queues, :port, :ticket
 
-    class ServerDown      < StandardError; end
-    class ProtocolError   < StandardError; end
-
     def initialize(opts = {})
 			@host = opts[:host] || 'localhost'
 			@port = opts[:port] || AMQP::PORT
@@ -17,7 +14,7 @@ module AMQP
       @vhost  = opts[:vhost] || '/'
 			@logging = opts[:logging] || false
       @insist = opts[:insist]
-      @status = 'NOT CONNECTED'
+      @status = NOT_CONNECTED
     end
 
 		def exchanges
@@ -148,7 +145,7 @@ module AMQP
         if Socket.constants.include? 'TCP_NODELAY'
           @socket.setsockopt Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1
         end
-        @status   = 'CONNECTED'
+        @status   = CONNECTED
       rescue SocketError, SystemCallError, IOError, Timeout::Error => e
         raise ServerDown, e.message
       end
@@ -160,14 +157,14 @@ module AMQP
       # Close the socket. The server is not considered dead.
       @socket.close if @socket and not @socket.closed?
       @socket   = nil
-      @status   = "NOT CONNECTED"
+      @status   = NOT_CONNECTED
     end
 
     def log(*args)
       return unless logging
       require 'pp'
       pp args
-      puts
+	    puts
     end
 
   end

data/lib/amqp/frame.rb

@@ -29,8 +29,6 @@ module AMQP
       end
     end
     
-    class Invalid < StandardError; end
-    
     class Method
       def initialize payload = nil, channel = 0
         super

data/lib/bunny.rb

@@ -12,8 +12,6 @@ class Bunny
 	
 	attr_reader :client
 
-  class Error < StandardError; end
-
 	def initialize(opts = {})
 		@client = AMQP::Client.new(opts)
   end

data/lib/bunny/exchange.rb

@@ -5,6 +5,9 @@ class Exchange
   attr_reader :client, :type, :name, :opts, :key
 
   def initialize(client, type, name, opts = {})
+		# check connection to server
+		raise 'Not connected to server' if client.status == NOT_CONNECTED
+		
     @client, @type, @name, @opts = client, type, name, opts
     @key = opts[:key]
 		@client.exchanges[@name] ||= self

data/lib/bunny/queue.rb

@@ -6,6 +6,9 @@
 	  attr_accessor :delivery_tag
 
 	  def initialize(client, name, opts = {})
+			# check connection to server
+			raise 'Not connected to server' if client.status == NOT_CONNECTED
+			
 	    @client = client
 	    @opts   = opts
 	    @name   = name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: celldee-bunny
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Chris Duncan