advanced-sneakers-activejob 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d76d72ecda9caf10d961a1489214fb54a19b336fb2bfaa20c0db2678e06a36e0
-  data.tar.gz: 22ce99262256a1e7715ad56ea901163ea6a88ac66c9f6b4df0c457dc3c8633a1
+  metadata.gz: bec1f0d5e31956d8ca88a49fece6f4327a1e5c4445e77f98cbbadd69f70bb96c
+  data.tar.gz: 04fa0eb0c1c61e076bb944c97fa070baf3d551ee86aa1dbebd459a599f838aba
 SHA512:
-  metadata.gz: 682edc7c6a50785943662fd7350881df2808a942eb0101b92e4cdefcc44e37481be1b791af4ed9d7af38939e2554a748ab836ec2daa4ec936688b19201de56ef
-  data.tar.gz: de2fcbb80cfcb3d011334355aad8d09532d497b1151b11b2407d42435b967b5154e488f058324bcfb496e7279637c7d0c93fc16bdcc31d34c190adf6bfd07603
+  metadata.gz: 1075449c689b6699e58bef54367c026a772880a3a31f61aa467035dba32f23b5164f2f60f4f03f8f5041e8ad4151492670d1909f11863fa93713427a0291e276
+  data.tar.gz: 855163848962913b241864245cc73a47525b8f5c495bba8a79cbe85a48baa4661ea4ac9d7271016570e48173c3cba0bba5f5d45ae5cbcce23999601b1e356f63

data/CHANGELOG.md

@@ -4,7 +4,19 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-## [Unreleased](https://github.com/veeqo/advanced-sneakers-activejob/compare/v0.6.0...HEAD)
+## [Unreleased](https://github.com/veeqo/advanced-sneakers-activejob/compare/v0.7.0...HEAD)
+
+## [0.7.0](https://github.com/veeqo/advanced-sneakers-activejob/compare/v0.6.0...v0.6.0) - 2026-04-09
+
+### Added
+- [#42](https://github.com/veeqo/advanced-sneakers-activejob/pull/42) Add support for ActiveJob v7.1 and v7.2 (including ActionMailer queue consumer detection)
+- [#42](https://github.com/veeqo/advanced-sneakers-activejob/pull/42) Add Ruby 3.3 and 3.4 to CI matrix
+
+### Changed
+- [#42](https://github.com/veeqo/advanced-sneakers-activejob/pull/42) Bump minimum Ruby version from 2.5 to 2.7
+
+### Removed
+- [#42](https://github.com/veeqo/advanced-sneakers-activejob/pull/42) Drop support for Ruby 2.5 and 2.6
 
 
 ## [0.6.0](https://github.com/veeqo/advanced-sneakers-activejob/compare/v0.5.0...v0.6.0) - 2022-02-15

data/lib/advanced_sneakers_activejob/version.rb

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

data/lib/advanced_sneakers_activejob/workers_registry.rb

@@ -70,15 +70,41 @@ module AdvancedSneakersActiveJob
       active_job_classes_with_matching_adapter.each do |worker|
         AdvancedSneakersActiveJob.define_consumer(queue_name: worker.new.queue_name)
       end
+
+      action_mailer_classes_with_matching_adapter.each do |mailer|
+        AdvancedSneakersActiveJob.define_consumer(queue_name: mailer_queue_name(mailer))
+      end
     end
 
     private
 
     def active_job_classes_with_matching_adapter
       ([ActiveJob::Base] + ActiveJob::Base.descendants).select do |klass|
-        klass.queue_adapter == ::ActiveJob::QueueAdapters::AdvancedSneakersAdapter ||
-          klass.queue_adapter.is_a?(::ActiveJob::QueueAdapters::AdvancedSneakersAdapter)
+        advanced_sneakers_adapter?(klass) &&
+          !(defined?(ActionMailer::Base) && klass <= ActionMailer::MailDeliveryJob)
+      end
+    end
+
+    def action_mailer_classes_with_matching_adapter
+      return [] if !defined?(ActionMailer::Base) ||
+                   ActionMailer.gem_version < Gem::Version.new('6.0.0') ||
+                   !advanced_sneakers_adapter?(ActionMailer::MailDeliveryJob)
+
+      ([ActionMailer::Base] + ActionMailer::Base.descendants).select do |klass|
+        klass.delivery_job == ActionMailer::MailDeliveryJob
       end
     end
+
+    def advanced_sneakers_adapter?(klass)
+      klass.queue_adapter == ::ActiveJob::QueueAdapters::AdvancedSneakersAdapter ||
+        klass.queue_adapter.is_a?(::ActiveJob::QueueAdapters::AdvancedSneakersAdapter)
+    end
+
+    # Gets the queue name for the mailer with activejob prefix and delimiter
+    # Queue name from ActionMailer::Base.deliver_later_queue_name is not prefixed
+    # and has no delimiter, so we need to add them manually
+    def mailer_queue_name(mailer)
+      [ActiveJob::Base.queue_name_prefix.presence, mailer.deliver_later_queue_name.to_s].compact.join(ActiveJob::Base.queue_name_delimiter)
+    end
   end
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: advanced-sneakers-activejob
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Rustam Sharshenov
 - Vlad Bokov
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-15 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -17,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: bunny-publisher
   requirement: !ruby/object:Gem::Requirement
@@ -59,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -157,7 +156,6 @@ metadata:
   homepage_uri: https://github.com/veeqo/advanced-sneakers-activejob
   source_code_uri: https://github.com/veeqo/advanced-sneakers-activejob
   changelog_uri: https://github.com/veeqo/advanced-sneakers-activejob/blob/main/CHANGELOG.md
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -165,15 +163,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key: 
+rubygems_version: 3.7.1
 specification_version: 4
 summary: Advanced Sneakers adapter for ActiveJob
 test_files: []