Make URI friendly to Ractor

Author: kirs

lib/uri.rb

@@ -30,7 +30,7 @@
 # class RSYNC < Generic
 # DEFAULT_PORT = 873
 # end
-# @@schemes['RSYNC'] = RSYNC
+# register_scheme('RSYNC', RSYNC)
 # end
 # #=> URI::RSYNC
 #

lib/uri/common.rb

@@ -17,6 +17,8 @@ module URI
  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|
@@ -27,6 +29,7 @@ module URI
  DEFAULT_PARSER.regexp.each_pair do |sym, str|
  const_set(sym, str)
  end
+ Ractor.make_shareable(DEFAULT_PARSER) if defined?(Ractor)
 
  module Util # :nodoc:
  def make_components_hash(klass, array_hash)
@@ -62,10 +65,26 @@ def make_components_hash(klass, array_hash)
 
  include REGEXP
 
- @@schemes = {}
+ SCHEMES = {}.freeze
+ private_constant :SCHEMES
+
  # Returns a Hash of the defined schemes.
  def self.scheme_list
- @@schemes
+ SCHEMES
+ end
+
+ # Registers a new scheme when adding custom URIs.
+ # Example:
+ # module URI
+ # class RSYNC < Generic
+ # DEFAULT_PORT = 873
+ # end
+ # register_scheme('RSYNC', RSYNC)
+ # end
+ def self.register_scheme(name, mod)
+ updated = SCHEMES.merge("#{name}" => mod).freeze
+ remove_const(:SCHEMES)
+ const_set(:SCHEMES, updated)
  end
 
  #
@@ -74,7 +93,7 @@ def self.scheme_list
  #
  def self.for(scheme, *arguments, default: Generic)
  if scheme
- uri_class = @@schemes[scheme.upcase] || default
+ uri_class = SCHEMES[scheme.upcase] || default
  else
  uri_class = default
  end

lib/uri/file.rb

@@ -90,5 +90,5 @@ def set_password(v)
  end
  end
 
- @@schemes['FILE'] = File
+ register_scheme('FILE', File)
 end

lib/uri/ftp.rb

@@ -262,5 +262,5 @@ def to_s
  return str
  end
  end
- @@schemes['FTP'] = FTP
+ register_scheme('FTP', FTP)
 end

lib/uri/http.rb

@@ -82,6 +82,6 @@ def request_uri
  end
  end
 
- @@schemes['HTTP'] = HTTP
+ register_scheme('HTTP', HTTP)
 
 end

lib/uri/https.rb

@@ -18,5 +18,5 @@ class HTTPS < HTTP
  # A Default port of 443 for URI::HTTPS
  DEFAULT_PORT = 443
  end
- @@schemes['HTTPS'] = HTTPS
+ register_scheme('HTTPS', HTTPS)
 end

lib/uri/ldap.rb

@@ -257,5 +257,5 @@ def hierarchical?
  end
  end
 
- @@schemes['LDAP'] = LDAP
+ register_scheme('LDAP', LDAP)
 end

lib/uri/ldaps.rb

@@ -17,5 +17,5 @@ class LDAPS < LDAP
  # A Default port of 636 for URI::LDAPS
  DEFAULT_PORT = 636
  end
- @@schemes['LDAPS'] = LDAPS
+ register_scheme('LDAPS', LDAPS)
 end

lib/uri/mailto.rb

@@ -289,5 +289,5 @@ def to_mailtext
  alias to_rfc822text to_mailtext
  end
 
- @@schemes['MAILTO'] = MailTo
+ register_scheme('MAILTO', MailTo)
 end

lib/uri/ws.rb

@@ -79,6 +79,6 @@ def request_uri
  end
  end
 
- @@schemes['WS'] = WS
+ register_scheme('WS', WS)
 
 end