Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Use RFC3986_Parser by default #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jul 19, 2024
Merged

Use RFC3986_Parser by default #107

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d7dc19a
Added URI.parser= method for switch back to RFC2396_Parser
hsbt Jul 17, 2024
bbb8a40
Added compatibility methods for RFC2396 parser
hsbt Jul 18, 2024
0ab9abb
Switch to inspect with default parser
hsbt Jul 18, 2024
2e0f73f
Rename and switch RFC2396_PARSER test
hsbt Jul 18, 2024
984145c
URI.extract needs to pass block
hsbt Jul 18, 2024
6f616d9
Added test for constant definition and remove URI::REGEXP when using …
hsbt Jul 18, 2024
823697e
Also support URI::PATTERN with switch-back
hsbt Jul 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Added URI.parser= method for switch back to RFC2396_Parser
  • Loading branch information
@hsbt
hsbt committed Jul 18, 2024
commit d7dc19ad3fc5efe094abb4bffbe6b80a1d7aacae
34 changes: 22 additions & 12 deletions lib/uri/common.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,34 @@
require_relative "rfc3986_parser"

module URI
include RFC2396_REGEXP
RFC2396_PARSER = RFC2396_Parser.new
Ractor.make_shareable(RFC2396_PARSER) if defined?(Ractor)

REGEXP = RFC2396_REGEXP
Parser = RFC2396_Parser
RFC3986_PARSER = RFC3986_Parser.new
Ractor.make_shareable(RFC3986_PARSER) if defined?(Ractor)

# URI::Parser.new
DEFAULT_PARSER = Parser.new
DEFAULT_PARSER.pattern.each_pair do |sym, str|
unless REGEXP::PATTERN.const_defined?(sym)
REGEXP::PATTERN.const_set(sym, str)
DEFAULT_PARSER = RFC3986_PARSER
Ractor.make_shareable(DEFAULT_PARSER) if defined?(Ractor)

def self.parser=(parser = RFC3986_PARSER)
remove_const(:Parser) if defined?(Parser)
const_set("Parser", parser.class)

if Parser == RFC2396_Parser
remove_const(:REGEXP) if defined?(REGEXP)
const_set("REGEXP", URI::RFC2396_REGEXP)
Parser.new.pattern.each_pair do |sym, str|
unless REGEXP::PATTERN.const_defined?(sym)
REGEXP::PATTERN.const_set(sym, str)
end
end
end
Parser.new.regexp.each_pair do |sym, str|
remove_const(sym) if const_defined?(sym)
const_set(sym, str)
end
end
DEFAULT_PARSER.regexp.each_pair do |sym, str|
const_set(sym, str)
end
Ractor.make_shareable(DEFAULT_PARSER) if defined?(Ractor)
self.parser = RFC3986_PARSER

module Util # :nodoc:
def make_components_hash(klass, array_hash)
Expand Down