message-driver 0.2.0.rc1 → 0.2.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee1e524ed1e97823d1bf57bebb54afdd7be3d377
-  data.tar.gz: a1e55de021a74bcbf71b4df3be92e3f28506464f
+  metadata.gz: f170e7f772832db44e2182d0ec0e9b57a3d7c35d
+  data.tar.gz: 932d64d463e45ccd9a5729aec220b334ccc304e6
 SHA512:
-  metadata.gz: aaa3bd79fe84ddb7020fbb1173824d4bd24dba54b86737712bf412f450d07bee650ea1636d411f55a7d19668a950e87d4a583ac28fd2f167814fad1ea253accb
-  data.tar.gz: b71dbc3eb07d9f75b00032ea1c8bdcf8412026cc8b51a77c257ec62b8b578d754efdbeaf7a2b5b3a46763f2723150bfd181d970756b3d7852cf01a254a205d4e
+  metadata.gz: 8cf33a6bc250b26d594be85bc3ca6d78d0e9d365d3235f546d930a2fb9d9a046be02a2870a022d5ee33c57fcdcdbe57f2b605e1ec578e5028236f3dd0c512205
+  data.tar.gz: 836edced5bb12c61b080a475d67adfe0dc643114d83399996e4e0498984483e9b207d10dba41251ed473444abc1c547ffd38fe767fb7b534aa4099b63fa170a0

data/.gitignore

@@ -6,6 +6,7 @@
 .rvmrc
 .ruby-version
 .rbenv-version
+.rbenv-vars
 Gemfile.lock
 InstalledFiles
 _yardoc

data/.travis.yml

@@ -12,7 +12,7 @@ env:
   - ADAPTER=bunny:0.9.0
   - ADAPTER=bunny:0.10.0
   - ADAPTER=stomp
-  - ADAPTER=bunny:1.0.0.pre
+  - ADAPTER=bunny:1.0.0.rc
 rvm:
   - 2.0.0
   - 1.9.3
@@ -27,7 +27,7 @@ matrix:
     - rvm: jruby-head
       env: ADAPTER=bunny:0.9.0
   allow_failures:
-    - env: ADAPTER=bunny:1.0.0.pre
+    - env: ADAPTER=bunny:1.0.0.rc
     - rvm: jruby-head
     - rvm: rbx-19mode
     - rvm: jruby-19mode

data/CHANGELOG.md

@@ -1,12 +1,22 @@
 # Changelog
 
+## 0.2.0.rc2 - 2013-10-30
+
+* Features
+    * Prefetch size for bunny consumers
+* Bugs
+    * better error handling for transaction bunny consumers
+
 ## 0.2.0.rc1 - 2013-09-23
 
 * Features
-    * Message Consumers
+    * Message Consumers, all different flavors
         * Bunny and InMemory adapters
     * Client Acks
         * Bunny adapter
+    * Bunny adapter
+        * much better connection and channel error handling, including
+          reconnecting when broker becomes unreachable
 * Adapters
     * begin work on Stomp 1.1/1.2 adapter
 

data/features/CHANGELOG.md

@@ -1,12 +1,22 @@
 # Changelog
 
+## 0.2.0.rc2 - 2013-10-30
+
+* Features
+    * Prefetch size for bunny consumers
+* Bugs
+    * better error handling for transaction bunny consumers
+
 ## 0.2.0.rc1 - 2013-09-23
 
 * Features
-    * Message Consumers
+    * Message Consumers, all different flavors
         * Bunny and InMemory adapters
     * Client Acks
         * Bunny adapter
+    * Bunny adapter
+        * much better connection and channel error handling, including
+          reconnecting when broker becomes unreachable
 * Adapters
     * begin work on Stomp 1.1/1.2 adapter
 

data/features/amqp_specific_features/nack_redelivered_messages.feature

@@ -25,7 +25,7 @@ Feature: Nacking Redelievered Messages from a consumer
     And I have a destination :rabbit_track with no messages on it
 
 
-  Scenario: Raising a DontRequeueError in an auto_ack consumer
+  Scenario: Raising an error in an auto_ack consumer
     Given I have a message consumer
     """ruby
     MessageDriver::Broker.consumer(:manual_redeliver) do |message|
@@ -57,7 +57,7 @@ Feature: Nacking Redelievered Messages from a consumer
       | Auto Retry 2 Attempt |
 
 
-  Scenario: Raising a DontRequeueError in a transactional consumer
+  Scenario: Raising an error in a transactional consumer
     Given I have a message consumer
     """ruby
     @attempts = 0
@@ -76,17 +76,21 @@ Feature: Nacking Redelievered Messages from a consumer
       | body                      |
       | Transactional Redeliver 1 |
       | Transactional Redeliver 2 |
-    And I let the subscription process
-    And I restart the subscription
+      | Transactional Redeliver 3 |
+      | Transactional Redeliver 4 |
+      | Transactional Redeliver 5 |
     And I let the subscription process
 
     Then I expect to find no messages on :rabbit_track
     Then I expect to find no messages on :rabbit_work
     Then I expect the following check to pass
     """ruby
-    expect(@attempts).to eq(4)
+    expect(@attempts).to eq(10)
     """
-    Then I expect to find the following 2 messages on :rabbit_dlq
+    Then I expect to find the following 5 messages on :rabbit_dlq
       | body                      |
       | Transactional Redeliver 1 |
       | Transactional Redeliver 2 |
+      | Transactional Redeliver 3 |
+      | Transactional Redeliver 4 |
+      | Transactional Redeliver 5 |

data/features/message_consumers/prefetch_size.feature

@@ -0,0 +1,59 @@
+@bunny
+@wip
+Feature: Message Consumers prefetch size
+  You can set the prefetch size for your message consumers 
+
+  Background:
+    Given I am connected to the broker
+    And I have a destination :dest_queue_1 with no messages on it
+    And I have a destination :dest_queue_2 with no messages on it
+    And I have a destination :source_queue with no messages on it
+
+  Scenario: Consuming Messages
+    Given I have a message consumer
+    """ruby
+    MessageDriver::Broker.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.publish(:dest_queue_2, message.body)
+    end
+    """
+    And I create a subscription
+    """ruby
+    MessageDriver::Client.subscribe(:source_queue, :my_consumer_1, ack: :auto, prefetch_size: 20)
+    MessageDriver::Client.subscribe(:source_queue, :my_consumer_2, ack: :auto, prefetch_size: 1)
+    """
+
+    When I send the following messages to :source_queue
+      | body       |
+      | Auto Ack 1 |
+      | Auto Ack 2 |
+      | Auto Ack 3 |
+      | Auto Ack 4 |
+      | Auto Ack 5 |
+      | Auto Ack 6 |
+      | Auto Ack 7 |
+      | Auto Ack 8 |
+      | Auto Ack 9 |
+      | Auto Ack 10 |
+    And I let the subscription process
+
+    Then I expect to find no messages on :source_queue
+    And I expect to find no messages on :dest_queue_2
+    And I expect to find the following 2 messages on :dest_queue_1
+      | body       |
+      | Auto Ack 1 |
+      | Auto Ack 2 |
+      | Auto Ack 3 |
+      | Auto Ack 4 |
+      | Auto Ack 5 |
+      | Auto Ack 6 |
+      | Auto Ack 7 |
+      | Auto Ack 8 |
+      | Auto Ack 9 |
+      | Auto Ack 10 |
+

data/features/step_definitions/message_consumers_steps.rb

@@ -22,8 +22,3 @@ When "I let the subscription process" do
   step "I cancel the subscription"
   expect(test_runner).to have_no_errors
 end
-
-When "I restart the subscription" do
-  test_runner.run_test_code("@subscription.start")
-  step "I allow for processing"
-end

data/lib/message_driver/adapters/bunny_adapter.rb

@@ -118,6 +118,9 @@ module MessageDriver
           @error_handler = options[:error_handler]
           @sub_ctx.with_channel do |ch|
             queue = destination.bunny_queue(@sub_ctx.channel)
+            if options.has_key? :prefetch_size
+              ch.prefetch(options[:prefetch_size])
+            end
             ack_mode = case options[:ack]
                        when :auto, nil
                          :auto
@@ -145,20 +148,20 @@ module MessageDriver
                     end
                   end
                 rescue => e
-                  if e.is_a?(DontRequeue) || (options[:retry_redelivered] == false && message.redelivered?)
-                    if [:auto, :transactional].include? ack_mode
-                      @sub_ctx.nack_message(message, requeue: false)
+                  if [:auto, :transactional].include? ack_mode
+                    requeue = true
+                    if e.is_a?(DontRequeue) || (options[:retry_redelivered] == false && message.redelivered?)
+                      requeue = false
                     end
-                  else
-                    if @sub_ctx.valid? && ack_mode == :auto
+                    if @sub_ctx.valid?
                       begin
-                        @sub_ctx.nack_message(message, requeue: true)
+                        @sub_ctx.nack_message(message, requeue: requeue)
                       rescue => e
                         logger.error exception_to_str(e)
                       end
                     end
-                    @error_handler.call(e, message) unless @error_handler.nil?
                   end
+                  @error_handler.call(e, message) unless @error_handler.nil?
                 end
               end
             end
@@ -257,10 +260,12 @@ module MessageDriver
           raise MessageDriver::TransactionError, "you can't finish the transaction unless you already in one!" if !in_transaction? && !channel_commit
           begin
             if is_transactional? && valid? && !@need_channel_reset
-              if @rollback_only
-                @channel.tx_rollback
-              else
-                @channel.tx_commit
+              handle_errors do
+                if @rollback_only
+                  @channel.tx_rollback
+                else
+                  @channel.tx_commit
+                end
               end
             end
           ensure
@@ -341,15 +346,9 @@ module MessageDriver
           end
         end
 
-        def with_channel(require_commit=true)
-          raise MessageDriver::TransactionRollbackOnly if @rollback_only
-          raise MessageDriver::Error, "oh nos!" if !valid?
-          @channel = adapter.connection.create_channel if @channel.nil?
-          reset_channel if @need_channel_reset
+        def handle_errors
           begin
-            result = yield @channel
-            commit_transaction(true) if require_commit && is_transactional? && !in_transaction?
-            result
+            yield
           rescue Bunny::ChannelLevelException => e
             @need_channel_reset = true
             @rollback_only = true if in_transaction?
@@ -358,12 +357,29 @@ module MessageDriver
             else
               raise MessageDriver::WrappedError.new(e.to_s, e)
             end
+          rescue Bunny::ChannelAlreadyClosed => e
+            @need_channel_reset = true
+            @rollback_only = true if in_transaction?
+            raise MessageDriver::WrappedError.new(e.to_s, e)
           rescue *NETWORK_ERRORS => e
+            @need_channel_reset = true
             @rollback_only = true if in_transaction?
             raise MessageDriver::ConnectionError.new(e.to_s, e)
           end
         end
 
+        def with_channel(require_commit=true)
+          raise MessageDriver::TransactionRollbackOnly if @rollback_only
+          raise MessageDriver::Error, "oh nos!" if !valid?
+          @channel = adapter.connection.create_channel if @channel.nil?
+          reset_channel if @need_channel_reset
+          handle_errors do
+            result = yield @channel
+            commit_transaction(true) if require_commit && is_transactional? && !in_transaction?
+            result
+          end
+        end
+
         def args_to_message(delivery_info, properties, payload)
           Message.new(delivery_info, properties, payload)
         end

data/lib/message_driver/adapters/stomp_adapter.rb

@@ -116,10 +116,10 @@ module MessageDriver
       end
 
       def validate_stomp_version
-        required = Gem::Requirement.create('~> 1.2.10')
+        required = Gem::Requirement.create('~> 1.3.1')
         current = Gem::Version.create(Stomp::Version::STRING)
         unless required.satisfied_by? current
-          raise MessageDriver::Error, "stomp 1.2.10 or a later version of the 1.2.x series is required for the stomp adapter"
+          raise MessageDriver::Error, "stomp 1.3.1 or a later version of the 1.3.x series is required for the stomp adapter"
         end
       end
     end

data/lib/message_driver/client.rb

@@ -47,18 +47,22 @@ module MessageDriver
       wrapper = fetch_context_wrapper
       wrapper.increment_transaction_depth
       begin
-        if wrapper.transaction_depth == 1 && wrapper.ctx.supports_transactions?
-          wrapper.ctx.begin_transaction(options)
-          begin
-            yield
-            wrapper.ctx.commit_transaction
-          rescue
+        if wrapper.ctx.supports_transactions?
+          if wrapper.transaction_depth == 1
+            wrapper.ctx.begin_transaction(options)
             begin
-              wrapper.ctx.rollback_transaction
-            rescue => e
-              logger.error exception_to_str(e)
+              yield
+            rescue
+              begin
+                wrapper.ctx.rollback_transaction
+              rescue => e
+                logger.error exception_to_str(e)
+              end
+              raise
             end
-            raise
+            wrapper.ctx.commit_transaction
+          else
+            yield
           end
         else
           logger.debug("this adapter does not support transactions")

data/lib/message_driver/version.rb

@@ -1,5 +1,5 @@
 module Message
   module Driver
-    VERSION = "0.2.0.rc1"
+    VERSION = "0.2.0.rc2"
   end
 end

data/spec/integration/stomp/stomp_adapter_spec.rb

@@ -16,7 +16,7 @@ module MessageDriver::Adapters
             stub_const("Stomp::Version::STRING", version)
             expect {
               described_class.new(connection_attrs)
-            }.to raise_error MessageDriver::Error, "stomp 1.2.10 or a later version of the 1.2.x series is required for the stomp adapter"
+            }.to raise_error MessageDriver::Error, "stomp 1.3.1 or a later version of the 1.3.x series is required for the stomp adapter"
           end
         end
         shared_examples "doesn't raise a stomp error" do
@@ -28,13 +28,13 @@ module MessageDriver::Adapters
             }.to_not raise_error
           end
         end
-        %w(1.1.0 1.2.9 1.3.0).each do |v|
+        %w(1.1.0 1.2.9 1.3.0 1.4.0).each do |v|
           context "stomp version #{v}" do
             let(:version) { v }
             include_examples "raises a stomp error"
           end
         end
-        %w(1.2.10 1.2.11).each do |v|
+        %w(1.3.1 1.3.5).each do |v|
           context "stomp version #{v}" do
             let(:version) { v }
             include_examples "doesn't raise a stomp error"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: message-driver
 version: !ruby/object:Gem::Version
-  version: 0.2.0.rc1
+  version: 0.2.0.rc2
 platform: ruby
 authors:
 - Matt Campbell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-23 00:00:00.000000000 Z
+date: 2013-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -106,6 +106,7 @@ files:
 - features/message_consumers.feature
 - features/message_consumers/auto_ack_consumers.feature
 - features/message_consumers/manual_ack_consumers.feature
+- features/message_consumers/prefetch_size.feature
 - features/message_consumers/transactional_ack_consumers.feature
 - features/publishing_a_message.feature
 - features/publishing_with_transactions.feature
@@ -204,6 +205,7 @@ test_files:
 - features/message_consumers.feature
 - features/message_consumers/auto_ack_consumers.feature
 - features/message_consumers/manual_ack_consumers.feature
+- features/message_consumers/prefetch_size.feature
 - features/message_consumers/transactional_ack_consumers.feature
 - features/publishing_a_message.feature
 - features/publishing_with_transactions.feature