delayed_job 4.1.13 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43e384d153214d0d03705b22c26d52b1f0a42d49c493c7ab0a5eed59e408851a
-  data.tar.gz: 49359f19f8c9834261f70994f89e656c6e532b4a018b1c7b8daea2880d7c351b
+  metadata.gz: ae0a826ebddefa73dc33ce40c1fb057cda95951144e347835ca17829ead8c8f5
+  data.tar.gz: 2fcd3abb457bcdf72b31247dbb76fd77646a1530a2fdceed10d31e061f14e6f1
 SHA512:
-  metadata.gz: 212ee115ce11b730c70c25ab4888e8849ba2642bd7027d83d1e7b50f24ad7b683c5a013a6109ebc9b23e0ad551a8caa4b8d91540f339d0dbfe7b164933e7855b
-  data.tar.gz: ee66c64bde7c0ec4bddc57b84ae46afe83c8f42f6425d44d84e54d535caeb3f1913647d519b5be02304a884f2540e417500ae3a747bc450d57dfdab9c6f1d45d
+  metadata.gz: a5ac2118e954f040b0820a2ba7d06b51fb3c1cd420e671b0d7af6d69918fe5279f80a44183ee1d2b5d67a9b5b155f76c5b183e828aeb11793a016d13d3ed7c5e
+  data.tar.gz: f075ae005041db3928fc2edf4f044834db426bf816841fc443ddfd29a5f27037a78d41a1fe9f948200ee0fb7ffee79ed4e75b8067b415e30697b1d464bb31f2c

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+4.2.0 - 2025-12-29
+=======================
+* Add dependencies for benchmark and logger which are moving out of stdlib.
+* Pull ActiveJob adapter from rails into DJ for future rails release.
+* Add Ruby 4.0 and Rails 8.1 to test matrix.
+
 4.1.13 - 2024-11-08
 =======================
 * Enable Rails 8

data/README.md

@@ -1,7 +1,7 @@
 **If you're viewing this at https://github.com/collectiveidea/delayed_job,
 you're reading the documentation for the master branch.
 [View documentation for the latest release
-(4.1.13).](https://github.com/collectiveidea/delayed_job/tree/v4.1.13)**
+(4.2.0).](https://github.com/collectiveidea/delayed_job/tree/v4.2.0)**
 
 Delayed::Job
 ============

data/delayed_job.gemspec

@@ -2,6 +2,8 @@
 
 Gem::Specification.new do |spec|
   spec.add_dependency 'activesupport', ['>= 3.0', '< 9.0']
+  spec.add_dependency 'benchmark'
+  spec.add_dependency 'logger'
   spec.authors        = ['Brandon Keepers', 'Brian Ryckbost', 'Chris Gaffney', 'David Genord II', 'Erik Michaels-Ober', 'Matt Griffin', 'Steve Richert', 'Tobias Lütke']
   spec.description    = 'Delayed_job (or DJ) encapsulates the common pattern of asynchronously executing longer tasks in the background. It is a direct extraction from Shopify where the job table is responsible for a multitude of core tasks.'
   spec.email          = ['brian@collectiveidea.com']
@@ -13,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.require_paths  = ['lib']
   spec.summary        = 'Database-backed asynchronous priority queue system -- Extracted from Shopify'
   spec.test_files     = Dir.glob('spec/**/*')
-  spec.version        = '4.1.13'
+  spec.version        = '4.2.0'
   spec.metadata       = {
     'changelog_uri'   => 'https://github.com/collectiveidea/delayed_job/blob/master/CHANGELOG.md',
     'bug_tracker_uri' => 'https://github.com/collectiveidea/delayed_job/issues',

data/lib/active_job/queue_adapters/delayed_job_adapter.rb

@@ -0,0 +1,52 @@
+require 'active_support/core_ext/string/inflections'
+
+module ActiveJob
+  module QueueAdapters
+    # = Delayed Job adapter for Active Job
+    #
+    # To use Delayed Job, set the queue_adapter config to +:delayed_job+.
+    #
+    #   Rails.application.config.active_job.queue_adapter = :delayed_job
+    class DelayedJobAdapter < ::ActiveJob::QueueAdapters::AbstractAdapter
+      def enqueue(job)
+        delayed_job = Delayed::Job.enqueue(JobWrapper.new(job.serialize), :queue => job.queue_name, :priority => job.priority)
+        job.provider_job_id = delayed_job.id
+        delayed_job
+      end
+
+      def enqueue_at(job, timestamp)
+        delayed_job = Delayed::Job.enqueue(JobWrapper.new(job.serialize), :queue => job.queue_name, :priority => job.priority, :run_at => Time.at(timestamp))
+        job.provider_job_id = delayed_job.id
+        delayed_job
+      end
+
+      class JobWrapper
+        attr_accessor :job_data
+
+        def initialize(job_data)
+          @job_data = job_data
+        end
+
+        def display_name
+          base_name = "#{job_data['job_class']} [#{job_data['job_id']}] from DelayedJob(#{job_data['queue_name']})"
+
+          return base_name unless log_arguments?
+
+          "#{base_name} with arguments: #{job_data['arguments']}"
+        end
+
+        def perform
+          Base.execute(job_data)
+        end
+
+      private
+
+        def log_arguments?
+          job_data['job_class'].constantize.log_arguments?
+        rescue NameError
+          false
+        end
+      end
+    end
+  end
+end

data/lib/delayed/railtie.rb

@@ -3,6 +3,15 @@ require 'rails'
 
 module Delayed
   class Railtie < Rails::Railtie
+    initializer 'delayed_job.active_job' do
+      ActiveSupport.on_load(:active_job) do
+        # Use Rails packaged adpater if present
+        unless defined?(ActiveJob::QueueAdapters::DelayedJobAdapter)
+          require 'active_job/queue_adapters/delayed_job_adapter'
+        end
+      end
+    end
+
     initializer :after_initialize do
       Delayed::Worker.logger ||= if defined?(Rails)
         Rails.logger

data/spec/active_job_adapter_spec.rb

@@ -0,0 +1,110 @@
+require 'helper'
+
+if ActiveSupport.gem_version >= Gem::Version.new('8.1.0.alpha')
+  require 'active_job'
+  require 'concurrent'
+end
+
+describe 'a Rails active job backend' do
+  before do
+    if ActiveSupport.gem_version < Gem::Version.new('8.1.0.alpha')
+      skip("Bundled adapter used in #{ActiveSupport.gem_version}")
+    end
+  end
+
+  if ActiveSupport.gem_version >= Gem::Version.new('8.1.0.alpha')
+    module JobBuffer
+      @values = Concurrent::Array.new
+
+      class << self
+        def clear
+          @values.clear
+        end
+
+        def add(value)
+          @values << value
+        end
+
+        def values
+          @values.dup
+        end
+      end
+    end
+
+    class TestJob < ActiveJob::Base
+      queue_as :integration_tests
+
+      def perform(message)
+        JobBuffer.add(message)
+      end
+    end
+  end
+
+  let(:worker) { Delayed::Worker.new(:sleep_delay => 0.5, :queues => %w[integration_tests]) }
+
+  before do
+    JobBuffer.clear
+    Delayed::Job.delete_all
+    ActiveJob::Base.queue_adapter = :delayed_job
+    ActiveJob::Base.logger = nil
+  end
+
+  it 'should supply a wrapped class name to DelayedJob' do
+    TestJob.perform_later
+    job = Delayed::Job.all.last
+    expect(job.name).to match(/TestJob \[[0-9a-f-]+\] from DelayedJob\(integration_tests\) with arguments: \[\]/)
+  end
+
+  it 'enqueus and executes the job' do
+    TestJob.perform_later('Rails')
+    worker.work_off
+    expect(JobBuffer.values).to eq(['Rails'])
+  end
+
+  it 'should queue the job on the correct queue' do
+    old_queue = TestJob.queue_name
+    begin
+      TestJob.queue_as :some_other_queue
+      TestJob.perform_later 'Rails'
+      expect(Delayed::Job.all.last.queue).to eq('some_other_queue')
+    ensure
+      TestJob.queue_name = old_queue
+    end
+  end
+
+  it 'runs multiple queued jobs' do
+    ActiveJob.perform_all_later(TestJob.new('Rails'), TestJob.new('World'))
+    worker.work_off
+    expect(JobBuffer.values).to eq(%w[Rails World])
+  end
+
+  it 'should not run job enqueued in the future' do
+    TestJob.set(:wait => 5.seconds).perform_later('Rails')
+
+    worker.work_off
+
+    expect(JobBuffer.values.empty?).to eq true
+  end
+
+  it 'should run job enqueued in the future at the specified time' do
+    TestJob.set(:wait => 5.seconds).perform_later('Rails')
+
+    expect(Delayed::Job.all.last.run_at).to within(1.second).of(5.seconds.from_now)
+  end
+
+  it 'should run job bulk enqueued in the future at the specified time' do
+    ActiveJob.perform_all_later([TestJob.new('Rails').set(:wait => 5.seconds)])
+
+    expect(Delayed::Job.all.last.run_at).to within(1.second).of(5.seconds.from_now)
+  end
+
+  it 'should run job with higher priority first' do
+    wait_until = Time.now
+    TestJob.set(:wait_until => wait_until, :priority => 20).perform_later '1'
+    TestJob.set(:wait_until => wait_until, :priority => 10).perform_later '2'
+
+    worker.work_off
+
+    expect(JobBuffer.values).to eq(%w[2 1])
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job
 version: !ruby/object:Gem::Version
-  version: 4.1.13
+  version: 4.2.0
 platform: ruby
 authors:
 - Brandon Keepers
@@ -12,10 +12,9 @@ authors:
 - Matt Griffin
 - Steve Richert
 - Tobias Lütke
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-08 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -37,6 +36,34 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '9.0'
+- !ruby/object:Gem::Dependency
+  name: benchmark
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Delayed_job (or DJ) encapsulates the common pattern of asynchronously
   executing longer tasks in the background. It is a direct extraction from Shopify
   where the job table is responsible for a multitude of core tasks.
@@ -56,6 +83,7 @@ files:
 - contrib/delayed_job_rails_4.monitrc
 - contrib/delayed_job_rails_4_multiple.monitrc
 - delayed_job.gemspec
+- lib/active_job/queue_adapters/delayed_job_adapter.rb
 - lib/delayed/backend/base.rb
 - lib/delayed/backend/job_preparer.rb
 - lib/delayed/backend/shared_spec.rb
@@ -81,6 +109,7 @@ files:
 - lib/generators/delayed_job/delayed_job_generator.rb
 - lib/generators/delayed_job/templates/script
 - recipes/delayed_job.rb
+- spec/active_job_adapter_spec.rb
 - spec/autoloaded/clazz.rb
 - spec/autoloaded/instance_clazz.rb
 - spec/autoloaded/instance_struct.rb
@@ -106,7 +135,6 @@ metadata:
   changelog_uri: https://github.com/collectiveidea/delayed_job/blob/master/CHANGELOG.md
   bug_tracker_uri: https://github.com/collectiveidea/delayed_job/issues
   source_code_uri: https://github.com/collectiveidea/delayed_job
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -121,11 +149,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key: 
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Database-backed asynchronous priority queue system -- Extracted from Shopify
 test_files:
+- spec/active_job_adapter_spec.rb
 - spec/autoloaded/clazz.rb
 - spec/autoloaded/instance_clazz.rb
 - spec/autoloaded/instance_struct.rb