jruby · Jul 3, 2015 · Jul 3, 2015
diff --git a/core/src/main/java/org/jruby/RubyFile.java b/core/src/main/java/org/jruby/RubyFile.java
@@ -505,9 +505,10 @@ public IRubyObject inspect() {
         val.append(">");
         return getRuntime().newString(val.toString());
     }
-
+
+    private static Pattern ROOT_PATTERN = Pattern.compile("^(uri|jar|file|classpath):([^:]*:)?//?$");
+
     /* File class methods */
-
     @JRubyMethod(required = 1, optional = 1, meta = true)
     public static IRubyObject basename(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
         Ruby runtime = context.runtime;
@@ -516,6 +517,11 @@ public static IRubyObject basename(ThreadContext context, IRubyObject recv, IRub
         Encoding origEncoding = origString.getEncoding();
         String name = origString.toString();
 
+        // uri-like paths without parent directory
+        if (name.endsWith("!/") || ROOT_PATTERN.matcher(name).matches()) {
+            return args[0];
+        }
+
         // MRI-compatible basename handling for windows drive letter paths
         if (Platform.IS_WINDOWS) {
             if (name.length() > 1 && name.charAt(1) == ':' && Character.isLetter(name.charAt(0))) {
@@ -661,7 +667,7 @@ public static IRubyObject dirname(ThreadContext context, IRubyObject recv, IRuby
         return runtime.newString(dirname(context, jfilename)).infectBy(filename);
     }
 
-    private static Pattern PROTOCOL_PATTERN = Pattern.compile("^([a-z]+:)?[a-z]+:/.*");
+    private static Pattern PROTOCOL_PATTERN = Pattern.compile("^(uri|jar|file|classpath):([^:]*:)?//?.*");
     public static String dirname(ThreadContext context, String jfilename) {
         String name = jfilename.replace('\\', '/');
         int minPathLength = 1;

diff --git a/lib/ruby/1.8/pathname.rb b/lib/ruby/1.8/pathname.rb
@@ -276,9 +276,9 @@ def sub(pattern, *rest, &block)
   end
 
   if File::ALT_SEPARATOR
-    SEPARATOR_PAT = /[#{Regexp.quote File::ALT_SEPARATOR}#{Regexp.quote File::SEPARATOR}]/
+    SEPARATOR_PAT = /[#{Regexp.quote File::ALT_SEPARATOR}#{Regexp.quote File::SEPARATOR}]|.+!\/|[a-z:]+:\/\/?/
   else
-    SEPARATOR_PAT = /#{Regexp.quote File::SEPARATOR}/
+    SEPARATOR_PAT = /#{Regexp.quote File::SEPARATOR}|.+!\/|[a-z:]+:\/\/?/
   end
 
   # chop_basename(path) -> [pre-basename, basename] or nil

diff --git a/lib/ruby/1.9/pathname.rb b/lib/ruby/1.9/pathname.rb
@@ -33,10 +33,10 @@ class Pathname
 
   if File::ALT_SEPARATOR
     SEPARATOR_LIST = "#{Regexp.quote File::ALT_SEPARATOR}#{Regexp.quote File::SEPARATOR}"
-    SEPARATOR_PAT = /[#{SEPARATOR_LIST}]/
+    SEPARATOR_PAT = /[#{SEPARATOR_LIST}]|.+!\/|[a-z:]+:\/\/?/
   else
     SEPARATOR_LIST = "#{Regexp.quote File::SEPARATOR}"
-    SEPARATOR_PAT = /#{Regexp.quote File::SEPARATOR}/
+    SEPARATOR_PAT = /#{Regexp.quote File::SEPARATOR}|.+!\/|[a-z:]+:\/\/?/
   end
 
   # chop_basename(path) -> [pre-basename, basename] or nil

diff --git a/test/jruby.1.8.index b/test/jruby.1.8.index
@@ -43,6 +43,7 @@ test_ivar_table_integrity
 test_io
 test_line_endings
 test_load
+test_load_gem_extensions
 test_method
 test_method_cache
 test_method_override_and_caching
@@ -103,6 +104,7 @@ test_jruby_ext
 test_jruby_core_ext
 test_thread_context_frame_dereferences_unreachable_variables
 test_context_classloader
+test_uri_classloader
 test_rexml_document
 test_load_compiled_ruby
 test_openssl_stub

diff --git a/test/jruby.1.9.index b/test/jruby.1.9.index
@@ -37,6 +37,7 @@ test_integer_overflows
 test_ivar_table_integrity
 test_io
 test_load
+test_load_gem_extensions
 test_method
 test_method_cache
 test_method_override_and_caching
@@ -90,6 +91,7 @@ test_jruby_ext
 test_jruby_core_ext
 test_thread_context_frame_dereferences_unreachable_variables
 test_context_classloader
+test_uri_classloader
 test_rexml_document
 test_load_compiled_ruby
 test_openssl_stub

diff --git a/test/test_file.rb b/test/test_file.rb
@@ -48,6 +48,24 @@ def test_basename
     assert_equal("/", File.basename("/"))
   end
 
+  def test_basename_uri_like_paths
+    assert_equal('uri:classloader:/', File.basename('uri:classloader:/'))
+    assert_equal('uri:classloader://', File.basename('uri:classloader://'))
+    assert_equal('uri:file:/', File.basename('uri:file:/'))
+    assert_equal('uri:file://', File.basename('uri:file://'))
+    assert_equal('classpath:/', File.basename('classpath:/'))
+    assert_equal('classpath://', File.basename('classpath://'))
+    assert_equal('file:/', File.basename('file:/'))
+    assert_equal('file://', File.basename('file://'))
+    assert_equal('jar:file:/my.jar!/', File.basename('jar:file:/my.jar!/'))
+    assert_equal('jar:file://my.jar!/', File.basename('jar:file://my.jar!/'))
+    assert_equal('jar:/my.jar!/', File.basename('jar:/my.jar!/'))
+    assert_equal('jar://my.jar!/', File.basename('jar://my.jar!/'))
+    assert_equal('file:/my.jar!/', File.basename('file:/my.jar!/'))
+    assert_equal('file://my.jar!/', File.basename('file://my.jar!/'))
+    assert_equal('my.jar!/', File.basename('my.jar!/'))
+  end
+
   # Added to add more flexibility on windows.  Depending on subsystem (msys,
   # cygwin, cmd) environment sometimes we have mixed case drive letters.  Since
   # windows is still case insensitive, downcasing seems a simple solution.

diff --git a/test/test_pathname.rb b/test/test_pathname.rb
@@ -21,4 +21,42 @@ def test_realpath_symlink
       File.delete(link) if link && File.exists?(link)
     end
   end
+
+  def test_root_and_absolute
+    [:root?, :absolute?].each do |method|
+      assert Pathname.new('uri:classloader:/').send method
+      assert Pathname.new('uri:classloader://').send method
+      assert Pathname.new('uri:file:/').send method
+      assert Pathname.new('uri:file://').send method
+      assert Pathname.new('classpath:/').send method
+      assert Pathname.new('classpath://').send method
+      assert Pathname.new('file:/').send method
+      assert Pathname.new('file://').send method
+      assert Pathname.new('jar:file:/my.jar!/').send method
+      assert Pathname.new('jar:file://my.jar!/').send method
+      assert Pathname.new('jar:/my.jar!/').send method
+      assert Pathname.new('jar://my.jar!/').send method
+      assert Pathname.new('file:/my.jar!/').send method
+      assert Pathname.new('file://my.jar!/').send method
+      assert Pathname.new('my.jar!/').send method
+    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
 end
diff --git a/test/test_uri_classloader.rb b/test/test_uri_classloader.rb
@@ -2,7 +2,8 @@
 require 'test/unit'
 require 'test/test_helper'
 
-class TestFile < Test::Unit::TestCase
+# TODO fails with enableassertion :(
+class TestURIClassloader < Test::Unit::TestCase
   include TestHelper
 
   def setup