bunny 0.4.0 → 0.4.1

data/README

@@ -17,7 +17,7 @@ You can use Bunny to -
 * 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.
+Bunny is known to work with RabbitMQ versions 1.5.4, 1.5.5 and version 0-8 of the AMQP specification.
 
 === INSTALL:
 

data/lib/bunny/client.rb

@@ -281,9 +281,11 @@ _Bunny_::_ProtocolError_ is raised. If successful, _Client_._status_ is set to <
     end
 
     def socket
-      return @socket if @socket and not @socket.closed?
+      return @socket if @socket and (@status == :connected) and not @socket.closed?
 
       begin
+        @status = :not_connected
+   
         # Attempt to connect.
         @socket = timeout(CONNECT_TIMEOUT) do
           TCPSocket.new(host, port)
@@ -293,7 +295,8 @@ _Bunny_::_ProtocolError_ is raised. If successful, _Client_._status_ is set to <
           @socket.setsockopt Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1
         end
         @status   = :connected
-      rescue SocketError, SystemCallError, IOError, Timeout::Error => e
+      rescue => e
+        @status = :not_connected
         raise Bunny::ServerDownError, e.message
       end
 

data/lib/bunny/queue.rb

@@ -397,6 +397,38 @@ from queues if successful. If an error occurs raises _Bunny_::_ProtocolError_.
 			:delete_ok
 	  end
 
+=begin rdoc
+
+=== DESCRIPTION:
+
+Removes all messages from a queue.  It does not cancel consumers.  Purged messages are deleted
+without any formal "undo" mechanism. If an error occurs raises _Bunny_::_ProtocolError_.
+
+==== Options:
+
+* <tt>:nowait => true or false (_default_)</tt> - Ignored by Bunny, always _false_.
+
+==== Returns:
+
+<tt>:purge_ok</tt> if successful
+=end
+	
+	def purge(opts = {})
+		# ignore the :nowait option if passed, otherwise program will hang waiting for a
+		# response that will not be sent by the server
+		opts.delete(:nowait)
+		
+    client.send_frame(
+      Qrack::Protocol::Queue::Purge.new({ :queue => name, :nowait => false }.merge(opts))
+    )
+
+		raise Bunny::ProtocolError, "Error purging queue #{name}" unless client.next_method.is_a?(Qrack::Protocol::Queue::PurgeOk)
+		
+		# return confirmation
+		:purge_ok
+		
+  end
+
 	private
 	  def exchange
 	    @exchange ||= Bunny::Exchange.new(client, '', {:type => :direct, :key => name})

data/lib/bunny.rb

@@ -20,7 +20,7 @@ module Bunny
 	class ConnectionError < StandardError; end
 	class MessageError < StandardError; end
 	
-	VERSION = '0.4.0'
+	VERSION = '0.4.1'
 	
 	# Returns the Bunny version number
 

data/lib/qrack/transport/buffer.rb

@@ -1,7 +1,16 @@
+if [].map.respond_to? :with_index
+  class Array #:nodoc:
+    def enum_with_index
+      each.with_index
+    end
+  end
+else
+  require 'enumerator'
+end
+
 module Qrack
 	module Transport #:nodoc: all
 	  class Buffer
-    	require 'enumerator' if RUBY_VERSION < '1.8.7'
 
 	    def initialize data = ''
 	      @data = data

data/spec/queue_spec.rb

@@ -67,6 +67,14 @@ describe Bunny::Queue do
 		q.message_count.should == 0
 	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')}
+		q.message_count.should == 5
+		q.purge
+		q.message_count.should == 0
+	end
+	
 	it "should return an empty message when popping an empty queue" do
 		q = @b.queue('test1')
 		q.publish('This is another test message')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bunny
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Chris Duncan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-15 00:00:00 +01:00
+date: 2009-05-21 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -25,7 +25,6 @@ files:
 - LICENSE
 - README
 - Rakefile
-- bunny.gemspec
 - examples/simple.rb
 - examples/simple_ack.rb
 - examples/simple_consumer.rb

data/bunny.gemspec

@@ -1,37 +0,0 @@
-Gem::Specification.new do |s|
-  s.name = %q{bunny}
-  s.version = "0.4.0"
-  s.authors = ["Chris Duncan"]
-  s.date = %q{2009-05-15}
-  s.description = %q{Another synchronous Ruby AMQP client}
-  s.email = %q{celldee@gmail.com}
-  s.rubyforge_project = %q{bunny-amqp}
-  s.has_rdoc = true
- 	s.extra_rdoc_files = [ "README" ]
-  s.rdoc_options = [ "--main", "README" ]
-  s.homepage = %q{http://github.com/celldee/bunny}
-  s.summary = %q{A synchronous Ruby AMQP client that enables interaction with AMQP-compliant brokers/servers.}
-  s.files = ["LICENSE",
-	 "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",
-	 "lib/bunny.rb",
-	 "lib/bunny/client.rb",
-	 "lib/bunny/exchange.rb",
-	 "lib/bunny/queue.rb",
-	 "lib/qrack/client.rb",
-	 "lib/qrack/protocol/protocol.rb",
-	 "lib/qrack/protocol/spec.rb",
-	 "lib/qrack/qrack.rb",
-	 "lib/qrack/transport/buffer.rb",
-	 "lib/qrack/transport/frame.rb",
-	 "spec/bunny_spec.rb",
-	 "spec/exchange_spec.rb",
-	 "spec/queue_spec.rb"]
-end