Use URI::DEFAULT_PARSER.unescape instead of URI.decode for Ruby 2.7

carrierwaveuploader · Mar 26, 2020 · f10026b · f10026b
1 parent 132cf30
commit f10026b
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/carrierwave/uploader/download.rb b/lib/carrierwave/uploader/download.rb
@@ -57,7 +57,7 @@ def filename_from_header
         end
 
         def filename_from_uri
-          URI.decode(File.basename(file.base_uri.path))
+          URI::DEFAULT_PARSER.unescape(File.basename(file.base_uri.path))
         end
 
         def method_missing(*args, &block)
@@ -92,8 +92,8 @@ def process_uri(uri)
       rescue URI::InvalidURIError
         uri_parts = uri.split('?')
         # regexp from Ruby's URI::Parser#regexp[:UNSAFE], with [] specifically removed
-        encoded_uri = URI.encode(uri_parts.shift, /[^\-_.!~*'()a-zA-Z\d;\/?:@&=+$,]/)
-        encoded_uri << '?' << URI.encode(uri_parts.join('?')) if uri_parts.any?
+        encoded_uri = URI::DEFAULT_PARSER.unescape(uri_parts.shift, /[^\-_.!~*'()a-zA-Z\d;\/?:@&=+$,]/)
+        encoded_uri << '?' << URI::DEFAULT_PARSER.unescape(uri_parts.join('?')) if uri_parts.any?
         URI.parse(encoded_uri) rescue raise CarrierWave::DownloadError, "couldn't parse URL"
       end