Add UrlWithTrailingSlash

Author: mythz

src/ServiceStack.Text/StringExtensions.cs

@@ -224,6 +224,16 @@ public static string ToRot13(this string value)
             return new string(array);
         }
 
+        private static char[] UrlPathDelims = new[] {'?', '#'};
+
+        public static string UrlWithTrailingSlash(this string url)
+        {
+            var endPos = url?.IndexOfAny(UrlPathDelims) ?? -1;
+            return endPos >= 0
+                ? url.Substring(0, endPos).WithTrailingSlash() + url.Substring(endPos)
+                : url.WithTrailingSlash();
+        }
+        
         public static string WithTrailingSlash(this string path)
         {
             if (path == null)

tests/ServiceStack.Text.Tests/StringExtensionsTests.cs

@@ -362,5 +362,39 @@ public void Does_ReplaceAll_from_Start()
             Assert.That("/images".ReplaceAll("/",""), Is.EqualTo("images"));
         }
 
+        [TestCase("", ExpectedResult = "/")]
+        [TestCase("/", ExpectedResult = "/")]
+        [TestCase("?p1=asdf", ExpectedResult = "/?p1=asdf")]
+        [TestCase("/page", ExpectedResult = "/page/")]
+        [TestCase("/page/", ExpectedResult = "/page/")]
+        [TestCase("/page?p1=asdf", ExpectedResult = "/page/?p1=asdf")]
+        [TestCase("/page?p1=asdf&p2=asdf", ExpectedResult = "/page/?p1=asdf&p2=asdf")]
+        [TestCase("/page/?p1=asdf&p2=asdf", ExpectedResult = "/page/?p1=asdf&p2=asdf")]
+
+        [TestCase("#here", ExpectedResult = "/#here")]
+        [TestCase("?p1=asdf#here", ExpectedResult = "/?p1=asdf#here")]
+        [TestCase("/page#here", ExpectedResult = "/page/#here")]
+        [TestCase("/page/#here", ExpectedResult = "/page/#here")]
+        [TestCase("/page?p1=asdf#here", ExpectedResult = "/page/?p1=asdf#here")]
+        [TestCase("/page?p1=asdf&p2=asdf#here", ExpectedResult = "/page/?p1=asdf&p2=asdf#here")]
+        [TestCase("/page/?p1=asdf&p2=asdf#here", ExpectedResult = "/page/?p1=asdf&p2=asdf#here")]
+
+        [TestCase("domain.com", ExpectedResult = "domain.com/")]
+        [TestCase("domain.com/", ExpectedResult = "domain.com/")]
+        [TestCase("domain.com?p1=asdf", ExpectedResult = "domain.com/?p1=asdf")]
+        [TestCase("domain.com/page?p1=asdf", ExpectedResult = "domain.com/page/?p1=asdf")]
+        [TestCase("domain.com/page?p1=asdf&p2=asdf", ExpectedResult = "domain.com/page/?p1=asdf&p2=asdf")]
+        [TestCase("domain.com/page/?p1=asdf&p2=asdf", ExpectedResult = "domain.com/page/?p1=asdf&p2=asdf")]
+
+        [TestCase("domain.com#here", ExpectedResult = "domain.com/#here")]
+        [TestCase("domain.com/#here", ExpectedResult = "domain.com/#here")]
+        [TestCase("domain.com?p1=asdf#here", ExpectedResult = "domain.com/?p1=asdf#here")]
+        [TestCase("domain.com/page?p1=asdf#here", ExpectedResult = "domain.com/page/?p1=asdf#here")]
+        [TestCase("domain.com/page?p1=asdf&p2=asdf#here", ExpectedResult = "domain.com/page/?p1=asdf&p2=asdf#here")]
+        [TestCase("domain.com/page/?p1=asdf&p2=asdf#here", ExpectedResult = "domain.com/page/?p1=asdf&p2=asdf#here")]
+        public string Does_UrlWithTrailingSlash(string url)
+        {
+            return url.UrlWithTrailingSlash();
+        }
     }
 }