Merge branch 'ruby:master' into master

ruby · Aug 18, 2021 · 6f7e3cf · 6f7e3cf
2 parents 71ef3a6 + bc47bf7
commit 6f7e3cf
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/lib/uri.rb b/lib/uri.rb
@@ -100,9 +100,4 @@ module URI
 require_relative 'uri/ldap'
 require_relative 'uri/ldaps'
 require_relative 'uri/mailto'
-
-module URI
-  INITIAL_SCHEMES = scheme_list
-  private_constant :INITIAL_SCHEMES
-  Ractor.make_shareable(INITIAL_SCHEMES) if defined?(Ractor)
-end
+require_relative 'uri/ws'
diff --git a/lib/uri/common.rb b/lib/uri/common.rb
@@ -79,6 +79,10 @@ def self.scheme_list
     }.to_h
   end
 
+  INITIAL_SCHEMES = scheme_list
+  private_constant :INITIAL_SCHEMES
+  Ractor.make_shareable(INITIAL_SCHEMES) if defined?(Ractor)
+
   #
   # Construct a URI instance, using the scheme to detect the appropriate class
   # from +URI.scheme_list+.
@@ -87,8 +91,8 @@ def self.for(scheme, *arguments, default: Generic)
     const_name = scheme.to_s.upcase
 
     uri_class = INITIAL_SCHEMES[const_name]
-    if !uri_class && !const_name.empty? && Schemes.const_defined?(const_name, false)
-      uri_class = Schemes.const_get(const_name, false)
+    uri_class ||= if /\A[A-Z]\w*\z/.match?(const_name) && Schemes.const_defined?(const_name, false)
+      Schemes.const_get(const_name, false)
     end
     uri_class ||= default
 

diff --git a/test/uri/test_generic.rb b/test/uri/test_generic.rb
@@ -159,6 +159,13 @@ def test_parse
     assert_equal(nil, url.userinfo)
   end
 
+  def test_parse_scheme_with_symbols
+    # Valid schemes from https://www.iana.org/assignments/uri-schemes/uri-schemes.xhtml
+    assert_equal 'ms-search', URI.parse('ms-search://localhost').scheme
+    assert_equal 'microsoft.windows.camera', URI.parse('microsoft.windows.camera://localhost').scheme
+    assert_equal 'coaps+ws', URI.parse('coaps+ws:localhost').scheme
+  end
+
   def test_merge
     u1 = URI.parse('http://foo')
     u2 = URI.parse('http://foo/')