Merge branch 'jruby-1_7'

Conflicts: test/test_file.rb
jruby · Jun 19, 2015 · 1dc3b6e · 1dc3b6e
2 parents 3311a58 + e4be16f
commit 1dc3b6e
Showing 2 changed files with 58 additions and 1 deletion.
diff --git a/core/src/main/java/org/jruby/util/URLResource.java b/core/src/main/java/org/jruby/util/URLResource.java
@@ -171,7 +171,8 @@ public static FileResource create(Ruby runtime, String pathname, boolean isFile)
         if (!pathname.startsWith(URI)) {
             return null;
         }
-        pathname = pathname.substring(URI.length());
+        // GH-2005 needs the replace
+        pathname = pathname.substring(URI.length()).replace("\\", "/");
         if (pathname.startsWith(CLASSLOADER)) {
             return createClassloaderURI(runtime, pathname.substring(CLASSLOADER.length()), isFile);
         }

diff --git a/test/jruby/test_file.rb b/test/jruby/test_file.rb
@@ -244,6 +244,62 @@ def test_expand_path_with_file_prefix
       assert_equal "file:/bar", File.expand_path("file:/foo/../bar")
       assert_equal "file:/foo/bar/baz", File.expand_path("baz", "file:/foo/bar")
       assert_equal "file:/foo/bar", File.expand_path("file:/foo/bar", "file:/baz/quux")
+      assert_equal "file:/foo/bar", File.expand_path("../../foo/bar", "file:/baz/quux")
+      assert_equal "file:/foo/bar", File.expand_path("../../../foo/bar", "file:/baz/quux")
+    end
+
+    def test_expand_path_with_jar_prefix
+      jruby_specific_test
+      assert_equal "file:/my.jar!/foo/bar", File.expand_path("file:/my.jar!/foo/bar")
+      assert_equal "file:/my.jar!/bar", File.expand_path("file:/my.jar!/foo/../bar")
+      assert_equal "file:/my.jar!/foo/bar/baz", File.expand_path("baz", "file:/my.jar!/foo/bar")
+      assert_equal "file:/my.jar!/foo/bar", File.expand_path("file:/my.jar!/foo/bar", "file:/my.jar!/baz/quux")
+      assert_equal "file:/my.jar!/foo/bar", File.expand_path("../../foo/bar", "file:/my.jar!/baz/quux")
+      #assert_equal "file:/my.jar!/foo/bar", File.expand_path("../../../foo/bar", "file:/my.jar!/baz/quux")
+    end
+
+    def test_expand_path_with_jar_file_prefix
+      jruby_specific_test
+      assert_equal "jar:file:/my.jar!/foo/bar", File.expand_path("jar:file:/my.jar!/foo/bar")
+      assert_equal "jar:file:/my.jar!/bar", File.expand_path("jar:file:/my.jar!/foo/../bar")
+      assert_equal "jar:file:/my.jar!/foo/bar/baz", File.expand_path("baz", "jar:file:/my.jar!/foo/bar")
+      assert_equal "jar:file:/my.jar!/foo/bar", File.expand_path("jar:file:/my.jar!/foo/bar", "file:/my.jar!/baz/quux")
+      assert_equal "jar:file:/my.jar!/foo/bar", File.expand_path("../../foo/bar", "jar:file:/my.jar!/baz/quux")
+      #assert_equal "jar:file:/my.jar!/foo/bar", File.expand_path("../../../foo/bar", "jar:file:/my.jar!/baz/quux")
+    end
+
+    def test_expand_path_with_uri_file_prefix
+      jruby_specific_test
+      assert_equal "uri:file:/foo/bar", File.expand_path("uri:file:/foo/bar")
+      #assert_equal "uri:file:/bar", File.expand_path("uri:file:/foo/../bar")
+      # TODO why uri:file:// ?
+      assert_equal "uri:file://foo/bar/baz", File.expand_path("baz", "uri:file:/foo/bar")
+      assert_equal "uri:file:/foo/bar", File.expand_path("uri:file:/foo/bar", "uri:file:/baz/quux")
+      # TODO why uri:file:// ?
+      assert_equal "uri:file://foo/bar", File.expand_path("../../foo/bar", "uri:file:/baz/quux")
+      assert_equal "uri:file:/foo/bar", File.expand_path("../../../foo/bar", "uri:file:/baz/quux")
+    end
+
+    def test_expand_path_with_uri_classloader_prefix
+      jruby_specific_test
+      assert_equal "uri:classloader:/foo/bar", File.expand_path("uri:classloader:/foo/bar")
+      #assert_equal "uri:classloader:/bar", File.expand_path("uri:classloader:/foo/../bar")
+      # TODO why uri:classloader:// ?
+      assert_equal "uri:classloader://foo/bar/baz", File.expand_path("baz", "uri:classloader:/foo/bar")
+      assert_equal "uri:classloader:/foo/bar", File.expand_path("uri:classloader:/foo/bar", "uri:classloader:/baz/quux")
+      # TODO why uri:classloader:// ?
+      assert_equal "uri:classloader://foo/bar", File.expand_path("../../foo/bar", "uri:classloader:/baz/quux")
+      assert_equal "uri:classloader:/foo/bar", File.expand_path("../../../foo/bar", "uri:classloader:/baz/quux")
+    end
+
+    def test_expand_path_with_classpath_prefix
+      jruby_specific_test
+      assert_equal "classpath:/foo/bar", File.expand_path("classpath:/foo/bar")
+      #assert_equal "classpath:/bar", File.expand_path("classpath:/foo/../bar")
+      assert_equal "classpath:/foo/bar/baz", File.expand_path("baz", "classpath:/foo/bar")
+      assert_equal "classpath:/foo/bar", File.expand_path("classpath:/foo/bar", "classpath:/baz/quux")
+      assert_equal "classpath:/foo/bar", File.expand_path("../../foo/bar", "classpath:/baz/quux")
+      assert_equal "classpath:/foo/bar", File.expand_path("../../../foo/bar", "classpath:/baz/quux")
     end
 
     def test_expand_path_with_file_url_relative_path