delayed_job_active_record 4.1.4 → 4.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34b98bb9055f3859d08f79f718c41a32010f49af901dc106a71d09599096b2ac
-  data.tar.gz: 917eaf5a7b4e2752a69dcaffa1e24d63d6b258cbfe54c53c8a5014d7c1f02b8e
+  metadata.gz: 6f3787467e904817090ad112e500a855194661f9295623517cc73c0bbb930c57
+  data.tar.gz: 200346cb19ab7030a82e86c41499220a6aab7e76bec940b14a17b39a96f13490
 SHA512:
-  metadata.gz: ad865a5de93e631550580611f794f34847707770bb7c8dbb64dcaa92d9ef36b4168dc618daedb770c9b69fbdd55fff920bc47c0267ca695a568dfeda00a16b34
-  data.tar.gz: f1c84d310f8ccfd17879bd368d3434c764c26341f1fb4035a5f1141ae647773268c1ce2c6e1daee2635e0bcfd73019cc6c220807d38bed8a3ca9618ba5c3de53
+  metadata.gz: 96b163e6ddbd7dd28c1b8bfd33fcbc7c39ee3b7c66af76774e45f7cf60f88946b26c8afa994af786ce7b4960f33c41209bcc75a99c4c0fd8b023ad83bd737c52
+  data.tar.gz: f149d6efdc7b06935639ea8f57d39f32710f1961f285b9a1baf0afd95c8bd30553d2a2c7e59e9ced337d323008a173832c6724af12d4788976808bb9bfae6f60

data/README.md

@@ -1,12 +1,12 @@
 **If you're viewing this at https://github.com/collectiveidea/delayed_job_active_record,
 you're reading the documentation for the master branch.
 [View documentation for the latest release
-(4.1.4).](https://github.com/collectiveidea/delayed_job_active_record/tree/v4.1.4)**
+(4.1.7).](https://github.com/collectiveidea/delayed_job_active_record/tree/v4.1.8)**
 
 # DelayedJob ActiveRecord Backend
 
 [![Gem Version](https://img.shields.io/gem/v/delayed_job_active_record.svg)](https://rubygems.org/gems/delayed_job_active_record)
-[![Build Status](https://img.shields.io/travis/collectiveidea/delayed_job_active_record.svg)](https://travis-ci.org/collectiveidea/delayed_job_active_record)
+![CI](https://github.com/collectiveidea/delayed_job_active_record/workflows/CI/badge.svg)
 [![Coverage Status](https://img.shields.io/coveralls/collectiveidea/delayed_job_active_record.svg)](https://coveralls.io/r/collectiveidea/delayed_job_active_record)
 
 ## Installation

data/delayed_job_active_record.gemspec

@@ -1,16 +1,17 @@
 # frozen_string_literal: true
 
 Gem::Specification.new do |spec|
-  spec.add_dependency "activerecord", [">= 3.0", "< 6.1"]
+  spec.add_dependency "activerecord", [">= 3.0", "< 8.0"]
   spec.add_dependency "delayed_job",  [">= 3.0", "< 5"]
-  spec.authors        = ["Brian Ryckbost", "Matt Griffin", "Erik Michaels-Ober"]
+  spec.authors        = ["David Genord II", "Brian Ryckbost", "Matt Griffin", "Erik Michaels-Ober"]
   spec.description    = "ActiveRecord backend for Delayed::Job, originally authored by Tobias Lütke"
-  spec.email          = ["bryckbost@gmail.com", "matt@griffinonline.org", "sferik@gmail.com"]
+  spec.email          = ["david@collectiveidea.com", "bryckbost@gmail.com", "matt@griffinonline.org", "sferik@gmail.com"]
   spec.files          = %w[CONTRIBUTING.md LICENSE.md README.md delayed_job_active_record.gemspec] + Dir["lib/**/*.rb"]
   spec.homepage       = "http://github.com/collectiveidea/delayed_job_active_record"
   spec.licenses       = ["MIT"]
+  spec.metadata       = { "rubygems_mfa_required" => "true" }
   spec.name           = "delayed_job_active_record"
   spec.require_paths  = ["lib"]
   spec.summary        = "ActiveRecord backend for DelayedJob"
-  spec.version        = "4.1.4"
+  spec.version        = "4.1.8"
 end

data/lib/delayed/backend/active_record.rb

@@ -54,7 +54,7 @@ module Delayed
 
         def self.ready_to_run(worker_name, max_run_time)
           where(
-            "(run_at <= ? AND (locked_at IS NULL OR locked_at < ?) OR locked_by = ?) AND failed_at IS NULL",
+            "((run_at <= ? AND (locked_at IS NULL OR locked_at < ?)) OR locked_by = ?) AND failed_at IS NULL",
             db_time_now,
             db_time_now - max_run_time,
             worker_name
@@ -62,7 +62,7 @@ module Delayed
         end
 
         def self.before_fork
-          ::ActiveRecord::Base.clear_all_connections!
+          ::ActiveRecord::Base.connection_handler.clear_all_connections!
         end
 
         def self.after_fork
@@ -112,8 +112,11 @@ module Delayed
         end
 
         def self.reserve_with_scope_using_default_sql(ready_scope, worker, now)
-          # This is our old fashion, tried and true, but slower lookup
-          ready_scope.limit(worker.read_ahead).detect do |job|
+          # This is our old fashion, tried and true, but possibly slower lookup
+          # Instead of reading the entire job record for our detect loop, we select only the id,
+          # and only read the full job record after we've successfully locked the job.
+          # This can have a noticable impact on large read_ahead configurations and large payload jobs.
+          ready_scope.limit(worker.read_ahead).select(:id).detect do |job|
             count = ready_scope.where(id: job.id).update_all(locked_at: now, locked_by: worker.name)
             count == 1 && job.reload
           end
@@ -169,13 +172,21 @@ module Delayed
         def self.db_time_now
           if Time.zone
             Time.zone.now
-          elsif ::ActiveRecord::Base.default_timezone == :utc
+          elsif default_timezone == :utc
             Time.now.utc
           else
             Time.now # rubocop:disable Rails/TimeZone
           end
         end
 
+        def self.default_timezone
+          if ::ActiveRecord.respond_to?(:default_timezone)
+            ::ActiveRecord.default_timezone
+          else
+            ::ActiveRecord::Base.default_timezone
+          end
+        end
+
         def reload(*args)
           reset
           super

data/lib/generators/delayed_job/next_migration_version.rb

@@ -6,7 +6,14 @@ module DelayedJob
     # since ActiveRecord 3.0
     def next_migration_number(dirname)
       next_migration_number = current_migration_number(dirname) + 1
-      if ActiveRecord::Base.timestamped_migrations
+      timestamped_migrations =
+        if ActiveRecord.respond_to?(:timestamped_migrations)
+          ActiveRecord.timestamped_migrations
+        else
+          ActiveRecord::Base.timestamped_migrations
+        end
+
+      if timestamped_migrations
         [Time.now.utc.strftime("%Y%m%d%H%M%S"), format("%.14d", next_migration_number)].max
       else
         format("%.3d", next_migration_number)

data/lib/generators/delayed_job/templates/migration.rb

@@ -1,6 +1,6 @@
 class CreateDelayedJobs < ActiveRecord::Migration<%= migration_version %>
   def self.up
-    create_table :delayed_jobs, force: true do |table|
+    create_table :delayed_jobs do |table|
       table.integer :priority, default: 0, null: false # Allows some jobs to jump to the front of the queue
       table.integer :attempts, default: 0, null: false # Provides for retries, but still fail eventually.
       table.text :handler,                 null: false # YAML-encoded string of the object that will do work

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job_active_record
 version: !ruby/object:Gem::Version
-  version: 4.1.4
+  version: 4.1.8
 platform: ruby
 authors:
+- David Genord II
 - Brian Ryckbost
 - Matt Griffin
 - Erik Michaels-Ober
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-20 00:00:00.000000000 Z
+date: 2023-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -21,7 +22,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,7 +32,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: delayed_job
   requirement: !ruby/object:Gem::Requirement
@@ -55,6 +56,7 @@ dependencies:
 description: ActiveRecord backend for Delayed::Job, originally authored by Tobias
   Lütke
 email:
+- david@collectiveidea.com
 - bryckbost@gmail.com
 - matt@griffinonline.org
 - sferik@gmail.com
@@ -76,8 +78,9 @@ files:
 homepage: http://github.com/collectiveidea/delayed_job_active_record
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -92,8 +95,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.4.20
+signing_key:
 specification_version: 4
 summary: ActiveRecord backend for DelayedJob
 test_files: []