delayed_job_active_record 4.1.5 → 4.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1799d6d0f6301b5285da09c332bfe6abeb6cfb60b410a29e93f94a99aa0313b7
-  data.tar.gz: a1b0adfed07a2a7f47603390156688e193aed7bcc187184c9812b72e182fb859
+  metadata.gz: 6f3787467e904817090ad112e500a855194661f9295623517cc73c0bbb930c57
+  data.tar.gz: 200346cb19ab7030a82e86c41499220a6aab7e76bec940b14a17b39a96f13490
 SHA512:
-  metadata.gz: c17b88c4d64f8698405c1cf9918b887baecbd2366d42a71d4d02879227d339aba4de0ba3419fc3a4cc0272b193769709efb86fd95f251a08afa4e9c00d07ac58
-  data.tar.gz: 9d8bc65f7e959d71264c8d46d2cff8c2409a975755be9c5a9f0387d033bf1054d76c20e56a0dd685f7556b9cde282dd7c76818f733c9ad9e28fc9e7cbaa67da1
+  metadata.gz: 96b163e6ddbd7dd28c1b8bfd33fcbc7c39ee3b7c66af76774e45f7cf60f88946b26c8afa994af786ce7b4960f33c41209bcc75a99c4c0fd8b023ad83bd737c52
+  data.tar.gz: f149d6efdc7b06935639ea8f57d39f32710f1961f285b9a1baf0afd95c8bd30553d2a2c7e59e9ced337d323008a173832c6724af12d4788976808bb9bfae6f60

data/README.md

@@ -1,7 +1,7 @@
 **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.5).](https://github.com/collectiveidea/delayed_job_active_record/tree/v4.1.5)**
+(4.1.7).](https://github.com/collectiveidea/delayed_job_active_record/tree/v4.1.8)**
 
 # DelayedJob ActiveRecord Backend
 

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.2"]
+  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.5"
+  spec.version        = "4.1.8"
 end

data/lib/delayed/backend/active_record.rb

@@ -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
@@ -172,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/delayed_job_active_record.rb

@@ -1,12 +1,7 @@
 # frozen_string_literal: true
 
+require "active_record"
 require "delayed_job"
+require "delayed/backend/active_record"
 
-if defined?(Rails::Railtie)
-  require "delayed/backend/active_record/railtie"
-else
-  require "active_record"
-  require "delayed/backend/active_record"
-
-  Delayed::Worker.backend = :active_record
-end
+Delayed::Worker.backend = :active_record

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)

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job_active_record
 version: !ruby/object:Gem::Version
-  version: 4.1.5
+  version: 4.1.8
 platform: ruby
 authors:
+- David Genord II
 - Brian Ryckbost
 - Matt Griffin
 - Erik Michaels-Ober
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-09 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.2'
+        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.2'
+        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
@@ -67,7 +69,6 @@ files:
 - README.md
 - delayed_job_active_record.gemspec
 - lib/delayed/backend/active_record.rb
-- lib/delayed/backend/active_record/railtie.rb
 - lib/delayed_job_active_record.rb
 - lib/generators/delayed_job/active_record_generator.rb
 - lib/generators/delayed_job/next_migration_version.rb
@@ -77,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
@@ -93,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: []

data/lib/delayed/backend/active_record/railtie.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-module Delayed
-  module Backend
-    module ActiveRecord
-      class Railtie < ::Rails::Railtie
-        config.after_initialize do
-          require "delayed/backend/active_record"
-          Delayed::Worker.backend = :active_record
-        end
-      end
-    end
-  end
-end