diff options
-rw-r--r-- | lib/uri/rfc2396_parser.rb | 6 | ||||
-rw-r--r-- | test/uri/test_parser.rb | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/lib/uri/rfc2396_parser.rb b/lib/uri/rfc2396_parser.rb index b9e7b2b26e..a6e5df91f9 100644 --- a/lib/uri/rfc2396_parser.rb +++ b/lib/uri/rfc2396_parser.rb @@ -315,13 +315,13 @@ module URI # # :call-seq: # unescape( str ) - # unescape( str, unsafe ) + # unescape( str, escaped ) # # == Args # # +str+:: # String to remove escapes from - # +unsafe+:: + # +escaped+:: # Regexp to apply. Defaults to self.regexp[:ESCAPED] # # == Description @@ -329,7 +329,7 @@ module URI # Removes escapes from +str+ # def unescape(str, escaped = @regexp[:ESCAPED]) - str.gsub(escaped) { [$&[1, 2].hex].pack('C') }.force_encoding(str.encoding) + str.gsub(escaped) { [$&[1, 2]].pack('H2').force_encoding(str.encoding) } end @@to_s = Kernel.instance_method(:to_s) diff --git a/test/uri/test_parser.rb b/test/uri/test_parser.rb index 757ac86c74..b9cf4b7e1a 100644 --- a/test/uri/test_parser.rb +++ b/test/uri/test_parser.rb @@ -45,4 +45,11 @@ class URI::TestParser < Test::Unit::TestCase URI.parse(1) end end + + def test_unescape + p1 = URI::Parser.new + assert_equal("\xe3\x83\x90", p1.unescape("\xe3\x83\x90")) + assert_equal("\xe3\x83\x90", p1.unescape('%e3%83%90')) + assert_equal("\xe3\x83\x90\xe3\x83\x90", p1.unescape("\xe3\x83\x90%e3%83%90")) + end end |