Add url support to ResolvePaths

Author: mythz

src/ServiceStack.Text/PathUtils.cs

@@ -137,7 +137,12 @@ public static string ResolvePaths(this string path)
             if (path == null || path.IndexOfAny("./", "/.") == -1)
                 return path;
 
-            var parts = path.Split('/').ToList();
+            var schemePos = path.IndexOf("://", StringComparison.Ordinal);
+            var prefix = schemePos >= 0
+                ? path.Substring(0, schemePos + 3)
+                : "";
+
+            var parts = path.Substring(prefix.Length).Split('/').ToList();
             var combinedPaths = new List<string>();
             foreach (var part in parts)
             {
@@ -151,12 +156,12 @@ public static string ResolvePaths(this string path)
             }
 
             var resolvedPath = string.Join("/", combinedPaths);
-            if (path[0] == '/')
+            if (path[0] == '/' && prefix.Length == 0)
                 resolvedPath = '/' + resolvedPath;
 
-            return path[path.Length - 1] == '/'
-                ? resolvedPath + '/'
-                : resolvedPath;
+            return path[path.Length - 1] == '/' && resolvedPath.Length > 0
+                ? prefix + resolvedPath + '/'
+                : prefix + resolvedPath;
         }
 
         public static string[] ToStrings(object[] thesePaths)

tests/ServiceStack.Text.Tests/CombinePathTests.cs

@@ -49,5 +49,22 @@ public void Can_resolve_paths()
             Assert.That("a/../../b".ResolvePaths(), Is.EqualTo("../b"));
         }
 
+        [Test]
+        public void Can_resolve_paths_with_urls()
+        {
+            Assert.That("http://example.org/a/b/../".ResolvePaths(), Is.EqualTo("http://example.org/a/"));
+            Assert.That("http://example.org/a/b/..".ResolvePaths(), Is.EqualTo("http://example.org/a"));
+
+            Assert.That("http://example.org/a/../b".ResolvePaths(), Is.EqualTo("http://example.org/b"));
+            Assert.That("http://example.org/a/../b/./c".ResolvePaths(), Is.EqualTo("http://example.org/b/c"));
+            Assert.That("http://example.org/a/b/c/d/../..".ResolvePaths(), Is.EqualTo("http://example.org/a/b"));
+            Assert.That("http://example.org/a/b/../../c/d".ResolvePaths(), Is.EqualTo("http://example.org/c/d"));
+
+            Assert.That("http://example.org/a/..".ResolvePaths(), Is.EqualTo("http://example.org"));
+            Assert.That("http://example.org/a/../..".ResolvePaths(), Is.EqualTo("http://"));
+            Assert.That("http://example.org/a/../../".ResolvePaths(), Is.EqualTo("http://"));
+            Assert.That("http://example.org/a/../../b".ResolvePaths(), Is.EqualTo("http://b"));
+        }
+
     }
 }