cwyckoff-rosetta_queue 0.2.2 → 0.3.0

data/README.rdoc

@@ -4,17 +4,21 @@ Rosetta Queue is a messaging gateway API with adapters for many messaging system
 
 The adapters provided currently are for stomp, amqp, and beanstalk.  We would like to add adapters for other messaging gateways.  The stomp adapter has been used in production along side with Apache's ActiveMQ.  The amqp adapter currently works along side RabbitMQ and passes the acceptance tests but as of yet has not been used in production.
 
+
 == Quick Tutorial
+
 Note: The API will most likely change until we reach 1.0.  We will be moving to a more concise API (i.e. queue(:test_queue) << message, etc...)  We will also be changing how exceptions are handled.
 
 When using Rosetta Queue in an application you will need to configure the queues, adapters, and filters (optional).  These configurations should be placed in a file that gets loaded once when your program starts.  If you are using Rails then a good place for this is config/initializers/rosetta_queue.rb.
 
-To set up destinations to produce messages to and consume messages from:
+
+To set up destinations for producing and consuming messages:
 
 RosettaQueue::Destinations.define do |queue|
   queue.map :test_queue, '/queue/my_test_queue'
 end
 
+
 Defining your adapter:
 
   RosettaQueue::Adapter.define do |a|
@@ -25,6 +29,7 @@ Defining your adapter:
     a.type = "stomp"
   end
 
+
 Define a logger for Rosetta Queue to use.  The logger should be a standard ruby logger:
 
   RosettaQueue.logger = Logger.new('/my_project/rosetta_queue.log')
@@ -76,11 +81,31 @@ It is recommended that you set your adapter to the 'null' adapter for your specs
 Please look at the publishing matchers for more information.  For examples on how to write acceptance tests for your Rosetta Queue's code please see RosettaQueue's own Cucumber features and read this {blog post}[http://www.benmabey.com/2009/02/17/using-cucumber-to-integrate-distributed-systems-and-test-messaging/].
 
 
+=== AMQP
+
+The AMQP adapter is based on the synchronous AMQP ruby client "Bunny" by celldee [http://github.com/celldee/bunny].  The original AMQP adapter for RosettaQueue was the 'evented' client by Aman Gupta [http://github.com/tmm1/amqp], but the evented model posed some problems for our integration tests.  That, and the desire to keep things simple led us to use a synchronous AMQP client.
+
+==== Configuration
+
+If you are using the AMQP adapter, there are some important rules when defining the adapter and mapping your destinations.  Two of the basic building blocks of AMQP are queues and exchanges.  Queues bind to exchanges in several different ways.  A can queue bind to an exchange and requests messages that match a specific routing key, which is called 'direct exchange' and is analogous to the 'point-to-point' messaging pattern.  Alternately, queues can bind to an exchange to receive all messages sent to that exchange; this is called 'fanout exchange' and is analogous to the 'publish-subscribe' pattern.  So, when you want to define a simple 'direct-exchange' queue, your queue name must begin with the term "queue".
+
+   RosettaQueue::Destinations.define do |queue|
+     queue.map :test_queue, 'queue.my_test_queue'
+   end
+
+And, when you want to define a queue that will bind to a 'fanout-exchange', your queue name must begin with the term "fanout".
+
+   RosettaQueue::Destinations.define do |queue|
+     queue.map :test_queue, 'fanout.my_test_queue'
+   end
+
+Oh, and when defining your adapter, be sure to specify the AMQP adapter as :amqp_synch, not :amqp.  This way, if we do get around to adding Aman's evented AMQP client, we can distinguish between the synchronous and asynchronous clients (i.e., :amqp_sync vs. :amqp_asynch).
+
 
 == How to contribute
 ----------------------------------------------------------------
 Gems you will need:
-cucumber, rspec, yaml, stomp, tmm1-amqp, beanstalk-client
+cucumber, rspec, yaml, stomp, bunny, beanstalk-client
 
 You should be able to run the rspec code examples (specs) without any brokers running with autospec or 'rake spec'.
 

data/Rakefile

@@ -18,8 +18,8 @@ begin
     s.name = "rosetta_queue"
     s.rubyforge_project = "rosetta-queue"
     s.summary = %Q{Messaging gateway API with adapters for many messaging systems available in Ruby.}
-    s.email = "ben@benmabey.com"
-    s.homepage = "http://github.com/bmabey/rosetta_queue"
+    s.email = "cbwyckoff@gmail.com"
+    s.homepage = "http://github.com/cwyckoff/rosetta_queue"
     s.description = %Q{Messaging gateway API with adapters for many messaging systems available in Ruby. Messaging systems can be easily switched out with a small configuration change. Code for testing on the object and application level is also provided.}
     s.extra_rdoc_files = ["README.rdoc", "MIT-LICENSE.txt"]
     s.files = FileList["[A-Z]*.*", "{bin,generators,lib,features,spec}/**/*", "Rakefile", "cucumber.yml"]

data/lib/rosetta_queue.rb

@@ -11,6 +11,8 @@ require 'rosetta_queue/filters'
 require 'rosetta_queue/logger'
 require 'rosetta_queue/message_handler'
 require 'rosetta_queue/producer'
+require 'rosetta_queue/consumer_managers/base'
+require 'rosetta_queue/consumer_managers/threaded'
 
 if defined?(Rails)
   RosettaQueue.logger = RosettaQueue::Logger.new(File.join(Rails.root, 'log', 'rosetta_queue.log'))

data/lib/rosetta_queue/adapters/{amqp.rb → amqp_synch.rb}

@@ -1,11 +1,11 @@
-require 'carrot'
+require 'bunny'
 
 module RosettaQueue
   module Gateway
 
-    # This AMQP adapter utilizes a forked version of the synchronous AMPQ client 'Carrot'
-    # by famoseagle (http://github.com/famoseagle)
-    class AmqpAdapter < BaseAdapter
+    # This AMQP adapter utilizes the synchronous AMPQ client 'Bunny'
+    # by celldee (http://github.com/celldee/bunny)
+    class AmqpSynchAdapter < BaseAdapter
 
       def initialize(adapter_settings = {})
         raise AdapterException, "Missing adapter settings" if adapter_settings.empty?
@@ -40,11 +40,11 @@ module RosettaQueue
 
       def exchange_strategy_for(destination, options)
         case destination
-        when /fanout/
+        when /^fanout\./
           @exchange ||= AmqpExchangeStrategies::FanoutExchange.new(@adapter_settings, options)
-        when /topic/
+        when /^topic\./
           raise "Sorry.  RosettaQueue can not process AMQP topics yet"
-        when /queue/
+        when /^queue\./
           @exchange ||= AmqpExchangeStrategies::DirectExchange.new(@adapter_settings, options)
         else
           @exchange ||= AmqpExchangeStrategies::DirectExchange.new(@adapter_settings, options)
@@ -66,12 +66,15 @@ module RosettaQueue
         end 
 
         protected
+
         def conn
           vhost = @adapter_settings[:opts][:vhost] || "/" 
-          @conn ||= Carrot.new(:user => @adapter_settings[:user], 
+          @conn ||= Bunny.new( :user => @adapter_settings[:user], 
                                :pass => @adapter_settings[:password], 
                                :host => @adapter_settings[:host], 
                                :vhost => vhost)
+          @conn.start unless @conn.status == :connected
+          @conn
         end
       end
 
@@ -83,15 +86,21 @@ module RosettaQueue
         end      
 
         def receive(destination, message_handler)
-          conn.queue(destination, @options).subscribe(@options) do |msg|
+          queue = conn.queue(destination, @options)
+          ack = @options[:ack]
+          queue.subscribe(@options) do |msg|
             RosettaQueue.logger.info("Receiving from #{destination} :: #{msg}")
             message_handler.on_message(Filters.process_receiving(msg))
+            queue.ack if ack
           end 
         end
 
         def receive_once(destination, options={})
-          msg = conn.queue(destination, options).pop(options)
+          q = conn.queue(destination, @options)
+          ack = @options[:ack]
+          msg = q.pop(options)
           RosettaQueue.logger.info("Receiving from #{destination} :: #{msg}")
+          q.ack if ack
           yield Filters.process_receiving(msg)
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cwyckoff-rosetta_queue
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors: 
 - Ben Mabey
@@ -31,7 +31,7 @@ files:
 - lib/rosetta_queue
 - lib/rosetta_queue/adapter.rb
 - lib/rosetta_queue/adapters
-- lib/rosetta_queue/adapters/amqp.rb
+- lib/rosetta_queue/adapters/amqp_synch.rb
 - lib/rosetta_queue/adapters/base.rb
 - lib/rosetta_queue/adapters/fake.rb
 - lib/rosetta_queue/adapters/null.rb