eh_messaging 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f0602e56bb0054195d21d3ef88d5e9a784d7bd8462a4c0021e87c675b13687f
-  data.tar.gz: 6a2d3936b301d919f68b36043cb68681291e1e955b46bb7cb39b10c4ebc9acdb
+  metadata.gz: c106f20ae28f4b93615f8033e16e7e2bfb70fd00987bd1b498cb1ec17b7485be
+  data.tar.gz: 8c56ad0f9ce039a4d91627d84dae6444496788df4d94490b0e7c6c3dd418c01f
 SHA512:
-  metadata.gz: a6dd61080c1409691c49d0d38384041b54fbdf851037b82a1c54deabfc6fea9c4f046f2895c770ae715ce9b2b39fad6ba6c36136169733278a7c2d78dd43d4f8
-  data.tar.gz: dba29ccd76b533621e61c18be2190cdc2a7bf954549eaaec04d02149ac644f136a5fe3fabd77d7e71feb3684a10cf17cfdadc35869927854feb3e8c98f056b5c
+  metadata.gz: a40d35a2017aa0688b33514cfd80d304f3850fb301e9a2d030dd26ce373dcd6f16ae3f0b5f746ccf3a0155f14bc4a86e7b1d2fa0902a0c00536211fa5b5d452b
+  data.tar.gz: 71f4cc75ba2217bf9eeac4cdf0f61eb374790f1815175835a45347a157b9d117f2c2b7d7f54127db8fa7426596069fef3e8d096532ec68278ffc5639e771eb36

data/lib/eh_messaging/configuration.rb

@@ -67,6 +67,27 @@ module EhMessaging
       config
     end
 
+    def broker_name_for_topic(topic, side:, fallback: :default)
+      config = @topics[topic]
+      return fallback unless config
+      return fallback if side && config[:side] != :both && config[:side] != side
+
+      config[:broker] || fallback
+    end
+
+    def consume_broker_name(handler, mode: :normal, fallback: :default)
+      case mode
+      when :recovery
+        return handler.recovery_broker if handler.respond_to?(:recovery_broker)
+        return handler.broker if handler.respond_to?(:broker)
+      when :dlt
+        return handler.dead_letter_broker if handler.respond_to?(:dead_letter_broker)
+      else
+        return handler.broker if handler.respond_to?(:broker)
+      end
+      broker_name_for_topic(handler.topic, side: :consume, fallback: fallback)
+    end
+
     def topic_config(name, side: nil)
       config = @topics[name]
       return broker_config if config.nil?

data/lib/eh_messaging/dead_letter_router.rb

@@ -9,7 +9,7 @@ module EhMessaging
     def route(handler, envelope, error)
       publisher = @producer || Publisher.new(@configuration)
       owns_publisher = @producer.nil?
-      broker = handler.respond_to?(:dead_letter_broker) ? handler.dead_letter_broker : :default
+      broker = @configuration.consume_broker_name(handler, mode: :dlt)
       topic = Topics.dead_letter(handler.topic, envelope.consumer_group)
       return @logger.warn("EhMessaging: DLT topic unavailable: #{topic}") unless publisher.topic_exists?(topic, broker: broker)
 

data/lib/eh_messaging/subscriber.rb

@@ -157,11 +157,7 @@ module EhMessaging
     end
 
     def build_consumer(handler, mode, topic, group)
-      broker_name = if mode == :recovery && handler.respond_to?(:recovery_broker)
-        handler.recovery_broker
-      else
-        handler.respond_to?(:broker) ? handler.broker : :default
-      end
+      broker_name = @configuration.consume_broker_name(handler, mode: mode)
       connection = @configuration.broker_config(broker_name)
       if @consumer_factory
         @consumer_factory.call(handler, mode, topic, group, connection)
@@ -227,10 +223,10 @@ module EhMessaging
         return consumer.topic_exists?(topic)
       end
 
-      broker_method = (mode == :dlt) ? :dead_letter_broker : :recovery_broker
-      broker = handler.respond_to?(broker_method) ? handler.public_send(broker_method) : :default
-      connection = @configuration.broker_config(broker)
-      consumer ||= build_consumer(handler, mode, topic, (mode == :normal) ? handler.group : Topics.recovery_group(handler.group))
+      group = (mode == :normal) ? handler.group : Topics.recovery_group(handler.group)
+      broker_name = @configuration.consume_broker_name(handler, mode: mode)
+      connection = @configuration.broker_config(broker_name)
+      consumer ||= build_consumer(handler, mode, topic, group)
       metadata = if consumer.respond_to?(:metadata)
         consumer.metadata(topic)
       else

data/lib/eh_messaging/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EhMessaging
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eh_messaging
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Diego E