From b5924004d8e8c16f41ee3f811fed3e239566f180 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 19 Jan 2025 20:49:22 +0000
Subject: [PATCH 1/8] chore(deps): update dependency carrierwave to v3
---
Gemfile | 2 +-
Gemfile.lock | 27 ++++++++++++---------------
2 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/Gemfile b/Gemfile
index 31dc829d..4967ac18 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,7 @@ gem 'dav4rack', git: 'https://github.com/csvalpha/dav4rack.git', ref: '8541e53'
gem 'bcrypt', '~> 3.1', '>= 3.1.20'
gem 'bootsnap', '~> 1.18', '>= 1.18.4'
-gem 'carrierwave', '~> 2.2', '>= 2.2.6'
+gem 'carrierwave', '~> 3.1', '>= 3.1.1'
gem 'carrierwave-base64', '~> 2.11'
gem 'carrierwave-bombshelter', '~> 0.2', '>= 0.2.2'
gem 'case_transform', '~> 0.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index 3c0f32b0..a8be5e40 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -108,13 +108,12 @@ GEM
activesupport (>= 3.0.0)
uniform_notifier (~> 1.11)
byebug (11.1.3)
- carrierwave (2.2.6)
- activemodel (>= 5.0.0)
- activesupport (>= 5.0.0)
+ carrierwave (3.1.1)
+ activemodel (>= 6.0.0)
+ activesupport (>= 6.0.0)
addressable (~> 2.6)
image_processing (~> 1.1)
marcel (~> 1.0.0)
- mini_mime (>= 0.1.3)
ssrf_filter (~> 1.0)
carrierwave-base64 (2.11.0)
carrierwave (>= 2.2.1)
@@ -128,7 +127,7 @@ GEM
activesupport
coderay (1.1.3)
colorize (0.8.1)
- concurrent-ruby (1.3.4)
+ concurrent-ruby (1.3.5)
connection_pool (2.4.1)
consistency_fail (0.3.7)
counter_culture (3.8.2)
@@ -172,10 +171,7 @@ GEM
ruby2_keywords (>= 0.0.4)
faraday-net_http (2.0.1)
fastimage (2.2.6)
- ffi (1.15.5)
- ffi (1.15.5-java)
- ffi (1.15.5-x64-mingw32)
- ffi (1.15.5-x86-mingw32)
+ ffi (1.17.1)
ffi-compiler (1.3.2)
ffi (>= 1.15.5)
rake
@@ -225,7 +221,7 @@ GEM
ice_cube (~> 0.16)
ostruct
ice_cube (0.17.0)
- image_processing (1.12.2)
+ image_processing (1.13.0)
mini_magick (>= 4.9.5, < 5)
ruby-vips (>= 2.0.17, < 3)
improvmx (0.2.1)
@@ -268,7 +264,7 @@ GEM
mini_magick (4.13.2)
mini_mime (1.1.5)
mini_portile2 (2.8.8)
- minitest (5.25.2)
+ minitest (5.25.4)
msgpack (1.7.5)
msgpack (1.7.5-java)
nenv (0.3.0)
@@ -314,7 +310,7 @@ GEM
pry (~> 0.13.0)
pry-rails (0.3.9)
pry (>= 0.10.4)
- public_suffix (4.0.7)
+ public_suffix (6.0.1)
puma (6.5.0)
nio4r (~> 2.0)
puma (6.5.0-java)
@@ -448,8 +444,9 @@ GEM
rubocop (~> 1.19)
ruby-filemagic (0.7.3)
ruby-progressbar (1.11.0)
- ruby-vips (2.1.4)
+ ruby-vips (2.2.2)
ffi (~> 1.12)
+ logger
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
rufus-scheduler (3.9.2)
@@ -486,7 +483,7 @@ GEM
spring-watcher-listen (2.0.1)
listen (>= 2.7, < 4.0)
spring (>= 1.2, < 3.0)
- ssrf_filter (1.0.8)
+ ssrf_filter (1.2.0)
terminal-notifier-guard (1.7.0)
thor (1.3.2)
tilt (2.4.0)
@@ -544,7 +541,7 @@ DEPENDENCIES
bootsnap (~> 1.18, >= 1.18.4)
brakeman
bullet
- carrierwave (~> 2.2, >= 2.2.6)
+ carrierwave (~> 3.1, >= 3.1.1)
carrierwave-base64 (~> 2.11)
carrierwave-bombshelter (~> 0.2, >= 0.2.2)
case_transform (~> 0.2)
From 06fabde7512d92c3c05116ffd97545ec11c69bf1 Mon Sep 17 00:00:00 2001
From: Jorai Geertsema <jamestreeg@gmail.com>
Date: Tue, 21 Jan 2025 17:22:24 +0100
Subject: [PATCH 2/8] manualy defined concurrend ruby
---
Gemfile | 1 +
1 file changed, 1 insertion(+)
diff --git a/Gemfile b/Gemfile
index 4967ac18..9d3896d4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,6 +9,7 @@ gem 'carrierwave', '~> 3.1', '>= 3.1.1'
gem 'carrierwave-base64', '~> 2.11'
gem 'carrierwave-bombshelter', '~> 0.2', '>= 0.2.2'
gem 'case_transform', '~> 0.2'
+gem 'concurrent-ruby', '1.3.4' #can be removed when we upgrade to rails 7.1 https://www.devgem.io/posts/resolving-the-loggerthreadsafelevel-error-in-rails-after-bundle-update
gem 'counter_culture', '~> 3.8', '>= 3.8.2'
gem 'dav4rack_ext', '~> 1.0'
gem 'doorkeeper', '~> 5.8', '>= 5.8.1'
From 121e84dea634180864279be58eb8d5f9e0865fb0 Mon Sep 17 00:00:00 2001
From: Jorai Geertsema <jamestreeg@gmail.com>
Date: Tue, 21 Jan 2025 17:29:53 +0100
Subject: [PATCH 3/8] fixed lint
---
Gemfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Gemfile b/Gemfile
index 9d3896d4..3deaec00 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,7 +9,7 @@ gem 'carrierwave', '~> 3.1', '>= 3.1.1'
gem 'carrierwave-base64', '~> 2.11'
gem 'carrierwave-bombshelter', '~> 0.2', '>= 0.2.2'
gem 'case_transform', '~> 0.2'
-gem 'concurrent-ruby', '1.3.4' #can be removed when we upgrade to rails 7.1 https://www.devgem.io/posts/resolving-the-loggerthreadsafelevel-error-in-rails-after-bundle-update
+gem 'concurrent-ruby', '1.3.4' # can be removed when we upgrade to rails 7.1 https://www.devgem.io/posts/resolving-the-loggerthreadsafelevel-error-in-rails-after-bundle-update
gem 'counter_culture', '~> 3.8', '>= 3.8.2'
gem 'dav4rack_ext', '~> 1.0'
gem 'doorkeeper', '~> 5.8', '>= 5.8.1'
From 16a09861a676a73bb11120f13b51191d31cb73cd Mon Sep 17 00:00:00 2001
From: Jorai Geertsema <jamestreeg@gmail.com>
Date: Tue, 21 Jan 2025 17:34:02 +0100
Subject: [PATCH 4/8] Fixed warning tests
---
app/uploaders/application_uploader.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/uploaders/application_uploader.rb b/app/uploaders/application_uploader.rb
index d5dcaa11..7f9e49fd 100644
--- a/app/uploaders/application_uploader.rb
+++ b/app/uploaders/application_uploader.rb
@@ -10,7 +10,7 @@ def store_dir
# See https://github.com/carrierwaveuploader/carrierwave/wiki/How-to:-Create-random-and-unique-filenames-for-all-versioned-files#unique-filenames
def filename
- "#{secure_token}.#{file.extension}" if original_filename.present?
+ "#{secure_token}.#{file.extension}"
end
protected
From 1064be7f9a9fcb1bb5c3fdebf9e16ab57744f51c Mon Sep 17 00:00:00 2001
From: lodewiges <131907615+lodewiges@users.noreply.github.com>
Date: Thu, 30 Jan 2025 02:12:23 +0100
Subject: [PATCH 5/8] Update mini magick
---
Gemfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Gemfile b/Gemfile
index 3deaec00..82e115b0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,7 +24,7 @@ gem 'isbn_validation', '~> 1.2', '>= 1.2.2'
gem 'jsonapi-authorization', '~> 3.0', '>= 3.0.2'
gem 'jsonapi-resources', '~> 0.9.1'
gem 'message_bus', '~> 4.3', '>= 4.3.8'
-gem 'mini_magick', '~> 4.13', '>= 4.13.2'
+gem 'mini_magick', '~> 5.1'
gem 'paper_trail', '~> 14.0'
gem 'paranoia', '~> 3.0'
gem 'pg', '~> 1.5', '>= 1.5.9'
From 933ee9c3a2bc2c1d67be0e743f3b5f71c0452a7e Mon Sep 17 00:00:00 2001
From: Jorai Geertsema <jamestreeg@gmail.com>
Date: Thu, 13 Feb 2025 14:52:25 +0100
Subject: [PATCH 6/8] update gem.lock
---
Gemfile.lock | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index 104c4d81..c215e224 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -94,6 +94,7 @@ GEM
base64 (0.2.0)
bcrypt (3.1.20)
bcrypt (3.1.20-java)
+ benchmark (0.4.0)
better_errors (2.9.1)
coderay (>= 1.0.0)
erubi (>= 1.0.0)
@@ -127,7 +128,7 @@ GEM
activesupport
coderay (1.1.3)
colorize (0.8.1)
- concurrent-ruby (1.3.5)
+ concurrent-ruby (1.3.4)
connection_pool (2.4.1)
consistency_fail (0.3.7)
counter_culture (3.8.2)
@@ -221,8 +222,8 @@ GEM
ice_cube (~> 0.16)
ostruct
ice_cube (0.17.0)
- image_processing (1.13.0)
- mini_magick (>= 4.9.5, < 5)
+ image_processing (1.14.0)
+ mini_magick (>= 4.9.5, < 6)
ruby-vips (>= 2.0.17, < 3)
improvmx (0.2.1)
rest-client (~> 2.0)
@@ -261,7 +262,9 @@ GEM
mina (1.2.4)
open4 (~> 1.3.4)
rake
- mini_magick (4.13.2)
+ mini_magick (5.1.2)
+ benchmark
+ logger
mini_mime (1.1.5)
mini_portile2 (2.8.8)
minitest (5.25.4)
@@ -546,6 +549,7 @@ DEPENDENCIES
carrierwave-bombshelter (~> 0.2, >= 0.2.2)
case_transform (~> 0.2)
colorize
+ concurrent-ruby (= 1.3.4)
consistency_fail
counter_culture (~> 3.8, >= 3.8.2)
dav4rack!
@@ -569,7 +573,7 @@ DEPENDENCIES
listen
message_bus (~> 4.3, >= 4.3.8)
mina
- mini_magick (~> 4.13, >= 4.13.2)
+ mini_magick (~> 5.1)
paper_trail (~> 16.0)
paranoia (~> 3.0)
pg (~> 1.5, >= 1.5.9)
From 19990b7b63889ab2017bffa34cf8a0ed60886880 Mon Sep 17 00:00:00 2001
From: Jorai Geertsema <jamestreeg@gmail.com>
Date: Fri, 14 Feb 2025 20:36:32 +0100
Subject: [PATCH 7/8] Update test to reflect changes
---
.../behaviors/requests/model_accepting_base_64_image.rb | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/spec/support/behaviors/requests/model_accepting_base_64_image.rb b/spec/support/behaviors/requests/model_accepting_base_64_image.rb
index 74459f47..c4c71089 100644
--- a/spec/support/behaviors/requests/model_accepting_base_64_image.rb
+++ b/spec/support/behaviors/requests/model_accepting_base_64_image.rb
@@ -23,8 +23,11 @@
before { model.instance_variable_set(:"@#{attr}_secure_token", nil) }
it do
- expect { model.public_send(attr).recreate_versions! }
- .to(change { model.public_send(attr).url })
+ expect {
+ model.public_send(attr).cache! # https://makandracards.com/makandra/611988-upgrade-carrierwave-3-x
+ model.public_send(attr).store!
+ model.public_send(attr).recreate_versions!
+ }.to(change { model.public_send(attr).url })
end
end
From 39eea2b883055f05db066f77f5c1b69c6954ba10 Mon Sep 17 00:00:00 2001
From: Jorai Geertsema <jamestreeg@gmail.com>
Date: Fri, 14 Feb 2025 21:27:20 +0100
Subject: [PATCH 8/8] Fixed lint
---
.../behaviors/requests/model_accepting_base_64_image.rb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/spec/support/behaviors/requests/model_accepting_base_64_image.rb b/spec/support/behaviors/requests/model_accepting_base_64_image.rb
index c4c71089..976e88aa 100644
--- a/spec/support/behaviors/requests/model_accepting_base_64_image.rb
+++ b/spec/support/behaviors/requests/model_accepting_base_64_image.rb
@@ -23,11 +23,11 @@
before { model.instance_variable_set(:"@#{attr}_secure_token", nil) }
it do
- expect {
+ expect do
model.public_send(attr).cache! # https://makandracards.com/makandra/611988-upgrade-carrierwave-3-x
model.public_send(attr).store!
- model.public_send(attr).recreate_versions!
- }.to(change { model.public_send(attr).url })
+ model.public_send(attr).recreate_versions!
+ end.to(change { model.public_send(attr).url })
end
end