message-driver 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 1337b90514d41c7c6706f472dd0d4d809a9b9d2c87398718b5648d5e11cc0cca
-  data.tar.gz: 00c838ad1a5785b711c6253a69ecdf407c92b5aecd76b41cdce0618d48709bfc
+SHA1:
+  metadata.gz: e9dc548fdfd73e6d0b82f2ca05a5560ef883c2bb
+  data.tar.gz: a55216b3b977be05bcd575e296654ab2bb75b5f0
 SHA512:
-  metadata.gz: 0a022e82819601477f85a4fe69cfae307da7a276aac011a865c245a8a35d76947bf5822be2436185920db810ee65e36f38635b4a7c5e1738d55d2cda470f91f7
-  data.tar.gz: 8c26175b1b69e2e7e1fbfb5380105dc2c83ef07957517eb6ba344f49efe379c1615d4d5f2b2e1dc37750a799913a042e02a8c4d87f4af19b182c5985bb533420
+  metadata.gz: dfa2114ec8b59a6a4fd40e72114cdace5a50367beef49de9f7531a202e2ff62cbb7049381e264ae6e743716456f5ce0a96ecaa2cb02acb6c658d67fe3fc85387
+  data.tar.gz: 3e37a3937bd46591458c8bd9c755625f941803e5b9caf3d1b11a9ed854c2d09a3a95ae655c52b69a827e17e617b2ec121129e3f20e17615a7cc8a61da03e145f

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.0.1 - 2018-06-06
+
+* Fix an edge case with publisher acknowledgements in the bunny adapter. #40
+
 ## 1.0.0 - 2018-05-07
 
 We decided to go 1.0 just because it was time to be done with the 0.x since we have been using this in production since 2013.

data/lib/message_driver/adapters/bunny_adapter.rb

@@ -341,7 +341,7 @@ module MessageDriver
           end
           begin
             if @in_confirms_transaction
-              @channel.wait_for_confirms unless @rollback_only || @channel.nil?
+              @channel.wait_for_confirms unless @rollback_only || @channel.nil? || !@channel.using_publisher_confirms?
             elsif is_transactional? && valid? && !@need_channel_reset && @require_commit
               handle_errors do
                 if @rollback_only

data/lib/message_driver/version.rb

@@ -1,4 +1,4 @@
 module MessageDriver
   # @return [String] version of the library
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.1'.freeze
 end

data/spec/integration/bunny/bunny_adapter_spec.rb

@@ -380,6 +380,82 @@ module MessageDriver
           end
         end
 
+        context 'publisher confirmations in a consumer', :aggregate_failures do
+          let(:source_queue) { adapter_context.create_destination('subscriptions_example_queue') }
+          let(:destination) { adapter_context.create_destination('confirms_destination_queue') }
+          let(:body) { 'Testing the QueueDestination' }
+          let(:headers) { { 'foo' => 'bar' } }
+          let(:properties) { { persistent: false } }
+          let(:error_handler) { double('error_handler', call: nil) }
+
+          let(:subscription) { adapter_context.subscribe(source_queue, {ack: :auto, error_handler: error_handler}, &consumer) }
+          let(:subscription_channel) { subscription.sub_ctx.channel }
+
+          before do
+            allow(error_handler).to receive(:call) do |err, _msg|
+              puts err.inspect
+            end
+            destination.purge
+            source_queue.purge
+            subscription
+            allow(subscription_channel).to receive(:wait_for_confirms).and_call_original
+          end
+
+          after do
+            subscription.unsubscribe
+          end
+
+          context 'when messages are sent during the transaction' do
+            let(:consumer) do
+              ->(msg) do
+                MessageDriver::Client.with_message_transaction(type: :confirm_and_wait) do
+                  destination.publish(msg.body, msg.headers, msg.properties)
+                end
+              end
+            end
+
+            it 'publishes and waits for confirmation before "committing" the transaction' do
+              expect {
+                source_queue.publish(body, headers, properties)
+                pause_if_needed
+              }.to change { destination.message_count }.from(0).to(1)
+
+              expect(subscription_channel).to be_using_publisher_confirms
+              expect(subscription_channel.unconfirmed_set).to be_empty
+
+              expect(adapter_context.channel).not_to be_using_publisher_confirms
+              expect(adapter_context.channel.unconfirmed_set).to be_nil
+
+              expect(error_handler).not_to have_received(:call)
+              expect(subscription_channel).to have_received(:wait_for_confirms)
+            end
+          end
+
+          context 'when no messages are sent during the transaction' do
+            let(:consumer) do
+              ->(msg) do
+                MessageDriver::Client.with_message_transaction(type: :confirm_and_wait) do
+                  # do nothing
+                end
+              end
+            end
+
+            it 'publishes and waits for confirmation before "committing" the transaction' do
+              source_queue.publish(body, headers, properties)
+              pause_if_needed
+
+              expect(subscription.sub_ctx.channel).not_to be_using_publisher_confirms
+              expect(subscription.sub_ctx.channel.unconfirmed_set).to be_nil
+
+              expect(adapter_context.channel).not_to be_using_publisher_confirms
+              expect(adapter_context.channel.unconfirmed_set).to be_nil
+
+              expect(error_handler).not_to have_received(:call)
+              expect(subscription_channel).not_to have_received(:wait_for_confirms)
+            end
+          end
+        end
+
         context 'during a transaction with a transactional context' do
           let(:channel) { adapter_context.ensure_channel }
           let(:destination) { MessageDriver::Client.dynamic_destination('tx.test.queue') }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: message-driver
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Matt Campbell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-07 00:00:00.000000000 Z
+date: 2018-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -208,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Easy message queues for ruby