Sunm 36153/branch 2

.github/workflows/ci.yml

@@ -0,0 +1,92 @@
+name: CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ['2.7', '3.0', '3.1', '3.2', jruby-head, ruby-head]
+        rails_version:
+          - '6.0.0'
+          - '6.1.0'
+          - '7.0.0'
+          - 'edge'
+        include:
+          # Rails 5.2
+          - ruby: 2.6
+            rails_version: '5.2.0'
+          - ruby: 2.7
+            rails_version: '5.2.0'
+          - ruby: jruby-9.2
+            rails_version: '5.2.0'
+
+          # Ruby 2.6
+          - ruby: 2.6
+            rails_version: '6.0.0'
+          - ruby: 2.6
+            rails_version: '6.1.0'
+
+          # jruby-9.2
+          - ruby: jruby-9.2
+            rails_version: '6.0.0'
+          - ruby: jruby-9.2
+            rails_version: '6.1.0'
+
+          # jruby-9.4
+          - ruby: jruby-9.4
+            rails_version: '7.0.0'
+          - ruby: jruby-9.4
+            rails_version: 'edge'
+
+          #
+          # The past
+          #
+          # EOL Active Record
+          - ruby: 2.2
+            rails_version: '3.2.0'
+          - ruby: 2.1
+            rails_version: '4.1.0'
+          - ruby: 2.4
+            rails_version: '4.2.0'
+          - ruby: 2.4
+            rails_version: '5.0.0'
+          - ruby: 2.5
+            rails_version: '5.1.0'
+
+    continue-on-error: ${{ matrix.rails_version == 'edge' || endsWith(matrix.ruby, 'head') }}
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      env:
+        RAILS_VERSION: ${{ matrix.rails_version }}
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      env:
+        RAILS_VERSION: ${{ matrix.rails_version }}
+      run: bundle exec rspec
+    - name: Coveralls Parallel
+      uses: coverallsapp/github-action@master
+      with:
+        github-token: ${{ secrets.github_token }}
+        flag-name: run-${{ matrix.ruby }}-${{ matrix.rails_version }}
+        parallel: true
+
+  finish:
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+    - name: Coveralls Finished
+      uses: coverallsapp/github-action@master
+      with:
+        github-token: ${{ secrets.github_token }}
+        parallel-finished: true

.github/workflows/rubocop.yml

@@ -0,0 +1,30 @@
+name: RuboCop
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby 2.7
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.7
+    - name: Generate lockfile for cache key
+      run: bundle lock
+    - name: Cache gems
+      uses: actions/cache@v1
+      with:
+        path: vendor/bundle
+        key: ${{ runner.os }}-rubocop-${{ hashFiles('**/Gemfile.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-rubocop-
+    - name: Install gems
+      run: |
+        bundle config path vendor/bundle
+        bundle config set without 'default test'
+        bundle install --jobs 4 --retry 3
+    - name: Run RuboCop
+      run: bundle exec rubocop

CHANGELOG.md

@@ -1,10 +1,42 @@
+4.1.11 - 2022-09-28
+===================
+* Fix missing require for Rails 7.0.3+
+
+4.1.10 - 2022-01-17
+===================
+* Support for Rails 7.0. NOTE: If you are using Delayed Job independent of Rails, Active Support 7 has dropped classic dependency autoloading. You will need to add and setup zeitwerk for autoloading to continue working in ActiveSupport 7.
+
+4.1.9 - 2020-12-09
+==================
+* Support for Rails 6.1
+* Add support for parameterized mailers via delay call (#1121)
+
+4.1.8 - 2019-08-16
+==================
+* Support for Rails 6.0.0
+
+4.1.7 - 2019-06-20
+==================
+* Fix loading Delayed::PerformableMailer when ActionMailer isn't loaded yet
+
+4.1.6 - 2019-06-19
+==================
+* Properly initialize ActionMailer outside railties (#1077)
+* Fix Psych load_tags support (#1093)
+* Replace REMOVED with FAILED in log message (#1048)
+* Misc doc updates (#1052, #1074, #1064, #1063)
+
+4.1.5 - 2018-04-13
+==================
+* Allow Rails 5.2
+
 4.1.4 - 2017-12-29
-=================
+==================
 * Use `yaml_tag` instead of deprecated `yaml_as` (#996)
 * Support ruby 2.5.0
 
 4.1.3 - 2017-05-26
-=================
+==================
 * Don't mutate the options hash (#877)
 * Log an error message when a deserialization error occurs (#894)
 * Adding the queue name to the log output (#917)

Gemfile

@@ -3,21 +3,40 @@ source 'https://rubygems.org'
 gem 'rake'
 
 platforms :ruby do
-  gem 'sqlite3'
+  # Rails 5.1 is the first to work with sqlite 1.4
+  # Rails 6 now requires sqlite 1.4
+  if ENV['RAILS_VERSION'] && ENV['RAILS_VERSION'] < '5.1'
+    gem 'sqlite3', '< 1.4'
+  else
+    gem 'sqlite3'
+  end
 end
 
 platforms :jruby do
-  if ENV['RAILS_VERSION'] == '~> 4.2.0'
+  if ENV['RAILS_VERSION'] == '4.2.0'
     gem 'activerecord-jdbcsqlite3-adapter', '< 50.0'
+  elsif ENV['RAILS_VERSION'] == '5.0.0'
+    gem 'activerecord-jdbcsqlite3-adapter', '~> 50.0'
+  elsif ENV['RAILS_VERSION'] == '5.1.0'
+    gem 'activerecord-jdbcsqlite3-adapter', '~> 51.0'
+  elsif ENV['RAILS_VERSION'] == '5.2.0'
+    gem 'activerecord-jdbcsqlite3-adapter', '~> 52.0'
+  elsif ENV['RAILS_VERSION'] == '6.0.0'
+    gem 'activerecord-jdbcsqlite3-adapter', '~> 60.0'
+  elsif ENV['RAILS_VERSION'] == '6.1.0'
+    gem 'activerecord-jdbcsqlite3-adapter', '~> 61.0'
   else
     gem 'activerecord-jdbcsqlite3-adapter'
   end
   gem 'jruby-openssl'
   gem 'mime-types', ['~> 2.6', '< 2.99']
+
   if ENV['RAILS_VERSION'] == 'edge'
     gem 'railties', :github => 'rails/rails'
+  elsif ENV['RAILS_VERSION']
+    gem 'railties', "~> #{ENV['RAILS_VERSION']}"
   else
-    gem 'railties', (ENV['RAILS_VERSION'] || ['>= 3.0', '< 5.2'])
+    gem 'railties', (ENV['RAILS_VERSION'] || ['>= 3.0', '< 6.2'])
   end
 end
 
@@ -29,15 +48,29 @@ group :test do
   if ENV['RAILS_VERSION'] == 'edge'
     gem 'actionmailer', :github => 'rails/rails'
     gem 'activerecord', :github => 'rails/rails'
+  elsif ENV['RAILS_VERSION']
+    gem 'actionmailer', "~> #{ENV['RAILS_VERSION']}"
+    gem 'activerecord', "~> #{ENV['RAILS_VERSION']}"
   else
-    gem 'actionmailer', (ENV['RAILS_VERSION'] || ['>= 3.0', '< 5.2'])
-    gem 'activerecord', (ENV['RAILS_VERSION'] || ['>= 3.0', '< 5.2'])
+    gem 'actionmailer', (ENV['RAILS_VERSION'] || ['>= 3.0', '< 6.2'])
+    gem 'activerecord', (ENV['RAILS_VERSION'] || ['>= 3.0', '< 6.2'])
   end
-
-  gem 'coveralls', :require => false
+  gem 'net-smtp' if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1.0')
   gem 'rspec', '>= 3'
+  gem 'simplecov', :require => false
+  if /\A2.[12]/ =~ RUBY_VERSION
+    # 0.8.0 doesn't work with simplecov < 0.18.0 and older ruby can't run 0.18.0
+    gem 'simplecov-lcov', '< 0.8.0', :require => false
+  else
+    gem 'simplecov-lcov', :require => false
+  end
+  if ENV['RAILS_VERSION'].nil? || ENV['RAILS_VERSION'] >= '6.0.0'
+    gem 'zeitwerk', :require => false
+  end
+end
+
+group :rubocop do
   gem 'rubocop', '>= 0.25', '< 0.49'
-  gem 'simplecov', '>= 0.9'
 end
 
 gemspec

README.md

@@ -1,19 +1,16 @@
 **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.4).](https://github.com/collectiveidea/delayed_job/tree/v4.1.4)**
+(4.1.11).](https://github.com/collectiveidea/delayed_job/tree/v4.1.11)**
 
 Delayed::Job
 ============
-[![Gem Version](https://badge.fury.io/rb/delayed_job.png)][gem]
-[![Build Status](https://travis-ci.org/collectiveidea/delayed_job.png?branch=master)][travis]
-[![Dependency Status](https://gemnasium.com/collectiveidea/delayed_job.png?travis)][gemnasium]
-[![Code Climate](https://codeclimate.com/github/collectiveidea/delayed_job.png)][codeclimate]
-[![Coverage Status](https://coveralls.io/repos/collectiveidea/delayed_job/badge.png?branch=master)][coveralls]
+[![Gem Version](https://badge.fury.io/rb/delayed_job.svg)][gem]
+![CI](https://github.com/collectiveidea/delayed_job/workflows/CI/badge.svg)
+[![Code Climate](https://codeclimate.com/github/collectiveidea/delayed_job.svg)][codeclimate]
+[![Coverage Status](https://coveralls.io/repos/collectiveidea/delayed_job/badge.svg?branch=master)][coveralls]
 
 [gem]: https://rubygems.org/gems/delayed_job
-[travis]: https://travis-ci.org/collectiveidea/delayed_job
-[gemnasium]: https://gemnasium.com/collectiveidea/delayed_job
 [codeclimate]: https://codeclimate.com/github/collectiveidea/delayed_job
 [coveralls]: https://coveralls.io/r/collectiveidea/delayed_job
 
@@ -62,16 +59,16 @@ running the following command:
     rails generate delayed_job:active_record
     rake db:migrate
 
-For Rails 4.2, see [below](#rails-42)
+For Rails 4.2+, see [below](#active-job)
 
 Development
 ===========
 In development mode, if you are using Rails 3.1+, your application code will automatically reload every 100 jobs or when the queue finishes.
 You no longer need to restart Delayed Job every time you update your code in development.
 
-Rails 4.2
-=========
-Set the queue_adapter in config/application.rb
+Active Job
+==========
+In Rails 4.2+, set the queue_adapter in config/application.rb
 
 ```ruby
 config.active_job.queue_adapter = :delayed_job
@@ -170,9 +167,10 @@ end
 
 If you ever want to call a `handle_asynchronously`'d method without Delayed Job, for instance while debugging something at the console, just add `_without_delay` to the method name. For instance, if your original method was `foo`, then call `foo_without_delay`.
 
-Rails 3 Mailers
-===============
-Due to how mailers are implemented in Rails 3, we had to do a little work around to get delayed_job to work.
+Rails Mailers
+=============
+Delayed Job uses special syntax for Rails Mailers.
+Do not call the `.deliver` method when using `.delay`.
 
 ```ruby
 # without delayed_job
@@ -181,12 +179,16 @@ Notifier.signup(@user).deliver
 # with delayed_job
 Notifier.delay.signup(@user)
 
-# with delayed_job running at a specific time
+# delayed_job running at a specific time
 Notifier.delay(run_at: 5.minutes.from_now).signup(@user)
+
+# when using parameters, the .with method must be called before the .delay method
+Notifier.with(foo: 1, bar: 2).delay.signup(@user)
 ```
 
-Remove the `.deliver` method to make it work. It's not ideal, but it's the best
-we could do for now.
+You may also wish to consider using
+[Active Job with Action Mailer](https://edgeguides.rubyonrails.org/active_job_basics.html#action-mailer)
+which provides convenient `.deliver_later` syntax that forwards to Delayed Job under-the-hood.
 
 Named Queues
 ============
@@ -377,6 +379,9 @@ Hooks
 =====
 You can define hooks on your job that will be called at different stages in the process:
 
+
+**NOTE:** If you are using ActiveJob these hooks are **not** available to your jobs. You will need to use ActiveJob's callbacks. You can find details here https://guides.rubyonrails.org/active_job_basics.html#callbacks
+
 ```ruby
 class ParanoidNewsletterJob < NewsletterJob
   def enqueue(job)
@@ -430,7 +435,7 @@ end
 
 On error, the job is scheduled again in 5 seconds + N ** 4, where N is the number of attempts or using the job's defined `reschedule_at` method.
 
-The default `Worker.max_attempts` is 25. After this, the job either deleted (default), or left in the database with "failed_at" set.
+The default `Worker.max_attempts` is 25. After this, the job is either deleted (default), or left in the database with "failed_at" set.
 With the default of 25 attempts, the last retry will be 20 days later, with the last interval being almost 100 hours.
 
 The default `Worker.max_run_time` is 4.hours. If your job takes longer than that, another computer could pick it up. It's up to you to