From c8d2a061caa1eb3d4a81b762db450bc2cdc7872c Mon Sep 17 00:00:00 2001 From: Harry Lascelles Date: Sun, 10 May 2020 20:03:16 +0100 Subject: [PATCH] Adding back in queue names support in Rails 6 Adding back in queue names support in Rails 6 --- Appraisals | 20 +- CHANGELOG.md | 3 +- Gemfile.lock | 12 +- .../activesupport_4_que_0_12.gemfile.lock | 22 +- .../activesupport_4_que_0_14.gemfile.lock | 22 +- gemfiles/activesupport_4_que_1_x.gemfile.lock | 22 +- .../activesupport_5_que_0_12.gemfile.lock | 22 +- ...esupport_5_que_0_12_activejob.gemfile.lock | 22 +- .../activesupport_5_que_0_14.gemfile.lock | 22 +- ...esupport_5_que_0_14_activejob.gemfile.lock | 22 +- gemfiles/activesupport_5_que_1_x.gemfile.lock | 22 +- ...vesupport_5_que_1_x_activejob.gemfile.lock | 22 +- .../activesupport_6_que_0_14.gemfile.lock | 52 ++--- ...esupport_6_que_0_14_activejob.gemfile.lock | 56 ++--- gemfiles/activesupport_6_que_1_x.gemfile.lock | 52 ++--- ...ith_queue_names_que_0_14_activejob.gemfile | 9 + ...ueue_names_que_0_14_activejob.gemfile.lock | 197 ++++++++++++++++++ ...with_queue_names_que_1_x_activejob.gemfile | 9 + ...ueue_names_que_1_x_activejob.gemfile.lock} | 58 +++--- ...without_queue_names_1_x_activejob.gemfile} | 2 +- ...out_queue_names_1_x_activejob.gemfile.lock | 197 ++++++++++++++++++ ...out_queue_names_que_0_14_activejob.gemfile | 9 + ...ueue_names_que_0_14_activejob.gemfile.lock | 197 ++++++++++++++++++ lib/que/scheduler/to_enqueue.rb | 17 +- spec/support/to_enqueue_test_support.rb | 6 +- 25 files changed, 864 insertions(+), 230 deletions(-) create mode 100644 gemfiles/activesupport_6_with_queue_names_que_0_14_activejob.gemfile create mode 100644 gemfiles/activesupport_6_with_queue_names_que_0_14_activejob.gemfile.lock create mode 100644 gemfiles/activesupport_6_with_queue_names_que_1_x_activejob.gemfile rename gemfiles/{activesupport_6_que_1_x_activejob.gemfile.lock => activesupport_6_with_queue_names_que_1_x_activejob.gemfile.lock} (82%) rename gemfiles/{activesupport_6_que_1_x_activejob.gemfile => activesupport_6_without_queue_names_1_x_activejob.gemfile} (84%) create mode 100644 gemfiles/activesupport_6_without_queue_names_1_x_activejob.gemfile.lock create mode 100644 gemfiles/activesupport_6_without_queue_names_que_0_14_activejob.gemfile create mode 100644 gemfiles/activesupport_6_without_queue_names_que_0_14_activejob.gemfile.lock diff --git a/Appraisals b/Appraisals index 86a3eb2e..13a947f8 100644 --- a/Appraisals +++ b/Appraisals @@ -41,10 +41,16 @@ appraise 'activesupport-6-que-0-14' do gem 'que', '~> 0.14' end -appraise 'activesupport-6-que-0-14-activejob' do +appraise 'activesupport-6-without-queue-names-que-0-14-activejob' do gem 'activesupport', '~> 6.0' gem 'que', '~> 0.14' - gem 'activejob', '~> 6.0' + gem 'activejob', '6.0.2' +end + +appraise 'activesupport-6-with-queue-names-que-0-14-activejob' do + gem 'activesupport', '~> 6.0' + gem 'que', '~> 0.14' + gem 'activejob', '~> 6.0', '>= 6.0.3' end appraise 'activesupport-4-que-1-x' do @@ -68,8 +74,14 @@ appraise 'activesupport-6-que-1-x' do gem 'que', '1.0.0.beta4' end -appraise 'activesupport-6-que-1-x-activejob' do +appraise 'activesupport-6-without-queue-names-1-x-activejob' do + gem 'activesupport', '~> 6.0' + gem 'que', '1.0.0.beta4' + gem 'activejob', '6.0.2' +end + +appraise 'activesupport-6-with-queue-names-que-1-x-activejob' do gem 'activesupport', '~> 6.0' gem 'que', '1.0.0.beta4' - gem 'activejob', '~> 6.0' + gem 'activejob', '~> 6.0', '>= 6.0.3' end diff --git a/CHANGELOG.md b/CHANGELOG.md index a6113398..24e0d2ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ -## +## Unreleased +- Include new support for queue names in Rails 6 [#180](https://github.com/hlascelles/que-scheduler/pull/180) - Remove backports gem [#170](https://github.com/hlascelles/que-scheduler/pull/170) ## 3.3.0 (2020-04-04) diff --git a/Gemfile.lock b/Gemfile.lock index 8fe7b335..65736b5b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -40,7 +40,7 @@ GEM thor (>= 0.14.0) ast (2.4.0) builder (3.2.4) - byebug (11.1.1) + byebug (11.1.3) coderay (1.1.2) colorize (0.8.1) combustion (1.3.0) @@ -93,7 +93,7 @@ GEM pry (~> 0.13.0) psych (3.1.0) que (0.14.3) - raabro (1.1.6) + raabro (1.3.1) rack (2.2.2) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -120,15 +120,15 @@ GEM rspec-core (~> 3.9.0) rspec-expectations (~> 3.9.0) rspec-mocks (~> 3.9.0) - rspec-core (3.9.1) - rspec-support (~> 3.9.1) - rspec-expectations (3.9.1) + rspec-core (3.9.2) + rspec-support (~> 3.9.3) + rspec-expectations (3.9.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-mocks (3.9.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) - rspec-support (3.9.2) + rspec-support (3.9.3) rubocop (0.80.1) jaro_winkler (~> 1.5.1) parallel (~> 1.10) diff --git a/gemfiles/activesupport_4_que_0_12.gemfile.lock b/gemfiles/activesupport_4_que_0_12.gemfile.lock index 523ec9c7..9871d140 100644 --- a/gemfiles/activesupport_4_que_0_12.gemfile.lock +++ b/gemfiles/activesupport_4_que_0_12.gemfile.lock @@ -42,10 +42,10 @@ GEM arel (6.0.4) ast (2.4.0) builder (3.2.4) - byebug (11.1.1) + byebug (11.1.3) coderay (1.1.2) colorize (0.8.1) - combustion (1.1.2) + combustion (1.3.0) activesupport (>= 3.0.0) railties (>= 3.0.0) thor (>= 0.14.6) @@ -57,7 +57,7 @@ GEM thor (>= 0.19.4, < 2.0) tins (~> 1.6) crass (1.0.6) - database_cleaner (1.8.4) + database_cleaner (1.8.5) diff-lcs (1.3) docile (1.3.2) erubis (2.7.0) @@ -66,7 +66,7 @@ GEM fasterer (0.8.3) colorize (~> 0.7) ruby_parser (>= 3.14.1) - fugit (1.3.4) + fugit (1.3.5) et-orbi (~> 1.1, >= 1.1.8) raabro (~> 1.1) hashie (4.1.0) @@ -84,7 +84,7 @@ GEM nokogiri (1.10.9) mini_portile2 (~> 2.4.0) parallel (1.19.1) - parser (2.7.1.0) + parser (2.7.1.2) ast (~> 2.4.0) pg (0.21.0) pry (0.13.1) @@ -95,7 +95,7 @@ GEM pry (~> 0.13.0) psych (3.1.0) que (0.12.3) - raabro (1.1.6) + raabro (1.3.1) rack (1.6.13) rack-test (0.6.3) rack (>= 1.0) @@ -124,15 +124,15 @@ GEM rspec-core (~> 3.9.0) rspec-expectations (~> 3.9.0) rspec-mocks (~> 3.9.0) - rspec-core (3.9.1) - rspec-support (~> 3.9.1) - rspec-expectations (3.9.1) + rspec-core (3.9.2) + rspec-support (~> 3.9.3) + rspec-expectations (3.9.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-mocks (3.9.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) - rspec-support (3.9.2) + rspec-support (3.9.3) rubocop (0.80.1) jaro_winkler (~> 1.5.1) parallel (~> 1.10) @@ -141,7 +141,7 @@ GEM rexml ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) - rubocop-rspec (1.38.1) + rubocop-rspec (1.39.0) rubocop (>= 0.68.1) ruby-progressbar (1.10.1) ruby_parser (3.14.2) diff --git a/gemfiles/activesupport_4_que_0_14.gemfile.lock b/gemfiles/activesupport_4_que_0_14.gemfile.lock index 7e8c67d0..0cb142ea 100644 --- a/gemfiles/activesupport_4_que_0_14.gemfile.lock +++ b/gemfiles/activesupport_4_que_0_14.gemfile.lock @@ -42,10 +42,10 @@ GEM arel (6.0.4) ast (2.4.0) builder (3.2.4) - byebug (11.1.1) + byebug (11.1.3) coderay (1.1.2) colorize (0.8.1) - combustion (1.1.2) + combustion (1.3.0) activesupport (>= 3.0.0) railties (>= 3.0.0) thor (>= 0.14.6) @@ -57,7 +57,7 @@ GEM thor (>= 0.19.4, < 2.0) tins (~> 1.6) crass (1.0.6) - database_cleaner (1.8.4) + database_cleaner (1.8.5) diff-lcs (1.3) docile (1.3.2) erubis (2.7.0) @@ -66,7 +66,7 @@ GEM fasterer (0.8.3) colorize (~> 0.7) ruby_parser (>= 3.14.1) - fugit (1.3.4) + fugit (1.3.5) et-orbi (~> 1.1, >= 1.1.8) raabro (~> 1.1) hashie (4.1.0) @@ -84,7 +84,7 @@ GEM nokogiri (1.10.9) mini_portile2 (~> 2.4.0) parallel (1.19.1) - parser (2.7.1.0) + parser (2.7.1.2) ast (~> 2.4.0) pg (0.21.0) pry (0.13.1) @@ -95,7 +95,7 @@ GEM pry (~> 0.13.0) psych (3.1.0) que (0.14.3) - raabro (1.1.6) + raabro (1.3.1) rack (1.6.13) rack-test (0.6.3) rack (>= 1.0) @@ -124,15 +124,15 @@ GEM rspec-core (~> 3.9.0) rspec-expectations (~> 3.9.0) rspec-mocks (~> 3.9.0) - rspec-core (3.9.1) - rspec-support (~> 3.9.1) - rspec-expectations (3.9.1) + rspec-core (3.9.2) + rspec-support (~> 3.9.3) + rspec-expectations (3.9.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-mocks (3.9.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) - rspec-support (3.9.2) + rspec-support (3.9.3) rubocop (0.80.1) jaro_winkler (~> 1.5.1) parallel (~> 1.10) @@ -141,7 +141,7 @@ GEM rexml ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) - rubocop-rspec (1.38.1) + rubocop-rspec (1.39.0) rubocop (>= 0.68.1) ruby-progressbar (1.10.1) ruby_parser (3.14.2) diff --git a/gemfiles/activesupport_4_que_1_x.gemfile.lock b/gemfiles/activesupport_4_que_1_x.gemfile.lock index e9889a74..0a5ad2fb 100644 --- a/gemfiles/activesupport_4_que_1_x.gemfile.lock +++ b/gemfiles/activesupport_4_que_1_x.gemfile.lock @@ -42,10 +42,10 @@ GEM arel (6.0.4) ast (2.4.0) builder (3.2.4) - byebug (11.1.1) + byebug (11.1.3) coderay (1.1.2) colorize (0.8.1) - combustion (1.1.2) + combustion (1.3.0) activesupport (>= 3.0.0) railties (>= 3.0.0) thor (>= 0.14.6) @@ -57,7 +57,7 @@ GEM thor (>= 0.19.4, < 2.0) tins (~> 1.6) crass (1.0.6) - database_cleaner (1.8.4) + database_cleaner (1.8.5) diff-lcs (1.3) docile (1.3.2) erubis (2.7.0) @@ -66,7 +66,7 @@ GEM fasterer (0.8.3) colorize (~> 0.7) ruby_parser (>= 3.14.1) - fugit (1.3.4) + fugit (1.3.5) et-orbi (~> 1.1, >= 1.1.8) raabro (~> 1.1) hashie (4.1.0) @@ -84,7 +84,7 @@ GEM nokogiri (1.10.9) mini_portile2 (~> 2.4.0) parallel (1.19.1) - parser (2.7.1.0) + parser (2.7.1.2) ast (~> 2.4.0) pg (0.21.0) pry (0.13.1) @@ -95,7 +95,7 @@ GEM pry (~> 0.13.0) psych (3.1.0) que (1.0.0.beta4) - raabro (1.1.6) + raabro (1.3.1) rack (1.6.13) rack-test (0.6.3) rack (>= 1.0) @@ -124,15 +124,15 @@ GEM rspec-core (~> 3.9.0) rspec-expectations (~> 3.9.0) rspec-mocks (~> 3.9.0) - rspec-core (3.9.1) - rspec-support (~> 3.9.1) - rspec-expectations (3.9.1) + rspec-core (3.9.2) + rspec-support (~> 3.9.3) + rspec-expectations (3.9.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-mocks (3.9.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) - rspec-support (3.9.2) + rspec-support (3.9.3) rubocop (0.80.1) jaro_winkler (~> 1.5.1) parallel (~> 1.10) @@ -141,7 +141,7 @@ GEM rexml ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) - rubocop-rspec (1.38.1) + rubocop-rspec (1.39.0) rubocop (>= 0.68.1) ruby-progressbar (1.10.1) ruby_parser (3.14.2) diff --git a/gemfiles/activesupport_5_que_0_12.gemfile.lock b/gemfiles/activesupport_5_que_0_12.gemfile.lock index 12478243..9b7c0775 100644 --- a/gemfiles/activesupport_5_que_0_12.gemfile.lock +++ b/gemfiles/activesupport_5_que_0_12.gemfile.lock @@ -41,10 +41,10 @@ GEM arel (9.0.0) ast (2.4.0) builder (3.2.4) - byebug (11.1.1) + byebug (11.1.3) coderay (1.1.2) colorize (0.8.1) - combustion (1.1.2) + combustion (1.3.0) activesupport (>= 3.0.0) railties (>= 3.0.0) thor (>= 0.14.6) @@ -56,7 +56,7 @@ GEM thor (>= 0.19.4, < 2.0) tins (~> 1.6) crass (1.0.6) - database_cleaner (1.8.4) + database_cleaner (1.8.5) diff-lcs (1.3) docile (1.3.2) erubi (1.9.0) @@ -65,7 +65,7 @@ GEM fasterer (0.8.3) colorize (~> 0.7) ruby_parser (>= 3.14.1) - fugit (1.3.4) + fugit (1.3.5) et-orbi (~> 1.1, >= 1.1.8) raabro (~> 1.1) hashie (4.1.0) @@ -83,7 +83,7 @@ GEM nokogiri (1.10.9) mini_portile2 (~> 2.4.0) parallel (1.19.1) - parser (2.7.1.0) + parser (2.7.1.2) ast (~> 2.4.0) pg (0.21.0) pry (0.13.1) @@ -94,7 +94,7 @@ GEM pry (~> 0.13.0) psych (3.1.0) que (0.12.3) - raabro (1.1.6) + raabro (1.3.1) rack (2.2.2) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -121,15 +121,15 @@ GEM rspec-core (~> 3.9.0) rspec-expectations (~> 3.9.0) rspec-mocks (~> 3.9.0) - rspec-core (3.9.1) - rspec-support (~> 3.9.1) - rspec-expectations (3.9.1) + rspec-core (3.9.2) + rspec-support (~> 3.9.3) + rspec-expectations (3.9.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-mocks (3.9.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) - rspec-support (3.9.2) + rspec-support (3.9.3) rubocop (0.80.1) jaro_winkler (~> 1.5.1) parallel (~> 1.10) @@ -138,7 +138,7 @@ GEM rexml ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) - rubocop-rspec (1.38.1) + rubocop-rspec (1.39.0) rubocop (>= 0.68.1) ruby-progressbar (1.10.1) ruby_parser (3.14.2) diff --git a/gemfiles/activesupport_5_que_0_12_activejob.gemfile.lock b/gemfiles/activesupport_5_que_0_12_activejob.gemfile.lock index 562143b8..590fd9fd 100644 --- a/gemfiles/activesupport_5_que_0_12_activejob.gemfile.lock +++ b/gemfiles/activesupport_5_que_0_12_activejob.gemfile.lock @@ -44,10 +44,10 @@ GEM arel (9.0.0) ast (2.4.0) builder (3.2.4) - byebug (11.1.1) + byebug (11.1.3) coderay (1.1.2) colorize (0.8.1) - combustion (1.1.2) + combustion (1.3.0) activesupport (>= 3.0.0) railties (>= 3.0.0) thor (>= 0.14.6) @@ -59,7 +59,7 @@ GEM thor (>= 0.19.4, < 2.0) tins (~> 1.6) crass (1.0.6) - database_cleaner (1.8.4) + database_cleaner (1.8.5) diff-lcs (1.3) docile (1.3.2) erubi (1.9.0) @@ -68,7 +68,7 @@ GEM fasterer (0.8.3) colorize (~> 0.7) ruby_parser (>= 3.14.1) - fugit (1.3.4) + fugit (1.3.5) et-orbi (~> 1.1, >= 1.1.8) raabro (~> 1.1) globalid (0.4.2) @@ -88,7 +88,7 @@ GEM nokogiri (1.10.9) mini_portile2 (~> 2.4.0) parallel (1.19.1) - parser (2.7.1.0) + parser (2.7.1.2) ast (~> 2.4.0) pg (0.21.0) pry (0.13.1) @@ -99,7 +99,7 @@ GEM pry (~> 0.13.0) psych (3.1.0) que (0.12.3) - raabro (1.1.6) + raabro (1.3.1) rack (2.2.2) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -126,15 +126,15 @@ GEM rspec-core (~> 3.9.0) rspec-expectations (~> 3.9.0) rspec-mocks (~> 3.9.0) - rspec-core (3.9.1) - rspec-support (~> 3.9.1) - rspec-expectations (3.9.1) + rspec-core (3.9.2) + rspec-support (~> 3.9.3) + rspec-expectations (3.9.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-mocks (3.9.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) - rspec-support (3.9.2) + rspec-support (3.9.3) rubocop (0.80.1) jaro_winkler (~> 1.5.1) parallel (~> 1.10) @@ -143,7 +143,7 @@ GEM rexml ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) - rubocop-rspec (1.38.1) + rubocop-rspec (1.39.0) rubocop (>= 0.68.1) ruby-progressbar (1.10.1) ruby_parser (3.14.2) diff --git a/gemfiles/activesupport_5_que_0_14.gemfile.lock b/gemfiles/activesupport_5_que_0_14.gemfile.lock index 557ac0d9..bb188d50 100644 --- a/gemfiles/activesupport_5_que_0_14.gemfile.lock +++ b/gemfiles/activesupport_5_que_0_14.gemfile.lock @@ -41,10 +41,10 @@ GEM arel (9.0.0) ast (2.4.0) builder (3.2.4) - byebug (11.1.1) + byebug (11.1.3) coderay (1.1.2) colorize (0.8.1) - combustion (1.1.2) + combustion (1.3.0) activesupport (>= 3.0.0) railties (>= 3.0.0) thor (>= 0.14.6) @@ -56,7 +56,7 @@ GEM thor (>= 0.19.4, < 2.0) tins (~> 1.6) crass (1.0.6) - database_cleaner (1.8.4) + database_cleaner (1.8.5) diff-lcs (1.3) docile (1.3.2) erubi (1.9.0) @@ -65,7 +65,7 @@ GEM fasterer (0.8.3) colorize (~> 0.7) ruby_parser (>= 3.14.1) - fugit (1.3.4) + fugit (1.3.5) et-orbi (~> 1.1, >= 1.1.8) raabro (~> 1.1) hashie (4.1.0) @@ -83,7 +83,7 @@ GEM nokogiri (1.10.9) mini_portile2 (~> 2.4.0) parallel (1.19.1) - parser (2.7.1.0) + parser (2.7.1.2) ast (~> 2.4.0) pg (0.21.0) pry (0.13.1) @@ -94,7 +94,7 @@ GEM pry (~> 0.13.0) psych (3.1.0) que (0.14.3) - raabro (1.1.6) + raabro (1.3.1) rack (2.2.2) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -121,15 +121,15 @@ GEM rspec-core (~> 3.9.0) rspec-expectations (~> 3.9.0) rspec-mocks (~> 3.9.0) - rspec-core (3.9.1) - rspec-support (~> 3.9.1) - rspec-expectations (3.9.1) + rspec-core (3.9.2) + rspec-support (~> 3.9.3) + rspec-expectations (3.9.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-mocks (3.9.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) - rspec-support (3.9.2) + rspec-support (3.9.3) rubocop (0.80.1) jaro_winkler (~> 1.5.1) parallel (~> 1.10) @@ -138,7 +138,7 @@ GEM rexml ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) - rubocop-rspec (1.38.1) + rubocop-rspec (1.39.0) rubocop (>= 0.68.1) ruby-progressbar (1.10.1) ruby_parser (3.14.2) diff --git a/gemfiles/activesupport_5_que_0_14_activejob.gemfile.lock b/gemfiles/activesupport_5_que_0_14_activejob.gemfile.lock index e04734bb..e6b42f23 100644 --- a/gemfiles/activesupport_5_que_0_14_activejob.gemfile.lock +++ b/gemfiles/activesupport_5_que_0_14_activejob.gemfile.lock @@ -44,10 +44,10 @@ GEM arel (9.0.0) ast (2.4.0) builder (3.2.4) - byebug (11.1.1) + byebug (11.1.3) coderay (1.1.2) colorize (0.8.1) - combustion (1.1.2) + combustion (1.3.0) activesupport (>= 3.0.0) railties (>= 3.0.0) thor (>= 0.14.6) @@ -59,7 +59,7 @@ GEM thor (>= 0.19.4, < 2.0) tins (~> 1.6) crass (1.0.6) - database_cleaner (1.8.4) + database_cleaner (1.8.5) diff-lcs (1.3) docile (1.3.2) erubi (1.9.0) @@ -68,7 +68,7 @@ GEM fasterer (0.8.3) colorize (~> 0.7) ruby_parser (>= 3.14.1) - fugit (1.3.4) + fugit (1.3.5) et-orbi (~> 1.1, >= 1.1.8) raabro (~> 1.1) globalid (0.4.2) @@ -88,7 +88,7 @@ GEM nokogiri (1.10.9) mini_portile2 (~> 2.4.0) parallel (1.19.1) - parser (2.7.1.0) + parser (2.7.1.2) ast (~> 2.4.0) pg (0.21.0) pry (0.13.1) @@ -99,7 +99,7 @@ GEM pry (~> 0.13.0) psych (3.1.0) que (0.14.3) - raabro (1.1.6) + raabro (1.3.1) rack (2.2.2) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -126,15 +126,15 @@ GEM rspec-core (~> 3.9.0) rspec-expectations (~> 3.9.0) rspec-mocks (~> 3.9.0) - rspec-core (3.9.1) - rspec-support (~> 3.9.1) - rspec-expectations (3.9.1) + rspec-core (3.9.2) + rspec-support (~> 3.9.3) + rspec-expectations (3.9.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-mocks (3.9.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) - rspec-support (3.9.2) + rspec-support (3.9.3) rubocop (0.80.1) jaro_winkler (~> 1.5.1) parallel (~> 1.10) @@ -143,7 +143,7 @@ GEM rexml ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) - rubocop-rspec (1.38.1) + rubocop-rspec (1.39.0) rubocop (>= 0.68.1) ruby-progressbar (1.10.1) ruby_parser (3.14.2) diff --git a/gemfiles/activesupport_5_que_1_x.gemfile.lock b/gemfiles/activesupport_5_que_1_x.gemfile.lock index 3bbc286b..a03cd9b8 100644 --- a/gemfiles/activesupport_5_que_1_x.gemfile.lock +++ b/gemfiles/activesupport_5_que_1_x.gemfile.lock @@ -41,10 +41,10 @@ GEM arel (9.0.0) ast (2.4.0) builder (3.2.4) - byebug (11.1.1) + byebug (11.1.3) coderay (1.1.2) colorize (0.8.1) - combustion (1.1.2) + combustion (1.3.0) activesupport (>= 3.0.0) railties (>= 3.0.0) thor (>= 0.14.6) @@ -56,7 +56,7 @@ GEM thor (>= 0.19.4, < 2.0) tins (~> 1.6) crass (1.0.6) - database_cleaner (1.8.4) + database_cleaner (1.8.5) diff-lcs (1.3) docile (1.3.2) erubi (1.9.0) @@ -65,7 +65,7 @@ GEM fasterer (0.8.3) colorize (~> 0.7) ruby_parser (>= 3.14.1) - fugit (1.3.4) + fugit (1.3.5) et-orbi (~> 1.1, >= 1.1.8) raabro (~> 1.1) hashie (4.1.0) @@ -83,7 +83,7 @@ GEM nokogiri (1.10.9) mini_portile2 (~> 2.4.0) parallel (1.19.1) - parser (2.7.1.0) + parser (2.7.1.2) ast (~> 2.4.0) pg (0.21.0) pry (0.13.1) @@ -94,7 +94,7 @@ GEM pry (~> 0.13.0) psych (3.1.0) que (1.0.0.beta4) - raabro (1.1.6) + raabro (1.3.1) rack (2.2.2) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -121,15 +121,15 @@ GEM rspec-core (~> 3.9.0) rspec-expectations (~> 3.9.0) rspec-mocks (~> 3.9.0) - rspec-core (3.9.1) - rspec-support (~> 3.9.1) - rspec-expectations (3.9.1) + rspec-core (3.9.2) + rspec-support (~> 3.9.3) + rspec-expectations (3.9.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-mocks (3.9.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) - rspec-support (3.9.2) + rspec-support (3.9.3) rubocop (0.80.1) jaro_winkler (~> 1.5.1) parallel (~> 1.10) @@ -138,7 +138,7 @@ GEM rexml ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) - rubocop-rspec (1.38.1) + rubocop-rspec (1.39.0) rubocop (>= 0.68.1) ruby-progressbar (1.10.1) ruby_parser (3.14.2) diff --git a/gemfiles/activesupport_5_que_1_x_activejob.gemfile.lock b/gemfiles/activesupport_5_que_1_x_activejob.gemfile.lock index 01567de3..e6270021 100644 --- a/gemfiles/activesupport_5_que_1_x_activejob.gemfile.lock +++ b/gemfiles/activesupport_5_que_1_x_activejob.gemfile.lock @@ -44,10 +44,10 @@ GEM arel (9.0.0) ast (2.4.0) builder (3.2.4) - byebug (11.1.1) + byebug (11.1.3) coderay (1.1.2) colorize (0.8.1) - combustion (1.1.2) + combustion (1.3.0) activesupport (>= 3.0.0) railties (>= 3.0.0) thor (>= 0.14.6) @@ -59,7 +59,7 @@ GEM thor (>= 0.19.4, < 2.0) tins (~> 1.6) crass (1.0.6) - database_cleaner (1.8.4) + database_cleaner (1.8.5) diff-lcs (1.3) docile (1.3.2) erubi (1.9.0) @@ -68,7 +68,7 @@ GEM fasterer (0.8.3) colorize (~> 0.7) ruby_parser (>= 3.14.1) - fugit (1.3.4) + fugit (1.3.5) et-orbi (~> 1.1, >= 1.1.8) raabro (~> 1.1) globalid (0.4.2) @@ -88,7 +88,7 @@ GEM nokogiri (1.10.9) mini_portile2 (~> 2.4.0) parallel (1.19.1) - parser (2.7.1.0) + parser (2.7.1.2) ast (~> 2.4.0) pg (0.21.0) pry (0.13.1) @@ -99,7 +99,7 @@ GEM pry (~> 0.13.0) psych (3.1.0) que (1.0.0.beta4) - raabro (1.1.6) + raabro (1.3.1) rack (2.2.2) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -126,15 +126,15 @@ GEM rspec-core (~> 3.9.0) rspec-expectations (~> 3.9.0) rspec-mocks (~> 3.9.0) - rspec-core (3.9.1) - rspec-support (~> 3.9.1) - rspec-expectations (3.9.1) + rspec-core (3.9.2) + rspec-support (~> 3.9.3) + rspec-expectations (3.9.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-mocks (3.9.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) - rspec-support (3.9.2) + rspec-support (3.9.3) rubocop (0.80.1) jaro_winkler (~> 1.5.1) parallel (~> 1.10) @@ -143,7 +143,7 @@ GEM rexml ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) - rubocop-rspec (1.38.1) + rubocop-rspec (1.39.0) rubocop (>= 0.68.1) ruby-progressbar (1.10.1) ruby_parser (3.14.2) diff --git a/gemfiles/activesupport_6_que_0_14.gemfile.lock b/gemfiles/activesupport_6_que_0_14.gemfile.lock index f736bd4f..b5ceba33 100644 --- a/gemfiles/activesupport_6_que_0_14.gemfile.lock +++ b/gemfiles/activesupport_6_que_0_14.gemfile.lock @@ -10,40 +10,40 @@ PATH GEM remote: https://rubygems.org/ specs: - actionpack (6.0.2.2) - actionview (= 6.0.2.2) - activesupport (= 6.0.2.2) + actionpack (6.0.3) + actionview (= 6.0.3) + activesupport (= 6.0.3) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (6.0.2.2) - activesupport (= 6.0.2.2) + actionview (6.0.3) + activesupport (= 6.0.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activemodel (6.0.2.2) - activesupport (= 6.0.2.2) - activerecord (6.0.2.2) - activemodel (= 6.0.2.2) - activesupport (= 6.0.2.2) - activesupport (6.0.2.2) + activemodel (6.0.3) + activesupport (= 6.0.3) + activerecord (6.0.3) + activemodel (= 6.0.3) + activesupport (= 6.0.3) + activesupport (6.0.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - zeitwerk (~> 2.2) + zeitwerk (~> 2.2, >= 2.2.2) appraisal (2.2.0) bundler rake thor (>= 0.14.0) ast (2.4.0) builder (3.2.4) - byebug (11.1.1) + byebug (11.1.3) coderay (1.1.2) colorize (0.8.1) - combustion (1.1.2) + combustion (1.3.0) activesupport (>= 3.0.0) railties (>= 3.0.0) thor (>= 0.14.6) @@ -55,7 +55,7 @@ GEM thor (>= 0.19.4, < 2.0) tins (~> 1.6) crass (1.0.6) - database_cleaner (1.8.4) + database_cleaner (1.8.5) diff-lcs (1.3) docile (1.3.2) erubi (1.9.0) @@ -64,7 +64,7 @@ GEM fasterer (0.8.3) colorize (~> 0.7) ruby_parser (>= 3.14.1) - fugit (1.3.4) + fugit (1.3.5) et-orbi (~> 1.1, >= 1.1.8) raabro (~> 1.1) hashie (4.1.0) @@ -82,7 +82,7 @@ GEM nokogiri (1.10.9) mini_portile2 (~> 2.4.0) parallel (1.19.1) - parser (2.7.1.0) + parser (2.7.1.2) ast (~> 2.4.0) pg (0.21.0) pry (0.13.1) @@ -93,7 +93,7 @@ GEM pry (~> 0.13.0) psych (3.1.0) que (0.14.3) - raabro (1.1.6) + raabro (1.3.1) rack (2.2.2) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -102,9 +102,9 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (6.0.2.2) - actionpack (= 6.0.2.2) - activesupport (= 6.0.2.2) + railties (6.0.3) + actionpack (= 6.0.3) + activesupport (= 6.0.3) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) @@ -120,15 +120,15 @@ GEM rspec-core (~> 3.9.0) rspec-expectations (~> 3.9.0) rspec-mocks (~> 3.9.0) - rspec-core (3.9.1) - rspec-support (~> 3.9.1) - rspec-expectations (3.9.1) + rspec-core (3.9.2) + rspec-support (~> 3.9.3) + rspec-expectations (3.9.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-mocks (3.9.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) - rspec-support (3.9.2) + rspec-support (3.9.3) rubocop (0.80.1) jaro_winkler (~> 1.5.1) parallel (~> 1.10) @@ -137,7 +137,7 @@ GEM rexml ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) - rubocop-rspec (1.38.1) + rubocop-rspec (1.39.0) rubocop (>= 0.68.1) ruby-progressbar (1.10.1) ruby_parser (3.14.2) diff --git a/gemfiles/activesupport_6_que_0_14_activejob.gemfile.lock b/gemfiles/activesupport_6_que_0_14_activejob.gemfile.lock index ff788eba..c42f297e 100644 --- a/gemfiles/activesupport_6_que_0_14_activejob.gemfile.lock +++ b/gemfiles/activesupport_6_que_0_14_activejob.gemfile.lock @@ -10,43 +10,43 @@ PATH GEM remote: https://rubygems.org/ specs: - actionpack (6.0.2.2) - actionview (= 6.0.2.2) - activesupport (= 6.0.2.2) + actionpack (6.0.3) + actionview (= 6.0.3) + activesupport (= 6.0.3) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (6.0.2.2) - activesupport (= 6.0.2.2) + actionview (6.0.3) + activesupport (= 6.0.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.0.2.2) - activesupport (= 6.0.2.2) + activejob (6.0.3) + activesupport (= 6.0.3) globalid (>= 0.3.6) - activemodel (6.0.2.2) - activesupport (= 6.0.2.2) - activerecord (6.0.2.2) - activemodel (= 6.0.2.2) - activesupport (= 6.0.2.2) - activesupport (6.0.2.2) + activemodel (6.0.3) + activesupport (= 6.0.3) + activerecord (6.0.3) + activemodel (= 6.0.3) + activesupport (= 6.0.3) + activesupport (6.0.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - zeitwerk (~> 2.2) + zeitwerk (~> 2.2, >= 2.2.2) appraisal (2.2.0) bundler rake thor (>= 0.14.0) ast (2.4.0) builder (3.2.4) - byebug (11.1.1) + byebug (11.1.3) coderay (1.1.2) colorize (0.8.1) - combustion (1.1.2) + combustion (1.3.0) activesupport (>= 3.0.0) railties (>= 3.0.0) thor (>= 0.14.6) @@ -58,7 +58,7 @@ GEM thor (>= 0.19.4, < 2.0) tins (~> 1.6) crass (1.0.6) - database_cleaner (1.8.4) + database_cleaner (1.8.5) diff-lcs (1.3) docile (1.3.2) erubi (1.9.0) @@ -67,7 +67,7 @@ GEM fasterer (0.8.3) colorize (~> 0.7) ruby_parser (>= 3.14.1) - fugit (1.3.4) + fugit (1.3.5) et-orbi (~> 1.1, >= 1.1.8) raabro (~> 1.1) globalid (0.4.2) @@ -87,7 +87,7 @@ GEM nokogiri (1.10.9) mini_portile2 (~> 2.4.0) parallel (1.19.1) - parser (2.7.1.0) + parser (2.7.1.2) ast (~> 2.4.0) pg (0.21.0) pry (0.13.1) @@ -98,7 +98,7 @@ GEM pry (~> 0.13.0) psych (3.1.0) que (0.14.3) - raabro (1.1.6) + raabro (1.3.1) rack (2.2.2) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -107,9 +107,9 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (6.0.2.2) - actionpack (= 6.0.2.2) - activesupport (= 6.0.2.2) + railties (6.0.3) + actionpack (= 6.0.3) + activesupport (= 6.0.3) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) @@ -125,15 +125,15 @@ GEM rspec-core (~> 3.9.0) rspec-expectations (~> 3.9.0) rspec-mocks (~> 3.9.0) - rspec-core (3.9.1) - rspec-support (~> 3.9.1) - rspec-expectations (3.9.1) + rspec-core (3.9.2) + rspec-support (~> 3.9.3) + rspec-expectations (3.9.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-mocks (3.9.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) - rspec-support (3.9.2) + rspec-support (3.9.3) rubocop (0.80.1) jaro_winkler (~> 1.5.1) parallel (~> 1.10) @@ -142,7 +142,7 @@ GEM rexml ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) - rubocop-rspec (1.38.1) + rubocop-rspec (1.39.0) rubocop (>= 0.68.1) ruby-progressbar (1.10.1) ruby_parser (3.14.2) diff --git a/gemfiles/activesupport_6_que_1_x.gemfile.lock b/gemfiles/activesupport_6_que_1_x.gemfile.lock index 30913af1..406fbbe6 100644 --- a/gemfiles/activesupport_6_que_1_x.gemfile.lock +++ b/gemfiles/activesupport_6_que_1_x.gemfile.lock @@ -10,40 +10,40 @@ PATH GEM remote: https://rubygems.org/ specs: - actionpack (6.0.2.2) - actionview (= 6.0.2.2) - activesupport (= 6.0.2.2) + actionpack (6.0.3) + actionview (= 6.0.3) + activesupport (= 6.0.3) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (6.0.2.2) - activesupport (= 6.0.2.2) + actionview (6.0.3) + activesupport (= 6.0.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activemodel (6.0.2.2) - activesupport (= 6.0.2.2) - activerecord (6.0.2.2) - activemodel (= 6.0.2.2) - activesupport (= 6.0.2.2) - activesupport (6.0.2.2) + activemodel (6.0.3) + activesupport (= 6.0.3) + activerecord (6.0.3) + activemodel (= 6.0.3) + activesupport (= 6.0.3) + activesupport (6.0.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - zeitwerk (~> 2.2) + zeitwerk (~> 2.2, >= 2.2.2) appraisal (2.2.0) bundler rake thor (>= 0.14.0) ast (2.4.0) builder (3.2.4) - byebug (11.1.1) + byebug (11.1.3) coderay (1.1.2) colorize (0.8.1) - combustion (1.1.2) + combustion (1.3.0) activesupport (>= 3.0.0) railties (>= 3.0.0) thor (>= 0.14.6) @@ -55,7 +55,7 @@ GEM thor (>= 0.19.4, < 2.0) tins (~> 1.6) crass (1.0.6) - database_cleaner (1.8.4) + database_cleaner (1.8.5) diff-lcs (1.3) docile (1.3.2) erubi (1.9.0) @@ -64,7 +64,7 @@ GEM fasterer (0.8.3) colorize (~> 0.7) ruby_parser (>= 3.14.1) - fugit (1.3.4) + fugit (1.3.5) et-orbi (~> 1.1, >= 1.1.8) raabro (~> 1.1) hashie (4.1.0) @@ -82,7 +82,7 @@ GEM nokogiri (1.10.9) mini_portile2 (~> 2.4.0) parallel (1.19.1) - parser (2.7.1.0) + parser (2.7.1.2) ast (~> 2.4.0) pg (0.21.0) pry (0.13.1) @@ -93,7 +93,7 @@ GEM pry (~> 0.13.0) psych (3.1.0) que (1.0.0.beta4) - raabro (1.1.6) + raabro (1.3.1) rack (2.2.2) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -102,9 +102,9 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (6.0.2.2) - actionpack (= 6.0.2.2) - activesupport (= 6.0.2.2) + railties (6.0.3) + actionpack (= 6.0.3) + activesupport (= 6.0.3) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) @@ -120,15 +120,15 @@ GEM rspec-core (~> 3.9.0) rspec-expectations (~> 3.9.0) rspec-mocks (~> 3.9.0) - rspec-core (3.9.1) - rspec-support (~> 3.9.1) - rspec-expectations (3.9.1) + rspec-core (3.9.2) + rspec-support (~> 3.9.3) + rspec-expectations (3.9.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-mocks (3.9.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) - rspec-support (3.9.2) + rspec-support (3.9.3) rubocop (0.80.1) jaro_winkler (~> 1.5.1) parallel (~> 1.10) @@ -137,7 +137,7 @@ GEM rexml ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) - rubocop-rspec (1.38.1) + rubocop-rspec (1.39.0) rubocop (>= 0.68.1) ruby-progressbar (1.10.1) ruby_parser (3.14.2) diff --git a/gemfiles/activesupport_6_with_queue_names_que_0_14_activejob.gemfile b/gemfiles/activesupport_6_with_queue_names_que_0_14_activejob.gemfile new file mode 100644 index 00000000..c3aa67bb --- /dev/null +++ b/gemfiles/activesupport_6_with_queue_names_que_0_14_activejob.gemfile @@ -0,0 +1,9 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "activesupport", "~> 6.0" +gem "que", "~> 0.14" +gem "activejob", "~> 6.0", ">= 6.0.3" + +gemspec path: "../" diff --git a/gemfiles/activesupport_6_with_queue_names_que_0_14_activejob.gemfile.lock b/gemfiles/activesupport_6_with_queue_names_que_0_14_activejob.gemfile.lock new file mode 100644 index 00000000..7ec5467c --- /dev/null +++ b/gemfiles/activesupport_6_with_queue_names_que_0_14_activejob.gemfile.lock @@ -0,0 +1,197 @@ +PATH + remote: .. + specs: + que-scheduler (3.3.0) + activesupport (>= 4.0) + fugit (~> 1.1, >= 1.1.8) + hashie (>= 3, < 5) + que (>= 0.12, <= 1.0.0.beta4) + +GEM + remote: https://rubygems.org/ + specs: + actionpack (6.0.3) + actionview (= 6.0.3) + activesupport (= 6.0.3) + rack (~> 2.0, >= 2.0.8) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actionview (6.0.3) + activesupport (= 6.0.3) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (6.0.3) + activesupport (= 6.0.3) + globalid (>= 0.3.6) + activemodel (6.0.3) + activesupport (= 6.0.3) + activerecord (6.0.3) + activemodel (= 6.0.3) + activesupport (= 6.0.3) + activesupport (6.0.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + zeitwerk (~> 2.2, >= 2.2.2) + appraisal (2.2.0) + bundler + rake + thor (>= 0.14.0) + ast (2.4.0) + builder (3.2.4) + byebug (11.1.3) + coderay (1.1.2) + colorize (0.8.1) + combustion (1.3.0) + activesupport (>= 3.0.0) + railties (>= 3.0.0) + thor (>= 0.14.6) + concurrent-ruby (1.1.6) + coveralls (0.8.23) + json (>= 1.8, < 3) + simplecov (~> 0.16.1) + term-ansicolor (~> 1.3) + thor (>= 0.19.4, < 2.0) + tins (~> 1.6) + crass (1.0.6) + database_cleaner (1.8.5) + diff-lcs (1.3) + docile (1.3.2) + erubi (1.9.0) + et-orbi (1.2.4) + tzinfo + fasterer (0.8.3) + colorize (~> 0.7) + ruby_parser (>= 3.14.1) + fugit (1.3.5) + et-orbi (~> 1.1, >= 1.1.8) + raabro (~> 1.1) + globalid (0.4.2) + activesupport (>= 4.2.0) + hashie (4.1.0) + i18n (1.8.2) + concurrent-ruby (~> 1.0) + jaro_winkler (1.5.4) + json (2.3.0) + kwalify (0.7.2) + loofah (2.5.0) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + method_source (1.0.0) + mini_portile2 (2.4.0) + minitest (5.14.0) + nokogiri (1.10.9) + mini_portile2 (~> 2.4.0) + parallel (1.19.1) + parser (2.7.1.2) + ast (~> 2.4.0) + pg (0.21.0) + pry (0.13.1) + coderay (~> 1.1) + method_source (~> 1.0) + pry-byebug (3.9.0) + byebug (~> 11.0) + pry (~> 0.13.0) + psych (3.1.0) + que (0.14.3) + raabro (1.3.1) + rack (2.2.2) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + railties (6.0.3) + actionpack (= 6.0.3) + activesupport (= 6.0.3) + method_source + rake (>= 0.8.7) + thor (>= 0.20.3, < 2.0) + rainbow (3.0.0) + rake (13.0.1) + reek (6.0.0) + kwalify (~> 0.7.0) + parser (>= 2.5.0.0, < 2.8, != 2.5.1.1) + psych (~> 3.1.0) + rainbow (>= 2.0, < 4.0) + rexml (3.2.4) + rspec (3.9.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-core (3.9.2) + rspec-support (~> 3.9.3) + rspec-expectations (3.9.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.9.0) + rspec-mocks (3.9.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.9.0) + rspec-support (3.9.3) + rubocop (0.80.1) + jaro_winkler (~> 1.5.1) + parallel (~> 1.10) + parser (>= 2.7.0.1) + rainbow (>= 2.2.2, < 4.0) + rexml + ruby-progressbar (~> 1.7) + unicode-display_width (>= 1.4.0, < 1.7) + rubocop-rspec (1.39.0) + rubocop (>= 0.68.1) + ruby-progressbar (1.10.1) + ruby_parser (3.14.2) + sexp_processor (~> 4.9) + sexp_processor (4.14.1) + simplecov (0.16.1) + docile (~> 1.1) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.2) + sqlite3 (1.4.2) + sync (0.5.0) + term-ansicolor (1.7.1) + tins (~> 1.0) + thor (1.0.1) + thread_safe (0.3.6) + timecop (0.9.1) + tins (1.24.1) + sync + tzinfo (1.2.7) + thread_safe (~> 0.1) + unicode-display_width (1.6.1) + zeitwerk (2.3.0) + zonebie (0.6.1) + +PLATFORMS + ruby + +DEPENDENCIES + activejob (~> 6.0, >= 6.0.3) + activerecord (>= 4.0) + activesupport (~> 6.0) + appraisal + combustion + coveralls + database_cleaner + fasterer + pg (~> 0.21) + pry-byebug + que (~> 0.14) + que-scheduler! + rake + reek + rspec + rubocop (= 0.80.1) + rubocop-rspec + sqlite3 (>= 1.3) + timecop + zonebie + +BUNDLED WITH + 1.17.3 diff --git a/gemfiles/activesupport_6_with_queue_names_que_1_x_activejob.gemfile b/gemfiles/activesupport_6_with_queue_names_que_1_x_activejob.gemfile new file mode 100644 index 00000000..4be86ab4 --- /dev/null +++ b/gemfiles/activesupport_6_with_queue_names_que_1_x_activejob.gemfile @@ -0,0 +1,9 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "activesupport", "~> 6.0" +gem "que", "1.0.0.beta4" +gem "activejob", "~> 6.0", ">= 6.0.3" + +gemspec path: "../" diff --git a/gemfiles/activesupport_6_que_1_x_activejob.gemfile.lock b/gemfiles/activesupport_6_with_queue_names_que_1_x_activejob.gemfile.lock similarity index 82% rename from gemfiles/activesupport_6_que_1_x_activejob.gemfile.lock rename to gemfiles/activesupport_6_with_queue_names_que_1_x_activejob.gemfile.lock index 53321a67..05baacfb 100644 --- a/gemfiles/activesupport_6_que_1_x_activejob.gemfile.lock +++ b/gemfiles/activesupport_6_with_queue_names_que_1_x_activejob.gemfile.lock @@ -10,43 +10,43 @@ PATH GEM remote: https://rubygems.org/ specs: - actionpack (6.0.2.2) - actionview (= 6.0.2.2) - activesupport (= 6.0.2.2) + actionpack (6.0.3) + actionview (= 6.0.3) + activesupport (= 6.0.3) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (6.0.2.2) - activesupport (= 6.0.2.2) + actionview (6.0.3) + activesupport (= 6.0.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.0.2.2) - activesupport (= 6.0.2.2) + activejob (6.0.3) + activesupport (= 6.0.3) globalid (>= 0.3.6) - activemodel (6.0.2.2) - activesupport (= 6.0.2.2) - activerecord (6.0.2.2) - activemodel (= 6.0.2.2) - activesupport (= 6.0.2.2) - activesupport (6.0.2.2) + activemodel (6.0.3) + activesupport (= 6.0.3) + activerecord (6.0.3) + activemodel (= 6.0.3) + activesupport (= 6.0.3) + activesupport (6.0.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - zeitwerk (~> 2.2) + zeitwerk (~> 2.2, >= 2.2.2) appraisal (2.2.0) bundler rake thor (>= 0.14.0) ast (2.4.0) builder (3.2.4) - byebug (11.1.1) + byebug (11.1.3) coderay (1.1.2) colorize (0.8.1) - combustion (1.1.2) + combustion (1.3.0) activesupport (>= 3.0.0) railties (>= 3.0.0) thor (>= 0.14.6) @@ -58,7 +58,7 @@ GEM thor (>= 0.19.4, < 2.0) tins (~> 1.6) crass (1.0.6) - database_cleaner (1.8.4) + database_cleaner (1.8.5) diff-lcs (1.3) docile (1.3.2) erubi (1.9.0) @@ -67,7 +67,7 @@ GEM fasterer (0.8.3) colorize (~> 0.7) ruby_parser (>= 3.14.1) - fugit (1.3.4) + fugit (1.3.5) et-orbi (~> 1.1, >= 1.1.8) raabro (~> 1.1) globalid (0.4.2) @@ -87,7 +87,7 @@ GEM nokogiri (1.10.9) mini_portile2 (~> 2.4.0) parallel (1.19.1) - parser (2.7.1.0) + parser (2.7.1.2) ast (~> 2.4.0) pg (0.21.0) pry (0.13.1) @@ -98,7 +98,7 @@ GEM pry (~> 0.13.0) psych (3.1.0) que (1.0.0.beta4) - raabro (1.1.6) + raabro (1.3.1) rack (2.2.2) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -107,9 +107,9 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (6.0.2.2) - actionpack (= 6.0.2.2) - activesupport (= 6.0.2.2) + railties (6.0.3) + actionpack (= 6.0.3) + activesupport (= 6.0.3) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) @@ -125,15 +125,15 @@ GEM rspec-core (~> 3.9.0) rspec-expectations (~> 3.9.0) rspec-mocks (~> 3.9.0) - rspec-core (3.9.1) - rspec-support (~> 3.9.1) - rspec-expectations (3.9.1) + rspec-core (3.9.2) + rspec-support (~> 3.9.3) + rspec-expectations (3.9.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-mocks (3.9.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) - rspec-support (3.9.2) + rspec-support (3.9.3) rubocop (0.80.1) jaro_winkler (~> 1.5.1) parallel (~> 1.10) @@ -142,7 +142,7 @@ GEM rexml ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) - rubocop-rspec (1.38.1) + rubocop-rspec (1.39.0) rubocop (>= 0.68.1) ruby-progressbar (1.10.1) ruby_parser (3.14.2) @@ -172,7 +172,7 @@ PLATFORMS ruby DEPENDENCIES - activejob (~> 6.0) + activejob (~> 6.0, >= 6.0.3) activerecord (>= 4.0) activesupport (~> 6.0) appraisal diff --git a/gemfiles/activesupport_6_que_1_x_activejob.gemfile b/gemfiles/activesupport_6_without_queue_names_1_x_activejob.gemfile similarity index 84% rename from gemfiles/activesupport_6_que_1_x_activejob.gemfile rename to gemfiles/activesupport_6_without_queue_names_1_x_activejob.gemfile index a033098f..4f79f456 100644 --- a/gemfiles/activesupport_6_que_1_x_activejob.gemfile +++ b/gemfiles/activesupport_6_without_queue_names_1_x_activejob.gemfile @@ -4,6 +4,6 @@ source "https://rubygems.org" gem "activesupport", "~> 6.0" gem "que", "1.0.0.beta4" -gem "activejob", "~> 6.0" +gem "activejob", "6.0.2" gemspec path: "../" diff --git a/gemfiles/activesupport_6_without_queue_names_1_x_activejob.gemfile.lock b/gemfiles/activesupport_6_without_queue_names_1_x_activejob.gemfile.lock new file mode 100644 index 00000000..0343f2dd --- /dev/null +++ b/gemfiles/activesupport_6_without_queue_names_1_x_activejob.gemfile.lock @@ -0,0 +1,197 @@ +PATH + remote: .. + specs: + que-scheduler (3.3.0) + activesupport (>= 4.0) + fugit (~> 1.1, >= 1.1.8) + hashie (>= 3, < 5) + que (>= 0.12, <= 1.0.0.beta4) + +GEM + remote: https://rubygems.org/ + specs: + actionpack (6.0.2) + actionview (= 6.0.2) + activesupport (= 6.0.2) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actionview (6.0.2) + activesupport (= 6.0.2) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (6.0.2) + activesupport (= 6.0.2) + globalid (>= 0.3.6) + activemodel (6.0.2) + activesupport (= 6.0.2) + activerecord (6.0.2) + activemodel (= 6.0.2) + activesupport (= 6.0.2) + activesupport (6.0.2) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + zeitwerk (~> 2.2) + appraisal (2.2.0) + bundler + rake + thor (>= 0.14.0) + ast (2.4.0) + builder (3.2.4) + byebug (11.1.3) + coderay (1.1.2) + colorize (0.8.1) + combustion (1.3.0) + activesupport (>= 3.0.0) + railties (>= 3.0.0) + thor (>= 0.14.6) + concurrent-ruby (1.1.6) + coveralls (0.8.23) + json (>= 1.8, < 3) + simplecov (~> 0.16.1) + term-ansicolor (~> 1.3) + thor (>= 0.19.4, < 2.0) + tins (~> 1.6) + crass (1.0.6) + database_cleaner (1.8.5) + diff-lcs (1.3) + docile (1.3.2) + erubi (1.9.0) + et-orbi (1.2.4) + tzinfo + fasterer (0.8.3) + colorize (~> 0.7) + ruby_parser (>= 3.14.1) + fugit (1.3.5) + et-orbi (~> 1.1, >= 1.1.8) + raabro (~> 1.1) + globalid (0.4.2) + activesupport (>= 4.2.0) + hashie (4.1.0) + i18n (1.8.2) + concurrent-ruby (~> 1.0) + jaro_winkler (1.5.4) + json (2.3.0) + kwalify (0.7.2) + loofah (2.5.0) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + method_source (1.0.0) + mini_portile2 (2.4.0) + minitest (5.14.0) + nokogiri (1.10.9) + mini_portile2 (~> 2.4.0) + parallel (1.19.1) + parser (2.7.1.2) + ast (~> 2.4.0) + pg (0.21.0) + pry (0.13.1) + coderay (~> 1.1) + method_source (~> 1.0) + pry-byebug (3.9.0) + byebug (~> 11.0) + pry (~> 0.13.0) + psych (3.1.0) + que (1.0.0.beta4) + raabro (1.3.1) + rack (2.2.2) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + railties (6.0.2) + actionpack (= 6.0.2) + activesupport (= 6.0.2) + method_source + rake (>= 0.8.7) + thor (>= 0.20.3, < 2.0) + rainbow (3.0.0) + rake (13.0.1) + reek (6.0.0) + kwalify (~> 0.7.0) + parser (>= 2.5.0.0, < 2.8, != 2.5.1.1) + psych (~> 3.1.0) + rainbow (>= 2.0, < 4.0) + rexml (3.2.4) + rspec (3.9.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-core (3.9.2) + rspec-support (~> 3.9.3) + rspec-expectations (3.9.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.9.0) + rspec-mocks (3.9.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.9.0) + rspec-support (3.9.3) + rubocop (0.80.1) + jaro_winkler (~> 1.5.1) + parallel (~> 1.10) + parser (>= 2.7.0.1) + rainbow (>= 2.2.2, < 4.0) + rexml + ruby-progressbar (~> 1.7) + unicode-display_width (>= 1.4.0, < 1.7) + rubocop-rspec (1.39.0) + rubocop (>= 0.68.1) + ruby-progressbar (1.10.1) + ruby_parser (3.14.2) + sexp_processor (~> 4.9) + sexp_processor (4.14.1) + simplecov (0.16.1) + docile (~> 1.1) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.2) + sqlite3 (1.4.2) + sync (0.5.0) + term-ansicolor (1.7.1) + tins (~> 1.0) + thor (1.0.1) + thread_safe (0.3.6) + timecop (0.9.1) + tins (1.24.1) + sync + tzinfo (1.2.7) + thread_safe (~> 0.1) + unicode-display_width (1.6.1) + zeitwerk (2.3.0) + zonebie (0.6.1) + +PLATFORMS + ruby + +DEPENDENCIES + activejob (= 6.0.2) + activerecord (>= 4.0) + activesupport (~> 6.0) + appraisal + combustion + coveralls + database_cleaner + fasterer + pg (~> 0.21) + pry-byebug + que (= 1.0.0.beta4) + que-scheduler! + rake + reek + rspec + rubocop (= 0.80.1) + rubocop-rspec + sqlite3 (>= 1.3) + timecop + zonebie + +BUNDLED WITH + 1.17.3 diff --git a/gemfiles/activesupport_6_without_queue_names_que_0_14_activejob.gemfile b/gemfiles/activesupport_6_without_queue_names_que_0_14_activejob.gemfile new file mode 100644 index 00000000..7b05ed39 --- /dev/null +++ b/gemfiles/activesupport_6_without_queue_names_que_0_14_activejob.gemfile @@ -0,0 +1,9 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "activesupport", "~> 6.0" +gem "que", "~> 0.14" +gem "activejob", "6.0.2" + +gemspec path: "../" diff --git a/gemfiles/activesupport_6_without_queue_names_que_0_14_activejob.gemfile.lock b/gemfiles/activesupport_6_without_queue_names_que_0_14_activejob.gemfile.lock new file mode 100644 index 00000000..a1804a88 --- /dev/null +++ b/gemfiles/activesupport_6_without_queue_names_que_0_14_activejob.gemfile.lock @@ -0,0 +1,197 @@ +PATH + remote: .. + specs: + que-scheduler (3.3.0) + activesupport (>= 4.0) + fugit (~> 1.1, >= 1.1.8) + hashie (>= 3, < 5) + que (>= 0.12, <= 1.0.0.beta4) + +GEM + remote: https://rubygems.org/ + specs: + actionpack (6.0.2) + actionview (= 6.0.2) + activesupport (= 6.0.2) + rack (~> 2.0) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actionview (6.0.2) + activesupport (= 6.0.2) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (6.0.2) + activesupport (= 6.0.2) + globalid (>= 0.3.6) + activemodel (6.0.2) + activesupport (= 6.0.2) + activerecord (6.0.2) + activemodel (= 6.0.2) + activesupport (= 6.0.2) + activesupport (6.0.2) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + zeitwerk (~> 2.2) + appraisal (2.2.0) + bundler + rake + thor (>= 0.14.0) + ast (2.4.0) + builder (3.2.4) + byebug (11.1.3) + coderay (1.1.2) + colorize (0.8.1) + combustion (1.3.0) + activesupport (>= 3.0.0) + railties (>= 3.0.0) + thor (>= 0.14.6) + concurrent-ruby (1.1.6) + coveralls (0.8.23) + json (>= 1.8, < 3) + simplecov (~> 0.16.1) + term-ansicolor (~> 1.3) + thor (>= 0.19.4, < 2.0) + tins (~> 1.6) + crass (1.0.6) + database_cleaner (1.8.5) + diff-lcs (1.3) + docile (1.3.2) + erubi (1.9.0) + et-orbi (1.2.4) + tzinfo + fasterer (0.8.3) + colorize (~> 0.7) + ruby_parser (>= 3.14.1) + fugit (1.3.5) + et-orbi (~> 1.1, >= 1.1.8) + raabro (~> 1.1) + globalid (0.4.2) + activesupport (>= 4.2.0) + hashie (4.1.0) + i18n (1.8.2) + concurrent-ruby (~> 1.0) + jaro_winkler (1.5.4) + json (2.3.0) + kwalify (0.7.2) + loofah (2.5.0) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + method_source (1.0.0) + mini_portile2 (2.4.0) + minitest (5.14.0) + nokogiri (1.10.9) + mini_portile2 (~> 2.4.0) + parallel (1.19.1) + parser (2.7.1.2) + ast (~> 2.4.0) + pg (0.21.0) + pry (0.13.1) + coderay (~> 1.1) + method_source (~> 1.0) + pry-byebug (3.9.0) + byebug (~> 11.0) + pry (~> 0.13.0) + psych (3.1.0) + que (0.14.3) + raabro (1.3.1) + rack (2.2.2) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + railties (6.0.2) + actionpack (= 6.0.2) + activesupport (= 6.0.2) + method_source + rake (>= 0.8.7) + thor (>= 0.20.3, < 2.0) + rainbow (3.0.0) + rake (13.0.1) + reek (6.0.0) + kwalify (~> 0.7.0) + parser (>= 2.5.0.0, < 2.8, != 2.5.1.1) + psych (~> 3.1.0) + rainbow (>= 2.0, < 4.0) + rexml (3.2.4) + rspec (3.9.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-core (3.9.2) + rspec-support (~> 3.9.3) + rspec-expectations (3.9.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.9.0) + rspec-mocks (3.9.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.9.0) + rspec-support (3.9.3) + rubocop (0.80.1) + jaro_winkler (~> 1.5.1) + parallel (~> 1.10) + parser (>= 2.7.0.1) + rainbow (>= 2.2.2, < 4.0) + rexml + ruby-progressbar (~> 1.7) + unicode-display_width (>= 1.4.0, < 1.7) + rubocop-rspec (1.39.0) + rubocop (>= 0.68.1) + ruby-progressbar (1.10.1) + ruby_parser (3.14.2) + sexp_processor (~> 4.9) + sexp_processor (4.14.1) + simplecov (0.16.1) + docile (~> 1.1) + json (>= 1.8, < 3) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.2) + sqlite3 (1.4.2) + sync (0.5.0) + term-ansicolor (1.7.1) + tins (~> 1.0) + thor (1.0.1) + thread_safe (0.3.6) + timecop (0.9.1) + tins (1.24.1) + sync + tzinfo (1.2.7) + thread_safe (~> 0.1) + unicode-display_width (1.6.1) + zeitwerk (2.3.0) + zonebie (0.6.1) + +PLATFORMS + ruby + +DEPENDENCIES + activejob (= 6.0.2) + activerecord (>= 4.0) + activesupport (~> 6.0) + appraisal + combustion + coveralls + database_cleaner + fasterer + pg (~> 0.21) + pry-byebug + que (~> 0.14) + que-scheduler! + rake + reek + rspec + rubocop (= 0.80.1) + rubocop-rspec + sqlite3 (>= 1.3) + timecop + zonebie + +BUNDLED WITH + 1.17.3 diff --git a/lib/que/scheduler/to_enqueue.rb b/lib/que/scheduler/to_enqueue.rb index 76a0ba82..0c8a835c 100644 --- a/lib/que/scheduler/to_enqueue.rb +++ b/lib/que/scheduler/to_enqueue.rb @@ -32,6 +32,15 @@ def active_job_sufficient_version? active_job_version && active_job_version > Gem::Version.create('5') end + def active_job_version_supports_queues? + # Supporting queue name in ActiveJob was removed in Rails 4.2.3 + # https://github.com/rails/rails/pull/19498 + # and readded in Rails 6.0.3 + # https://github.com/rails/rails/pull/38635 + ToEnqueue.active_job_version && ToEnqueue.active_job_version >= + Gem::Version.create('6.0.3') + end + private def type_from_job_class(job_class) @@ -87,8 +96,6 @@ def enqueue EnqueuedJobType.new(enqueued_values) end - private - def calculate_enqueued_values(job) # Now read the just inserted job back out of the DB to get the actual values that will # be used when the job is worked. @@ -101,9 +108,8 @@ def calculate_enqueued_values(job) scheduled_at_float ? Time.zone.at(scheduled_at_float) : nil end - # Rails doesn't support queues for ActiveJob - # https://github.com/rails/rails/pull/19498 - used_queue = nil + # Rails did't support queues for ActiveJob for a while + used_queue = data[:queue_name] if ToEnqueue.active_job_version_supports_queues? # We can't get the priority out of the DB, as the returned `job` doesn't give us access # to the underlying ActiveJob that was scheduled. We have no option but to assume @@ -125,6 +131,7 @@ def enqueue_active_job job_settings = { priority: priority, wait_until: run_at, + queue: queue || Que::Scheduler::VersionSupport.default_scheduler_queue, }.compact job_class_set = job_class.set(**job_settings) diff --git a/spec/support/to_enqueue_test_support.rb b/spec/support/to_enqueue_test_support.rb index 0f5a9365..5c92988d 100644 --- a/spec/support/to_enqueue_test_support.rb +++ b/spec/support/to_enqueue_test_support.rb @@ -1,11 +1,7 @@ shared_context 'when job testing' do if Que::Scheduler::ToEnqueue.active_job_sufficient_version? let(:handles_queue_name) { - # This was removed in Rails 4.2.3 - # https://github.com/rails/rails/pull/19498 - # and readded in Rails 6.0.3 - # https://github.com/rails/rails/pull/38635 - Que::Scheduler::ToEnqueue.active_job_version >= Gem::Version.create('6.0.3') + Que::Scheduler::ToEnqueue.active_job_version_supports_queues? } def expected_class_in_db(_enqueued_class)