Merge pull request #2462 from aubinlrx/tweak/deprecation_warning_ruby_27

[1.x-stable] - Fix deprecation warning ruby 2.7
carrierwaveuploader · Oct 4, 2020 · 0712435 · 0712435
2 parents c3c652a + 6097836
commit 0712435
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/lib/carrierwave/sanitized_file.rb b/lib/carrierwave/sanitized_file.rb
@@ -312,7 +312,7 @@ def file=(file)
     def mkdir!(path, directory_permissions)
       options = {}
       options[:mode] = directory_permissions if directory_permissions
-      FileUtils.mkdir_p(File.dirname(path), options) unless File.exist?(File.dirname(path))
+      FileUtils.mkdir_p(File.dirname(path), **options) unless File.exist?(File.dirname(path))
     end
 
     def chmod!(path, permissions)

diff --git a/lib/carrierwave/uploader/download.rb b/lib/carrierwave/uploader/download.rb
@@ -40,7 +40,7 @@ def file
             headers = @remote_headers.
               reverse_merge('User-Agent' => "CarrierWave/#{CarrierWave::VERSION}")
 
-            @file = Kernel.open(@uri.to_s, headers)
+            @file = URI.open(@uri.to_s, headers)
             @file = @file.is_a?(String) ? StringIO.new(@file) : @file
           end
           @file
@@ -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