URLs with trailing slash (#240)

* fixes #232

* additional test case

* Updated BitBucket URL converter as well

* merged rebase conflict

* fixing implementations

* Today's special: test one one cover another for the same price

Author: SeanFeldman

SourceLink.Create.BitBucket/BitBucketUrlConverter.cs

@@ -1,19 +1,22 @@
-
-namespace SourceLink.Create.BitBucket
+namespace SourceLink.Create.BitBucket
 {
     public static class UrlConverter
     {
         public static string Convert(string origin)
         {
-            if (!origin.Contains("bitbucket.org")) return null;
+            if (!origin.Contains("bitbucket.org"))
+                return null;
+
             if (origin.StartsWith("git@"))
             {
                 origin = origin.Replace(':', '/');
                 origin = origin.Replace("git@", "https://");
             }
-            origin = origin.Replace(".git", "");
+            origin = origin.Replace(".git", string.Empty);
+            origin = origin.TrimEnd('/');
+
             var uri = new System.Uri(origin);
-            return "https://bitbucket.org" + uri.LocalPath + "/raw/{commit}/*";
+            return $"https://bitbucket.org{uri.LocalPath}/raw/{{commit}}/*";
         }
     }
 }

SourceLink.Create.GitHub/GitHubUrlConverter.cs

@@ -1,19 +1,23 @@
-
-namespace SourceLink.Create.GitHub
+namespace SourceLink.Create.GitHub
 {
     public static class UrlConverter
     {
         public static string Convert(string origin)
         {
-            if (!origin.Contains("github.com")) return null;
+            if (!origin.Contains("github.com"))
+                return null;
+
             if (origin.StartsWith("git@"))
             {
                 origin = origin.Replace(':', '/');
                 origin = origin.Replace("git@", "https://");
             }
-            origin = origin.Replace(".git", "");
+
+            origin = origin.Replace(".git", string.Empty);
+            origin = origin.TrimEnd('/');
             var uri = new System.Uri(origin);
-            return "https://raw.githubusercontent.com" + uri.LocalPath + "/{commit}/*";
+
+            return $"https://raw.githubusercontent.com{uri.LocalPath}/{{commit}}/*";
         }
     }
 }

Tests/Tests.csproj

@@ -15,6 +15,7 @@
   <ItemGroup>
     <ProjectReference Include="..\dotnet-sourcelink-git\dotnet-sourcelink-git.csproj" />
     <ProjectReference Include="..\dotnet-sourcelink\dotnet-sourcelink.csproj" />
+    <ProjectReference Include="..\SourceLink.Create.BitBucket\SourceLink.Create.BitBucket.csproj" />
     <ProjectReference Include="..\SourceLink.Create.GitHub\SourceLink.Create.GitHub.csproj" />
   </ItemGroup>
 

Tests/When_parsing_GitHub_links.cs

@@ -0,0 +1,29 @@
+using Xunit;
+
+namespace Tests
+{
+    public class When_parsing_links
+    {
+        [Theory]
+        [InlineData("git@github.com:ctaggart/sourcelink-test.git")]
+        [InlineData("https://github.com/ctaggart/sourcelink-test.git")]
+        [InlineData("https://github.com/ctaggart/sourcelink-test")]
+        [InlineData("https://github.com/ctaggart/sourcelink-test/")]
+        public void Should_return_url_in_canonical_form_for_GitHub(string provided)
+        {
+            var task = new SourceLink.Create.GitHub.CreateTask();
+            Assert.Equal("https://raw.githubusercontent.com/ctaggart/sourcelink-test/{commit}/*", task.ConvertUrl(provided));
+        }
+
+        [Theory]
+        [InlineData("git@bitbucket.org:ctaggart/sourcelink-test.git")]
+        [InlineData("https://bitbucket.org/ctaggart/sourcelink-test.git")]
+        [InlineData("https://bitbucket.org/ctaggart/sourcelink-test")]
+        [InlineData("https://bitbucket.org/ctaggart/sourcelink-test/")]
+        public void Should_return_url_in_canonical_form_for_BitBucket(string provided)
+        {
+            var task = new SourceLink.Create.BitBucket.CreateTask();
+            Assert.Equal("https://bitbucket.org/ctaggart/sourcelink-test/raw/{commit}/*", task.ConvertUrl(provided));
+        }
+    }
+}