sanger_warren 0.2.0.rc1 → 0.2.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6f14e9809f8c71405a3696920321ebbf7477c7f0ecf05421a3ffd85f4fbccfc
-  data.tar.gz: 5e13bbba217f9b09ad08433178e03f822a6f97e207c80e532a5c8b15c8d36b7b
+  metadata.gz: ca7edfe15b95424b868ca931fab20eb671e100fd75d43f4c9c8b03a72fcda71f
+  data.tar.gz: 294bf90ca85b4e4912368a152865df9f78e48509dd6feb7a314e56a0c76b8571
 SHA512:
-  metadata.gz: 0e2966ea368981ab85de2fc6ed22e349af14f2178862ee0025c79699a494e1d857d96eb23ab1c5fe5a68a24c9f6db68254c488add1d181b9391dc6e17156ca32
-  data.tar.gz: 8e882eba3c9a5e450447c73784bbed94655bf599c086521c0298a3f9a45433fca703ac52660644b262d837b94f0e793f3393e461dc62d96e76b99cffb1c64a6b
+  metadata.gz: f14cdf9e700764fc3b6fa403230c59b6af32b43da4484171677f313cd59e4ae95259c3dcb5ef9604492e4a6039ba7adeaae70171896c206913cb499be3bacf90
+  data.tar.gz: bfe863ec509ebe512880aeb762153c823fb0bfa1b0a5b60ad2dc70f898c9549399ca5a53b71fb4a6e284a408b47cef3e188a50cbff9da667bf3055b50e362712

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sanger_warren (0.2.0.rc1)
+    sanger_warren (0.2.0.rc2)
       bunny (~> 2.17.0)
       connection_pool (~> 2.2.0)
       multi_json (~> 1.0)

data/lib/warren/app/exchange_config.rb

@@ -102,6 +102,7 @@ module Warren
 
       def ask_direct_binding
         exchange = ask_exchange
+        routing_key_tip
         routing_key = @shell.ask 'Specify a routing_key: '
         add_binding('direct', exchange, { routing_key: routing_key })
       end
@@ -119,6 +120,7 @@ module Warren
 
       def ask_topic_binding
         exchange = ask_exchange
+        routing_key_tip
         loop do
           routing_key = @shell.ask 'Specify a routing_key [Leave blank to stop adding]: '
           break if routing_key == ''
@@ -133,6 +135,17 @@ module Warren
           'options' => options
         }
       end
+
+      def routing_key_tip
+        # Suggested cop style of %<routing_key_prefix>s but prefer suggesting the simpler option as it
+        # would be all to easy to miss out the 's', resulting in varying behaviour depending on the following
+        # character
+        # rubocop:disable Style/FormatStringToken
+        @shell.say(
+          'Tip: Use %{routing_key_prefix} in routing keys to reference the routing_key_prefix specified in warren.yml'
+        )
+        # rubocop:enable Style/FormatStringToken
+      end
     end
   end
 end

data/lib/warren/handler/broadcast.rb

@@ -17,12 +17,15 @@ module Warren
       class Channel
         extend Forwardable
 
+        attr_reader :routing_key_prefix
+
         def_delegators :@bun_channel, :close, :exchange, :queue, :prefetch, :ack, :nack
 
-        def initialize(bun_channel, routing_key_template:, exchange: nil)
+        def initialize(bun_channel, routing_key_prefix:, exchange: nil)
           @bun_channel = bun_channel
           @exchange_name = exchange
-          @routing_key_template = routing_key_template
+          @routing_key_prefix = routing_key_prefix
+          @routing_key_template = Handler.routing_key_template(routing_key_prefix)
         end
 
         def <<(message)
@@ -56,7 +59,7 @@ module Warren
         @server = server
         @exchange_name = exchange
         @pool_size = pool_size
-        @routing_key_template = Handler.routing_key_template(routing_key_prefix)
+        @routing_key_prefix = routing_key_prefix
       end
 
       #
@@ -107,7 +110,7 @@ module Warren
 
       def new_channel
         Channel.new(session.create_channel(nil, 1), exchange: @exchange_name,
-                                                    routing_key_template: @routing_key_template)
+                                                    routing_key_prefix: @routing_key_prefix)
       end
 
       private

data/lib/warren/subscription.rb

@@ -64,7 +64,14 @@ module Warren
     def establish_bindings!
       @bindings.each do |binding_config|
         exchange = exchange(binding_config['exchange'])
-        add_binding(exchange, binding_config['options'])
+        transformed_options = merge_routing_key_prefix(binding_config['options'])
+        add_binding(exchange, transformed_options)
+      end
+    end
+
+    def merge_routing_key_prefix(options)
+      options.transform_values do |value|
+        format(value, routing_key_prefix: channel.routing_key_prefix)
       end
     end
   end

data/lib/warren/version.rb

@@ -2,5 +2,5 @@
 
 module Warren
   # Gem version number. Bump prior to release of new version
-  VERSION = '0.2.0.rc1'
+  VERSION = '0.2.0.rc2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sanger_warren
 version: !ruby/object:Gem::Version
-  version: 0.2.0.rc1
+  version: 0.2.0.rc2
 platform: ruby
 authors:
 - James Glover
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-04 00:00:00.000000000 Z
+date: 2021-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny