rosetta_queue 0.4.0 → 0.5.0

data/History.txt

@@ -1,11 +1,17 @@
-== 0.4.x (git)
+== 0.5.0 (the "Resource Cleanup" release)
+ === New Features (Relevance Inc.)
+ * Fixed a socket leak in Producer::publish by using open on the Adapter (at least for Stomp, but probably others too).
+ * Add Adapter::open, which has semantics like File::open (ie auto-disconnecting the socket after the block),
+ * Removed Adapter::instance due to it's confusing name (it was not a singleton as the name suggested).
+ * Allow specifying a key when adding handlers to a consumer, to allow multiple instances of same consumer.
+ * Removed dependency on message_handler when calling Adapter#disconnect. (Chris Wyckoff)
 
 == 0.4.0
  === New features
  * Allows for custom exception handling logic to be registered for publishing and consuming actions. See ExceptionHandler for more info. (Ben Mabey)
   * RQ was doing a blanket rescue for publishing and consuming and then logging the errors.  If you still want this behaviour you will need to register a block/class to do that. Again, see ExceptionHandler for more details.
  * Added core time extension when ActiveSupport not present. (Chris Wyckoff)
- === Bufixes
+ === Bugfixes
  * Closing the connection after publishing message now instead of unsubscribing. (Chris Wyckoff)
 
 
@@ -16,7 +22,7 @@
   * Added .delete method to Consumer class (Chris Wyckoff - Lead Media Partners)
     * Allows user to purge a queue.
     * Works for AMQP adapters only.
- === Bufixes
+ === Bugfixes
   * client :ack now working. (Chris Wyckoff - Lead Media Partners)
 
 == 0.1.4

data/VERSION.yml

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

data/lib/rosetta_queue.rb

@@ -4,7 +4,6 @@ require('rosetta_queue/core_ext/string') unless defined? ActiveSupport
 require('rosetta_queue/core_ext/time') unless defined? ActiveSupport
 
 require 'rosetta_queue/adapter'
-require 'rosetta_queue/base'
 require 'rosetta_queue/consumer'
 require 'rosetta_queue/destinations'
 require 'rosetta_queue/exceptions'

data/lib/rosetta_queue/adapter.rb

@@ -22,9 +22,21 @@ module RosettaQueue
           raise AdapterException, "Adapter type '#{adapter_prefix}' does not match existing adapters!"
       end
 
-      def instance
+      # Yield a new (connected) adapter, run whatever is in the block, and then disconnect after the 
+      # block evaluates
+      def open
         raise AdapterException, "Adapter type was never defined!" unless @adapter_class
-        @adapter_class.new({:user => @user, :password => @password, :host => @host, :port => @port, :opts => opts})
+        adapter = @adapter_class.new({:user => @user, :password => @password, :host => @host, :port => @port, :opts => opts})
+
+        if block_given?
+          begin
+            yield adapter
+          ensure
+            adapter.disconnect
+          end
+        end
+
+        adapter
       end
 
       private

data/lib/rosetta_queue/adapters/amqp.rb

@@ -20,13 +20,13 @@ module RosettaQueue
         exchange_strategy_for(destination, opts).delete(destination)
       end
 
-      def disconnect(message_handler)
-        destination = destination_for(message_handler)
-        exchange_strategy_for(destination).unsubscribe
+      def disconnect
+        @exchange_strategy.unsubscribe if @exchange_strategy
       end
 
       def receive_once(destination, opts={})
-        exchange_strategy_for(destination, opts).receive_once(destination) do |msg|
+        @exchange_strategy = exchange_strategy_for(destination, opts)
+        @exchange_strategy.receive_once(destination) do |msg|
           return msg
         end
       end
@@ -34,15 +34,53 @@ module RosettaQueue
       def receive_with(message_handler)
         options = options_for(message_handler)
         destination = destination_for(message_handler)
-        exchange_strategy_for(destination, options).receive(destination, message_handler)
+        @exchange_strategy = exchange_strategy_for(destination, options)
+        @exchange_strategy.receive(destination, message_handler)
       end
 
       def send_message(destination, message, options=nil)
-        exchange_strategy_for(destination, options).publish(destination, message)
+        @exchange_strategy = exchange_strategy_for(destination, options)
+        @exchange_strategy.publish(destination, message)
       end
 
       def unsubscribe; end
 
     end
+
+    class AmqpEventedAdapter < Amqp
+
+      def exchange_strategy_for(destination, options)
+        case destination
+        when /^fanout\./
+          @exchange ||= EventedExchange::FanoutExchange.new(@adapter_settings, options)
+        when /^topic\./
+          raise "Sorry.  RosettaQueue can not process AMQP topics yet"
+        when /^queue\./
+          @exchange ||= EventedExchange::DirectExchange.new(@adapter_settings, options)
+        else
+          @exchange ||= EventedExchange::DirectExchange.new(@adapter_settings, options)
+        end
+      end
+    end
+
+
+    # This AMQP adapter utilizes the synchronous AMPQ client 'Bunny'
+    # by celldee (http://github.com/celldee/bunny)
+    class AmqpSynchAdapter < Amqp
+
+      def exchange_strategy_for(destination, options={})
+        case destination
+        when /^fanout\./
+          @exchange ||= SynchExchange::FanoutExchange.new(@adapter_settings, options)
+        when /^topic\./
+          raise "Sorry.  RosettaQueue can not process AMQP topics yet"
+        when /^queue\./
+          @exchange ||= SynchExchange::DirectExchange.new(@adapter_settings, options)
+        else
+          @exchange ||= SynchExchange::DirectExchange.new(@adapter_settings, options)
+        end
+      end
+    end
+
   end
 end

data/lib/rosetta_queue/adapters/amqp_evented.rb

@@ -5,23 +5,6 @@ require File.expand_path(File.dirname(__FILE__) + "/amqp.rb")
 module RosettaQueue
   module Gateway
 
-    class AmqpEventedAdapter < Amqp
-      private
-
-      def exchange_strategy_for(destination, options)
-        case destination
-        when /^fanout\./
-          @exchange ||= EventedExchange::FanoutExchange.new(@adapter_settings, options)
-        when /^topic\./
-          raise "Sorry.  RosettaQueue can not process AMQP topics yet"
-        when /^queue\./
-          @exchange ||= EventedExchange::DirectExchange.new(@adapter_settings, options)
-        else
-          @exchange ||= EventedExchange::DirectExchange.new(@adapter_settings, options)
-        end
-      end
-    end
-
     module EventedExchange
 
       class BaseExchange
@@ -34,6 +17,10 @@ module RosettaQueue
           conn.queue(destination).delete(@options)
         end
 
+        def unsubscribe
+          @queue.unsubscribe if @queue
+        end
+        
         protected
 
         def channel
@@ -55,18 +42,17 @@ module RosettaQueue
         def publish(destination, message, options={})
           raise AdapterException, "Messages need to be published in an EventMachine run block (e.g., EM.run { RosettaQueue::Producer.publish(:foo, msg) } " unless EM.reactor_running?
 
-          queue = channel.queue(destination, options)
-          queue.publish(message, options)
+          @queue = channel.queue(destination, options)
+          @queue.publish(message, options)
           RosettaQueue.logger.info("Publishing to #{destination} :: #{message}")
-          queue.unsubscribe
         end
 
         def receive(destination, message_handler)
           raise AdapterException, "Consumers need to run in an EventMachine 'run' block.  Try wrapping them inside the evented consumer manager." unless EM.reactor_running?
 
-          queue = channel.queue(destination, @options)
+          @queue = channel.queue(destination, @options)
           ack = @options[:ack]
-          queue.subscribe(@options) do |header, msg|
+          @queue.subscribe(@options) do |header, msg|
             RosettaQueue.logger.info("Receiving from #{destination} :: #{msg}")
             message_handler.handle_message(msg)
             header.ack if ack
@@ -76,9 +62,9 @@ module RosettaQueue
         def receive_once(destination, options={})
           raise AdapterException, "Consumers need to run in an EventMachine 'run' block. (e.g., EM.run { RosettaQueue::Consumer.receive }" unless EM.reactor_running?
 
-          queue = channel.queue(destination, @options)
+          @queue = channel.queue(destination, @options)
           ack = @options[:ack]
-          queue.pop(@options) do |header, msg|
+          @queue.pop(@options) do |header, msg|
             RosettaQueue.logger.info("Receiving from #{destination} :: #{msg}")
             header.ack if ack
             yield Filters.process_receiving(msg)
@@ -93,19 +79,19 @@ module RosettaQueue
         def publish(dest, msg, opts)
           raise AdapterException, "Messages need to be published in an EventMachine run block (e.g., EM.run { RosettaQueue::Producer.publish(:foo, msg) } " unless EM.reactor_running?
 
-          exchange = channel.fanout(fanout_name_for(dest), opts)
-          exchange.publish(msg, opts)
+          @queue = channel.fanout(fanout_name_for(dest), opts)
+          @queue.publish(msg, opts)
           RosettaQueue.logger.info("Publishing to fanout #{dest} :: #{msg}")
         end
 
         def receive(destination, message_handler)
           raise AdapterException, "Consumers need to run in an EventMachine 'run' block.  Try wrapping them inside the evented consumer manager." unless EM.reactor_running?
 
-          queue = channel.queue("queue_#{self.object_id}")
+          @queue = channel.queue("queue_#{self.object_id}")
           exchange = channel.fanout(fanout_name_for(destination), @options)
           ack = @options[:ack]
 
-          queue.bind(exchange).subscribe(@options) do |header, msg|
+          @queue.bind(exchange).subscribe(@options) do |header, msg|
             RosettaQueue.logger.info("Receiving from #{destination} :: #{msg}")
             message_handler.handle_message(msg)
             header.ack if ack
@@ -115,11 +101,11 @@ module RosettaQueue
         def receive_once(destination, opts={})
           raise AdapterException, "Consumers need to run in an EventMachine 'run' block. (e.g., EM.run { RosettaQueue::Consumer.receive }" unless EM.reactor_running?
 
-          queue = channel.queue("queue_#{self.object_id}")
+          @queue = channel.queue("queue_#{self.object_id}")
           exchange = channel.fanout(fanout_name_for(destination), opts)
           ack = @options[:ack]
 
-          queue.bind(exchange).pop(opts) do |header, msg|
+          @queue.bind(exchange).pop(opts) do |header, msg|
             RosettaQueue.logger.info("Receiving from #{destination} :: #{msg}")
             header.ack if ack
             yield Filters.process_receiving(msg)

data/lib/rosetta_queue/adapters/amqp_synch.rb

@@ -4,25 +4,6 @@ require File.expand_path(File.dirname(__FILE__) + "/amqp.rb")
 module RosettaQueue
   module Gateway
 
-    # This AMQP adapter utilizes the synchronous AMPQ client 'Bunny'
-    # by celldee (http://github.com/celldee/bunny)
-    class AmqpSynchAdapter < Amqp
-      private
-
-      def exchange_strategy_for(destination, options={})
-        case destination
-        when /^fanout\./
-          @exchange ||= SynchExchange::FanoutExchange.new(@adapter_settings, options)
-        when /^topic\./
-          raise "Sorry.  RosettaQueue can not process AMQP topics yet"
-        when /^queue\./
-          @exchange ||= SynchExchange::DirectExchange.new(@adapter_settings, options)
-        else
-          @exchange ||= SynchExchange::DirectExchange.new(@adapter_settings, options)
-        end
-      end
-    end
-
     module SynchExchange
 
       class BaseExchange
@@ -58,9 +39,8 @@ module RosettaQueue
 
         def publish(destination, message, options={})
           RosettaQueue.logger.info("Publishing to #{destination} :: #{message}")
-          queue = conn.queue(destination, options)
-          queue.publish(message, options)
-          conn.stop
+          @queue = conn.queue(destination, options)
+          @queue.publish(message, options)
         end
 
         def receive(destination, message_handler)
@@ -88,8 +68,8 @@ module RosettaQueue
         include Fanout
 
         def publish(destination, message, options={})
-          exchange = conn.exchange(fanout_name_for(destination), options.merge({:type => :fanout}))
-          exchange.publish(message, options)
+          @queue = conn.exchange(fanout_name_for(destination), options.merge({:type => :fanout}))
+          @queue.publish(message, options)
           RosettaQueue.logger.info("Publishing to fanout #{destination} :: #{message}")
         end
 

data/lib/rosetta_queue/adapters/fake.rb

@@ -3,8 +3,9 @@ module RosettaQueue
 
     class FakeAdapter
 
-      def initialize
+      def initialize(adapter_settings = {})
         @messages = []
+        @open = true
       end
 
       def send_message(queue, message, headers)
@@ -19,6 +20,14 @@ module RosettaQueue
         @messages.map {|message| message['queue']}
       end
 
+      def disconnect
+        @open = false
+      end
+      
+      def open?
+        @open == true
+      end
+
     end
 
   end

data/lib/rosetta_queue/adapters/null.rb

@@ -32,11 +32,11 @@ module RosettaQueue
       end
 
       def receive
-        raise "Null Adpater is in use, you can not consume messages!"
+        raise "Null Adapter is in use, you can not consume messages!"
       end
 
       def receive_with(message_handler)
-        raise "Null Adpater is in use, you can not consume messages!"
+        raise "Null Adapter is in use, you can not consume messages!"
       end
 
       def send_message(queue, message, options)

data/lib/rosetta_queue/adapters/stomp.rb

@@ -19,8 +19,8 @@ module RosettaQueue
                                        true)
       end
 
-      def disconnect(message_handler)
-        unsubscribe(destination_for(message_handler))
+      def disconnect
+        unsubscribe if @destination
         @conn.disconnect
       end
 
@@ -31,38 +31,38 @@ module RosettaQueue
       end
 
       def receive_once(destination, opts)
-        subscribe(destination, opts)
-        msg = receive(opts).body
-        unsubscribe(destination)
-        RosettaQueue.logger.info("Receiving from #{destination} :: #{msg}")
+        @destination, @options = destination, opts
+        subscribe
+        msg = receive(@options).body
+        unsubscribe
+        RosettaQueue.logger.info("Receiving from #{@destination} :: #{msg}")
         filter_receiving(msg)
       end
 
       def receive_with(message_handler)
-        options = options_for(message_handler)
-        destination = destination_for(message_handler)
-        @conn.subscribe(destination, options)
-
+        @destination, @options = destination_for(message_handler), options_for(message_handler)
+        subscribe
         running do
-          msg = receive(options).body
+          msg = receive(@options).body
           Thread.current[:processing] = true
-          RosettaQueue.logger.info("Receiving from #{destination} :: #{msg}")
+          RosettaQueue.logger.info("Receiving from #{@destination} :: #{msg}")
           message_handler.handle_message(msg)
           Thread.current[:processing] = false
         end
       end
 
       def send_message(destination, message, options)
-        RosettaQueue.logger.info("Publishing to #{destination} :: #{message}")
-        @conn.send(destination, message, options)
+        @destination = destination
+        RosettaQueue.logger.info("Publishing to #{@destination} :: #{message}")
+        @conn.send(@destination, message, options)
       end
 
-      def subscribe(destination, options)
-        @conn.subscribe(destination, options)
+      def subscribe
+        @conn.subscribe(@destination, @options)
       end
 
-      def unsubscribe(destination)
-        @conn.unsubscribe(destination)
+      def unsubscribe
+        @conn.unsubscribe(@destination)
       end
 
       private
@@ -73,16 +73,5 @@ module RosettaQueue
 
     end
 
-    class StompAdapterProxy
-
-      def initialize(adapter, msg)
-        @adapter, @msg = adapter, msg
-      end
-
-      def ack
-        @adapter.ack(@msg)
-      end
-    end
-
   end
 end

data/lib/rosetta_queue/consumer.rb

@@ -1,15 +1,15 @@
 module RosettaQueue
-  class Consumer < Base
+  class Consumer
 
     def self.receive(destination, options = {})
-      RosettaQueue::Adapter.instance.receive_once(Destinations.lookup(destination), options)
+      RosettaQueue::Adapter.open { |a| return a.receive_once(Destinations.lookup(destination), options) }
 
-      rescue Exception=>e
+    rescue Exception=>e
         RosettaQueue.logger.error("Caught exception in Consumer.receive: #{$!}\n" + e.backtrace.join("\n\t"))
     end
 
     def self.delete(destination, options={})
-      RosettaQueue::Adapter.instance.delete(Destinations.lookup(destination), options)
+      RosettaQueue::Adapter.open { |a| a.delete(Destinations.lookup(destination), options)}
 
       rescue Exception=>e
         RosettaQueue.logger.error("Caught exception in Consumer.delete: #{$!}\n" + e.backtrace.join("\n\t"))
@@ -26,5 +26,11 @@ module RosettaQueue
         RosettaQueue.logger.error("Caught exception in Consumer#receive: #{$!}\n" + e.backtrace.join("\n\t"))
     end
 
+    private
+
+    def connection
+      @conn ||= Adapter.open
+    end
+
   end
 end

data/lib/rosetta_queue/consumer_managers/base.rb

@@ -15,8 +15,7 @@ module RosettaQueue
       @consumers  = {}
     end
 
-    def add(message_handler)
-      key = message_handler.class.to_s.underscore.to_sym
+    def add(message_handler, key = message_handler.class.to_s.underscore.to_sym)
       @consumers[key] = Consumer.new(message_handler)
     end
 

data/lib/rosetta_queue/consumer_managers/evented.rb

@@ -1,3 +1,4 @@
+require 'eventmachine'
 require 'rosetta_queue/consumer_managers/base'
 require 'mq'
 

data/lib/rosetta_queue/producer.rb

@@ -1,6 +1,6 @@
 module RosettaQueue
 
-  class Producer < Base
+  class Producer
     include MessageHandler
 
     def self.publish(destination, message, options = {})
@@ -11,10 +11,12 @@ module RosettaQueue
            :destination => destination,
            :options => options}
         }) do
-        RosettaQueue::Adapter.instance.send_message(
-          Destinations.lookup(destination),
-          Filters.process_sending(message),
-          options)
+        RosettaQueue::Adapter.open do |a|
+          a.send_message(
+            Destinations.lookup(destination),
+            Filters.process_sending(message),
+            options)
+        end
       end
     end
   end

data/spec/rosetta_queue/adapter_spec.rb

@@ -12,9 +12,9 @@ module RosettaQueue
     describe ".reset" do
       it "should clear all definitions" do
         Adapter.define { |a| a.type = "null"  }
-        Adapter.instance.should be_instance_of(RosettaQueue::Gateway::NullAdapter)
+        Adapter.open.should be_instance_of(RosettaQueue::Gateway::NullAdapter)
         Adapter.reset
-        running { Adapter.instance }.should raise_error(AdapterException)
+        running { Adapter.open }.should raise_error(AdapterException)
       end
     end
 
@@ -31,11 +31,11 @@ module RosettaQueue
     end
 
     describe "adapter not type set" do
-      it "should raise an error when .instance is called" do
+      it "should raise an error when .open is called" do
         # given
         Adapter.define { |a|  }
         # then & when
-        running { Adapter.instance }.should raise_error(AdapterException)
+        running { Adapter.open }.should raise_error(AdapterException)
       end
     end
 
@@ -45,8 +45,8 @@ module RosettaQueue
         Adapter.define { |a| a.type = "null" }
       end
 
-      it "should return adapter instance" do
-        Adapter.instance.class.should == RosettaQueue::Gateway::NullAdapter
+      it "should return adapter open" do
+        Adapter.open.class.should == RosettaQueue::Gateway::NullAdapter
       end
 
     end
@@ -64,7 +64,7 @@ module RosettaQueue
       end
 
       def do_process
-        Adapter.instance
+        Adapter.open
       end
 
       it "should set opts as an empty has unless variable is set" do
@@ -92,10 +92,54 @@ module RosettaQueue
         end
 
         it "should raise an adapter exception" do
-          running { Adapter.instance }.should raise_error("Adapter options should be a hash")
+          running { Adapter.open }.should raise_error("Adapter options should be a hash")
         end
       end
 
     end
+    
+    describe ".open" do
+      
+      before(:each) do
+        Adapter.define do |a|
+          a.user = "foo"
+          a.password = "bar"
+          a.host = "localhost"
+          a.port = "9000"
+          a.type = "fake"
+        end
+      end
+
+      it "returns an open adapter if no block is given" do
+        adapter = Adapter.open
+        adapter.should be_open
+      end
+      
+      it "yields a newly-instantiated adapter to the block" do
+        ran_block = false
+        
+        Adapter.open do |a|
+          a.should_not be_nil
+          a.should be_instance_of(RosettaQueue::Gateway::FakeAdapter)
+          a.should be_open
+          ran_block = true
+        end
+        
+        ran_block.should be_true
+      end
+
+      it "closes the adapter after the block is evaluated" do
+        Adapter.open {|a| "something" }.should_not be_open
+      end
+
+      it "closes the adapter even if the block raises an error" do
+        adapter = nil
+        begin
+          Adapter.open {|a| adapter = a; raise("some connection error here!") }
+        rescue => e;
+        end
+        adapter.should_not be_open
+      end
+    end
   end
 end

data/spec/rosetta_queue/adapters/amqp_synchronous_spec.rb

@@ -87,9 +87,35 @@ module RosettaQueue::Gateway
         end
 
       end
-    end
 
+      describe "#disconnect" do
+
+        it "delegates to cached exchange strategy" do
+          # given
+          @adapter.receive_with(@handler)
+          
+          # expect
+          @exchange_strategy.should_receive(:unsubscribe)
+
+          # when
+          @adapter.disconnect
+        end
+
+        context "subscription was never made" do
+
+          it "does not delegate to exchange strategy" do
+            # expect
+            @exchange_strategy.should_not_receive(:unsubscribe)
 
+            # when
+            @adapter.disconnect
+          end
+
+        end
+
+      end
+    end
+    
     describe SynchExchange::DirectExchange do
 
       before(:each) do

data/spec/rosetta_queue/adapters/shared_adapter_behavior.rb

@@ -32,6 +32,13 @@ module RosettaQueue
         end
 
       end
+      
+      describe "#disconnect" do
+        
+        it "allows disconnecting" do
+          @adapter.should respond_to(:disconnect)
+        end
+      end
 
     end
   end

data/spec/rosetta_queue/adapters/stomp_spec.rb

@@ -83,42 +83,48 @@ module RosettaQueue
 
       describe "disconnect" do
 
-        def do_disconnecting
-          @adapter.disconnect(@handler)
-        end
+        describe "simple disconnection without previously subscribing" do
 
-        it "should unsubscribe connection" do
-          when_disconnecting {
-            @conn.should_receive("unsubscribe").with("foo")
-          }
-        end
-
-        it "should disconnect connection" do
-          when_disconnecting {
-            @conn.should_receive("disconnect")
-          }
-        end
+          def do_disconnecting
+            @adapter.disconnect
+          end
 
-      end
+          it "should NOT try to unsubscribe the connection" do
+            when_disconnecting {
+              @conn.should_receive("unsubscribe").never
+            }
+          end
 
-      describe StompAdapterProxy do
+          it "should disconnect connection" do
+            when_disconnecting {
+              @conn.should_receive("disconnect")
+            }
+          end
 
-        before(:each) do
-          @adapter = mock("StompAdapter", :ack => nil)
-          @proxy = StompAdapterProxy.new(@adapter, "foo")
         end
 
-        context "#ack" do
+        describe "when given a previously-subscribed message handler to unsubscribe from" do
 
-          it "should delegate to AMQP queue object" do
-            # expect
-            @adapter.should_receive(:ack).with("foo")
+          def do_disconnecting
+            @adapter.receive_with(@handler)
+            @adapter.disconnect
+          end
 
-            # when
-            @proxy.ack
+          it "should unsubscribe connection" do
+            when_disconnecting {
+              @conn.should_receive("unsubscribe").with("foo")
+            }
+          end
+
+          it "should disconnect connection" do
+            when_disconnecting {
+              @conn.should_receive("disconnect")
+            }
           end
 
         end
+
+
       end
 
     end

data/spec/rosetta_queue/consumer_managers/base_spec.rb

@@ -0,0 +1,36 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+module RosettaQueue
+  describe BaseManager do
+    
+    describe "#add" do
+      it "allows adding a handler" do
+        BaseManager.new.add(Object.new)
+      end
+      
+      it "wraps the handler with a consumer and stores it" do
+        handler = Object.new
+        Consumer.should_receive(:new).with(handler)
+        BaseManager.new.add(handler)
+      end
+      
+      describe "storing the consumer" do
+        it "uses the class name as the key by default" do
+          handler = Object.new
+          manager = BaseManager.new
+          manager.add(handler)
+          manager.consumers.keys.should == [:object]
+        end
+        
+        it "allows overriding the key name for cases where you have multiple instances of the same handler class" do
+          handler = Object.new
+          manager = BaseManager.new
+          manager.add(handler, :object_1)
+          manager.add(handler, :object_2)
+          manager.consumers.keys.should =~ [:object_1, :object_2]
+        end
+      end
+    end
+  end
+
+end

data/spec/rosetta_queue/consumer_spec.rb

@@ -16,14 +16,12 @@ module RosettaQueue
 
     before(:each) do
       @message  = mock("message", "headers" => "foo", "body" => "message body")
-      @adapter  = mock("adpater", :subscribe => true, :unsubscribe => true, :disconnect => true, :receive_with => TestConsumer.new,
+      @adapter  = mock("adapter", :subscribe => true, :unsubscribe => true, :disconnect => true, :receive_with => TestConsumer.new,
                                   :receive_once => @message.body, :ack => true)
-      Adapter.stub!(:instance).and_return(@adapter)
+      Adapter.stub!(:open).and_yield(@adapter)
       Destinations.stub!(:lookup).and_return("/queue/foo")
     end
 
-    it_should_behave_like "a messaging gateway object"
-
     attr_reader :adapter
     def gateway
       @gateway ||= Consumer.new(TestConsumer.new)
@@ -39,9 +37,10 @@ module RosettaQueue
         @consumer.receive
       end
 
-      it "should pass message handler onto the adpater with #receive" do
+      it "should pass message handler onto the adapter with #receive" do
+        Adapter.stub!(:open).and_return(@adapter)
         when_receiving {
-          @adapter.should_receive("receive_with").with(@message_handler)
+          @adapter.should_receive(:receive_with).with(@message_handler)
         }
       end
     end

data/spec/rosetta_queue/producer_spec.rb

@@ -12,44 +12,24 @@ module RosettaQueue
   describe Producer do
 
     before(:each) do
-      @adapter = mock("adapter", :send_message => nil)
-      RosettaQueue::Adapter.stub!(:instance).and_return(@adapter)
+      @adapter = mock("adapter", :send_message => nil, :disconnect => nil)
+      RosettaQueue::Adapter.stub!(:open).and_yield(@adapter)
       @gateway  = TestProducer.new
 
       Destinations.stub!(:lookup).and_return("/queue/test_queue")
     end
 
-    it_should_behave_like "a messaging gateway object"
     attr_reader :adapter, :gateway
 
-
-    describe "#publish" do
-
-      before(:each) do
-        @adapter = mock("adpater", :send_message => nil)
-        RosettaQueue::Adapter.stub!(:instance).and_return(@adapter)
-      end
-
-      it "should publish messages to queue with the options defined in the class" do
-        # TO DO: REFACTOR #publish METHOD SO THAT YOU PASS IN MESSAGE HANDLER AS WITH CONSUMER
-        pending
-        # expect
-        @adapter.should_receive(:send_message).with("/queue/test_queue", "Hello World!", {:persistent => false})
-        # when
-        @gateway.publish("Hello World!")
-      end
-
-    end
-
     describe ".publish" do
-      it "should send the message to the adpater along with the options" do
+      it "should send the message to the adapter along with the options" do
         # expect
         @adapter.should_receive(:send_message).with("/queue/test_queue", "Hello World!", {:persistent => true})
         # when
         Producer.publish(:test_queue, "Hello World!", {:persistent => true})
       end
 
-      it "delgates exception handling to the ExceptionHandler for :publishing" do
+      it "delegates exception handling to the ExceptionHandler for :publishing" do
         ExceptionHandler.should_receive(:handle).with(:publishing, anything)
         Producer.publish(:test_queue, "Hello World!", {:persistent => true})
       end

data/spec/spec_helper.rb

@@ -17,7 +17,6 @@ require 'rosetta_queue/spec_helpers'
 require 'rosetta_queue/consumer_managers/base'
 require 'rosetta_queue/consumer_managers/evented'
 require 'rosetta_queue/consumer_managers/threaded'
-require File.dirname(__FILE__) + '/rosetta_queue/shared_messaging_behavior.rb'
 
 class NullLogger
   def info(*args);  end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rosetta_queue
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Ben Mabey
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-28 00:00:00 -06:00
+date: 2009-12-21 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -38,6 +38,10 @@ files:
 - features/step_definitions/publish_subscribe_steps.rb
 - features/support/env.rb
 - features/support/sample_consumers.rb
+- features/support/tmp/barconsumer.log
+- features/support/tmp/fooconsumer.log
+- features/support/tmp/point-to-point.log
+- features/support/tmp/pub-sub.log
 - lib/rosetta_queue.rb
 - lib/rosetta_queue/adapter.rb
 - lib/rosetta_queue/adapters/amqp.rb
@@ -48,7 +52,6 @@ files:
 - lib/rosetta_queue/adapters/fake.rb
 - lib/rosetta_queue/adapters/null.rb
 - lib/rosetta_queue/adapters/stomp.rb
-- lib/rosetta_queue/base.rb
 - lib/rosetta_queue/consumer.rb
 - lib/rosetta_queue/consumer_managers/base.rb
 - lib/rosetta_queue/consumer_managers/evented.rb
@@ -74,6 +77,7 @@ files:
 - spec/rosetta_queue/adapters/shared_adapter_behavior.rb
 - spec/rosetta_queue/adapters/shared_fanout_behavior.rb
 - spec/rosetta_queue/adapters/stomp_spec.rb
+- spec/rosetta_queue/consumer_managers/base_spec.rb
 - spec/rosetta_queue/consumer_managers/evented_spec.rb
 - spec/rosetta_queue/consumer_managers/shared_manager_behavior.rb
 - spec/rosetta_queue/consumer_managers/threaded_spec.rb
@@ -84,7 +88,6 @@ files:
 - spec/rosetta_queue/filters_spec.rb
 - spec/rosetta_queue/message_handler_spec.rb
 - spec/rosetta_queue/producer_spec.rb
-- spec/rosetta_queue/shared_messaging_behavior.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
@@ -111,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rosetta-queue
-rubygems_version: 1.3.3
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Messaging gateway API with adapters for many messaging systems available in Ruby.
@@ -124,6 +127,7 @@ test_files:
 - spec/rosetta_queue/adapters/shared_adapter_behavior.rb
 - spec/rosetta_queue/adapters/shared_fanout_behavior.rb
 - spec/rosetta_queue/adapters/stomp_spec.rb
+- spec/rosetta_queue/consumer_managers/base_spec.rb
 - spec/rosetta_queue/consumer_managers/evented_spec.rb
 - spec/rosetta_queue/consumer_managers/shared_manager_behavior.rb
 - spec/rosetta_queue/consumer_managers/threaded_spec.rb
@@ -134,7 +138,6 @@ test_files:
 - spec/rosetta_queue/filters_spec.rb
 - spec/rosetta_queue/message_handler_spec.rb
 - spec/rosetta_queue/producer_spec.rb
-- spec/rosetta_queue/shared_messaging_behavior.rb
 - spec/spec_helper.rb
 - examples/sample_amqp_consumer.rb
 - examples/sample_amqp_fanout_consumer.rb

data/lib/rosetta_queue/base.rb

@@ -1,15 +0,0 @@
-module RosettaQueue
-
-  class Base
-
-    def disconnect
-      connection.disconnect(@message_handler)
-    end
-
-    protected
-     def connection
-       @conn ||= Adapter.instance
-     end
-
-  end
-end

data/spec/rosetta_queue/shared_messaging_behavior.rb

@@ -1,21 +0,0 @@
-module RosettaQueue
-
-  describe "a messaging gateway object", :shared => true do
-
-    it "#unsubscribe should be delegated to the adapter" do
-      pending
-      # expect
-      adapter.should_receive("unsubscribe")
-      # when
-      gateway.unsubscribe
-    end
-
-    it "#disconnect should be delegated to the adapter" do
-      # expect
-      adapter.should_receive("disconnect")
-      # when
-      gateway.disconnect
-    end
-
-  end
-end