carrot 0.7.0 → 0.8.0

data/VERSION.yml

@@ -1,4 +1,5 @@
 --- 
-:major: 0
-:minor: 7
+:build: 
+:minor: 8
 :patch: 0
+:major: 0

data/carrot.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{carrot}
-  s.version = "0.7.0"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Amos Elliston"]
-  s.date = %q{2009-10-19}
+  s.date = %q{2010-06-10}
   s.description = %q{A synchronous version of the ruby amqp client}
   s.email = %q{amos@geni.com}
   s.extra_rdoc_files = [
@@ -60,3 +60,4 @@ Gem::Specification.new do |s|
   else
   end
 end
+

data/lib/amqp/queue.rb

@@ -1,10 +1,9 @@
 module Carrot::AMQP
   class Queue
-    attr_reader :name, :server, :carrot
+    attr_reader   :name, :carrot
     attr_accessor :delivery_tag
 
     def initialize(carrot, name, opts = {})
-      @server = carrot.server
       @opts   = opts
       @name   = name
       @carrot = carrot
@@ -19,7 +18,7 @@ module Carrot::AMQP
         Protocol::Basic::Get.new({ :queue => name, :consumer_tag => name, :no_ack => !opts.delete(:ack), :nowait => true }.merge(opts))
       )
       method = server.next_method
-      return unless method.is_a?(Protocol::Basic::GetOk)
+      return unless method.kind_of?(Protocol::Basic::GetOk)
 
       self.delivery_tag = method.delivery_tag
 
@@ -56,6 +55,8 @@ module Carrot::AMQP
         Protocol::Queue::Declare.new({ :queue => name, :passive => true }.merge(opts))
       )
       method = server.next_method
+      return [nil, nil] if method.kind_of?(Protocol::Connection::Close)
+
       [method.message_count, method.consumer_count]
     end
 
@@ -85,6 +86,16 @@ module Carrot::AMQP
       carrot.queues.delete(name)
     end
 
+    def purge(opts = {})
+      server.send_frame(
+        Protocol::Queue::Purge.new({ :queue => name, :nowait => true }.merge(opts))
+      )
+    end
+
+    def server
+      carrot.server
+    end
+
   private
     def exchange
       @exchange ||= Exchange.new(carrot, :direct, '', :key => name)

data/lib/amqp/server.rb

@@ -66,6 +66,8 @@ module Carrot::AMQP
       )
       puts "Error closing connection" unless next_method.is_a?(Protocol::Connection::CloseOk)
 
+    rescue ServerDown => e
+    ensure
       close_socket
     end
 
@@ -86,7 +88,7 @@ module Carrot::AMQP
     def send_command(cmd, *args)
       begin
         socket.__send__(cmd, *args)
-      rescue Errno::EPIPE, IOError => e
+      rescue Errno::EPIPE, IOError, Errno::ECONNRESET, Errno::EINVAL => e
         raise ServerDown, e.message
       end
     end

data/lib/carrot.rb

@@ -27,19 +27,23 @@ class Carrot
   end
   class Error < StandardError; end
 
-  attr_accessor :server
-
   def initialize(opts = {})
-    @server = AMQP::Server.new(opts)
+    @opts = opts
   end
   
   def queue(name, opts = {})
     queues[name] ||= AMQP::Queue.new(self, name, opts)
   end
 
+  def server
+    @server ||= AMQP::Server.new(@opts)
+  end
+
   def stop
     server.close
+    @server = nil
   end
+  alias :reset :stop
 
   def queues
     @queues ||= {}

data/test/carrot_test.rb

@@ -1,6 +1,7 @@
 require File.dirname(__FILE__) + '/test_helper'
 
 class CarrotTest < Test::Unit::TestCase
+  TEST_QUEUE = '_carrot_test'
 
   test "simple server connection" do
     c = Carrot.new
@@ -8,8 +9,17 @@ class CarrotTest < Test::Unit::TestCase
 
   test "large messages" do
     msg = 'a' * 1024 * 1024
-    q = Carrot.queue('_carrot_test')
+    q = Carrot.queue(TEST_QUEUE)
     q.publish(msg)
     assert_equal msg, q.pop
   end
+
+  test "reset" do
+    c = Carrot.new
+    q = c.queue(TEST_QUEUE)
+    count = q.message_count
+    q.publish('test')
+    c.reset
+    assert_equal count + 1, q.message_count
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: carrot
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Amos Elliston
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-19 00:00:00 -07:00
+date: 2010-06-10 00:00:00 -07:00
 default_executable: 
 dependencies: []