diff options
| author | ThibG <thib@sitedethib.com> | 2020-03-26 15:09:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-26 15:09:16 +0100 |
| commit | 6c79b7237e31eb510af7df3f4f2cb133dea39845 (patch) | |
| tree | 0d4037900901516a1a22b849742efa3259246ddc | |
| parent | d88480da4ac7be7dc74c3b499dcfc00f18d7de4a (diff) | |
Fix Paperclip using deprecated URI.escape function (#13320)
Monkey-patch Paperclip to perform URL escaping in a slightly more appropriate way, and get rid of runtime deprecation warnings.
| -rw-r--r-- | config/application.rb | 1 | ||||
| -rw-r--r-- | lib/paperclip/url_generator_extensions.rb | 17 |
2 files changed, 18 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index cd599eefc..4c34efa15 100644 --- a/config/application.rb +++ b/config/application.rb @@ -7,6 +7,7 @@ require 'rails/all' Bundler.require(*Rails.groups) require_relative '../app/lib/exceptions' +require_relative '../lib/paperclip/url_generator_extensions' require_relative '../lib/paperclip/attachment_extensions' require_relative '../lib/paperclip/lazy_thumbnail' require_relative '../lib/paperclip/gif_transcoder' diff --git a/lib/paperclip/url_generator_extensions.rb b/lib/paperclip/url_generator_extensions.rb new file mode 100644 index 000000000..1079efdbc --- /dev/null +++ b/lib/paperclip/url_generator_extensions.rb @@ -0,0 +1,17 @@ +# frozen_string_literal: true + +module Paperclip + module UrlGeneratorExtensions + # Monkey-patch Paperclip to use Addressable::URI's normalization instead + # of the long-deprecated URI.esacpe + def escape_url(url) + if url.respond_to?(:escape) + url.escape + else + Addressable::URI.parse(url).normalize.to_str.gsub(escape_regex) { |m| "%#{m.ord.to_s(16).upcase}" } + end + end + end +end + +Paperclip::UrlGenerator.prepend(Paperclip::UrlGeneratorExtensions) |