advanced-sneakers-activejob 0.3.1 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea3374ddb93226f413dd09ed2cdf2ee317890c5592e03563d64e786ae3ac96d1
-  data.tar.gz: aec7a20fd45441a06de50c6978e71402f002e079f0ba11a88677ec4556559746
+  metadata.gz: 7c9c85eff744ad5d1de5009fc25cf53ad1b11922d4ed75b65c87045615850143
+  data.tar.gz: a67cc5ac97620471e7424066acab3ac5b513da37888ccd70599946c107b0a0fe
 SHA512:
-  metadata.gz: b9a007a2443a4e8add7f5918745944587ee7b9a159e534f1bcc87fbbcd9be16747ab25544eb2dbe37707e9ddeb3c299d4ef608b0ea2aafbb5e49a320e7d2d9ce
-  data.tar.gz: 3f63ffdf312d58faa22bdfd73bd0599508b0b8894c5fed8fc03142da7dbbf8b4bf2c9ab488748c895e3782e6308e6d9908c8a74d4d4a549007f784bfc9813117
+  metadata.gz: 2ba5450df0c6b7dd824c468d5962d77085c2cabcf3db3b009485cee68c917fbdf3d3109355b9148176f4841c388065402c9ce15c7bd2093bc89eec47cf6488a5
+  data.tar.gz: b9780aa81dc55deb3a311ba5d658b5c584398ee4df82a2e963acca9d9429bbfa6fbd34f3e1794e4e407ba7624456e6ea92cb19e47de22d8f3ccb7670cd76b323

data/.gitignore

@@ -7,6 +7,7 @@
 /spec/reports/
 /tmp/
 /Gemfile.lock
+/gemfiles/*.lock
 /.ruby-gemset
 /.ruby-version
 

data/.rubocop.yml

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

data/.travis.yml

@@ -2,20 +2,24 @@
 dist: xenial
 language: ruby
 cache: bundler
+
 rvm:
   - 2.5.8
   - 2.6.6
   - 2.7.1
-env:
-  - RAILS_VERSION="~> 4.2.11"
-  - RAILS_VERSION="~> 5.2.4"
-  - RAILS_VERSION="~> 6.0.2"
-jobs:
+
+gemfile:
+  - gemfiles/activejob_4.2.x.gemfile
+  - gemfiles/activejob_5.2.x.gemfile
+  - gemfiles/activejob_6.0.x.gemfile
+
+matrix:
   exclude:
     - rvm: 2.7.1
-      env: RAILS_VERSION="~> 4.2.11"
+      gemfile: gemfiles/activejob_4.2.x.gemfile
+
+before_install: 'gem install bundler -v "$(ruby -e "puts RUBY_VERSION.to_f >= 2.7 ? \">= 2.0\" : \"< 2\"")"'
+
+before_script: .ci/install_rabbitmq
 
-before_install: gem install bundler -v 1.17.3
-before_script:
-  - ".ci/install_rabbitmq"
 bundler_args: --jobs 3 --retry 3

data/Appraisals

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+appraise 'activejob-4.2.x' do
+  gem 'rails', '~> 4.2.11'
+end
+
+appraise 'activejob-5.2.x' do
+  gem 'rails', '~> 5.2.4'
+end
+
+appraise 'activejob-6.0.x' do
+  gem 'rails', '~> 6.0.3'
+end

data/CHANGELOG.md

@@ -1,32 +1,85 @@
-## Changes Between 0.3.0 and 0.3.1
+# Changelog
 
-### [Restore Sneakers::Worker::Classes methods](https://github.com/veeqo/advanced-sneakers-activejob/pull/6)
+All notable changes to this project will be documented in this file.
 
-## Changes Between 0.2.3 and 0.3.0
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-This release does not change the observed behavior, but replaces the publisher with completely new implementation.
+## [Unreleased](https://github.com/veeqo/advanced-sneakers-activejob/compare/v0.3.6...HEAD)
 
-### Reusable parts of publisher are extracted to [bunny-publisher](https://github.com/veeqo/bunny-publisher)
 
-## Changes Between 0.2.2 and 0.2.3
+## [0.3.6](https://github.com/veeqo/advanced-sneakers-activejob/compare/v0.3.5...v0.3.6) - 2020-09-18
 
-### [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)
+### Changed
+- [#12](https://github.com/veeqo/advanced-sneakers-activejob/pull/12) Refactor changelog to comply with Keep a Changelog
+- [#13](https://github.com/veeqo/advanced-sneakers-activejob/pull/13) Use appraisals for Travis matrix
 
-## Changes Between 0.2.1 and 0.2.2
+### Fixed
+- [#14](https://github.com/veeqo/advanced-sneakers-activejob/pull/14) Fix deprecation warnings of ruby 2.7
 
-Cleanup of `puts` and logger mistakenly introduced in previous version
 
-## Changes Between 0.2.0 and 0.2.1
+## [0.3.5](https://github.com/veeqo/advanced-sneakers-activejob/compare/v0.3.4...v0.3.5) - 2020-06-27
 
-### [Support for ActiveJob prefix](https://github.com/veeqo/advanced-sneakers-activejob/pull/2)
+### Fixed
+- [#11](https://github.com/veeqo/advanced-sneakers-activejob/pull/11) `NoMethodError` on `Rails.application.eager_load!` in Rails initializer
 
-Fixed worker class name in rake task description
 
-## Changes Between 0.1.0 and 0.2.0
+## [0.3.4](https://github.com/veeqo/advanced-sneakers-activejob/compare/v0.3.3...v0.3.4) - 2020-06-11
 
-### [`message_options`](https://github.com/veeqo/advanced-sneakers-activejob/pull/1)
+### Added
+- [#10](https://github.com/veeqo/advanced-sneakers-activejob/pull/10) Ability to run ActiveJob consumers by wildcards for queue names
 
-Customizable options for message publishing (`routing_key`, `headers`, etc)
 
-## Original Release: 0.1.0
+## [0.3.3](https://github.com/veeqo/advanced-sneakers-activejob/compare/v0.3.2...v0.3.3) - 2020-06-09
+
+### Added
+- [#9](https://github.com/veeqo/advanced-sneakers-activejob/pull/9) Ability to run ActiveJob consumers by queue names
+
+
+## [0.3.2](https://github.com/veeqo/advanced-sneakers-activejob/compare/v0.3.1...v0.3.2) - 2020-06-05
+
+### Added
+- [#8](https://github.com/veeqo/advanced-sneakers-activejob/pull/8) Ability to run specified ActiveJob queues consumers
+
+
+## [0.3.1](https://github.com/veeqo/advanced-sneakers-activejob/compare/v0.3.0...v0.3.1) - 2020-06-02
+
+### Fixed
+- [#6](https://github.com/veeqo/advanced-sneakers-activejob/pull/6) Restore Sneakers::Worker::Classes methods
+
+
+## [0.3.0](https://github.com/veeqo/advanced-sneakers-activejob/compare/v0.2.3...v0.3.0) - 2020-05-21
+
+### Changed
+- [#5](https://github.com/veeqo/advanced-sneakers-activejob/pull/5) Publisher is extracted to [bunny-publisher](https://github.com/veeqo/bunny-publisher)
+
+
+## [0.2.3](https://github.com/veeqo/advanced-sneakers-activejob/compare/v0.2.2...v0.2.3) - 2020-04-06
+
+### Added
+- [#4](https://github.com/veeqo/advanced-sneakers-activejob/pull/4) Support for custom adapter per job
+
+### Changed
+- [#3](https://github.com/veeqo/advanced-sneakers-activejob/pull/3) Refactored support for ActiveJob prefix
+
+
+## [0.2.2](https://github.com/veeqo/advanced-sneakers-activejob/compare/v0.2.1...v0.2.2) - 2020-04-05
+
+### Fixed
+-  Cleanup of `puts` and logger mistakenly introduced in version `0.2.1`
+
+## [0.2.1](https://github.com/veeqo/advanced-sneakers-activejob/compare/v0.2.0...v0.2.1) - 2020-04-05
+
+### Added
+-  [#2](https://github.com/veeqo/advanced-sneakers-activejob/pull/2) Support queue name prefixes
+
+
+## [0.2.0](https://github.com/veeqo/advanced-sneakers-activejob/compare/v0.1.0...v0.2.0) - 2020-03-23
+
+### Added
+- [#1](https://github.com/veeqo/advanced-sneakers-activejob/pull/1) Customizable options for message publishing (`routing_key`, `headers`, etc)
+
+
+## [0.1.0](https://github.com/veeqo/advanced-sneakers-activejob/releases/tag/v0.1.0) - 2020-03-19
+
+### Added
+- `:advanced_sneakers` adapter for ActiveJob

data/Gemfile

@@ -2,10 +2,6 @@
 
 source 'https://rubygems.org'
 
-git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
-
-# Specify your gem's dependencies in advanced-sneakers-activejob.gemspec
 gemspec
 
-gem 'rails', ENV.fetch('RAILS_VERSION', '~> 4.2.11')
-gem 'sneakers', ENV.fetch('SNEAKERS_VERSION', '~> 2.11')
+gem 'rails'

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/advanced-sneakers-activejob.gemspec

@@ -30,10 +30,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'bunny-publisher', '~> 0.1'
   spec.add_dependency 'sneakers', '~> 2.7'
 
+  spec.add_development_dependency 'appraisal', '~> 2.3.0'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'rabbitmq_http_api_client', '~> 1.13'
-  spec.add_development_dependency 'rails', '>= 4.2'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rspec', '~> 3.0'
 end

data/gemfiles/.bundle/config

@@ -0,0 +1,3 @@
+---
+BUNDLE_RETRY: "3"
+BUNDLE_JOBS: "3"

data/gemfiles/activejob_4.2.x.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.2.11"
+
+gemspec path: "../"

data/gemfiles/activejob_5.2.x.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 5.2.4"
+
+gemspec path: "../"

data/gemfiles/activejob_6.0.x.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 6.0.3"
+
+gemspec path: "../"

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
@@ -46,11 +54,11 @@ module AdvancedSneakersActiveJob
     end
 
     def publisher
-      @publisher ||= AdvancedSneakersActiveJob::Publisher.new(config.publisher_config)
+      @publisher ||= AdvancedSneakersActiveJob::Publisher.new(**config.publisher_config)
     end
 
     def delayed_publisher
-      @delayed_publisher ||= AdvancedSneakersActiveJob::DelayedPublisher.new(config.publisher_config)
+      @delayed_publisher ||= AdvancedSneakersActiveJob::DelayedPublisher.new(**config.publisher_config)
     end
 
     # Based on ActiveSupport::Inflector#parameterize
@@ -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.1'
+  VERSION = '0.3.6'
 end

data/lib/advanced_sneakers_activejob/workers_registry.rb

@@ -66,14 +66,14 @@ module AdvancedSneakersActiveJob
       call.respond_to?(method_name) || super
     end
 
-    private
-
     def define_active_job_consumers
       active_job_classes_with_matching_adapter.each do |worker|
         AdvancedSneakersActiveJob.define_consumer(queue_name: worker.new.queue_name)
       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.1
+  version: 0.3.6
 platform: ruby
 authors:
 - Rustam Sharshenov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-02 00:00:00.000000000 Z
+date: 2020-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -54,21 +54,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.7'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -82,61 +82,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rabbitmq_http_api_client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.13'
-- !ruby/object:Gem::Dependency
-  name: rails
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rabbitmq_http_api_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 description: Advanced Sneakers adapter for ActiveJob
 email:
 - rustam@sharshenov.com
@@ -149,12 +135,17 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- Appraisals
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - advanced-sneakers-activejob.gemspec
+- gemfiles/.bundle/config
+- gemfiles/activejob_4.2.x.gemfile
+- gemfiles/activejob_5.2.x.gemfile
+- gemfiles/activejob_6.0.x.gemfile
 - lib/active_job/queue_adapters/advanced_sneakers_adapter.rb
 - lib/advanced/sneakers/activejob.rb
 - lib/advanced_sneakers_activejob.rb
@@ -167,6 +158,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
@@ -192,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Advanced Sneakers adapter for ActiveJob