bunny 0.5.2 → 0.5.3

data/lib/qrack/channel.rb

@@ -0,0 +1,18 @@
+module Qrack
+	# Channel ancestor class
+	class Channel
+		
+		attr_accessor :number, :active, :frame_buffer
+		attr_reader :client
+		
+		def initialize(client)
+			@frame_buffer = []
+			@client = client
+			@number = client.channels.size
+			@active = false
+			client.channels[@number] = self
+		end
+		
+	end
+	
+end

data/lib/qrack/client.rb

@@ -1,4 +1,7 @@
 module Qrack
+	
+	class ClientTimeout < Timeout::Error; end
+	
 	# Client ancestor class
 	class Client
 		
@@ -6,7 +9,177 @@ module Qrack
     RETRY_DELAY     = 10.0
 
     attr_reader   :status, :host, :vhost, :port, :logging, :spec, :heartbeat
-    attr_accessor :channel, :logfile, :exchanges, :queues, :channels, :heartbeat_in, :connecting
+    attr_accessor :channel, :logfile, :exchanges, :queues, :channels, :message_in, :message_out,
+ 									:connecting
 
+		def initialize(opts = {})
+			@host = opts[:host] || 'localhost'
+      @user   = opts[:user]  || 'guest'
+      @pass   = opts[:pass]  || 'guest'
+      @vhost  = opts[:vhost] || '/'
+			@logfile = opts[:logfile] || nil
+			@logging = opts[:logging] || false
+      @status = :not_connected
+			@frame_max = opts[:frame_max] || 131072
+			@channel_max = opts[:channel_max] || 0
+			@heartbeat = opts[:heartbeat] || 0
+			@logger = nil
+			create_logger if @logging
+			@message_in = false
+			@message_out = false
+			@connecting = false
+			@channels ||= []
+			# Create channel 0
+      @channel = create_channel()
+			@exchanges ||= {}
+			@queues ||= {}
+		end
+		
+=begin rdoc
+
+=== DESCRIPTION:
+
+Closes all active communication channels and connection. If an error occurs a
+_Bunny_::_ProtocolError_ is raised. If successful, _Client_._status_ is set to <tt>:not_connected</tt>.
+
+==== RETURNS:
+
+<tt>:not_connected</tt> if successful.
+
+=end
+
+		def close
+			# Close all active channels
+			channels.each do |c|
+				c.close if c.open?
+			end
+
+			# Close connection to AMQP server
+			close_connection
+
+			# Close TCP Socket
+      close_socket
+    end
+
+		alias stop close
+		
+		def connected?
+			status == :connected
+		end
+		
+		def connecting?
+			connecting
+		end
+		
+		def logging=(bool)
+			@logging = bool
+			create_logger if @logging
+		end
+		
+    def next_payload(options = {})
+      next_frame(options).payload
+    end
+
+		alias next_method next_payload
+
+    def read(*args)
+      send_command(:read, *args)
+    end
+
+=begin rdoc
+
+=== DESCRIPTION:
+
+Checks to see whether or not an undeliverable message has been returned as a result of a publish
+with the <tt>:immediate</tt> or <tt>:mandatory</tt> options.
+
+==== OPTIONS:
+
+* <tt>:timeout => number of seconds (default = 0.1) - The method will wait for a return
+  message until this timeout interval is reached.
+
+==== RETURNS:
+
+<tt>:no_return</tt> if message was not returned before timeout .
+<tt>{:header, :return_details, :payload}</tt> if message is returned. <tt>:return_details</tt> is
+a hash <tt>{:reply_code, :reply_text, :exchange, :routing_key}</tt>.
+
+=end
+
+		def returned_message(opts = {})
+			secs = opts[:timeout] || 0.1		
+			frame = next_frame(:timeout => secs)
+
+			if frame.is_a?(Symbol)
+				return :no_return if frame == :timed_out
+			end
+
+			method = frame.payload
+			header = next_payload
+	    msg = next_payload
+	    raise Bunny::MessageError, 'unexpected length' if msg.length < header.size
+
+			# Return the message and related info
+			{:header => header, :payload => msg, :return_details => method.arguments}
+		end
+		
+		def switch_channel(chann)
+			if (0...channels.size).include? chann
+				@channel = channels[chann]
+				chann
+			else
+				raise RuntimeError, "Invalid channel number - #{chann}"
+			end
+		end
+		
+		def write(*args)
+      send_command(:write, *args)
+    end
+		
+		private
+		
+		def close_socket(reason=nil)
+      # Close the socket. The server is not considered dead.
+      @socket.close if @socket and not @socket.closed?
+      @socket   = nil
+      @status   = :not_connected
+    end
+
+    def create_logger
+			@logfile ? @logger = Logger.new("#{logfile}") : @logger = Logger.new(STDOUT)
+			@logger.level = Logger::INFO
+			@logger.datetime_format = "%Y-%m-%d %H:%M:%S"
+    end
+		
+		def send_command(cmd, *args)
+      begin
+				raise Bunny::ConnectionError, 'No connection - socket has not been created' if !@socket
+        @socket.__send__(cmd, *args)
+      rescue Errno::EPIPE, IOError => e
+        raise Bunny::ServerDownError, e.message
+      end
+    end
+
+    def socket
+      return @socket if @socket and (@status == :connected) and not @socket.closed?
+
+      begin
+        # Attempt to connect.
+        @socket = timeout(CONNECT_TIMEOUT) do
+          TCPSocket.new(host, port)
+        end
+
+        if Socket.constants.include? 'TCP_NODELAY'
+          @socket.setsockopt Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1
+        end
+      rescue => e
+        @status = :not_connected
+        raise Bunny::ServerDownError, e.message
+      end
+
+      @socket
+    end
+		
 	end
-end
+	
+end

data/lib/qrack/qrack08.rb

@@ -7,6 +7,8 @@ require 'transport/buffer08'
 require 'transport/frame08'
 
 require 'qrack/client'
+require 'qrack/channel'
+require 'qrack/queue'
 
 module Qrack
 	

data/lib/qrack/qrack09.rb

@@ -7,6 +7,8 @@ require 'transport/buffer09'
 require 'transport/frame09'
 
 require 'qrack/client'
+require 'qrack/channel'
+require 'qrack/queue'
 
 module Qrack
 	

data/lib/qrack/queue.rb

@@ -0,0 +1,53 @@
+module Qrack
+	
+	# Queue ancestor class
+	class Queue
+		
+		attr_reader :name, :client
+	  attr_accessor :delivery_tag
+	
+=begin rdoc
+
+=== DESCRIPTION:
+
+Returns consumer count from Queue#status.
+
+=end
+
+	  def consumer_count
+	    s = status
+			s[:consumer_count]
+	  end
+
+=begin rdoc
+
+=== DESCRIPTION:
+
+Returns message count from Queue#status.
+
+=end
+
+	  def message_count
+	    s = status
+			s[:message_count]
+	  end
+
+=begin rdoc
+
+=== DESCRIPTION:
+
+Publishes a message to the queue via the default nameless '' direct exchange.
+
+==== RETURNS:
+
+nil
+
+=end
+
+	  def publish(data, opts = {})
+	    exchange.publish(data, opts)
+	  end
+		
+	end
+	
+end

data/spec/spec_08/exchange_spec.rb

@@ -115,6 +115,13 @@ describe Bunny do
 		exch = @b.exchange('direct_exchange')
 		exch.publish('This is a published message')
 	end
+
+  it "should not modify the passed options hash when publishing a message" do
+		exch = @b.exchange('direct_exchange')
+    opts = {:key => 'a', :persistent => true}
+		exch.publish('', opts)
+    opts.should == {:key => 'a', :persistent => true}
+  end
 	
 	it "should be able to return an undeliverable message" do
 		exch = @b.exchange('')
@@ -136,4 +143,4 @@ describe Bunny do
 		exch.delete(:nowait => true)
 	end
 	
-end
+end

data/spec/spec_08/queue_spec.rb

@@ -67,6 +67,14 @@ describe Bunny do
 		q.message_count.should == 0
 	end
 	
+	it "should be able to pop a message where body length exceeds max frame size" do
+		q = @b.queue('test1')
+		lg_msg = 'z' * 142000
+		q.publish(lg_msg)
+		msg = q.pop
+		msg.should == lg_msg
+	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')}
@@ -82,6 +90,24 @@ describe Bunny do
 		msg = q.pop
 		msg.should == :queue_empty
 	end
+	
+	it "should stop subscription without processing messages if max specified is 0" do
+		q = @b.queue('test1')
+		5.times {q.publish('Yet another test message')}
+		q.message_count.should == 5
+		q.subscribe(:message_max => 0){|msg| x = 1}
+		q.message_count.should == 5
+		q.unsubscribe.should == :unsubscribe_ok
+		q.purge.should == :purge_ok
+	end
+	
+	it "should stop subscription after processing number of messages specified > 0" do
+		q = @b.queue('test1')
+		5.times {q.publish('Yet another test message')}
+		q.message_count.should == 5
+		q.subscribe(:message_max => 5){|msg| x = 1}
+		q.unsubscribe.should == :unsubscribe_ok
+	end
 
 	it "should be able to be deleted" do
 		q = @b.queue('test1')

data/spec/spec_09/exchange_spec.rb

@@ -115,6 +115,13 @@ describe Bunny do
 		exch = @b.exchange('direct_exchange')
 		exch.publish('This is a published message')
 	end
+
+  it "should not modify the passed options hash when publishing a message" do
+		exch = @b.exchange('direct_exchange')
+    opts = {:key => 'a', :persistent => true}
+		exch.publish('', opts)
+    opts.should == {:key => 'a', :persistent => true}
+  end
 	
 	it "should be able to return an undeliverable message" do
 		exch = @b.exchange('')
@@ -136,4 +143,4 @@ describe Bunny do
 		exch.delete(:nowait => true)
 	end
 	
-end
+end

data/spec/spec_09/queue_spec.rb

@@ -67,6 +67,14 @@ describe Bunny do
 		q.message_count.should == 0
 	end
 	
+	it "should be able to pop a message where body length exceeds max frame size" do
+		q = @b.queue('test1')
+		lg_msg = 'z' * 142000
+		q.publish(lg_msg)
+		msg = q.pop
+		msg.should == lg_msg
+	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')}
@@ -82,6 +90,24 @@ describe Bunny do
 		msg = q.pop
 		msg.should == :queue_empty
 	end
+	
+	it "should stop subscription without processing messages if max specified is 0" do
+		q = @b.queue('test1')
+		5.times {q.publish('Yet another test message')}
+		q.message_count.should == 5
+		q.subscribe(:message_max => 0){|msg| x = 1}
+		q.message_count.should == 5
+		q.unsubscribe.should == :unsubscribe_ok
+		q.purge.should == :purge_ok
+	end
+	
+	it "should stop subscription after processing number of messages specified > 0" do
+		q = @b.queue('test1')
+		5.times {q.publish('Yet another test message')}
+		q.message_count.should == 5
+		q.subscribe(:message_max => 5){|msg| x = 1}
+		q.unsubscribe.should == :unsubscribe_ok
+	end
 
 	it "should be able to be deleted" do
 		q = @b.queue('test1')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bunny
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors: 
 - Chris Duncan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-17 00:00:00 +01:00
+date: 2009-09-07 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -50,6 +50,8 @@ files:
 - lib/bunny/queue08.rb
 - lib/bunny/queue09.rb
 - lib/qrack/client.rb
+- lib/qrack/channel.rb
+- lib/qrack/queue.rb
 - lib/qrack/protocol/protocol08.rb
 - lib/qrack/protocol/protocol09.rb
 - lib/qrack/protocol/spec08.rb