1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ruby/uri] Added test for constant definition and remove URI::REGEXP when using RFC3986_PARSER

Browse Source 
https://github.com/ruby/uri/commit/6f616d97fc
This commit is contained in:
Hiroshi SHIBATA 2024-07-18 13:16:20 +09:00 committed by git
parent 2a56c1841d
commit 082335494b
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/uri/common.rb
View File

@ -26,8 +26,8 @@ module URI
remove_const(:Parser) if defined?(Parser) remove_const(:Parser) if defined?(Parser)
const_set("Parser", parser.class) const_set("Parser", parser.class)
remove_const(:REGEXP) if defined?(REGEXP)
if Parser == RFC2396_Parser if Parser == RFC2396_Parser
remove_const(:REGEXP) if defined?(REGEXP)
const_set("REGEXP", URI::RFC2396_REGEXP) const_set("REGEXP", URI::RFC2396_REGEXP)
Parser.new.pattern.each_pair do |sym, str| Parser.new.pattern.each_pair do |sym, str|
unless REGEXP::PATTERN.const_defined?(sym) unless REGEXP::PATTERN.const_defined?(sym)
@ -35,6 +35,7 @@ module URI
end end
end end
end end
Parser.new.regexp.each_pair do |sym, str| Parser.new.regexp.each_pair do |sym, str|
remove_const(sym) if const_defined?(sym) remove_const(sym) if const_defined?(sym)
const_set(sym, str) const_set(sym, str)

17
test/uri/test_common.rb
View File

@ -10,6 +10,23 @@ class URI::TestCommon < Test::Unit::TestCase
def teardown def teardown
end end
def test_parser_switch
assert_equal(URI::Parser, URI::RFC3986_Parser)
refute defined?(::URI::REGEXP)
URI.parser = URI::RFC2396_PARSER
assert_equal(URI::Parser, URI::RFC2396_Parser)
assert defined?(URI::REGEXP)
URI.parser = URI::RFC3986_PARSER
assert_equal(URI::Parser, URI::RFC3986_Parser)
refute defined?(URI::REGEXP)
ensure
URI.parser = URI::RFC3986_PARSER
end
def test_extract def test_extract
EnvUtil.suppress_warning do EnvUtil.suppress_warning do
assert_equal(['http://example.com'], assert_equal(['http://example.com'],