message-driver 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3bcb04e7ce78a6c1fa187b2c3a4c1bdecc74506
-  data.tar.gz: 87bde205475a8f149eb6d08b0520b24826316189
+  metadata.gz: 1296071efa2a7b9f589eddcd94d99847f515ad16
+  data.tar.gz: 9b0a163a287824a8f2928dd13d5083b7a97b3245
 SHA512:
-  metadata.gz: e9f602d1836c47357d30d76c7c34e1e75a5ebad910f84fa6871960d4fdefc9913c30d612ae9c4b3d52b84368ef8046164d1bc0a922f62f4f8e965d5d8fabb0a2
-  data.tar.gz: cf87a47b64e7fd438c515c4abb5891f6f6c803190d2fa3e7b8e89f3722f20db0be9ef89dd5c14ffc8c85a4c0896945ae4dfcc9ebce1b84e2ea9e0321b04829dd
+  metadata.gz: f344fef0e415eb76d0d54572390ec1311fdb1165ea9126fb59de69f70a7e324cb94b852a11b138e489b7f05cceea4132480f63ecea115b958acf69c218c9c570
+  data.tar.gz: 0da3bc34be7f8c00c01b45cda0f9acf152bdf33640ddd947254538c58dbbb5c7a163edfda4579759430594a787754fc90dca54c5b9780d16f0321b7cce46414b

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.7.1 - 2017-04-10
+
+* Move middleware processing for consumers inside the message handler so error in middleware are correctly handled - Fixes #35
+
 ## 0.7.0 - 2016-12-19
 
 * update test gems

data/Guardfile

@@ -45,6 +45,7 @@ group :tests_and_checks, halt_on_failure: true do
   group 'features' do
     guard('cucumber',
           all_on_start: false,
+          all_after_pass: false,
           cmd: "bundle exec cucumber --no-profile --color --strict --tag @all_adapters,@#{BrokerConfig.current_adapter} --tag ~@wip",
           cmd_additional_args: '--format pretty --tag ~@slow',
           run_all: {

data/README.md

@@ -1,4 +1,4 @@
-# Message::Driver
+# MessageDriver
 
 Easy message queues for ruby
 

data/features/middleware/middleware_error_handling.feature

@@ -0,0 +1,120 @@
+@bunny
+Feature: Middleware Error Handling
+
+  If a middleware raises an error, we need to ensure it is handled properly.
+
+  Background:
+    Given I am connected to the broker
+    And I have a destination :middleware_queue with no messages on it
+    And I have a middleware class
+    """ruby
+    class ErrorMiddleware < MessageDriver::Middleware::Base
+      # def on_publish(body, headers, properties)
+      #   [body, headers, properties]
+      # end
+
+      def on_consume(body, headers, properties)
+        if body.start_with? 'error'
+          raise "error trying to consume! #{body}"
+        else
+          [body, headers, properties]
+        end
+      end
+    end
+    """
+    And I append middleware "ErrorMiddleware" to :middleware_queue
+    And I have a destination :dest_queue with no messages on it
+
+  @in_memory
+  Scenario: Publishing a message
+    Given I have a middleware class
+    """ruby
+    class PublishErrorMiddleware < MessageDriver::Middleware::Base
+      def on_publish(body, headers, properties)
+        raise 'error trying to publish!'
+      end
+
+      def on_consume(body, headers, properties)
+        [body, headers, properties]
+      end
+    end
+    """
+    And I append middleware "PublishErrorMiddleware" to :middleware_queue
+
+    When I execute the following code
+    """ruby
+    MessageDriver::Client.publish(:middleware_queue, 'middleware error test')
+    """
+    Then I expect it to raise "error trying to publish!"
+    And I expect to find no message on :middleware_queue
+
+
+  Scenario: Consuming a message with an auto-ack consumer
+    Given I create a subscription
+    """ruby
+    MessageDriver::Client.subscribe_with(:middleware_queue) do |message|
+      MessageDriver::Client.publish(:dest_queue, message.body)
+    end
+    """
+
+    When I send the following message to :middleware_queue
+      | body           |
+      | Test Message 1 |
+      | error message  |
+      | Test Message 2 |
+    And I let the subscription process
+
+    Then I expect to find the following 2 messages on :dest_queue
+      | body           |
+      | Test Message 1 |
+      | Test Message 2 |
+    And I expect to find the following message on :middleware_queue
+      | body          |
+      | error message |
+
+  Scenario: Consuming with a manual ack consumer
+    Given I create a subscription
+    """ruby
+    MessageDriver::Client.subscribe_with(:middleware_queue, ack: :manual) do |message|
+      MessageDriver::Client.publish(:dest_queue, message.body)
+      message.ack
+    end
+    """
+
+    When I send the following message to :middleware_queue
+      | body           |
+      | Test Message 1 |
+      | error message  |
+      | Test Message 2 |
+    And I let the subscription process
+
+    Then I expect to find the following 2 messages on :dest_queue
+      | body           |
+      | Test Message 1 |
+      | Test Message 2 |
+    And I expect to find the following message on :middleware_queue
+      | body          |
+      | error message |
+
+  Scenario: Consuming with a transactional ack consumer
+    Given I create a subscription
+    """ruby
+    MessageDriver::Client.subscribe_with(:middleware_queue, ack: :transactional) do |message|
+      MessageDriver::Client.publish(:dest_queue, message.body)
+    end
+    """
+
+    When I send the following message to :middleware_queue
+      | body           |
+      | Test Message 1 |
+      | error message  |
+      | Test Message 2 |
+    And I let the subscription process
+
+    Then I expect to find the following 2 messages on :dest_queue
+      | body           |
+      | Test Message 1 |
+      | Test Message 2 |
+    And I expect to find the following message on :middleware_queue
+      | body          |
+      | error message |

data/lib/message_driver/adapters/bunny_adapter.rb

@@ -181,13 +181,14 @@ module MessageDriver
           include Logging
 
           attr_accessor :subscription
-          def_delegators :subscription, :adapter, :sub_ctx, :consumer, :error_handler, :options
+          def_delegators :subscription, :adapter, :sub_ctx, :consumer, :error_handler, :options, :destination
 
           def initialize(subscription)
             @subscription = subscription
           end
 
-          def call(message)
+          def call(*message_args)
+            message = sub_ctx.args_to_message(*message_args, destination)
             consumer.call(message)
           rescue => e
             error_handler.call(e, message) unless error_handler.nil?
@@ -213,7 +214,8 @@ module MessageDriver
         end
 
         class AutoAckHandler < MessageHandler
-          def call(message)
+          def call(*message_args)
+            message = sub_ctx.args_to_message(*message_args, destination)
             consumer.call(message)
             sub_ctx.ack_message(message)
           rescue => e
@@ -223,7 +225,8 @@ module MessageDriver
         end
 
         class TransactionalAckHandler < MessageHandler
-          def call(message)
+          def call(*message_args)
+            message = sub_ctx.args_to_message(*message_args, destination)
             adapter.broker.client.with_message_transaction do
               consumer.call(message)
               sub_ctx.ack_message(message)
@@ -241,8 +244,7 @@ module MessageDriver
             sub_opts = options.merge(adapter.ack_key => true)
             @bunny_consumer = queue.subscribe(sub_opts) do |delivery_info, properties, payload|
               adapter.broker.client.with_adapter_context(@sub_ctx) do
-                message = @sub_ctx.args_to_message(delivery_info, properties, payload, destination)
-                @message_handler.call(message)
+                @message_handler.call(delivery_info, properties, payload)
               end
             end
           end

data/lib/message_driver/middleware/middleware_stack.rb

@@ -33,7 +33,7 @@ module MessageDriver
       end
 
       def on_consume(body, headers, properties)
-        @middlewares.reverse.reduce([body, headers, properties]) do |args, middleware|
+        @middlewares.reverse_each.reduce([body, headers, properties]) do |args, middleware|
           middleware.on_consume(*args)
         end
       end

data/lib/message_driver/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: message-driver
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Matt Campbell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-19 00:00:00.000000000 Z
+date: 2017-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -116,6 +116,7 @@ files:
 - features/message_consumers/subscribe_with_a_block.feature
 - features/message_consumers/transactional_ack_consumers.feature
 - features/middleware/middleware_basics.feature
+- features/middleware/middleware_error_handling.feature
 - features/middleware/middleware_ordering.feature
 - features/middleware/middleware_parameters.feature
 - features/middleware/middleware_with_blocks.feature
@@ -236,6 +237,7 @@ test_files:
 - features/message_consumers/subscribe_with_a_block.feature
 - features/message_consumers/transactional_ack_consumers.feature
 - features/middleware/middleware_basics.feature
+- features/middleware/middleware_error_handling.feature
 - features/middleware/middleware_ordering.feature
 - features/middleware/middleware_parameters.feature
 - features/middleware/middleware_with_blocks.feature