message-driver 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f6ca18a14ba62a965bc18eac1072208821266e6
-  data.tar.gz: dbed32cf2ad5170579f1e013c85c79a94f0264e0
+  metadata.gz: c03ff5c533ab9ffdb8a6a3fce6b2ffe0b7239d56
+  data.tar.gz: 44614cda7f594028f587e7dfd79f608c7b3fb0c3
 SHA512:
-  metadata.gz: 9aae643f4f2396e55fbb848770530832ad4729e7fe566219f2c178f22e199adda8d19e70f766b248043f9c2a496909f4b343c575c303ab87ed105162c7138688
-  data.tar.gz: 85430c090e5667abe21e58207bcfaafc7e1d9122c260b2c2b50fc0956d8fa645c730db0ef2e678d0f1dc7d23e2a10630b978717f7051ea11dcfab5f3be9e0c93
+  metadata.gz: 335cc2f27f8b2a70ec0abb4523c1fee62abea0664fb80a4ea09e1936da6d66f6012087b05961bdcd6acbc3ff2a3dd396013b48021ca3f185fb1b0e2ffd56ccc2
+  data.tar.gz: 8ded01de5e953bf8486d2d139de8e677db11e138b6a6e221fbec35dcd12d905605c95403856f2c5da8ad922141a284b348f61093f874e17ce5177f661452e311

data/.travis.yml

@@ -1,33 +1,23 @@
 language: ruby
+cache: bundler
 bundler_args: --without tools darwin
 services:
   - rabbitmq
 before_script:
-  - sudo rabbitmqctl add_vhost message-driver-test
-  - sudo rabbitmqctl set_permissions -p message-driver-test guest ".*" ".*" ".*"
-  - sudo rabbitmq-plugins enable rabbitmq_stomp
-  - sudo service rabbitmq-server restart
-env:
-  - ADAPTER=in_memory
-  - ADAPTER=bunny:0.10.0
-  - ADAPTER=stomp
-  - ADAPTER=bunny:1.0.0
+  - ci/travis_setup
 rvm:
   - 2.1.0
   - 2.0.0
   - 1.9.3
-  - 1.9.2
   - jruby-19mode
-  - jruby-head
+  - 1.9.2
   - rbx
+env:
+  - ADAPTER=in_memory
+  - ADAPTER=stomp
+  - ADAPTER=bunny:1.1.3
 matrix:
-  exclude:
-    - rvm: jruby-19mode
-      env: ADAPTER=bunny:0.9.0
-    - rvm: jruby-head
-      env: ADAPTER=bunny:0.9.0
   allow_failures:
-    - rvm: jruby-head
     - rvm: rbx
     - rvm: jruby-19mode
       env: ADAPTER=stomp

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
 
-## 0.3.0.dev - master
+## 0.3.0 - 2014-02-26
+
+* Support for handling multiple broker connections
+* require bunny 1.1.3 or later
+* make bunny connections as lazily initialized as possible
+* bunny transaction start lazily
 
 ## 0.2.2 - 2014-02-21
 

data/Guardfile

@@ -8,9 +8,9 @@ guard 'bundler' do
   watch(/^.+\.gemspec/)
 end
 
-common_rspec_opts = {keep_failed: true, all_after_pass: true}
-unit_spec_opts = common_rspec_opts.merge({spec_paths: ["spec/units"], cmd: 'rspec -f doc', run_all: {cmd: 'rspec'}})
-integration_spec_opts = common_rspec_opts.merge({spec_paths: ["spec/integration/#{BrokerConfig.current_adapter}"], cmd: 'rspec -f doc -t all_adapters', run_all: {cmd: 'rspec -t all_adapters'}})
+common_rspec_opts = { all_after_pass: true }
+unit_spec_opts = common_rspec_opts.merge({ spec_paths: ["spec/units"], cmd: 'bundle exec rspec -f doc', run_all: { cmd: 'bundle exec rspec' } })
+integration_spec_opts = common_rspec_opts.merge({ spec_paths: ["spec/integration/#{BrokerConfig.current_adapter}"], cmd: 'bundle exec rspec -f doc -t all_adapters', run_all: { cmd: 'bundle exec rspec -t all_adapters' } })
 
 group 'specs' do
   guard 'rspec', unit_spec_opts do

data/Rakefile

@@ -6,8 +6,6 @@ require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'cucumber/rake/task'
 
-#require File.join(File.dirname(__FILE__), 'test_lib', 'broker_config')
-
 namespace :spec do
   desc "Run unit specs"
   RSpec::Core::RakeTask.new(:units) do |t|

data/ci/reset_vhost

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+rabbitmqctl delete_vhost message-driver-test
+rabbitmqctl add_vhost message-driver-test
+rabbitmqctl set_permissions -p message-driver-test guest ".*" ".*" ".*"

data/ci/travis_setup

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+sudo rabbitmqctl add_vhost message-driver-test
+sudo rabbitmqctl set_permissions -p message-driver-test guest ".*" ".*" ".*"
+
+if [ "$ADAPTER" = "stomp" ]; then
+  sudo rabbitmq-plugins enable rabbitmq_stomp
+  sudo service rabbitmq-server restart
+  sleep 3
+fi

data/features/.nav

@@ -6,15 +6,18 @@
 - destination_metadata.feature
 - client_acks.feature
 - logging.feature
-- message_consumers.feature
-- message_consumers
+- message_consumers (Message Consumers)
+  - basics.feature
   - auto_ack_consumers.feature
   - manual_ack_consumers.feature
   - transactional_ack_consumers.feature
+  - prefetch_size.feature
+  - subscribe_with_a_block.feature
 - amqp_specific_features (AMQP-Specific Features):
   - declaring_amqp_destinations.feature
   - binding_amqp_destinations.feature
   - server_named_desitnations.feature
   - requeueing_on_nack.feature
+- connecting_to_multiple_brokers.feature
 - error_handling.feature
 - Rails.md

data/features/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
 
-## 0.3.0.dev - master
+## 0.3.0 - 2014-02-26
+
+* Support for handling multiple broker connections
+* require bunny 1.1.3 or later
+* make bunny connections as lazily initialized as possible
+* bunny transaction start lazily
 
 ## 0.2.2 - 2014-02-21
 

data/features/amqp_specific_features/declaring_amqp_exchanges.feature

@@ -11,12 +11,12 @@ Feature: Declaring AMQP exchanges
     """ruby
     MessageDriver::Broker.define do |b|
       b.destination :my_exchange, "my_exchange", type: :exchange, declare: {type: :direct, auto_delete: true}
-      b.destination :my_queue, "", exclusive: true, bindings: [{source: "my_exchange", routing_key: "my_queue"}]
+      b.destination :exchange_bound_queue, "", exclusive: true, bindings: [{source: "my_exchange", routing_key: "exchange_bound_queue"}]
     end
 
-    publish(:my_exchange, "Test My New Exchange", routing_key: "my_queue")
+    publish(:my_exchange, "Test My New Exchange", routing_key: "exchange_bound_queue")
     """
 
-    Then I expect to find the following message on :my_queue
+    Then I expect to find the following message on :exchange_bound_queue
       | body                 |
       | Test My New Exchange |

data/features/amqp_specific_features/nack_redelivered_messages.feature

@@ -28,7 +28,7 @@ Feature: Nacking Redelievered Messages from a consumer
   Scenario: Raising an error in an auto_ack consumer
     Given I have a message consumer
     """ruby
-    MessageDriver::Broker.consumer(:manual_redeliver) do |message|
+    MessageDriver::Client.consumer(:manual_redeliver) do |message|
       publish(:rabbit_track, "#{message.body} Attempt")
       raise "oh nos!"
     end
@@ -61,7 +61,7 @@ Feature: Nacking Redelievered Messages from a consumer
     Given I have a message consumer
     """ruby
     @attempts = 0
-    MessageDriver::Broker.consumer(:transactional_redeliver) do |message|
+    MessageDriver::Client.consumer(:transactional_redeliver) do |message|
       publish(:rabbit_track, "#{message.body} Attempt")
       @attempts += 1
       raise "oh nos!"

data/features/amqp_specific_features/server_named_destinations.feature

@@ -3,15 +3,14 @@ Feature: Server-Named Destinations
   AMQP brokers allow you to create queues that are named by the server. Here's
   how you do it with message_driver.
 
-  Background:
-    Given I am connected to the broker
-
   Scenario: Creating a server-named queue
     I expect my destination to have the queue name given to it by the server
 
+    Given I am connected to the broker
+
     When I execute the following code
     """ruby
-    destination = MessageDriver::Broker.dynamic_destination("", exclusive: true)
+    destination = MessageDriver::Client.dynamic_destination("", exclusive: true)
     expect(destination.name).to_not be_empty
     """
 

data/features/connecting_to_multiple_brokers.feature

@@ -0,0 +1,51 @@
+Feature: Connecting to Multiple Brokers
+
+  Background:
+    Given I am connected to a broker named :my_broker
+
+  @all_adapters
+  Scenario: Declaring Destinations and Publishing on a secondary broker
+    Given I configure my broker as follows
+    """ruby
+    MessageDriver::Broker.define(:my_broker) do |b|
+      b.destination(:multi_broker_destination, "multi.broker.queue")
+    end
+    """
+    And I have no messages on :multi_broker_destination
+
+    When I execute the following code
+    """ruby
+    MessageDriver::Client[:my_broker].publish(:multi_broker_destination, "Test Message")
+    """
+
+    Then I expect to find the following message on :multi_broker_destination
+      | body         |
+      | Test Message |
+
+  @bunny
+  @in_memory
+  Scenario: Declaring Consumers and Subscriptions on a secondary broker
+    Given I have a destination :dest_queue with no messages on it
+    And I have a destination :source_queue with no messages on it
+    And I have a message consumer
+    """ruby
+    MessageDriver::Client[:my_broker].consumer(:my_consumer) do |message|
+      MessageDriver::Client[:my_broker].publish(:dest_queue, message.body)
+    end
+    """
+    And I create a subscription
+    """ruby
+    MessageDriver::Client[:my_broker].subscribe(:source_queue, :my_consumer)
+    """
+
+    When I send the following messages to :source_queue
+      | body           |
+      | Test Message 1 |
+      | Test Message 2 |
+    And I let the subscription process
+
+    Then I expect to find no messages on :source_queue
+    And I expect to find the following 2 messages on :dest_queue
+      | body           |
+      | Test Message 1 |
+      | Test Message 2 |

data/features/destination_metadata.feature

@@ -8,7 +8,7 @@ Feature: Destination Metadata
   Scenario: Checking the message count when the queue is empty
     When I execute the following code
     """ruby
-    destination = MessageDriver::Broker.find_destination(:my_queue)
+    destination = MessageDriver::Client.find_destination(:my_queue)
     expect(destination.message_count).to eq(0)
     """
 
@@ -23,7 +23,7 @@ Feature: Destination Metadata
     And I allow for processing
     And I execute the following code
     """ruby
-    destination = MessageDriver::Broker.find_destination(:my_queue)
+    destination = MessageDriver::Client.find_destination(:my_queue)
     expect(destination.message_count).to eq(2)
     """
 

data/features/dynamic_destinations.feature

@@ -10,7 +10,7 @@ Feature: Dynamic Destinations
   Scenario: Sending to a dynamic destination
     When I execute the following code
     """ruby
-    my_new_destination = MessageDriver::Broker.dynamic_destination("temp_queue")
+    my_new_destination = MessageDriver::Client.dynamic_destination("temp_queue")
     my_new_destination.publish("Test Message")
     """
 
@@ -26,7 +26,7 @@ Feature: Dynamic Destinations
 
     When I execute the following code
     """ruby
-    my_new_destination = MessageDriver::Broker.dynamic_destination("temp_queue")
+    my_new_destination = MessageDriver::Client.dynamic_destination("temp_queue")
 
     msg1 = my_new_destination.pop_message
     expect(msg1.body).to eq("Test Message 1")

data/features/error_handling.feature

@@ -1,13 +1,11 @@
 Feature: Error Handling
 
-  Background:
-    Given I am connected to the broker
-
   @bunny
   Scenario: Queue isn't found on the broker
+    Given I am connected to the broker
     When I execute the following code
     """ruby
-    MessageDriver::Broker.dynamic_destination("missing_queue", passive: true)
+    MessageDriver::Client.dynamic_destination("missing_queue", passive: true)
     """
 
     Then I expect it to raise a MessageDriver::QueueNotFound error

data/features/logging.feature

@@ -1,8 +1,9 @@
 @all_adapters
 Feature: Stuff gets logged if you set a logger
 
-  You can configure the logger by add a logger to the hash passed to `MessageDriver::Broker.configure`.
-  If you don't provide a logger, then an info level logger will be created and sent to `STDOUT`.
+  You can configure the logger by setting it on `MessageDriver.logger`.
+  If you don't provide a logger, then an info level logger will be created
+  and sent to `STDOUT`.
 
   Scenario: Starting the broker
     Given I am logging to a log file at the debug level

data/features/message_consumers/auto_ack_consumers.feature

@@ -1,5 +1,5 @@
 @bunny
-Feature: Message Consumers auto-acknowledgement
+Feature: Automatic Message Acknowledgement
   This mode will ack the message if the consumer completes successfully.
   It will nack the message if the consumer raises an error.
 
@@ -11,7 +11,7 @@ Feature: Message Consumers auto-acknowledgement
   Scenario: Consuming Messages
     Given I have a message consumer
     """ruby
-    MessageDriver::Broker.consumer(:my_consumer) do |message|
+    MessageDriver::Client.consumer(:my_consumer) do |message|
       MessageDriver::Client.publish(:dest_queue, message.body)
     end
     """
@@ -36,7 +36,7 @@ Feature: Message Consumers auto-acknowledgement
   Scenario: An error occurs during processing
     Given I have a message consumer
     """ruby
-    MessageDriver::Broker.consumer(:my_consumer) do |message|
+    MessageDriver::Client.consumer(:my_consumer) do |message|
       raise "oh nos!"
     end
     """
@@ -60,7 +60,7 @@ Feature: Message Consumers auto-acknowledgement
   Scenario: A DontRequeue error occurs during processing
     Given I have a message consumer
     """ruby
-    MessageDriver::Broker.consumer(:my_consumer) do |message|
+    MessageDriver::Client.consumer(:my_consumer) do |message|
       raise MessageDriver::DontRequeueError, "don't requeue me"
     end
     """

data/features/{message_consumers.feature → message_consumers/basics.feature}

@@ -1,13 +1,13 @@
 @in_memory
 @bunny
-Feature: Message Consumers
+Feature: Basics of Message Consumers
   Background:
     Given I am connected to the broker
     And I have a destination :dest_queue with no messages on it
     And I have a destination :source_queue with no messages on it
     And I have a message consumer
     """ruby
-    MessageDriver::Broker.consumer(:my_consumer) do |message|
+    MessageDriver::Client.consumer(:my_consumer) do |message|
       MessageDriver::Client.publish(:dest_queue, message.body)
     end
     """

data/features/message_consumers/manual_ack_consumers.feature

@@ -1,5 +1,5 @@
 @bunny
-Feature: Message Consumers with manual acknowledgement
+Feature: Manual Message Acknowledgement
   This mode requires the consumer to call ack on the message in order to acknowledge it
 
   Background:
@@ -9,7 +9,7 @@ Feature: Message Consumers with manual acknowledgement
   Scenario: Consuming Messages
     Given I have a message consumer
     """ruby
-    MessageDriver::Broker.consumer(:my_consumer) do |message|
+    MessageDriver::Client.consumer(:my_consumer) do |message|
       message.ack
     end
     """
@@ -29,7 +29,7 @@ Feature: Message Consumers with manual acknowledgement
   Scenario: When a message is nack'ed
     Given I have a message consumer
     """ruby
-    MessageDriver::Broker.consumer(:my_consumer) do |message|
+    MessageDriver::Client.consumer(:my_consumer) do |message|
       message.nack(requeue: true)
     end
     """
@@ -52,7 +52,7 @@ Feature: Message Consumers with manual acknowledgement
   Scenario: When an occurs before the message is ack'ed
     Given I have a message consumer
     """ruby
-    MessageDriver::Broker.consumer(:my_consumer) do |message|
+    MessageDriver::Client.consumer(:my_consumer) do |message|
       raise "oh nos!"
       message.ack
     end
@@ -76,7 +76,7 @@ Feature: Message Consumers with manual acknowledgement
   Scenario: When an error occurs after the message is ack'ed
     Given I have a message consumer
     """ruby
-    MessageDriver::Broker.consumer(:my_consumer) do |message|
+    MessageDriver::Client.consumer(:my_consumer) do |message|
       message.ack
       raise "oh nos!"
     end

data/features/message_consumers/prefetch_size.feature

@@ -1,7 +1,7 @@
 @bunny
 @wip
-Feature: Message Consumers prefetch size
-  You can set the prefetch size for your message consumers 
+Feature: Controlling Prefetch Size
+  You can set the prefetch size for your message consumers.
 
   Background:
     Given I am connected to the broker
@@ -12,13 +12,13 @@ Feature: Message Consumers prefetch size
   Scenario: Consuming Messages
     Given I have a message consumer
     """ruby
-    MessageDriver::Broker.consumer(:my_consumer_1) do |message|
+    MessageDriver::Client.consumer(:my_consumer_1) do |message|
       MessageDriver::Client.publish(:dest_queue_1, message.body)
     end
     """
     And I have a message consumer
     """ruby
-    MessageDriver::Broker.consumer(:my_consumer_2) do |message|
+    MessageDriver::Client.consumer(:my_consumer_2) do |message|
       MessageDriver::Client.publish(:dest_queue_2, message.body)
     end
     """

data/features/message_consumers/transactional_ack_consumers.feature

@@ -1,5 +1,8 @@
 @bunny
-Feature: Transactional Message Consumers
+Feature: Transactional Consumers
+  These consumers will wrap the acknowledgement of the consumed message
+  as well as any publishes in a native broker transaction.
+
   Background:
     Given I am connected to the broker
     And I have a destination :dest_queue with no messages on it
@@ -8,7 +11,7 @@ Feature: Transactional Message Consumers
   Scenario: Consuming Messages within a transaction
     Given I have a message consumer
     """ruby
-    MessageDriver::Broker.consumer(:my_consumer) do |message|
+    MessageDriver::Client.consumer(:my_consumer) do |message|
       MessageDriver::Client.publish(:dest_queue, message.body)
     end
     """
@@ -32,7 +35,7 @@ Feature: Transactional Message Consumers
   Scenario: When an error occurs
     Given I have a message consumer
     """ruby
-    MessageDriver::Broker.consumer(:my_consumer) do |message|
+    MessageDriver::Client.consumer(:my_consumer) do |message|
       MessageDriver::Client.publish(:dest_queue, message.body)
       raise "oh nos!"
     end
@@ -57,7 +60,7 @@ Feature: Transactional Message Consumers
   Scenario: When a DontRequeue error occurs
     Given I have a message consumer
     """ruby
-    MessageDriver::Broker.consumer(:my_consumer) do |message|
+    MessageDriver::Client.consumer(:my_consumer) do |message|
       MessageDriver::Client.publish(:dest_queue, message.body)
       raise MessageDriver::DontRequeueError, "don't requeue me"
     end

data/features/rabbitmq_specific_features/dead_letter_queueing.feature

@@ -43,7 +43,7 @@ Feature: DLQ-ing messages with nacks and consumers
   Scenario: Nacking a message on a manual_ack consumer
     Given I have a message consumer
     """ruby
-    MessageDriver::Broker.consumer(:manual_dql) do |message|
+    MessageDriver::Client.consumer(:manual_dql) do |message|
       message.nack(requeue: false)
     end
     """
@@ -68,7 +68,7 @@ Feature: DLQ-ing messages with nacks and consumers
   Scenario: Raising a DontRequeueError in an auto_ack consumer
     Given I have a message consumer
     """ruby
-    MessageDriver::Broker.consumer(:manual_dql) do |message|
+    MessageDriver::Client.consumer(:manual_dql) do |message|
       raise MessageDriver::DontRequeueError
     end
     """
@@ -93,7 +93,7 @@ Feature: DLQ-ing messages with nacks and consumers
   Scenario: Raising a DontRequeueError in a transactional consumer
     Given I have a message consumer
     """ruby
-    MessageDriver::Broker.consumer(:transactional_dql) do |message|
+    MessageDriver::Client.consumer(:transactional_dql) do |message|
       publish(:rabbit_work, "I get rolled back")
       raise MessageDriver::DontRequeueError
     end

data/features/step_definitions/dynamic_destinations_steps.rb

@@ -1,11 +1,11 @@
 Given(/^I have a dynamic destination "(#{STRING_OR_SYM})" with the following messages on it$/) do |destination, table|
-  dest = MessageDriver::Broker.dynamic_destination(destination)
+  dest = MessageDriver::Client[test_runner.broker_name].dynamic_destination(destination)
   test_runner.publish_table_to_destination(dest, table)
 end
 
 Then(/^I expect to find (#{NUMBER}) messages? on the dynamic destination "(#{STRING_OR_SYM})" with$/) do |count, destination, table|
   expect(test_runner).to have_no_errors
-  dest = MessageDriver::Broker.dynamic_destination(destination, passive: true)
+  dest = MessageDriver::Client[test_runner.broker_name].dynamic_destination(destination, passive: true)
   messages = test_runner.fetch_messages(dest)
   expect(messages).to have(count).items
   expect(messages).to match_message_table(table)

data/features/step_definitions/logging_steps.rb

@@ -8,7 +8,7 @@ Given(/^I am logging to a log file(?: at the (#{STRING_OR_SYM}) level)?$/) do |l
     @logger = Logger.new(LOG_FILE_NAME)
   end
   step "I set the log level to #{level || "info"}"
-  scenario_config[:logger] = @logger
+  @orig_logger, MessageDriver.logger = MessageDriver.logger, @logger
 end
 
 Given(/^I set the log level to (#{STRING_OR_SYM})$/) do |level|
@@ -25,4 +25,8 @@ After do
     @logger.close
     @logger = nil
   end
+  if @orig_logger
+    MessageDriver.logger = @orig_logger
+    @orig_logger = nil
+  end
 end

data/features/step_definitions/message_consumers_steps.rb

@@ -4,7 +4,7 @@ Given "I have a message consumer" do |src|
 end
 
 Given(/^I subscribe to (#{STRING_OR_SYM}) with (#{STRING_OR_SYM})$/) do |destination, consumer|
-  MessageDriver::Client.subscribe(destination, consumer)
+  MessageDriver::Client[test_runner.broker_name].subscribe(destination, consumer)
 end
 
 Given "I create a subscription" do |src|

data/features/step_definitions/steps.rb

@@ -1,5 +1,10 @@
 Given "I am connected to the broker" do
-  MessageDriver.configure(broker_config)
+  MessageDriver::Broker.configure(test_runner.broker_name, broker_config)
+end
+
+Given(/^I am connected to a broker named (#{STRING_OR_SYM})$/) do |broker_name|
+  test_runner.broker_name = broker_name
+  step "I am connected to the broker"
 end
 
 Given "the following broker configuration" do |src|
@@ -7,8 +12,12 @@ Given "the following broker configuration" do |src|
   test_runner.run_config_code(src)
 end
 
+Given "I configure my broker as follows" do |src|
+  test_runner.run_config_code(src)
+end
+
 Given(/^I have a destination (#{STRING_OR_SYM})$/) do |destination|
-  MessageDriver::Broker.define do |b|
+  MessageDriver::Broker.define(test_runner.broker_name) do |b|
     b.destination(destination, destination.to_s)
   end
 end
@@ -31,7 +40,7 @@ end
 
 When(/^I send the following messages? to (#{STRING_OR_SYM})$/) do |destination, table|
   table.hashes.each do |msg|
-    MessageDriver::Client.publish(destination, msg[:body])
+    MessageDriver::Client[test_runner.broker_name].publish(destination, msg[:body])
   end
 end
 
@@ -40,7 +49,7 @@ When "I execute the following code" do |src|
 end
 
 When "I reset the context" do
-  MessageDriver::Client.current_adapter_context.invalidate
+  MessageDriver::Client[test_runner.broker_name].current_adapter_context.invalidate
 end
 
 When "I allow for processing" do

data/features/support/env.rb

@@ -4,5 +4,5 @@ require 'aruba/cucumber'
 require 'message_driver'
 
 After do
-  MessageDriver.stop
+  MessageDriver::Broker.reset
 end

data/features/support/test_runner.rb

@@ -4,6 +4,11 @@ class TestRunner
 
   attr_accessor :raised_error
   attr_accessor :current_feature_file
+  attr_accessor :broker_name
+
+  def broker_name
+    @broker_name ||= MessageDriver::Broker::DEFAULT_BROKER_NAME
+  end
 
   def run_config_code(src)
     instance_eval(src, current_feature_file)
@@ -40,7 +45,7 @@ class TestRunner
   def fetch_destination(destination)
     case destination
     when String, Symbol
-      MessageDriver::Broker.find_destination(destination)
+      MessageDriver::Client[self.broker_name].find_destination(destination)
     when MessageDriver::Destination::Base
       destination
     else

data/lib/message_driver/adapters/base.rb

@@ -3,11 +3,13 @@ module MessageDriver
     class Base
       include Logging
 
+      attr_reader :broker
+
       def contexts
         @contexts ||= []
       end
 
-      def initialize(configuration)
+      def initialize(broker, configuration)
         raise "Must be implemented in subclass"
       end
 
@@ -21,6 +23,10 @@ module MessageDriver
         raise "Must be implemented in subclass"
       end
 
+      def reset_after_tests
+        #does nothing, can be overridden by adapters that want to support testing scenarios
+      end
+
       def stop
         if @contexts
           ctxs = @contexts