From b5470ecf1c908dff367d469eee94201dea801c7d Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Fri, 10 Oct 2025 13:24:40 +1300 Subject: [PATCH 01/12] update to 7.2 activesupport / actionpack --- supplejack_common.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/supplejack_common.gemspec b/supplejack_common.gemspec index 7c8b0f1..11b4a8e 100644 --- a/supplejack_common.gemspec +++ b/supplejack_common.gemspec @@ -18,8 +18,8 @@ Gem::Specification.new do |gem| gem.executables = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) } gem.require_paths = ['lib'] - gem.add_dependency 'actionpack', '~> 7.1.4' - gem.add_dependency 'activesupport', '~> 7.1.4' + gem.add_dependency 'actionpack', '~> 7.2.0' + gem.add_dependency 'activesupport', '~> 7.2.0' gem.add_dependency 'aws-sdk-s3' gem.add_dependency 'chronic', '<= 0.10.2' gem.add_dependency 'dimensions' From f1f484843b2a493fe1ad94acb061b3ab185875e6 Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Fri, 10 Oct 2025 13:27:40 +1300 Subject: [PATCH 02/12] updated mime magic --- Gemfile.lock | 41 ++++++++++++++++++++------------------- supplejack_common.gemspec | 2 +- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index be59a78..ae1ecbb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -13,8 +13,8 @@ PATH remote: . specs: supplejack_common (3.0.0) - actionpack (~> 7.1.4) - activesupport (~> 7.1.4) + actionpack (~> 7.2.0) + activesupport (~> 7.2.0) aws-sdk-s3 chronic (<= 0.10.2) dimensions @@ -24,7 +24,7 @@ PATH json (>= 2.3.0) jsonpath loofah - mimemagic + mimemagic (~> 0.4.3) mongoid nokogiri oai @@ -37,37 +37,35 @@ PATH GEM remote: https://rubygems.org/ specs: - actionpack (7.1.5.1) - actionview (= 7.1.5.1) - activesupport (= 7.1.5.1) + actionpack (7.2.2.2) + actionview (= 7.2.2.2) + activesupport (= 7.2.2.2) nokogiri (>= 1.8.5) racc - rack (>= 2.2.4) + rack (>= 2.2.4, < 3.2) rack-session (>= 1.0.1) rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actionview (7.1.5.1) - activesupport (= 7.1.5.1) + useragent (~> 0.16) + actionview (7.2.2.2) + activesupport (= 7.2.2.2) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activemodel (7.1.5.1) - activesupport (= 7.1.5.1) - activesupport (7.1.5.1) + activesupport (7.2.2.2) base64 benchmark (>= 0.3) bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) + concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) logger (>= 1.4.2) minitest (>= 5.1) - mutex_m securerandom (>= 0.3) - tzinfo (~> 2.0) + tzinfo (~> 2.0, >= 2.0.5) addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) ast (2.4.2) @@ -106,6 +104,7 @@ GEM dimensions (1.3.0) domain_name (0.6.20240107) drb (2.2.3) + durran-validatable (2.0.1) erubi (1.13.1) faraday (2.10.0) faraday-net_http (>= 2.0, < 3.2) @@ -128,6 +127,7 @@ GEM jsonpath (1.1.5) multi_json language_server-protocol (3.17.0.3) + leshill-will_paginate (2.3.11) logger (1.6.0) loofah (2.24.1) crass (~> 1.0.2) @@ -144,12 +144,12 @@ GEM mock_redis (0.44.0) mongo (2.20.1) bson (>= 4.14.1, < 6.0.0) - mongoid (9.0.6) - activemodel (>= 5.1, < 8.1, != 7.0.0) - concurrent-ruby (>= 1.0.5, < 2.0) - mongo (>= 2.18.0, < 3.0.0) + mongoid (1.0.6) + activesupport (>= 2.2.2) + durran-validatable (>= 2.0.1) + leshill-will_paginate (>= 2.3.11) + mongo (>= 0.18.2) multi_json (1.15.0) - mutex_m (0.3.0) net-http (0.4.1) uri netrc (0.11.0) @@ -243,6 +243,7 @@ GEM concurrent-ruby (~> 1.0) unicode-display_width (2.5.0) uri (1.0.3) + useragent (0.16.11) webmock (3.23.1) addressable (>= 2.8.0) crack (>= 0.3.2) diff --git a/supplejack_common.gemspec b/supplejack_common.gemspec index 11b4a8e..77ab020 100644 --- a/supplejack_common.gemspec +++ b/supplejack_common.gemspec @@ -29,7 +29,7 @@ Gem::Specification.new do |gem| gem.add_dependency 'json', '>= 2.3.0' gem.add_dependency 'jsonpath' gem.add_dependency 'loofah' - gem.add_dependency 'mimemagic' + gem.add_dependency 'mimemagic', '~> 0.4.3' gem.add_dependency 'mongoid' gem.add_dependency 'nokogiri' gem.add_dependency 'oai' From 4b6f2dcdda31d2a851791f26e6419e18ce69a7b7 Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Fri, 10 Oct 2025 13:38:22 +1300 Subject: [PATCH 03/12] bundle audit updates --- Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ae1ecbb..fef0ef5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -153,12 +153,12 @@ GEM net-http (0.4.1) uri netrc (0.11.0) - nokogiri (1.18.8) + nokogiri (1.18.10) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.18.8-arm64-darwin) + nokogiri (1.18.10-arm64-darwin) racc (~> 1.4) - nokogiri (1.18.8-x86_64-linux-gnu) + nokogiri (1.18.10-x86_64-linux-gnu) racc (~> 1.4) oai (1.2.1) builder (>= 3.1.0) @@ -203,7 +203,7 @@ GEM mime-types (>= 1.16, < 4.0) netrc (~> 0.8) retriable (3.1.2) - rexml (3.4.1) + rexml (3.4.4) rspec (3.13.0) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) From d4d26924e2ccb94063be9fd17f8649b80e1eeed7 Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Fri, 10 Oct 2025 13:39:15 +1300 Subject: [PATCH 04/12] update uri and rack --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index fef0ef5..f50650c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -177,7 +177,7 @@ GEM pry (>= 0.13, < 0.15) public_suffix (6.0.0) racc (1.8.1) - rack (3.1.16) + rack (3.1.17) rack-session (2.1.1) base64 (>= 0.1.0) rack (>= 3.0.0) @@ -242,7 +242,7 @@ GEM tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.5.0) - uri (1.0.3) + uri (1.0.4) useragent (0.16.11) webmock (3.23.1) addressable (>= 2.8.0) From 0e513d655cc5331ce9e42d316e89b119c8091efa Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Fri, 10 Oct 2025 13:41:23 +1300 Subject: [PATCH 05/12] Add active model --- Gemfile.lock | 3 +++ supplejack_common.gemspec | 1 + 2 files changed, 4 insertions(+) diff --git a/Gemfile.lock b/Gemfile.lock index f50650c..5bf7da0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -14,6 +14,7 @@ PATH specs: supplejack_common (3.0.0) actionpack (~> 7.2.0) + activemodel (~> 7.2.0) activesupport (~> 7.2.0) aws-sdk-s3 chronic (<= 0.10.2) @@ -54,6 +55,8 @@ GEM erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) + activemodel (7.2.2.2) + activesupport (= 7.2.2.2) activesupport (7.2.2.2) base64 benchmark (>= 0.3) diff --git a/supplejack_common.gemspec b/supplejack_common.gemspec index 77ab020..f0443b8 100644 --- a/supplejack_common.gemspec +++ b/supplejack_common.gemspec @@ -18,6 +18,7 @@ Gem::Specification.new do |gem| gem.executables = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) } gem.require_paths = ['lib'] + gem.add_dependency 'activemodel', '~> 7.2.0' gem.add_dependency 'actionpack', '~> 7.2.0' gem.add_dependency 'activesupport', '~> 7.2.0' gem.add_dependency 'aws-sdk-s3' From f13e5087a0400d5b9e90ab78e99ffb5653c0fcfa Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Fri, 10 Oct 2025 13:42:11 +1300 Subject: [PATCH 06/12] rubocop fix --- supplejack_common.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/supplejack_common.gemspec b/supplejack_common.gemspec index f0443b8..4fd0237 100644 --- a/supplejack_common.gemspec +++ b/supplejack_common.gemspec @@ -18,8 +18,8 @@ Gem::Specification.new do |gem| gem.executables = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) } gem.require_paths = ['lib'] - gem.add_dependency 'activemodel', '~> 7.2.0' gem.add_dependency 'actionpack', '~> 7.2.0' + gem.add_dependency 'activemodel', '~> 7.2.0' gem.add_dependency 'activesupport', '~> 7.2.0' gem.add_dependency 'aws-sdk-s3' gem.add_dependency 'chronic', '<= 0.10.2' From 65f919ca4f7fd8c766517ad17c19a737159ea8c9 Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Fri, 10 Oct 2025 13:44:16 +1300 Subject: [PATCH 07/12] add rails observers --- Gemfile.lock | 3 +++ supplejack_common.gemspec | 1 + 2 files changed, 4 insertions(+) diff --git a/Gemfile.lock b/Gemfile.lock index 5bf7da0..c324320 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -29,6 +29,7 @@ PATH mongoid nokogiri oai + rails-observers redis rest-client retriable @@ -193,6 +194,8 @@ GEM rails-html-sanitizer (1.6.2) loofah (~> 2.21) nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) + rails-observers (0.1.5) + activemodel (>= 4.0) rainbow (3.1.1) rake (13.2.1) redis (5.2.0) diff --git a/supplejack_common.gemspec b/supplejack_common.gemspec index 4fd0237..e303684 100644 --- a/supplejack_common.gemspec +++ b/supplejack_common.gemspec @@ -34,6 +34,7 @@ Gem::Specification.new do |gem| gem.add_dependency 'mongoid' gem.add_dependency 'nokogiri' gem.add_dependency 'oai' + gem.add_dependency 'rails-observers' gem.add_dependency 'redis' gem.add_dependency 'rest-client' gem.add_dependency 'retriable' From f68558c2e24dc5c8cc6434e2044125f2f10bedef Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Fri, 10 Oct 2025 13:45:38 +1300 Subject: [PATCH 08/12] added observer gem --- Gemfile.lock | 5 ++--- supplejack_common.gemspec | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c324320..9ec073c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -29,7 +29,7 @@ PATH mongoid nokogiri oai - rails-observers + observer redis rest-client retriable @@ -168,6 +168,7 @@ GEM builder (>= 3.1.0) faraday (< 3) faraday-follow_redirects (>= 0.3.0, < 2) + observer (0.1.2) optparse (0.5.0) parallel (1.25.1) parser (3.3.4.0) @@ -194,8 +195,6 @@ GEM rails-html-sanitizer (1.6.2) loofah (~> 2.21) nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0) - rails-observers (0.1.5) - activemodel (>= 4.0) rainbow (3.1.1) rake (13.2.1) redis (5.2.0) diff --git a/supplejack_common.gemspec b/supplejack_common.gemspec index e303684..d58d8ca 100644 --- a/supplejack_common.gemspec +++ b/supplejack_common.gemspec @@ -34,7 +34,7 @@ Gem::Specification.new do |gem| gem.add_dependency 'mongoid' gem.add_dependency 'nokogiri' gem.add_dependency 'oai' - gem.add_dependency 'rails-observers' + gem.add_dependency 'observer' gem.add_dependency 'redis' gem.add_dependency 'rest-client' gem.add_dependency 'retriable' From e798b06450bae81f9284939cf94ad5e87829c7f0 Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Fri, 10 Oct 2025 13:47:58 +1300 Subject: [PATCH 09/12] updated spec helper --- spec/spec_helper.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 5c65969..44a3899 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -12,6 +12,4 @@ config.example_status_persistence_file_path = 'spec/examples.txt' end -Mongoid.configure do |config| - config.load!('spec/support/mongoid.yml', 'test') -end +Mongoid.load!('spec/support/mongoid.yml', :test) \ No newline at end of file From c4950e4d95e714b1caf25d6e92e82cd0394b09c3 Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Fri, 10 Oct 2025 13:50:50 +1300 Subject: [PATCH 10/12] require mongoid --- spec/spec_helper.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 44a3899..878fa08 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -4,6 +4,7 @@ require 'supplejack_common' require 'webmock/rspec' require 'loofah' +require 'mongoid' RSpec.configure do |config| config.raise_errors_for_deprecations! From 319f128cda352a074d49a68c6a67789333fbfff9 Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Fri, 10 Oct 2025 13:56:32 +1300 Subject: [PATCH 11/12] tidy up --- Gemfile.lock | 2 +- spec/spec_helper.rb | 2 -- supplejack_common.gemspec | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9ec073c..55f4291 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -25,7 +25,7 @@ PATH json (>= 2.3.0) jsonpath loofah - mimemagic (~> 0.4.3) + mimemagic mongoid nokogiri oai diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 878fa08..bebab83 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -12,5 +12,3 @@ config.run_all_when_everything_filtered = true config.example_status_persistence_file_path = 'spec/examples.txt' end - -Mongoid.load!('spec/support/mongoid.yml', :test) \ No newline at end of file diff --git a/supplejack_common.gemspec b/supplejack_common.gemspec index d58d8ca..78d98df 100644 --- a/supplejack_common.gemspec +++ b/supplejack_common.gemspec @@ -30,7 +30,7 @@ Gem::Specification.new do |gem| gem.add_dependency 'json', '>= 2.3.0' gem.add_dependency 'jsonpath' gem.add_dependency 'loofah' - gem.add_dependency 'mimemagic', '~> 0.4.3' + gem.add_dependency 'mimemagic' gem.add_dependency 'mongoid' gem.add_dependency 'nokogiri' gem.add_dependency 'oai' From 34fa563e573bf7baf86c11cae3e3877274c30277 Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Fri, 10 Oct 2025 14:22:28 +1300 Subject: [PATCH 12/12] updated gem --- Gemfile.lock | 6 +++--- supplejack_common.gemspec | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 55f4291..babdfa4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -13,9 +13,9 @@ PATH remote: . specs: supplejack_common (3.0.0) - actionpack (~> 7.2.0) - activemodel (~> 7.2.0) - activesupport (~> 7.2.0) + actionpack (~> 7.2.2.2) + activemodel (~> 7.2.2.2) + activesupport (~> 7.2.2.2) aws-sdk-s3 chronic (<= 0.10.2) dimensions diff --git a/supplejack_common.gemspec b/supplejack_common.gemspec index 78d98df..b58229a 100644 --- a/supplejack_common.gemspec +++ b/supplejack_common.gemspec @@ -18,9 +18,9 @@ Gem::Specification.new do |gem| gem.executables = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) } gem.require_paths = ['lib'] - gem.add_dependency 'actionpack', '~> 7.2.0' - gem.add_dependency 'activemodel', '~> 7.2.0' - gem.add_dependency 'activesupport', '~> 7.2.0' + gem.add_dependency 'actionpack', '~> 7.2.2.2' + gem.add_dependency 'activemodel', '~> 7.2.2.2' + gem.add_dependency 'activesupport', '~> 7.2.2.2' gem.add_dependency 'aws-sdk-s3' gem.add_dependency 'chronic', '<= 0.10.2' gem.add_dependency 'dimensions'