delayed_job_master 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af19b8a7d431072868701600d2298be3df8dbcd67b77b9475ce8ac92299c9a00
-  data.tar.gz: 124d605397464a453c2bf96774c7453cdefd8746696eda34c027f0f8312522cb
+  metadata.gz: 2352f0e35b9bf06ef9362e797ea35d8b848583d03d8aea62235497dc8b938cc9
+  data.tar.gz: 205e1a4b04a8ad361ff0122acc65bcaa02439eaf5bbe91a258652dfa02d79eb9
 SHA512:
-  metadata.gz: f7f4033ac2a0289d098e38c001ffb8fcafbcecda60b757dd1622922f5779850bbf0887ffd45ce135d343ebc3f607c0249517ed8ad7230bbdbe0d55f766ec4942
-  data.tar.gz: 39f656a25a4a1d843749b727e09eace912f55b74fb5bd51d289abc3cc8679de837a95b330b455583a37c0d8b410a94372ce50e53edf3732cd3e0bf707d305de8
+  metadata.gz: f02b0683502467943f0e1e81543705b7d69febdcf22a846d05525a95fa13844552c6d3215df4f2b87fbfdf859d9178eb18350d746a8f92743752ac0cfa2f44f2
+  data.tar.gz: 104a01e051fce6f6fba061c38e1674a8c3a8bd23d9ae367399a9825fc0a560fc8657dd863d6dca053c734761b93160d70b50c5356343ec12320b572b8937f019

data/.github/workflows/ci.yml

@@ -4,27 +4,41 @@ on: [push, pull_request]
 
 jobs:
   test:
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.3, 2.4, 2.5, 2.6, 2.7, 3.0]
-        gemfile: ['rails50', 'rails51', 'rails52', 'rails60', 'rails61']
+        ruby: [2.3, 2.4, 2.5, 2.6, 2.7, '3.0', 3.1]
+        gemfile: ['rails50', 'rails51', 'rails52', 'rails60', 'rails61', 'rails70']
         exclude:
           - ruby: 2.3
             gemfile: rails60
           - ruby: 2.3
             gemfile: rails61
+          - ruby: 2.3
+            gemfile: rails70
           - ruby: 2.4
             gemfile: rails60
           - ruby: 2.4
             gemfile: rails61
+          - ruby: 2.4
+            gemfile: rails70
+          - ruby: 2.5
+            gemfile: rails70
+          - ruby: 2.6
+            gemfile: rails70
           - ruby: 3.0
             gemfile: rails50
           - ruby: 3.0
             gemfile: rails51
           - ruby: 3.0
             gemfile: rails52
+          - ruby: 3.1
+            gemfile: rails50
+          - ruby: 3.1
+            gemfile: rails51
+          - ruby: 3.1
+            gemfile: rails52
 
     name: ruby ${{ matrix.ruby }}, ${{ matrix.gemfile }}
 

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 2.0.3
+
+* Fix database config detection for rails 7.0.
+
 ## 2.0.2
 
 * Force establish_connection after fork.

data/gemfiles/rails60.gemfile

@@ -2,5 +2,6 @@ source 'https://rubygems.org'
 
 gem "delayed_job_active_record", "~> 4.1.0"
 gem "rails", "~> 6.0.0"
+gem "psych", "~> 3.3.0"
 
 gemspec path: "../"

data/gemfiles/rails70.gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem "rails", "~> 7.0.1"
+
+gemspec path: "../"

data/lib/delayed/master/database_detector.rb

@@ -0,0 +1,37 @@
+module Delayed
+  class Master
+    class DatabaseDetector
+      def initialize
+      end
+
+      def call
+        load_spec_names.select { |spec_name| has_delayed_job_table?(spec_name) }
+      end
+
+      private
+
+      def load_spec_names
+        if Rails::VERSION::MAJOR >= 6
+          load_spec_names_from_multi_db_config
+        else
+          [Rails.env.to_sym]
+        end
+      end
+
+      def load_spec_names_from_multi_db_config
+        configs = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env)
+        configs.reject!(&:replica?)
+        if Rails::VERSION::MAJOR == 6
+          configs.map { |c| c.spec_name.to_sym }
+        else
+          configs.map { |c| c.name.to_sym }
+        end
+      end
+
+      def has_delayed_job_table?(spec_name)
+        ActiveRecord::Base.establish_connection(spec_name)
+        ActiveRecord::Base.connection.tables.include?('delayed_jobs')
+      end
+    end
+  end
+end

data/lib/delayed/master/job_checker.rb

@@ -1,4 +1,5 @@
 require_relative 'job_counter'
+require_relative 'database_detector'
 
 module Delayed
   class Master
@@ -58,26 +59,12 @@ module Delayed
 
       def target_spec_names
         if @config.databases.nil? || @config.databases.empty?
-          load_spec_names.select { |spec_name| has_delayed_job_table?(spec_name) }
+          DatabaseDetector.new.call
         else
           @config.databases
         end
       end
 
-      def load_spec_names
-        if Rails::VERSION::MAJOR >= 6
-          configs = ActiveRecord::Base.configurations.configs_for(env_name: Rails.env)
-          configs.reject(&:replica?).map { |c| c.spec_name.to_sym }
-        else
-          [Rails.env.to_sym]
-        end
-      end
-
-      def has_delayed_job_table?(spec_name)
-        ActiveRecord::Base.establish_connection(spec_name)
-        ActiveRecord::Base.connection.tables.include?('delayed_jobs')
-      end
-
       def find_jobs_in_db(spec_name)
         counter = JobCounter.new(model_for(spec_name))
 

data/lib/delayed/master/version.rb

@@ -1,5 +1,5 @@
 module Delayed
   class Master
-    VERSION = "2.0.2"
+    VERSION = "2.0.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job_master
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Yoshikazu Kaneta
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-23 00:00:00.000000000 Z
+date: 2022-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: delayed_job
@@ -144,9 +144,11 @@ files:
 - gemfiles/rails52.gemfile
 - gemfiles/rails60.gemfile
 - gemfiles/rails61.gemfile
+- gemfiles/rails70.gemfile
 - lib/delayed/master.rb
 - lib/delayed/master/command.rb
 - lib/delayed/master/config.rb
+- lib/delayed/master/database_detector.rb
 - lib/delayed/master/forker.rb
 - lib/delayed/master/job_checker.rb
 - lib/delayed/master/job_counter.rb
@@ -182,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: A simple delayed_job master process to control multiple workers