famoseagle-carrot 0.2.0 → 0.3.0

data/README.markdown

@@ -2,23 +2,23 @@
 
 A synchronous amqp client. Based on Aman's amqp client:
 
-http://github.com/tmm1/amqp/tree/master
-
-## Example 
-
-q = Carrot.queue('name', :durable => true, :host => 'q1.rabbitmq.com')
-100.times do
-  q.publish('foo')
-end
-
-pp :count, q.message_count
-
-while msg = q.pop(:ack => true)
-  puts msg
-  q.ack
-end
-Carrot.stop
-
+[http://github.com/tmm1/amqp/tree/master] (http://github.com/tmm1/amqp/tree/master)
+
+## Example
+    
+    q = Carrot.queue('name', :durable => true, :host => 'q1.rabbitmq.com')
+    100.times do
+      q.publish('foo')
+    end
+    
+    pp :count, q.message_count
+    
+    while msg = q.pop(:ack => true)
+      puts msg
+      q.ack
+    end
+    Carrot.stop
+    
 # LICENSE
 
 Copyright (c) 2009 Amos Elliston, Geni.com; Published under The MIT License, see License

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :patch: 0
 :major: 0
-:minor: 2
+:minor: 3

data/lib/amqp/buffer.rb

@@ -8,7 +8,7 @@ else
   require 'enumerator'
 end
 
-module AMQP
+module Carrot::AMQP
   class Buffer #:nodoc: all
     class Overflow < StandardError; end
     class InvalidType < StandardError; end
@@ -247,7 +247,13 @@ module AMQP
       end
     end
 
-    def _read size, pack = nil
+    def _read(size, pack = nil)
+      if @data.is_a?(Server)
+        raw = @data.read(size)
+        return raw if raw.nil? or pack.nil? 
+        return raw.unpack(pack).first
+      end
+
       if @pos + size > length
         raise Overflow
       else

data/lib/amqp/exchange.rb

@@ -1,4 +1,4 @@
-module AMQP
+module Carrot::AMQP
   class Exchange
     attr_accessor :server, :type, :name, :opts, :key
 
@@ -37,7 +37,9 @@ module AMQP
     end
 
     def delete(opts = {})
-      server.send_frame(Protocol::Exchange::Delete.new({ :exchange => name, :nowait => true }.merge(opts)))
+      server.send_frame(
+        Protocol::Exchange::Delete.new({ :exchange => name, :nowait => true }.merge(opts))
+      )
     end
 
     def reset

data/lib/amqp/frame.rb

@@ -1,4 +1,4 @@
-module AMQP
+module Carrot::AMQP
   class Frame #:nodoc: all
     def initialize payload = nil, channel = 0
       @channel, @payload = channel, payload
@@ -51,22 +51,13 @@ module AMQP
 
     class Body; end
 
-    def self.parse buf
+    def self.parse(buf)
       buf = Buffer.new(buf) unless buf.is_a? Buffer
       buf.extract do
         id, channel, payload, footer = buf.read(:octet, :short, :longstr, :octet)
         Frame.types[id].new(payload, channel) if footer == FOOTER
       end
     end
-
-    def self.get(server)
-      id      = server.read(1).unpack('C').first
-      channel = server.read(2).unpack('n').first
-      size    = server.read(4).unpack('N').first
-      data    = server.read(size)
-      footer  = server.read(1).unpack('C').first
-      Frame.types[id].new(data, channel) if footer == FOOTER
-    end
   end
 end
 

data/lib/amqp/header.rb

@@ -1,4 +1,4 @@
-module AMQP
+module Carrot::AMQP
   class Header
     def initialize(server, header_obj)
       @server = server

data/lib/amqp/protocol.rb

@@ -1,4 +1,4 @@
-module AMQP
+module Carrot::AMQP
   module Protocol
     #:stopdoc:
     class Class::Method

data/lib/amqp/queue.rb

@@ -1,4 +1,4 @@
-module AMQP
+module Carrot::AMQP
   class Queue
     attr_reader :name, :server
     attr_accessor :delivery_tag
@@ -10,14 +10,6 @@ module AMQP
       server.send_frame(
         Protocol::Queue::Declare.new({ :queue => name, :nowait => true }.merge(opts))
       )
-      nil
-    end
-
-    def delete(opts = {})
-      server.send_frame(
-        Protocol::Queue::Delete.new({ :queue => name, :nowait => true }.merge(opts))
-      )
-      nil
     end
 
     def pop(opts = {})
@@ -26,7 +18,7 @@ module AMQP
         Protocol::Basic::Get.new({ :queue => name, :consumer_tag => name, :no_ack => !opts.delete(:ack), :nowait => true }.merge(opts))
       )
       method = server.next_method
-      return if method.is_a?(Protocol::Basic::GetEmpty)
+      return unless method.is_a?(Protocol::Basic::GetOk)
 
       self.delivery_tag = method.delivery_tag
 
@@ -63,9 +55,38 @@ module AMQP
       [method.message_count, method.consumer_count]
     end
 
+    def bind(exchange, opts = {})
+      exchange           = exchange.respond_to?(:name) ? exchange.name : exchange
+      bindings[exchange] = opts
+      server.send_frame(
+        Protocol::Queue::Bind.new({ :queue => name, :exchange => exchange, :routing_key => opts.delete(:key), :nowait => true }.merge(opts))
+      )
+    end
+
+    def unbind(exchange, opts = {})
+      exchange = exchange.respond_to?(:name) ? exchange.name : exchange
+      bindings.delete(exchange)
+
+      server.send_frame(
+        Protocol::Queue::Unbind.new({
+          :queue => name, :exchange => exchange, :routing_key => opts.delete(:key), :nowait => true }.merge(opts)
+        )
+      )
+    end
+
+    def delete(opts = {})
+      server.send_frame(
+        Protocol::Queue::Delete.new({ :queue => name, :nowait => true }.merge(opts))
+      )
+    end
+
   private
     def exchange
       @exchange ||= Exchange.new(server, :direct, '', :key => name)
     end
+
+    def bindings
+      @bindings ||= {}
+    end
   end
 end

data/lib/amqp/server.rb

@@ -2,18 +2,15 @@ require 'socket'
 require 'thread'
 require 'timeout'
 
-module AMQP
+module Carrot::AMQP
   class Server
     CONNECT_TIMEOUT = 1.0
     RETRY_DELAY     = 10.0
     DEFAULT_PORT    = 5672
 
     attr_reader   :host, :port, :status
-    attr_accessor :retry_at, :channel, :ticket
+    attr_accessor :channel, :ticket
 
-    class ConnectionError < StandardError; end
-    class ServerError     < StandardError; end
-    class ClientError     < StandardError; end
     class ServerDown      < StandardError; end
     class ProtocolError   < StandardError; end
 
@@ -30,44 +27,6 @@ module AMQP
       start_session
     end
 
-    def start_session
-      @channel = 0
-      write(HEADER)
-      write([1, 1, VERSION_MAJOR, VERSION_MINOR].pack('C4'))
-      raise ProtocolError, 'bad start connection' unless next_method.is_a?(Protocol::Connection::Start)
-
-      send_frame(
-        Protocol::Connection::StartOk.new(
-          {:platform => 'Ruby', :product => 'Carrot', :information => 'http://github.com/famosagle/carrot', :version => VERSION},
-          'AMQPLAIN',
-          {:LOGIN => @user, :PASSWORD => @pass},
-          'en_US'
-        )
-      )
-
-      if next_method.is_a?(Protocol::Connection::Tune)
-        send_frame(
-          Protocol::Connection::TuneOk.new( :channel_max => 0, :frame_max => 131072, :heartbeat => 0)
-        )
-      end
-
-      send_frame(
-        Protocol::Connection::Open.new(:virtual_host => @vhost, :capabilities => '', :insist => @insist)
-      )
-      raise ProtocolError, 'bad open connection' unless next_method.is_a?(Protocol::Connection::OpenOk)
-
-      @channel = 1
-      send_frame(Protocol::Channel::Open.new)
-      raise ProtocolError, "cannot open channel #{channel}" unless next_method.is_a?(Protocol::Channel::OpenOk)
-
-      send_frame(
-        Protocol::Access::Request.new(:realm => '/data', :read => true, :write => true, :active => true, :passive => true)
-      )
-      method = next_method
-      raise ProtocolError, 'access denied' unless method.is_a?(Protocol::Access::RequestOk)
-      self.ticket = method.ticket
-    end
-
     def send_frame(*args)
       args.each do |data|
         data.ticket  = ticket if ticket and data.respond_to?(:ticket=)
@@ -77,10 +36,11 @@ module AMQP
         log :send, data
         write(data.to_s)
       end
+      nil
     end
 
     def next_frame
-      frame = Frame.get(self)
+      frame = Frame.parse(buffer)
       log :received, frame
       frame
     end
@@ -90,7 +50,8 @@ module AMQP
     end
 
     def next_payload
-      next_frame.payload
+      frame = next_frame
+      frame and frame.payload
     end
 
     def close
@@ -109,49 +70,21 @@ module AMQP
     end
 
     def read(*args)
-      with_socket_management do |socket|
-        socket.read(*args)
-      end
+      socket.read(*args)
     end
 
     def write(*args)
-      with_socket_management do |socket|
-        socket.write(*args)
-      end
+      socket.write(*args)
     end
 
   private
 
-    def with_socket_management(&block)
-      retried = false
-      begin
-        mutex.lock if multithread?
-        yield socket
-
-      rescue ClientError, ServerError, SocketError, SystemCallError, IOError => error
-        if not retried
-          # Close the socket and retry once.
-          close_socket
-          #start_session
-          retried = true
-          retry
-        else
-          # Mark the server dead and raise an error.
-          close(error.message)
-
-          # Reraise as a ConnectionError
-          new_error = ConnectionError.new("#{error.class}: #{error.message}")
-          new_error.set_backtrace(error.backtrace)
-          raise new_error
-        end
-      ensure
-        mutex.unlock if multithread?
-      end
+    def buffer
+      @buffer ||= Buffer.new(self)
     end
 
     def socket
       return @socket if @socket and not @socket.closed?
-      raise ServerDown, "will retry at #{retry_at}" unless retry?
 
       begin
         # Attempt to connect.
@@ -163,10 +96,9 @@ module AMQP
         if Socket.constants.include? 'TCP_NODELAY'
           @socket.setsockopt Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1
         end
-        @retry_at = nil
         @status   = 'CONNECTED'
       rescue SocketError, SystemCallError, IOError, Timeout::Error => e
-        close_socket
+        kill(e.message)
         raise ServerDown, e.message
       ensure
         mutex.unlock if multithread?
@@ -175,16 +107,46 @@ module AMQP
       @socket
     end
 
-    def multithread?
-      @multithread
-    end
+    def start_session
+      @channel = 0
+      write(HEADER)
+      write([1, 1, VERSION_MAJOR, VERSION_MINOR].pack('C4'))
+      raise ProtocolError, 'bad start connection' unless next_method.is_a?(Protocol::Connection::Start)
 
-    def retry?
-      @retry_at.nil? or @retry_at < Time.now
+      send_frame(
+        Protocol::Connection::StartOk.new(
+          {:platform => 'Ruby', :product => 'Carrot', :information => 'http://github.com/famosagle/carrot', :version => VERSION},
+          'AMQPLAIN',
+          {:LOGIN => @user, :PASSWORD => @pass},
+          'en_US'
+        )
+      )
+
+      if next_method.is_a?(Protocol::Connection::Tune)
+        send_frame(
+          Protocol::Connection::TuneOk.new( :channel_max => 0, :frame_max => 131072, :heartbeat => 0)
+        )
+      end
+
+      send_frame(
+        Protocol::Connection::Open.new(:virtual_host => @vhost, :capabilities => '', :insist => @insist)
+      )
+      raise ProtocolError, 'bad open connection' unless next_method.is_a?(Protocol::Connection::OpenOk)
+
+      @channel = 1
+      send_frame(Protocol::Channel::Open.new)
+      raise ProtocolError, "cannot open channel #{channel}" unless next_method.is_a?(Protocol::Channel::OpenOk)
+
+      send_frame(
+        Protocol::Access::Request.new(:realm => '/data', :read => true, :write => true, :active => true, :passive => true)
+      )
+      method = next_method
+      raise ProtocolError, 'access denied' unless method.is_a?(Protocol::Access::RequestOk)
+      self.ticket = method.ticket
     end
 
-    def unexpected_eof!
-      raise ConnectionError, 'unexpected end of file' 
+    def multithread?
+      @multithread
     end
 
     def close_socket(reason=nil)
@@ -192,7 +154,6 @@ module AMQP
       mutex.lock if multithread?
       @socket.close if @socket and not @socket.closed?
       @socket   = nil
-      @retry_at = nil
       @status   = "NOT CONNECTED"
     ensure
       mutex.unlock if multithread?

data/lib/amqp/spec.rb

@@ -1,16 +1,4 @@
-
-#:stopdoc:
-# this file was autogenerated on Sat Jan 03 14:05:57 -0600 2009
-# using amqp-0.8.json    (mtime: Sat Jan 03 08:58:13 -0600 2009)
-#
-# DO NOT EDIT! (edit protocol/codegen.rb instead, and run `rake codegen`)
-
-module AMQP
-  HEADER        = "AMQP".freeze
-  VERSION_MAJOR = 8
-  VERSION_MINOR = 0
-  PORT          = 5672
-
+module Carrot::AMQP
   class Frame
     def self.types
       @types ||= {}
@@ -143,7 +131,7 @@ module AMQP
   end
 end
   
-module AMQP
+module Carrot::AMQP
   module Protocol
     class Connection   < Class(  10, :connection   ); end
     class Channel      < Class(  20, :channel      ); end

data/lib/carrot.rb

@@ -1,3 +1,12 @@
+class Carrot
+  module AMQP
+    HEADER        = "AMQP".freeze
+    VERSION_MAJOR = 8
+    VERSION_MINOR = 0
+    PORT          = 5672
+  end
+end
+  
 $:.unshift File.expand_path(File.dirname(File.expand_path(__FILE__)))
 require 'amqp/spec'
 require 'amqp/buffer'
@@ -18,40 +27,38 @@ class Carrot
   end
   class Error < StandardError; end
 
-  def self.queue(name, opts = {})
-    instance(opts).queue(name, opts)
-  end
-
-  def self.stop
-    instance.stop
-  end
-
-  def self.instance(opts = {})
-    @instance ||= new(opts)
-  end
+  attr_accessor :server
 
   def initialize(opts = {})
     @server = AMQP::Server.new(opts)
   end
   
   def queue(name, opts = {})
-    queues[name] ||= AMQP::Queue.new(@server, name, opts)
+    queues[name] ||= AMQP::Queue.new(server, name, opts)
   end
 
   def stop
-    @server.close
+    server.close
   end
 
   def queues
     @queues ||= {}
   end
 
-  def send_data(data)
-    @server.send_data(data)
+  def direct(name = 'amq.direct', opts = {})
+    exchanges[name] ||= Exchange.new(server, :direct, name, opts)
+  end
+
+  def topic(name = 'amq.topic', opts = {})
+    exchanges[name] ||= Exchange.new(server, :topic, name, opts)
   end
 
-  def send_command(cmd)
-    @server.send_command(cmd)
+  def headers(name = 'amq.match', opts = {})
+    exchanges[name] ||= Exchange.new(server, :headers, name, opts)
+  end
+
+  def exchanges
+    @exchanges ||= {}
   end
 
 private
@@ -62,3 +69,19 @@ private
     puts
   end
 end
+
+#-- convenience wrapper (read: HACK) for thread-local Carrot object
+
+class Carrot
+  def Carrot.default
+    #-- XXX clear this when connection is closed
+    Thread.current[:carrot] ||= Carrot.new
+  end
+
+  # Allows for calls to all Carrot instance methods. This implicitly calls
+  # Carrot.new so that a new channel is allocated for subsequent operations.
+  def Carrot.method_missing(meth, *args, &blk)
+    Carrot.default.__send__(meth, *args, &blk)
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: famoseagle-carrot
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Amos Elliston
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-08 00:00:00 -07:00
+date: 2009-04-12 00:00:00 -07:00
 default_executable: 
 dependencies: []