advanced-sneakers-activejob 0.3.0 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d7e686de7c5fe9a22c265854adf1c8e9afecbdcd8b23e8bffcf669738e2c23f
-  data.tar.gz: 60f16a0f4cb3492d1ad216a25cc4cef1d51cf4c5e13eef9cb5b47f672d7c4943
+  metadata.gz: 1aaae2951e9e941f00eaf9ef8c51a0c56d04cc9c562feed490a245c1d918ba07
+  data.tar.gz: 6489ed0097e980a21f10183422835ebc937d89cce253f5dc7a9074672747d83d
 SHA512:
-  metadata.gz: c039b2fc27c32064c34ae8071b3c5ae8e19766e3f71283b7052eeb4b0031300ec42c3d3a04e025674111e7160d59d7840cbeb348407e7a92e2b14f14cedf4cba
-  data.tar.gz: 47f9d05c9b1d9386faa8c3186868353665327701c11fb79542f3aeff2964b086ac6b84c476e95d313861311f275f18ca31131972de75d0743c064d15ae4269ba
+  metadata.gz: 3d5694a6f435e4fdb73be0f6966a5167b10b1c58075a6f52a8022a7954f4d40fe50d4b17de24cdd5d8141936a4c6b7235e93c69d14a4ba3eefd5483d1f6f63b8
+  data.tar.gz: 228835587b2413b91d6ac65e1a1aa5b4275e4feb8506b283a2622aa7798a768b352ab84d2ab0fa8355be25fa25e5362eaa017ed7bf190d7898e14dcdd018e866

data/.rubocop.yml

@@ -1,8 +1,15 @@
+AllCops:
+  NewCops: enable
+
 Layout/LineLength:
   Max: 140
   Exclude:
     - spec/**/*
 
+Lint/SuppressedException:
+  Exclude:
+    - spec/**/*
+
 Metrics/ClassLength:
   Enabled: false
 
@@ -11,6 +18,10 @@ Metrics/BlockLength:
     - advanced-sneakers-activejob.gemspec
     - spec/**/*
 
+Metrics/CyclomaticComplexity:
+  Exclude:
+    - spec/support/log_helpers.rb
+
 Metrics/MethodLength:
   Exclude:
     - spec/**/*
@@ -27,9 +38,5 @@ Metrics/AbcSize:
   Exclude:
     - spec/**/*
 
-Lint/SuppressedException:
-  Exclude:
-    - spec/**/*
-
 Style/Documentation:
   Enabled: false

data/CHANGELOG.md

@@ -1,4 +1,52 @@
-## Changes Between 0.2.3 and 0.3
+## Changes Between 0.3.4 and 0.3.5
+
+[Fixed NoMethodError on Rails.application.eager_load! in Rails initializer](https://github.com/veeqo/advanced-sneakers-activejob/pull/11)
+
+```
+NoMethodError: undefined method `message_options' for MyJob:Class
+```
+
+## 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)
+
+Works with `sneakers:active_job` task only!
+
+```sh
+QUEUES=mailers,default rake sneakers:active_job
+```
+
+## Changes Between 0.3.1 and 0.3.2
+
+### [Add ability to run specified ActiveJob queues consumers](https://github.com/veeqo/advanced-sneakers-activejob/pull/8)
+
+Sneakers allows to specify consumer classes to run:
+
+```sh
+WORKERS=MyConsumer rake sneakers:run
+```
+
+Now it works for ActiveJob queues consumers as well:
+
+```sh
+WORKERS=AdvancedSneakersActiveJob::MailersConsumer rake sneakers:run
+```
+
+## Changes Between 0.3.0 and 0.3.1
+
+### [Restore Sneakers::Worker::Classes methods](https://github.com/veeqo/advanced-sneakers-activejob/pull/6)
+
+## Changes Between 0.2.3 and 0.3.0
 
 This release does not change the observed behavior, but replaces the publisher with completely new implementation.
 
@@ -6,8 +54,8 @@ This release does not change the observed behavior, but replaces the publisher w
 
 ## Changes Between 0.2.2 and 0.2.3
 
-### Refactored support for ActiveJob prefix https://github.com/veeqo/advanced-sneakers-activejob/pull/3
-### Support for custom adapter per job https://github.com/veeqo/advanced-sneakers-activejob/pull/4
+### [Refactored support for ActiveJob prefix](https://github.com/veeqo/advanced-sneakers-activejob/pull/3)
+### [Support for custom adapter per job](https://github.com/veeqo/advanced-sneakers-activejob/pull/4)
 
 ## Changes Between 0.2.1 and 0.2.2
 
@@ -15,13 +63,13 @@ Cleanup of `puts` and logger mistakenly introduced in previous version
 
 ## Changes Between 0.2.0 and 0.2.1
 
-### Support for ActiveJob prefix https://github.com/veeqo/advanced-sneakers-activejob/pull/2
+### [Support for ActiveJob prefix](https://github.com/veeqo/advanced-sneakers-activejob/pull/2)
 
 Fixed worker class name in rake task description
 
 ## Changes Between 0.1.0 and 0.2.0
 
-### `message_options` https://github.com/veeqo/advanced-sneakers-activejob/pull/1
+### [`message_options`](https://github.com/veeqo/advanced-sneakers-activejob/pull/1)
 
 Customizable options for message publishing (`routing_key`, `headers`, etc)
 

data/README.md

@@ -34,11 +34,22 @@ Or install it yourself as:
 config.active_job.queue_adapter = :advanced_sneakers
 ```
 
-Run worker
+Run worker for all queues of ActiveJob
 ```sh
 rake sneakers:active_job
 ```
 
+Run worker for picked queues of ActiveJob
+```sh
+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
 
 If message is published before routing has been configured (e.g. by consumer), it might be lost. To mitigate this problem the adapter uses [:mandatory](http://rubybunny.info/articles/exchanges.html#publishing_messages_as_mandatory) option for publishing messages. RabbitMQ returns unrouted messages back and the publisher is able to handle them:

data/lib/advanced_sneakers_activejob.rb

@@ -21,6 +21,14 @@ require 'advanced_sneakers_activejob/active_job_patch'
 require 'advanced_sneakers_activejob/railtie' if defined?(::Rails::Railtie)
 require 'active_job/queue_adapters/advanced_sneakers_adapter'
 
+ActiveSupport.on_load(:active_job) do
+  ActiveJob::Base.include AdvancedSneakersActiveJob::ActiveJobPatch
+end
+
+ActiveSupport.on_load(:action_mailer) do
+  require 'action_mailer/delivery_job' # Enforce definition of ActionMailer::DeliveryJob::Consumer
+end
+
 # Advanced Sneakers adapter for ActiveJob
 module AdvancedSneakersActiveJob
   class << self
@@ -68,5 +76,11 @@ module AdvancedSneakersActiveJob
 
       [parameterized_string, 'consumer'].join('_').classify
     end
+
+    def const_missing(name)
+      Sneakers::Worker::Classes.define_active_job_consumers
+
+      constants.include?(name) ? const_get(name) : super
+    end
   end
 end

data/lib/advanced_sneakers_activejob/railtie.rb

@@ -3,18 +3,6 @@
 module AdvancedSneakersActiveJob
   # Rails integration
   class Railtie < ::Rails::Railtie
-    initializer 'advanced_sneakers_activejob.discover_mailer_job' do
-      ActiveSupport.on_load(:action_mailer) do
-        require 'action_mailer/delivery_job' # Enforce definition of ActionMailer::DeliveryJob::Consumer
-      end
-    end
-
-    initializer 'advanced_sneakers_activejob.discover_default_job' do
-      ActiveSupport.on_load(:active_job) do
-        ActiveJob::Base.include AdvancedSneakersActiveJob::ActiveJobPatch
-      end
-    end
-
     rake_tasks do
       require 'advanced_sneakers_activejob/tasks'
     end

data/lib/advanced_sneakers_activejob/support/locate_workers_by_queues.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module AdvancedSneakersActiveJob
+  module Support
+    class LocateWorkersByQueues
+      def initialize(queues)
+        @queues = queues.uniq.reject(&:blank?)
+        @queues_without_workers = []
+        @workers = []
+      end
+
+      def call
+        detect_workers_for_queues!
+        ensure_all_workers_found!
+
+        @workers.uniq
+      end
+
+      private
+
+      def ensure_all_workers_found!
+        return if @queues_without_workers.empty?
+
+        raise("Missing workers for queues: #{@queues_without_workers.join(', ')}")
+      end
+
+      def all_workers
+        @all_workers ||= Sneakers::Worker::Classes.activejob_workers
+      end
+
+      def detect_workers_for_queues!
+        @queues.each do |queue|
+          matching_workers = all_workers.select { |klass| klass.queue_name.match?(queue_regex(queue)) }
+
+          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/tasks.rb

@@ -5,10 +5,12 @@ require 'sneakers/tasks'
 task :environment
 
 namespace :sneakers do
-  desc 'Start work for ActiveJob only (set $WORKERS=AdvancedSneakersActiveJob::FooConsumer for processing of :foo queue)'
+  desc 'Start work for ActiveJob only (set $QUEUES=foo,bar.baz for processing of "foo" and "bar.baz" queues)'
   task :active_job do
     Rake::Task['environment'].invoke
 
+    populate_workers_by_queues if ENV['WORKERS'].blank? && ENV['QUEUES'].present?
+
     # Enforsing ActiveJob-only workers
     AdvancedSneakersActiveJob.configure { |c| c.activejob_workers_strategy = :only }
 
@@ -18,4 +20,14 @@ namespace :sneakers do
 
     Rake::Task['sneakers:run'].invoke
   end
+
+  def populate_workers_by_queues
+    require 'advanced_sneakers_activejob/support/locate_workers_by_queues'
+    ::Rails.application.eager_load!
+
+    queues = ENV['QUEUES'].split(',')
+    workers = AdvancedSneakersActiveJob::Support::LocateWorkersByQueues.new(queues).call
+
+    ENV['WORKERS'] = workers.map(&:name).join(',')
+  end
 end

data/lib/advanced_sneakers_activejob/version.rb

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

data/lib/advanced_sneakers_activejob/workers_registry.rb

@@ -54,7 +54,17 @@ module AdvancedSneakersActiveJob
       @activejob_workers
     end
 
-    private
+    def method_missing(method_name, *args, &block)
+      if call.respond_to?(method_name)
+        call.send(method_name, *args, &block)
+      else
+        super
+      end
+    end
+
+    def respond_to_missing?(method_name, include_private = false)
+      call.respond_to?(method_name) || super
+    end
 
     def define_active_job_consumers
       active_job_classes_with_matching_adapter.each do |worker|
@@ -62,6 +72,8 @@ module AdvancedSneakersActiveJob
       end
     end
 
+    private
+
     def active_job_classes_with_matching_adapter
       ([ActiveJob::Base] + ActiveJob::Base.descendants).select do |klass|
         klass.queue_adapter == ::ActiveJob::QueueAdapters::AdvancedSneakersAdapter ||

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: advanced-sneakers-activejob
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.5
 platform: ruby
 authors:
 - Rustam Sharshenov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-21 00:00:00.000000000 Z
+date: 2020-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -167,6 +167,7 @@ files:
 - lib/advanced_sneakers_activejob/handler.rb
 - lib/advanced_sneakers_activejob/publisher.rb
 - lib/advanced_sneakers_activejob/railtie.rb
+- lib/advanced_sneakers_activejob/support/locate_workers_by_queues.rb
 - lib/advanced_sneakers_activejob/tasks.rb
 - lib/advanced_sneakers_activejob/version.rb
 - lib/advanced_sneakers_activejob/workers_registry.rb