Removing monkeypatched `URI#unescape` since main branch follows ruby 2.7

This commit is contained in:
André Luis Leal Cardoso Junior 2021-02-06 18:39:50 -03:00
parent 978308ac87
commit 52363d9586
3 changed files with 0 additions and 16 deletions

View File

@ -65,5 +65,4 @@ require "active_support/core_ext/module/attribute_accessors"
require "active_support/core_ext/load_error"
require "active_support/core_ext/module/attr_internal"
require "active_support/core_ext/name_error"
require "active_support/core_ext/uri"
require "active_support/inflector"

View File

@ -1,7 +1,6 @@
# frozen_string_literal: true
require "action_dispatch/http/request"
require "active_support/core_ext/uri"
require "active_support/core_ext/array/extract_options"
require "rack/utils"
require "action_controller/metal/exceptions"

View File

@ -2,20 +2,6 @@
require "uri"
if RUBY_VERSION < "2.6.0"
require "active_support/core_ext/module/redefine_method"
URI::Parser.class_eval do
silence_redefinition_of_method :unescape
def unescape(str, escaped = /%[a-fA-F\d]{2}/)
# TODO: Are we actually sure that ASCII == UTF-8?
# YK: My initial experiments say yes, but let's be sure please
enc = str.encoding
enc = Encoding::UTF_8 if enc == Encoding::US_ASCII
str.dup.force_encoding(Encoding::ASCII_8BIT).gsub(escaped) { |match| [match[1, 2].hex].pack("C") }.force_encoding(enc)
end
end
end
module URI
class << self
def parser