delayed_job_groups_plugin 0.10.0 → 0.11.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (16) hide show
  1. checksums.yaml +4 -4
  2. data/.circleci/config.yml +17 -10
  3. data/.github/CODEOWNERS +1 -1
  4. data/Appraisals +13 -6
  5. data/CHANGELOG.md +6 -1
  6. data/README.md +2 -2
  7. data/delayed_job_groups.gemspec +1 -1
  8. data/gemfiles/rails_6.1.gemfile +3 -2
  9. data/gemfiles/rails_7.0.gemfile +3 -2
  10. data/gemfiles/rails_7.1.gemfile +2 -2
  11. data/gemfiles/rails_7.2.gemfile +8 -0
  12. data/lib/delayed/job_groups/compatibility.rb +5 -0
  13. data/lib/delayed/job_groups/job_group.rb +13 -4
  14. data/lib/delayed/job_groups/version.rb +1 -1
  15. data/lib/delayed/job_groups/yaml_loader.rb +2 -0
  16. metadata +5 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: f8a1d66a3872e0a8452f31085a5ca8950ed931628560662ac54b583f7ebde064
4
- data.tar.gz: 9dbf96724e95aa1e006abdc3b3a8871aa1d8e868eefcbeb37116756ae0242328
3
+ metadata.gz: 2a6bab379e52b57a7cd8843752403f34e400beae92d3543df108e95f515f85f6
4
+ data.tar.gz: fae84575e349f5b4c0571e946cf1e65bd710b9a5803b052ec4ea434afdbf7980
5
5
  SHA512:
6
- metadata.gz: 389485e1c9ab8df393c72581593b5cc7c7a04630780b3e188a5c77791f43fbabc6d17b31f834d5b410dba984f0aa09c416747dcef13df7022bd5e30e327832ad
7
- data.tar.gz: 9c38ddbb6f738854cd5de47d45d69610f7c5e9d6aa68412afe4b74240950ec4ecfa702c60576645d3044670664071e70bb98d84f81ec4e6687e11b883d653f39
6
+ metadata.gz: '0244339497c4b9c57fe46c91ad3f51ff79e764d71dc7ee2889677b29158fb0d61aa77beb031fb95a87a85eca79dd26b057f4da50a5018f9e7794d5636e3b53cb'
7
+ data.tar.gz: b40f715f086c64dced8bdd0e2262b1346d566e089b2828d6b05ee2afe8c1cbef227d08e4eedd8862c4e5d2d8d1289bf181755dbd5e37433a1f4f80a5c5b01fc1
data/.circleci/config.yml CHANGED
@@ -2,14 +2,16 @@ version: 2.1
2
2
  jobs:
3
3
  lint:
4
4
  docker:
5
- - image: cimg/ruby:3.0.6
5
+ - image: cimg/ruby:3.0.7
6
+ environment:
7
+ BUNDLE_GEMFILE: gemfiles/rails_6.1.gemfile
6
8
  working_directory: ~/delayed_job_groups
7
9
  steps:
8
10
  - checkout
9
11
  - restore_cache:
10
12
  keys:
11
- - v1-gems-ruby-3.0.6-{{ checksum "delayed_job_groups.gemspec" }}-{{ checksum "Gemfile" }}
12
- - v1-gems-ruby-3.0.6-
13
+ - v1-gems-ruby-3.0.7-{{ checksum "delayed_job_groups.gemspec" }}-{{ checksum "gemfiles/rails_6.1.gemfile" }}
14
+ - v1-gems-ruby-3.0.7-
13
15
  - run:
14
16
  name: Install Gems
15
17
  command: |
@@ -18,7 +20,7 @@ jobs:
18
20
  bundle clean
19
21
  fi
20
22
  - save_cache:
21
- key: v1-gems-ruby-3.0.6-{{ checksum "delayed_job_groups.gemspec" }}-{{ checksum "Gemfile" }}
23
+ key: v1-gems-ruby-3.0.7-{{ checksum "delayed_job_groups.gemspec" }}-{{ checksum "gemfiles/rails_6.1.gemfile" }}
22
24
  paths:
23
25
  - "vendor/bundle"
24
26
  - "gemfiles/vendor/bundle"
@@ -69,10 +71,15 @@ workflows:
69
71
  matrix:
70
72
  parameters:
71
73
  gemfile:
72
- - "gemfiles/rails_6.1.gemfile"
73
- - "gemfiles/rails_7.0.gemfile"
74
- - "gemfiles/rails_7.1.gemfile"
74
+ - gemfiles/rails_6.1.gemfile
75
+ - gemfiles/rails_7.0.gemfile
76
+ - gemfiles/rails_7.1.gemfile
77
+ - gemfiles/rails_7.2.gemfile
75
78
  ruby_version:
76
- - "3.0.6"
77
- - "3.1.4"
78
- - "3.2.2"
79
+ - 3.0.7
80
+ - 3.1.6
81
+ - 3.2.5
82
+ - 3.3.4
83
+ exclude:
84
+ - gemfile: gemfiles/rails_7.2.gemfile
85
+ ruby_version: 3.0.7
data/.github/CODEOWNERS CHANGED
@@ -1 +1 @@
1
- * @jturkel @salsify/infrastructure-services
1
+ * @salsify/pim-core-backend
data/Appraisals CHANGED
@@ -1,16 +1,23 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  appraise 'rails-6.1' do
4
- gem 'activerecord', '~> 6.1.5'
5
- gem 'activesupport', '~> 6.1.5'
4
+ gem 'activerecord', '~> 6.1.7'
5
+ gem 'activesupport', '~> 6.1.7'
6
+ gem 'sqlite3', '~> 1.7'
6
7
  end
7
8
 
8
9
  appraise 'rails-7.0' do
9
- gem 'activerecord', '~> 7.0.2'
10
- gem 'activesupport', '~> 7.0.2'
10
+ gem 'activerecord', '~> 7.0.8'
11
+ gem 'activesupport', '~> 7.0.8'
12
+ gem 'sqlite3', '~> 1.7'
11
13
  end
12
14
 
13
15
  appraise 'rails-7.1' do
14
- gem 'activerecord', '~> 7.1.1'
15
- gem 'activesupport', '~> 7.1.1'
16
+ gem 'activerecord', '~> 7.1.4'
17
+ gem 'activesupport', '~> 7.1.4'
18
+ end
19
+
20
+ appraise 'rails-7.2' do
21
+ gem 'activerecord', '~> 7.2.1'
22
+ gem 'activesupport', '~> 7.2.1'
16
23
  end
data/CHANGELOG.md CHANGED
@@ -1,7 +1,12 @@
1
1
  # Changelog
2
2
 
3
- ## 0.10.0
3
+ ## 0.11.0
4
+ - Add support for Rails 7.2.
5
+ -
6
+ ## 0.10.1
7
+ - Fix Rails 7.1 deprecation warnings
4
8
 
9
+ ## 0.10.0
5
10
  - Add support for Rails 7.1
6
11
 
7
12
  ## 0.9.0
data/README.md CHANGED
@@ -1,11 +1,11 @@
1
1
  # Delayed Job Groups
2
2
  [![Gem Version](https://badge.fury.io/rb/delayed_job_groups_plugin.png)][gem]
3
- [![Build Status](https://secure.travis-ci.org/salsify/delayed_job_groups_plugin.png?branch=master)][travis]
3
+ [![Build Status](https://circleci.com/gh/salsify/delayed_job_groups_plugin.svg?style=svg)][circleci]
4
4
  [![Code Climate](https://codeclimate.com/github/salsify/delayed_job_groups_plugin.png)][codeclimate]
5
5
  [![Coverage Status](https://coveralls.io/repos/salsify/delayed_job_groups_plugin/badge.png)][coveralls]
6
6
 
7
7
  [gem]: https://rubygems.org/gems/delayed_job_groups_plugin
8
- [travis]: http://travis-ci.org/salsify/delayed_job_groups_plugin
8
+ [circleci]: https://circleci.com/gh/salsify/delayed_job_groups_plugin
9
9
  [codeclimate]: https://codeclimate.com/github/salsify/delayed_job_groups_plugin
10
10
  [coveralls]: https://coveralls.io/r/salsify/delayed_job_groups_plugin
11
11
 
data/delayed_job_groups.gemspec CHANGED
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
27
27
 
28
28
  spec.required_ruby_version = '>= 3.0'
29
29
 
30
- spec.add_dependency 'activerecord', '>= 6.1', '< 7.2'
30
+ spec.add_dependency 'activerecord', '>= 6.1', '< 8.0'
31
31
  spec.add_dependency 'delayed_job', '>= 4.1'
32
32
  spec.add_dependency 'delayed_job_active_record', '>= 4.1.8'
33
33
 
data/gemfiles/rails_6.1.gemfile CHANGED
@@ -2,7 +2,8 @@
2
2
 
3
3
  source "https://rubygems.org"
4
4
 
5
- gem "activerecord", "~> 6.1.5"
6
- gem "activesupport", "~> 6.1.5"
5
+ gem "activerecord", "~> 6.1.7"
6
+ gem "activesupport", "~> 6.1.7"
7
+ gem "sqlite3", "~> 1.7"
7
8
 
8
9
  gemspec path: "../"
data/gemfiles/rails_7.0.gemfile CHANGED
@@ -2,7 +2,8 @@
2
2
 
3
3
  source "https://rubygems.org"
4
4
 
5
- gem "activerecord", "~> 7.0.2"
6
- gem "activesupport", "~> 7.0.2"
5
+ gem "activerecord", "~> 7.0.8"
6
+ gem "activesupport", "~> 7.0.8"
7
+ gem "sqlite3", "~> 1.7"
7
8
 
8
9
  gemspec path: "../"
data/gemfiles/rails_7.1.gemfile CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  source "https://rubygems.org"
4
4
 
5
- gem "activerecord", "~> 7.1.1"
6
- gem "activesupport", "~> 7.1.1"
5
+ gem "activerecord", "~> 7.1.4"
6
+ gem "activesupport", "~> 7.1.4"
7
7
 
8
8
  gemspec path: "../"
data/gemfiles/rails_7.2.gemfile ADDED
@@ -0,0 +1,8 @@
1
+ # This file was generated by Appraisal
2
+
3
+ source "https://rubygems.org"
4
+
5
+ gem "activerecord", "~> 7.2.1"
6
+ gem "activesupport", "~> 7.2.1"
7
+
8
+ gemspec path: "../"
data/lib/delayed/job_groups/compatibility.rb CHANGED
@@ -6,7 +6,12 @@ require 'active_record/version'
6
6
  module Delayed
7
7
  module JobGroups
8
8
  module Compatibility
9
+ ACTIVE_RECORD_VERSION = ::Gem::Version.new(::ActiveRecord::VERSION::STRING).release
10
+ VERSION_7_1 = ::Gem::Version.new('7.1.0')
9
11
 
12
+ def self.rails_7_1_or_greater?
13
+ ACTIVE_RECORD_VERSION >= VERSION_7_1
14
+ end
10
15
  end
11
16
  end
12
17
  end
data/lib/delayed/job_groups/job_group.rb CHANGED
@@ -1,6 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  require_relative 'yaml_loader'
4
+ require_relative 'compatibility'
4
5
 
5
6
  module Delayed
6
7
  module JobGroups
@@ -8,10 +9,18 @@ module Delayed
8
9
 
9
10
  self.table_name = "#{ActiveRecord::Base.table_name_prefix}delayed_job_groups"
10
11
 
11
- serialize :on_completion_job, Delayed::JobGroups::YamlLoader
12
- serialize :on_completion_job_options, Hash
13
- serialize :on_cancellation_job, Delayed::JobGroups::YamlLoader
14
- serialize :on_cancellation_job_options, Hash
12
+ if Compatibility.rails_7_1_or_greater?
13
+ serialize :on_completion_job, coder: YAML, yaml: { unsafe_load: true }
14
+ serialize :on_completion_job_options, coder: YAML, type: Hash
15
+ serialize :on_cancellation_job, coder: YAML, yaml: { unsafe_load: true }
16
+ serialize :on_cancellation_job_options, coder: YAML, type: Hash
17
+ else
18
+ serialize :on_completion_job, Delayed::JobGroups::YamlLoader
19
+ serialize :on_completion_job_options, Hash
20
+ serialize :on_cancellation_job, Delayed::JobGroups::YamlLoader
21
+ serialize :on_cancellation_job_options, Hash
22
+ end
23
+
15
24
 
16
25
  validates :queueing_complete, :blocked, :failure_cancels_group, inclusion: [true, false]
17
26
 
data/lib/delayed/job_groups/version.rb CHANGED
@@ -2,6 +2,6 @@
2
2
 
3
3
  module Delayed
4
4
  module JobGroups
5
- VERSION = '0.10.0'
5
+ VERSION = '0.11.0'
6
6
  end
7
7
  end
data/lib/delayed/job_groups/yaml_loader.rb CHANGED
@@ -1,5 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
+ # This can be removed when we only support Rails 7.1+ because Rails 7.1 add a serialization
4
+ # option for unsafe YAML loads
3
5
  module Delayed
4
6
  module JobGroups
5
7
  module YamlLoader
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: delayed_job_groups_plugin
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.10.0
4
+ version: 0.11.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Joel Turkel
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2023-10-13 00:00:00.000000000 Z
12
+ date: 2024-08-29 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: activerecord
@@ -20,7 +20,7 @@ dependencies:
20
20
  version: '6.1'
21
21
  - - "<"
22
22
  - !ruby/object:Gem::Version
23
- version: '7.2'
23
+ version: '8.0'
24
24
  type: :runtime
25
25
  prerelease: false
26
26
  version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
30
30
  version: '6.1'
31
31
  - - "<"
32
32
  - !ruby/object:Gem::Version
33
- version: '7.2'
33
+ version: '8.0'
34
34
  - !ruby/object:Gem::Dependency
35
35
  name: delayed_job
36
36
  requirement: !ruby/object:Gem::Requirement
@@ -266,6 +266,7 @@ files:
266
266
  - gemfiles/rails_6.1.gemfile
267
267
  - gemfiles/rails_7.0.gemfile
268
268
  - gemfiles/rails_7.1.gemfile
269
+ - gemfiles/rails_7.2.gemfile
269
270
  - lib/delayed/job_groups/compatibility.rb
270
271
  - lib/delayed/job_groups/complete_stuck_job_groups_job.rb
271
272
  - lib/delayed/job_groups/job_extensions.rb