Merge pull request #19 from insales/allow_rails8

Allow and test on rails 8
insales · Nov 14, 2024 · 0688c83 · 0688c83
2 parents 2c920ec + b212e11
commit 0688c83
Show file tree

Hide file tree

Showing 10 changed files with 179 additions and 6 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -6,8 +6,11 @@ jobs:
 
     strategy:
       matrix:
-        ruby-version: [3.3.4]
-        rails-version: [71, 72]
+        ruby-version: [3.3.6]
+        rails-version:
+          - 71
+          - 72
+          - 80
         include:
           - ruby-version: 3.2.4
             rails-version: 70

diff --git a/Appraisals b/Appraisals
@@ -11,3 +11,7 @@ end
 appraise 'rails_72' do
   gem 'activerecord', '~>7.2.1'
 end
+
+appraise 'rails_80' do
+  gem 'activerecord', '~>8.0.0'
+end
diff --git a/delayed_job.gemspec b/delayed_job.gemspec
@@ -13,8 +13,9 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files -z`.split("\x0").reject { |file| file.start_with?('.') || file.match(%r{^spec/}) }
   s.require_paths = ['lib']
 
-  s.add_dependency 'activerecord', '>= 7', '< 7.3'
+  s.add_dependency 'activerecord', '>= 7', '< 8.1'
   s.add_dependency 'railties'
+  s.add_dependency 'benchmark'
 
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'rake'

diff --git a/gemfiles/rails_70.gemfile.lock b/gemfiles/rails_70.gemfile.lock
@@ -2,7 +2,8 @@ PATH
   remote: ..
   specs:
     delayed_job (1.7.0)
-      activerecord (>= 7, < 7.3)
+      activerecord (>= 7, < 8.1)
+      benchmark
       railties
 
 GEM
@@ -31,6 +32,7 @@ GEM
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
+    benchmark (0.4.0)
     builder (3.3.0)
     concurrent-ruby (1.3.4)
     crass (1.0.6)
@@ -47,6 +49,8 @@ GEM
     nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
+    nokogiri (1.16.7-arm64-darwin)
+      racc (~> 1.4)
     nokogiri (1.16.7-x86_64-linux)
       racc (~> 1.4)
     pg (1.5.7)
@@ -84,13 +88,15 @@ GEM
     rspec-support (3.13.1)
     sqlite3 (2.0.4)
       mini_portile2 (~> 2.8.0)
+    sqlite3 (2.0.4-arm64-darwin)
     sqlite3 (2.0.4-x86_64-linux-gnu)
     thor (1.3.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     zeitwerk (2.6.18)
 
 PLATFORMS
+  arm64-darwin-23
   ruby
   x86_64-linux
 

diff --git a/gemfiles/rails_71.gemfile.lock b/gemfiles/rails_71.gemfile.lock
@@ -2,7 +2,8 @@ PATH
   remote: ..
   specs:
     delayed_job (1.7.0)
-      activerecord (>= 7, < 7.3)
+      activerecord (>= 7, < 8.1)
+      benchmark
       railties
 
 GEM
@@ -41,6 +42,7 @@ GEM
       mutex_m
       tzinfo (~> 2.0)
     base64 (0.2.0)
+    benchmark (0.4.0)
     bigdecimal (3.1.8)
     builder (3.3.0)
     concurrent-ruby (1.3.4)

diff --git a/gemfiles/rails_72.gemfile.lock b/gemfiles/rails_72.gemfile.lock
@@ -2,7 +2,8 @@ PATH
   remote: ..
   specs:
     delayed_job (1.7.0)
-      activerecord (>= 7, < 7.3)
+      activerecord (>= 7, < 8.1)
+      benchmark
       railties
 
 GEM
@@ -43,6 +44,7 @@ GEM
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
     base64 (0.2.0)
+    benchmark (0.4.0)
     bigdecimal (3.1.8)
     builder (3.3.0)
     concurrent-ruby (1.3.4)

diff --git a/gemfiles/rails_80.gemfile b/gemfiles/rails_80.gemfile
@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "pg", "~> 1.1"
+gem "sqlite3"
+gem "rspec"
+gem "activerecord", "~>8.0.0"
+
+gemspec path: "../"
diff --git a/gemfiles/rails_80.gemfile.lock b/gemfiles/rails_80.gemfile.lock
@@ -0,0 +1,142 @@
+PATH
+  remote: ..
+  specs:
+    delayed_job (1.7.0)
+      activerecord (>= 7, < 8.1)
+      benchmark
+      railties
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionpack (8.0.0)
+      actionview (= 8.0.0)
+      activesupport (= 8.0.0)
+      nokogiri (>= 1.8.5)
+      rack (>= 2.2.4)
+      rack-session (>= 1.0.1)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+      useragent (~> 0.16)
+    actionview (8.0.0)
+      activesupport (= 8.0.0)
+      builder (~> 3.1)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activemodel (8.0.0)
+      activesupport (= 8.0.0)
+    activerecord (8.0.0)
+      activemodel (= 8.0.0)
+      activesupport (= 8.0.0)
+      timeout (>= 0.4.0)
+    activesupport (8.0.0)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
+      minitest (>= 5.1)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
+    base64 (0.2.0)
+    benchmark (0.4.0)
+    bigdecimal (3.1.8)
+    builder (3.3.0)
+    concurrent-ruby (1.3.4)
+    connection_pool (2.4.1)
+    crass (1.0.6)
+    diff-lcs (1.5.1)
+    drb (2.2.1)
+    erubi (1.13.0)
+    i18n (1.14.6)
+      concurrent-ruby (~> 1.0)
+    io-console (0.7.2)
+    irb (1.14.1)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    logger (1.6.1)
+    loofah (2.23.1)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.12.0)
+    minitest (5.25.1)
+    nokogiri (1.16.7-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.16.7-x86_64-linux)
+      racc (~> 1.4)
+    pg (1.5.9)
+    psych (5.2.0)
+      stringio
+    racc (1.8.1)
+    rack (3.1.8)
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rackup (2.2.0)
+      rack (>= 3)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    railties (8.0.0)
+      actionpack (= 8.0.0)
+      activesupport (= 8.0.0)
+      irb (~> 1.13)
+      rackup (>= 1.0.0)
+      rake (>= 12.2)
+      thor (~> 1.0, >= 1.2.2)
+      zeitwerk (~> 2.6)
+    rake (13.2.1)
+    rdoc (6.7.0)
+      psych (>= 4.0.0)
+    reline (0.5.11)
+      io-console (~> 0.5)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.2)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    securerandom (0.3.2)
+    sqlite3 (2.2.0-arm64-darwin)
+    sqlite3 (2.2.0-x86_64-linux-gnu)
+    stringio (3.1.2)
+    thor (1.3.2)
+    timeout (0.4.2)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    uri (1.0.1)
+    useragent (0.16.10)
+    zeitwerk (2.7.1)
+
+PLATFORMS
+  arm64-darwin-23
+  x86_64-linux
+
+DEPENDENCIES
+  activerecord (~> 8.0.0)
+  bundler
+  delayed_job!
+  pg (~> 1.1)
+  rake
+  rspec
+  sqlite3
+
+BUNDLED WITH
+   2.4.19
diff --git a/lib/delayed/job.rb b/lib/delayed/job.rb
@@ -1,4 +1,5 @@
 require 'active_record'
+require 'benchmark'
 require 'socket'
 
 module Delayed

diff --git a/lib/delayed/worker.rb b/lib/delayed/worker.rb
@@ -1,3 +1,5 @@
+require 'benchmark'
+
 module Delayed
   class Worker
     SLEEP = 5