From 2413afa355ffbb433e68b56c85f1ccfda582ed2a Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Thu, 18 Feb 2021 10:57:03 +0000 Subject: [PATCH] Update patch with warning --- config/initializers/paperclip.rb | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb index a72408de9e..f934179d47 100644 --- a/config/initializers/paperclip.rb +++ b/config/initializers/paperclip.rb @@ -13,12 +13,18 @@ Paperclip.io_adapters.registered_handlers.delete_if do |_proc, adapter_class| url_adapters.include? adapter_class.to_s end -# Patches an error for missing method #silence_stream with Rails 5.0 -# Can be removed after Paperclip is upgraded to 3.5+ -module Paperclip - class GeometryDetector - def silence_stream(_stream, &block) - yield +if Paperclip::VERSION.to_f < 3.5 + if Rails::VERSION::MAJOR > 4 + # Patches an error for missing method #silence_stream with Rails 5.0 + # Can be removed after Paperclip is upgraded to 3.5+ + module Paperclip + class GeometryDetector + def silence_stream(_stream, &block) + yield + end + end end end +else + Rails.logger.warn "The Paperclip::GeometryDetector patch can now be removed." end