message-driver 0.5.2 → 0.5.3

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.5.3 = 2014-10-23
+
+* In bunny adapter, avoid sending a tx_commit if we haven't done anything requiring
+  a commit inside the transaction block.
+
 ## 0.5.2 - 2014-10-14
 
 * fix deprecation warning with bunny 1.5.0

data/features/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.5.3 = 2014-10-23
+
+* In bunny adapter, avoid sending a tx_commit if we haven't done anything requiring
+  a commit inside the transaction block.
+
 ## 0.5.2 - 2014-10-14
 
 * fix deprecation warning with bunny 1.5.0

data/lib/message_driver/adapters/bunny_adapter.rb

@@ -302,6 +302,7 @@ module MessageDriver
           @rollback_only = false
           @need_channel_reset = false
           @in_transaction = false
+          @require_commit = false
         end
 
         def create_destination(name, dest_options = {}, message_props = {})
@@ -330,8 +331,8 @@ module MessageDriver
           @in_confirms_transaction = true if options[:type] == :confirm_and_wait
         end
 
-        def commit_transaction(channel_commit = false)
-          if !in_transaction? && !channel_commit
+        def commit_transaction
+          if !in_transaction? && !@require_commit
             fail MessageDriver::TransactionError,
                  "you can't finish the transaction unless you already in one!"
           end
@@ -339,7 +340,7 @@ module MessageDriver
             if @in_confirms_transaction
               wait_for_confirms(@channel) unless @rollback_only
             else
-              if is_transactional? && valid? && !@need_channel_reset
+              if is_transactional? && valid? && !@need_channel_reset && @require_commit
                 handle_errors do
                   if @rollback_only
                     @channel.tx_rollback
@@ -353,6 +354,7 @@ module MessageDriver
             @rollback_only = false
             @in_transaction = false
             @in_confirms_transaction = false
+            @require_commit = false
           end
         end
 
@@ -415,7 +417,7 @@ module MessageDriver
         end
 
         def nack_message(message, options = {})
-          requeue = options[:requeue].is_a?(FalseClass) ? false : true
+          requeue = options.fetch(:requeue, true)
           with_channel(true) do |ch|
             ch.reject(message.delivery_tag, requeue)
           end
@@ -471,24 +473,39 @@ module MessageDriver
           raise MessageDriver::ConnectionError.new(e.to_s, e)
         end
 
+        def ensure_channel
+          @channel = adapter.connection.create_channel if @channel.nil?
+          reset_channel if @need_channel_reset
+          @channel
+        end
+
+        def ensure_transactional_channel
+          ensure_channel
+          make_channel_transactional
+        end
+
+        def make_channel_transactional
+          unless is_transactional?
+            @channel.tx_select
+            @is_transactional = true
+          end
+        end
+
         def with_channel(require_commit = true)
           fail MessageDriver::TransactionRollbackOnly if @rollback_only
           fail MessageDriver::Error, 'this adapter context is not valid!' unless valid?
-          @channel = adapter.connection.create_channel if @channel.nil?
-          reset_channel if @need_channel_reset
+          ensure_channel
+          @require_commit ||= require_commit
           if in_transaction?
             if @in_confirms_transaction
               @channel.confirm_select unless @channel.using_publisher_confirmations?
             else
-              unless is_transactional?
-                @channel.tx_select
-                @is_transactional = true
-              end
+              make_channel_transactional
             end
           end
           handle_errors do
             result = yield @channel
-            commit_transaction(true) if require_commit && is_transactional? && !in_transaction?
+            commit_transaction if require_commit && is_transactional? && !in_transaction?
             result
           end
         end
@@ -504,6 +521,7 @@ module MessageDriver
             @channel = adapter.connection.create_channel
             @is_transactional = false
             @rollback_only = true if in_transaction?
+            @require_commit
           end
           @need_channel_reset = false
         end

data/lib/message_driver/version.rb

@@ -1,3 +1,3 @@
 module MessageDriver
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end

data/spec/integration/bunny/bunny_adapter_spec.rb

@@ -117,6 +117,10 @@ module MessageDriver
           end
         end
 
+        after(:example) do
+          adapter_context.invalidate
+        end
+
         it_behaves_like 'an adapter context'
         it_behaves_like 'transactions are supported'
         it_behaves_like 'client acks are supported'
@@ -390,6 +394,88 @@ module MessageDriver
             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') }
+          before do
+            adapter_context.ensure_transactional_channel
+            destination.purge
+          end
+
+          context 'when nothing occurs' do
+            it 'does not send a commit to the broker' do
+              allow(channel).to receive(:tx_commit).and_call_original
+              MessageDriver::Client.with_message_transaction do
+              end
+              expect(channel).not_to have_received(:tx_commit)
+            end
+          end
+
+          context 'when a queue is declared' do
+            it 'does not send a commit to the broker' do
+              allow(channel).to receive(:tx_commit).and_call_original
+              MessageDriver::Client.with_message_transaction do
+                MessageDriver::Client.dynamic_destination('', exclusive: true)
+              end
+              expect(channel).not_to have_received(:tx_commit)
+            end
+          end
+
+          context 'when a message is published' do
+            it 'does send a commit to the broker' do
+              allow(channel).to receive(:tx_commit).and_call_original
+              MessageDriver::Client.with_message_transaction do
+                destination.publish('test message')
+              end
+              expect(channel).to have_received(:tx_commit).once
+              expect(destination.message_count).to eq(1)
+            end
+          end
+
+          context 'when a message is popped' do
+            it 'does not send a commit to the broker' do
+              destination.publish('test message')
+              allow(channel).to receive(:tx_commit).and_call_original
+              MessageDriver::Client.with_message_transaction do
+                msg = destination.pop_message(client_ack: true)
+                expect(msg).not_to be_nil
+                expect(msg.body).to eq('test message')
+              end
+              expect(channel).not_to have_received(:tx_commit)
+            end
+          end
+
+          context 'when a message is acked' do
+            it 'does send a commit to the broker' do
+              destination.publish('test message')
+              allow(channel).to receive(:tx_commit).and_call_original
+              MessageDriver::Client.with_message_transaction do
+                msg = destination.pop_message(client_ack: true)
+                expect(msg).not_to be_nil
+                expect(msg.body).to eq('test message')
+                msg.ack
+              end
+              expect(channel).to have_received(:tx_commit).once
+              expect(destination.message_count).to eq(0)
+            end
+          end
+
+          context 'when a message is nacked' do
+            it 'does send a commit to the broker' do
+              destination.publish('test message')
+              allow(channel).to receive(:tx_commit).and_call_original
+              MessageDriver::Client.with_message_transaction do
+                msg = destination.pop_message(client_ack: true)
+                expect(msg).not_to be_nil
+                expect(msg.body).to eq('test message')
+                msg.nack
+              end
+              expect(channel).to have_received(:tx_commit).once
+              expect(destination.message_count).to eq(1)
+            end
+          end
+        end
       end
     end
   end

metadata

@@ -1,69 +1,78 @@
 --- !ruby/object:Gem::Specification
 name: message-driver
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
+  prerelease: 
 platform: ruby
 authors:
 - Matt Campbell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Easy message queues for ruby using AMQ, STOMP and others
@@ -73,13 +82,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".coveralls.yml"
-- ".gitignore"
-- ".relish"
-- ".rspec"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
-- ".travis.yml"
+- .coveralls.yml
+- .gitignore
+- .relish
+- .rspec
+- .rubocop.yml
+- .rubocop_todo.yml
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -188,26 +197,30 @@ files:
 homepage: https://github.com/message-driver/message-driver
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4081124424208803284
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Easy message queues for ruby
 test_files:
 - features/.nav

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 37e87665e5236aa222f318953697cdd22afb4db9
-  data.tar.gz: 3ad5849abc80a63269e6425a3c4c81cc06694be4
-SHA512:
-  metadata.gz: 484d9c907162ac6b4b23829293daa8ee15e852104f823549306f8437448ecd34ff3e4b3f00c8aa2e07cb35a921e913fdac8ba0a6a70a02e21db33979d4441d84
-  data.tar.gz: 8885281a32669a94934c10e545663ee4a2888655b104bf0182edf90aff2d424c32f53447e53f1c9778c72249c8e7176651523c80770a9e8af9ad2af00cc3306e