From 07bd3932b0748bef7278bef1bdbe5eb0fb07934f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 6 Jul 2026 10:21:04 +0200 Subject: [PATCH] Update dependency kt-paperclip to v8 (#39667) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Pia B --- Gemfile | 2 +- Gemfile.lock | 10 ++++---- config/application.rb | 1 - .../media_type_spoof_detector_extensions.rb | 24 ------------------- 4 files changed, 6 insertions(+), 31 deletions(-) delete mode 100644 lib/paperclip/media_type_spoof_detector_extensions.rb diff --git a/Gemfile b/Gemfile index 301e89039c0..1d00a60e7e5 100644 --- a/Gemfile +++ b/Gemfile @@ -19,7 +19,7 @@ gem 'blurhash', '~> 0.1' gem 'fog-core', '<= 2.6.0' gem 'fog-openstack', '~> 1.0', require: false gem 'jd-paperclip-azure', '~> 3.0', require: false -gem 'kt-paperclip', '~> 7.2' +gem 'kt-paperclip', '~> 8.0' gem 'ruby-vips', '~> 2.2', require: false gem 'active_model_serializers', '~> 0.10' diff --git a/Gemfile.lock b/Gemfile.lock index 354fb107411..1e39966385f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -392,12 +392,12 @@ GEM activerecord kaminari-core (= 1.2.2) kaminari-core (1.2.2) - kt-paperclip (7.3.0) + kt-paperclip (8.0.0) activemodel (>= 4.2.0) activesupport (>= 4.2.0) - marcel (~> 1.0.1) + marcel (>= 1.0.1) mime-types - terrapin (>= 0.6.0, < 2.0) + terrapin (>= 0.6.0) language_server-protocol (3.17.0.5) launchy (3.1.1) addressable (~> 2.8) @@ -438,7 +438,7 @@ GEM net-imap net-pop net-smtp - marcel (1.0.4) + marcel (1.2.1) mario-redis-lock (1.2.1) redis (>= 3.0.5) matrix (0.4.3) @@ -1007,7 +1007,7 @@ DEPENDENCIES json-ld-preloaded (~> 3.2) json-schema (~> 6.0) kaminari (~> 1.2) - kt-paperclip (~> 7.2) + kt-paperclip (~> 8.0) letter_opener (~> 1.8) letter_opener_web (~> 3.0) link_header (~> 0.0) diff --git a/config/application.rb b/config/application.rb index 34899d6a690..181924da648 100644 --- a/config/application.rb +++ b/config/application.rb @@ -28,7 +28,6 @@ require_relative '../lib/paperclip/url_generator_extensions' require_relative '../lib/paperclip/attachment_extensions' require_relative '../lib/paperclip/gif_transcoder' -require_relative '../lib/paperclip/media_type_spoof_detector_extensions' require_relative '../lib/paperclip/transcoder' require_relative '../lib/paperclip/type_corrector' require_relative '../lib/paperclip/response_with_limit_adapter' diff --git a/lib/paperclip/media_type_spoof_detector_extensions.rb b/lib/paperclip/media_type_spoof_detector_extensions.rb deleted file mode 100644 index c8868d5e952..00000000000 --- a/lib/paperclip/media_type_spoof_detector_extensions.rb +++ /dev/null @@ -1,24 +0,0 @@ -# frozen_string_literal: true - -module Paperclip - module MediaTypeSpoofDetectorExtensions - MARCEL_MIME_TYPES = %w(audio/mpeg image/avif).freeze - - def calculated_content_type - return @calculated_content_type if defined?(@calculated_content_type) - - @calculated_content_type = type_from_file_command.chomp - - # The `file` command fails to recognize some MP3 files as such - @calculated_content_type = type_from_marcel if @calculated_content_type == 'application/octet-stream' && type_from_marcel.in?(MARCEL_MIME_TYPES) - @calculated_content_type - end - - def type_from_marcel - @type_from_marcel ||= Marcel::MimeType.for Pathname.new(@file.path), - name: @file.path - end - end -end - -Paperclip::MediaTypeSpoofDetector.prepend(Paperclip::MediaTypeSpoofDetectorExtensions)