Control: tags 1019617 + patch Control: tags 1019617 + pending Dear maintainer,
I've prepared an NMU for ruby-delayed-job-active-record (versioned as 4.1.6-3.1)and uploaded it to DELAYED/15. Please feel free to tell me if I should cancel it. cu Adrian
diff -Nru ruby-delayed-job-active-record-4.1.6/debian/changelog ruby-delayed-job-active-record-4.1.6/debian/changelog --- ruby-delayed-job-active-record-4.1.6/debian/changelog 2021-11-29 02:09:59.000000000 +0200 +++ ruby-delayed-job-active-record-4.1.6/debian/changelog 2022-10-15 17:00:10.000000000 +0300 @@ -1,3 +1,10 @@ +ruby-delayed-job-active-record (4.1.6-3.1) unstable; urgency=medium + + * Non-maintainer upload. + * Add upstream fix for Ruby 3.1. (Closes: #1019617) + + -- Adrian Bunk <b...@debian.org> Sat, 15 Oct 2022 17:00:10 +0300 + ruby-delayed-job-active-record (4.1.6-3) unstable; urgency=medium * Team upload. diff -Nru ruby-delayed-job-active-record-4.1.6/debian/patches/0001-Fix-a-broken-spec-due-to-Psych-4.patch ruby-delayed-job-active-record-4.1.6/debian/patches/0001-Fix-a-broken-spec-due-to-Psych-4.patch --- ruby-delayed-job-active-record-4.1.6/debian/patches/0001-Fix-a-broken-spec-due-to-Psych-4.patch 1970-01-01 02:00:00.000000000 +0200 +++ ruby-delayed-job-active-record-4.1.6/debian/patches/0001-Fix-a-broken-spec-due-to-Psych-4.patch 2022-10-15 16:59:38.000000000 +0300 @@ -0,0 +1,48 @@ +From 72da7676697cf995a42fd8140a834bfd6eef6a69 Mon Sep 17 00:00:00 2001 +From: willnet <netwill...@gmail.com> +Date: Mon, 1 Nov 2021 17:32:01 +0900 +Subject: Fix a broken spec due to Psych >= 4 + +Since psych4.0, the load method has been safe_load, which causes the following error. + +So I use YAML#load_dj to avoid them. ref: ref: https://github.com/collectiveidea/delayed_job/pull/1152/commits/b4ddd3dfe1450f1e51f9a6ac90db3134b5d7af78 + +``` + 1) ActiveRecord loads classes with non-default primary key + Failure/Error: + expect do + YAML.load(Story.create.to_yaml) + end.not_to raise_error + + expected no Exception, got #<Psych::DisallowedClass: Tried to load unspecified class: Story> with backtrace: + # ./spec/delayed/serialization/active_record_spec.rb:8:in `block (3 levels) in <top (required)>' + # ./spec/delayed/serialization/active_record_spec.rb:7:in `block (2 levels) in <top (required)>' + # ./spec/delayed/serialization/active_record_spec.rb:7:in `block (2 levels) in <top (required)>' +``` +--- + spec/delayed/serialization/active_record_spec.rb | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/spec/delayed/serialization/active_record_spec.rb b/spec/delayed/serialization/active_record_spec.rb +index 4aa27f1..f0b0cd3 100644 +--- a/spec/delayed/serialization/active_record_spec.rb ++++ b/spec/delayed/serialization/active_record_spec.rb +@@ -5,13 +5,13 @@ require "helper" + describe ActiveRecord do + it "loads classes with non-default primary key" do + expect do +- YAML.load(Story.create.to_yaml) ++ YAML.load_dj(Story.create.to_yaml) + end.not_to raise_error + end + + it "loads classes even if not in default scope" do + expect do +- YAML.load(Story.create(scoped: false).to_yaml) ++ YAML.load_dj(Story.create(scoped: false).to_yaml) + end.not_to raise_error + end + end +-- +2.30.2 + diff -Nru ruby-delayed-job-active-record-4.1.6/debian/patches/series ruby-delayed-job-active-record-4.1.6/debian/patches/series --- ruby-delayed-job-active-record-4.1.6/debian/patches/series 2021-11-29 02:09:59.000000000 +0200 +++ ruby-delayed-job-active-record-4.1.6/debian/patches/series 2022-10-15 17:00:10.000000000 +0300 @@ -1,2 +1,3 @@ no-simplecov-lcov.patch fix-path-to-migration-template.patch +0001-Fix-a-broken-spec-due-to-Psych-4.patch
