advanced-sneakers-activejob 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 144ceb20cac503afd808245bd4da0311a541694bf7c9cc0768a599355c60b001
-  data.tar.gz: fe1f7cce63c635af8647b96b0a140653c37cc44c37b0250464689cb895e472eb
+  metadata.gz: 818f3505d0e58ddf098ed2884db036a0e16019e04641e6c8ca457e8c48850910
+  data.tar.gz: 374b620fbb9092a3c24547d6c036b6da0973e0059ce910cca559e7dae59eb028
 SHA512:
-  metadata.gz: 2b6cc96c1725224e5e3663c221fe080ff6874114ab8a667dbf5ebe8eb935819f613e617efbfb81ab183f2b3a9ee1d7ff07c0bdc613175419d94c1031fdbadb3f
-  data.tar.gz: 57bfb70bc33895e6b30a30086a607dcdbec2a5b829b2fd95ccae6f5a305a267106833a8e54203858b5dcf37e5e3cabd56facf5e8aba7ca0785032432f9a620ac
+  metadata.gz: fc3de6bfbd43c907c242ac65104e7cd91523930f209e216511ad4877dbd0ac836d51d291c71eb776559eb1b5d3667236d36f6641a5255652f7be33dbb07bc820
+  data.tar.gz: 6dcc9e3426e5592738c44d3f9feb658ba57e17713ed185bf3f76b9cc6df7d2886064abd031efc8a3913c9b41c5dfff89671f59809af42c42b018e4b5d1d40bfb

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## Changes Between 0.3.3 and 0.3.4
+
+### [Support for wildcards to run ActiveJob consumers by queues](https://github.com/veeqo/advanced-sneakers-activejob/pull/10)
+
+Works with `sneakers:active_job` task only!
+
+```sh
+QUEUES=mailers,index.*,telemetery.# rake sneakers:active_job
+```
+
 ## Changes Between 0.3.2 and 0.3.3
 
 ### [Add ability to run ActiveJob consumers by queues](https://github.com/veeqo/advanced-sneakers-activejob/pull/9)
@@ -5,7 +15,7 @@
 Works with `sneakers:active_job` task only!
 
 ```sh
-rake sneakers:active_job QUEUES=mailers,default
+QUEUES=mailers,default rake sneakers:active_job
 ```
 
 ## Changes Between 0.3.1 and 0.3.2

data/README.md

@@ -41,7 +41,13 @@ rake sneakers:active_job
 
 Run worker for picked queues of ActiveJob
 ```sh
-rake sneakers:active_job QUEUES=mailers,foo,bar
+QUEUES=mailers,foo,bar rake sneakers:active_job
+```
+
+Wildcards are supported for queues names with "words" (separator is `.`). Algorithm is similar to the way the [topic exchange matches routing keys](https://www.rabbitmq.com/tutorials/tutorial-five-python.html). `*` (star) substitutes for exactly one word. `#` (hash) substitutes for zero or more words
+
+```sh
+QUEUES=mailers,index.*,telemetery.# rake sneakers:active_job
 ```
 
 ## Unrouted messages

data/lib/advanced_sneakers_activejob/support/locate_workers_by_queues.rb

@@ -13,7 +13,7 @@ module AdvancedSneakersActiveJob
         detect_workers_for_queues!
         ensure_all_workers_found!
 
-        @workers
+        @workers.uniq
       end
 
       private
@@ -30,15 +30,24 @@ module AdvancedSneakersActiveJob
 
       def detect_workers_for_queues!
         @queues.each do |queue|
-          worker = all_workers.detect { |klass| klass.queue_name == queue }
+          matching_workers = all_workers.select { |klass| klass.queue_name.match?(queue_regex(queue)) }
 
-          if worker
-            @workers << worker
+          if matching_workers.any?
+            @workers += matching_workers
           else
             @queues_without_workers << queue
           end
         end
       end
+
+      # https://www.rabbitmq.com/tutorials/tutorial-five-python.html
+      def queue_regex(queue)
+        regex = Regexp.escape(queue)
+                      .gsub(/\A\\\*|(\.)\\\*/, '\1[^\.]+') # "*" (star) substitutes for exactly one word
+                      .sub('\.\#', '(\.[^\.]+)*') # "#" (hash) substitutes for zero or more words
+
+        Regexp.new(['\A', regex, '\z'].join)
+      end
     end
   end
 end

data/lib/advanced_sneakers_activejob/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AdvancedSneakersActiveJob
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: advanced-sneakers-activejob
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Rustam Sharshenov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-09 00:00:00.000000000 Z
+date: 2020-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob