message-driver 0.2.2 → 0.3.0

data/spec/units/message_driver/message_spec.rb

@@ -6,49 +6,86 @@ module MessageDriver::Message
       let(:body) { "The message body" }
       let(:headers) { { foo: :bar, bar: :baz} }
       let(:properties) { {persistent: true, client_ack: true} }
+      let(:ctx) { double("adapter_context") }
 
       context "sets the body, header and properites on initialization" do
-        subject { described_class.new(body, headers, properties) }
+        subject { described_class.new(ctx, body, headers, properties) }
 
+        its(:ctx) { should be(ctx) }
         its(:body) { should eq(body) }
         its(:headers) { should eq(headers) }
         its(:properties) { should eq(properties) }
       end
     end
 
-    subject(:message) { described_class.new("body", {}, {}) }
+    let(:logger) { MessageDriver.logger }
+    let(:ctx) { double("adapter_context") }
+    let(:options) { double("options") }
+    subject(:message) { described_class.new(ctx, "body", {}, {}) }
 
     describe "#ack" do
-      let(:options) { {foo: :bar} }
-
       before do
-        MessageDriver::Client.stub(:ack_message)
+        allow(ctx).to receive(:ack_message)
       end
-      it "passes itself to Client.ack_message" do
-        subject.ack
-        expect(MessageDriver::Client).to have_received(:ack_message).with(subject, {})
+      context "when the adapter supports client acks" do
+        before do
+          allow(ctx).to receive(:supports_client_acks?) { true }
+        end
+        it "calls #ack_message with the message" do
+          subject.ack
+          expect(ctx).to have_received(:ack_message).with(subject, {})
+        end
+        it "passes the supplied options to ack_message" do
+          subject.ack(options)
+          expect(ctx).to have_received(:ack_message).with(subject, options)
+        end
       end
-
-      it "passes the options to Client.ack_message" do
-        subject.ack(options)
-        expect(MessageDriver::Client).to have_received(:ack_message).with(subject, options)
+      context "when the adapter doesn't support client acks" do
+        before do
+          allow(ctx).to receive(:supports_client_acks?) { false }
+        end
+        it "doesn't call #ack_message" do
+          subject.ack
+          expect(ctx).not_to have_received(:ack_message)
+        end
+        it "logs a warning" do
+          allow(logger).to receive(:debug)
+          subject.ack
+          expect(logger).to have_received(:debug).with("this adapter does not support client acks")
+        end
       end
     end
 
     describe "#nack" do
-      let(:options) { {foo: :bar} }
-
       before do
-        MessageDriver::Client.stub(:nack_message)
+        allow(ctx).to receive(:nack_message)
       end
-      it "passes itself to Client.nack_message" do
-        subject.nack
-        expect(MessageDriver::Client).to have_received(:nack_message).with(subject, {})
+      context "when the adapter supports client nacks" do
+        before do
+          allow(ctx).to receive(:supports_client_acks?) { true }
+        end
+        it "calls #nack_message with the message" do
+          subject.nack
+          expect(ctx).to have_received(:nack_message).with(subject, {})
+        end
+        it "passes the supplied options to nack_message" do
+          subject.nack(options)
+          expect(ctx).to have_received(:nack_message).with(subject, options)
+        end
       end
-
-      it "passes the options to Client.nack_message" do
-        subject.nack(options)
-        expect(MessageDriver::Client).to have_received(:nack_message).with(subject, options)
+      context "when the adapter doesn't support client nacks" do
+        before do
+          allow(ctx).to receive(:supports_client_acks?) { false }
+        end
+        it "doesn't call #nack_message" do
+          subject.nack
+          expect(ctx).not_to have_received(:nack_message)
+        end
+        it "logs a warning" do
+          allow(logger).to receive(:debug)
+          subject.nack
+          expect(logger).to have_received(:debug).with("this adapter does not support client acks")
+        end
       end
     end
   end

data/test_lib/broker_config.rb

@@ -7,7 +7,8 @@ class BrokerConfig
       when 'bunny'
         {
           adapter: :bunny,
-          vhost: 'message-driver-test'
+          vhost: 'message-driver-test',
+          continuation_timeout: 10000
         }
       when 'in_memory'
         {adapter: :in_memory}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: message-driver
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Matt Campbell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2014-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -83,6 +83,8 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- ci/reset_vhost
+- ci/travis_setup
 - examples/basic_producer_and_consumer/Gemfile
 - examples/basic_producer_and_consumer/common.rb
 - examples/basic_producer_and_consumer/consumer.rb
@@ -98,13 +100,14 @@ files:
 - features/amqp_specific_features/requeueing_on_nack.feature
 - features/amqp_specific_features/server_named_destinations.feature
 - features/client_acks.feature
+- features/connecting_to_multiple_brokers.feature
 - features/destination_metadata.feature
 - features/dynamic_destinations.feature
 - features/error_handling.feature
 - features/getting_started.md
 - features/logging.feature
-- features/message_consumers.feature
 - features/message_consumers/auto_ack_consumers.feature
+- features/message_consumers/basics.feature
 - features/message_consumers/manual_ack_consumers.feature
 - features/message_consumers/prefetch_size.feature
 - features/message_consumers/subscribe_with_a_block.feature
@@ -124,7 +127,6 @@ files:
 - features/support/no_error_matcher.rb
 - features/support/test_runner.rb
 - features/support/transforms.rb
-- lib/bunny/session_patch.rb
 - lib/message-driver.rb
 - lib/message_driver.rb
 - lib/message_driver/adapters/base.rb
@@ -159,7 +161,6 @@ files:
 - spec/units/message_driver/broker_spec.rb
 - spec/units/message_driver/client_spec.rb
 - spec/units/message_driver/destination_spec.rb
-- spec/units/message_driver/logging_spec.rb
 - spec/units/message_driver/message_spec.rb
 - spec/units/message_driver/subscription_spec.rb
 - test_lib/broker_config.rb
@@ -199,13 +200,14 @@ test_files:
 - features/amqp_specific_features/requeueing_on_nack.feature
 - features/amqp_specific_features/server_named_destinations.feature
 - features/client_acks.feature
+- features/connecting_to_multiple_brokers.feature
 - features/destination_metadata.feature
 - features/dynamic_destinations.feature
 - features/error_handling.feature
 - features/getting_started.md
 - features/logging.feature
-- features/message_consumers.feature
 - features/message_consumers/auto_ack_consumers.feature
+- features/message_consumers/basics.feature
 - features/message_consumers/manual_ack_consumers.feature
 - features/message_consumers/prefetch_size.feature
 - features/message_consumers/subscribe_with_a_block.feature
@@ -241,6 +243,5 @@ test_files:
 - spec/units/message_driver/broker_spec.rb
 - spec/units/message_driver/client_spec.rb
 - spec/units/message_driver/destination_spec.rb
-- spec/units/message_driver/logging_spec.rb
 - spec/units/message_driver/message_spec.rb
 - spec/units/message_driver/subscription_spec.rb

data/lib/bunny/session_patch.rb

@@ -1,19 +0,0 @@
-require 'bunny'
-
-module Bunny
-  class Session
-    def cleanup_threads
-      log_errors { self.maybe_shutdown_heartbeat_sender }
-      log_errors { self.maybe_shutdown_reader_loop }
-      log_errors { self.close_transport }
-    end
-
-    def log_errors
-      begin
-        yield
-      rescue => e
-        @logger.info "#{e.class}: #{e.to_s}"
-      end
-    end
-  end
-end

data/spec/units/message_driver/logging_spec.rb

@@ -1,18 +0,0 @@
-require 'spec_helper'
-
-module MessageDriver
-  describe Logging do
-    class TestLogger
-      include Logging
-    end
-    subject { TestLogger.new }
-
-    describe "#logger" do
-      let(:logger) { double(Logger) }
-      it "returns the broker logger" do
-        allow(MessageDriver::Broker).to receive(:logger).and_return(logger)
-        expect(subject.logger).to be logger
-      end
-    end
-  end
-end