More forms we accept :(

enebo · enebo · commit 3e238b6defff · 2023-04-14T15:37:53.000-05:00
diff --git a/lib/ruby/stdlib/pathname.rb b/lib/ruby/stdlib/pathname.rb
@@ -29,7 +29,7 @@ class Pathname
 
   if RUBY_ENGINE == 'jruby'
     # additional matching for paths that considers URI components to be roots
-    URI_ROOT_PAT = '|.+!/|classpath:uri:/|file:/'
+    URI_ROOT_PAT = '|.+!/|classpath:uri:/|(?:uri:|jar:)?file:/|uri:classloader:/|jar:/'
   else
     URI_ROOT_PAT = ""
   end
diff --git a/spec/jruby/library/pathname/absolute_spec.rb b/spec/jruby/library/pathname/absolute_spec.rb
@@ -14,16 +14,37 @@
     expect(Pathname.new('classpath:uri:/home/me').absolute?).to be true
   end
 
+  it "should return true for 'uri::classloader:/'" do
+    expect(Pathname.new('uri:classloader:/').absolute?).to be true
+    expect(Pathname.new('uri:classloader:/home/me').absolute?).to be true
+    expect(Pathname.new('uri:classloader://asd').absolute?).to be true    
+  end
+
   # Common URI for local file access.
   it "should return true for 'file:/'" do
     expect(Pathname.new('file:/').absolute?).to be true
     expect(Pathname.new('file:/home/me').absolute?).to be true
   end
 
+  it "should return true for 'uri:file:/'" do
+    expect(Pathname.new('uri:file:/asd').absolute?).to be true
+    expect(Pathname.new('uri:file://asd').absolute?).to be true
+  end  
+
   # Jar Resources
   it "should return true for 'some_jar!/'" do
     expect(Pathname.new('frogger.jar!/home').absolute?).to be true
     expect(Pathname.new('frogger.jar!/home/me').absolute?).to be true
     expect(Pathname.new('C:/opt/frogger.jar!/home/me').absolute?).to be true
   end
+
+  it "should return true for 'jar:file:/'" do
+    expect(Pathname.new('jar:file:/my.jar!/asd').absolute?).to be true
+    expect(Pathname.new('jar:file://my.jar!/asd').absolute?).to be true
+  end
+
+  it "should return true for 'jar:/'" do
+    expect(Pathname.new('jar:/my.jar!/asd').absolute?).to be true
+    expect(Pathname.new('jar://my.jar!/asd').absolute?).to be true
+  end
 end
diff --git a/test/jruby/test_pathname.rb b/test/jruby/test_pathname.rb
@@ -37,24 +37,6 @@ def test_root_and_absolute
     end
   end
 
-  def test_absolute
-    assert Pathname.new('uri:classloader:/asd').absolute?
-    assert Pathname.new('uri:classloader://asd').absolute?
-    assert Pathname.new('uri:file:/asd').absolute?
-    assert Pathname.new('uri:file://asd').absolute?
-    assert Pathname.new('classpath:/asd').absolute?
-    assert Pathname.new('classpath://asd').absolute?
-    assert Pathname.new('file:/asd').absolute?
-    assert Pathname.new('file://asd').absolute?
-    assert Pathname.new('jar:file:/my.jar!/asd').absolute?
-    assert Pathname.new('jar:file://my.jar!/asd').absolute?
-    assert Pathname.new('jar:/my.jar!/asd').absolute?
-    assert Pathname.new('jar://my.jar!/asd').absolute?
-    assert Pathname.new('file:/my.jar!/asd').absolute?
-    assert Pathname.new('file://my.jar!/asd').absolute?
-    assert Pathname.new('my.jar!/asd').absolute?
-  end
-
   def test_unicode_name
     x = "joe"
     y = "joe/⸀䐀攀氀攀琀攀䴀攀/fred"
