Update UriString to allow http URLs with owner

The following URL will now have an owner of "owner":
https://github.com/owner
Previously it would make a repository name of "owner".

Author: jcansdale

src/GitHub.Exports/Primitives/UriString.cs

@@ -43,11 +43,17 @@ public UriString(string uriString) : base(NormalizePath(uriString))
                 SetFilePath(uriString);
             }
 
-            if (RepositoryName != null)
+            if (Owner != null && RepositoryName != null)
             {
-                NameWithOwner = Owner != null
-                    ? string.Format(CultureInfo.InvariantCulture, "{0}/{1}", Owner, RepositoryName)
-                    : RepositoryName;
+                NameWithOwner = string.Format(CultureInfo.InvariantCulture, "{0}/{1}", Owner, RepositoryName);
+            }
+            else if (Owner != null)
+            {
+                NameWithOwner = Owner;
+            }
+            else if (RepositoryName != null)
+            {
+                NameWithOwner = RepositoryName;
             }
         }
 
@@ -68,13 +74,6 @@ void SetUri(Uri uri)
             var ownerSegment = FindSegment(uri.Segments, 0);
             var repositorySegment = FindSegment(uri.Segments, 1);
 
-            if (repositorySegment == null)
-            {
-                // Prioritize having a RepositoryName over an Owner
-                repositorySegment = ownerSegment;
-                ownerSegment = null;
-            }
-
             Host = uri.Host;
             Owner = ownerSegment;
             RepositoryName = GetRepositoryName(repositorySegment);
@@ -148,7 +147,7 @@ public Uri ToRepositoryUrl(string owner = null)
                 ? url.Scheme
                 : Uri.UriSchemeHttps;
 
-            var nameWithOwner = owner != null && Owner != null ?
+            var nameWithOwner = owner != null && RepositoryName != null ?
                 string.Format(CultureInfo.InvariantCulture, "{0}/{1}", owner, RepositoryName) :
                 NameWithOwner;
 

test/GitHub.Primitives.UnitTests/UriStringTests.cs

@@ -25,12 +25,15 @@ public class TheConstructor : TestBaseClass
         [TestCase("jane;fingerprint=9e:1a:5e:27:16:4d:2a:13:90:2c:64:41:bd:25:fd:[email protected]:github/Windows.git",
             "foo.com", "github", "Windows")]
         [TestCase("https://[email protected]/haacked/test-mytest.git", "bitbucket.org", "haacked", "test-mytest")]
-        [TestCase("https://git01.codeplex.com/nuget", "git01.codeplex.com", null, "nuget")]
+        [TestCase("https://git01.codeplex.com/nuget", "git01.codeplex.com", "nuget", null,
+            Description = "We assume the first component is the owner")]
         [TestCase("https://example.com/vpath/foo/bar", "example.com", "vpath", "foo")]
         [TestCase("https://example.com/vpath/foo/bar.git", "example.com", "vpath", "foo")]
         [TestCase("https://github.com/github/Windows.git?pr=24&branch=pr/23&filepath=relative/to/the/path.md",
             "github.com", "github", "Windows")]
         [TestCase("https://github.com/github/VisualStudio/blob/master/src/code.cs", "github.com", "github", "VisualStudio")]
+        [TestCase("https://github.com/github", "github.com", "github", null)]
+        [TestCase("https://github.com", "github.com", null, null)]
         public void ParsesWellFormedUrlComponents(string url, string expectedHost, string owner, string repositoryName)
         {
             var cloneUrl = new UriString(url);
@@ -71,13 +74,17 @@ public void ParsesLocalFileUris(string path)
         [TestCase("http://example.com", "example.com", null, null)]
         [TestCase("http://example.com?bar", "example.com", null, null)]
         [TestCase("https://example.com?bar", "example.com", null, null)]
-        [TestCase("ssh://[email protected]/Windows.git", "example.com", null, "Windows")]
+        [TestCase("ssh://[email protected]/Windows.git", "example.com", "Windows.git", null,
+            Description = "We assume the first component is the owner even if it ends with .git")]
         [TestCase("[email protected]:/", "bar.com", null, null)]
         [TestCase("[email protected]/", "bar.com", null, null)]
         [TestCase("[email protected]", "bar.com", null, null)]
         [TestCase("[email protected]:/Windows.git", "bar.com", null, "Windows")]
         [TestCase("[email protected]/Windows.git", "baz.com", null, "Windows")]
         [TestCase("ssh://[email protected]:github/Windows.git", "github.com", "github", "Windows")]
+
+        // NOTE: Used by LocalRepositoryModelTests.GenerateUrl but I don't think it's a legal URL
+        [TestCase("[email protected]/foo/bar", "github.com", null, "foo/bar")]
         public void ParsesWeirdUrlsAsWellAsPossible(string url, string expectedHost, string owner, string repositoryName)
         {
             var cloneUrl = new UriString(url);
@@ -202,21 +209,6 @@ public void ConvertsWithNewOwner(string uriString, string expected, string owner
         [TestCase("[email protected]:org/repo.git", "https://example.com/org/repo")]
         [TestCase("ssh://[email protected]:443/shana/cef", "https://github.com/shana/cef")]
         [TestCase("ssh://[email protected]:23/haacked/encourage", "https://example.com:23/haacked/encourage")]
-
-        [TestCase("asdf", null)]
-        [TestCase("", null)]
-        [TestCase("file:///C:/dev/exp/foo", "file:///C:/dev/exp/foo")]
-        [TestCase("http://example.com/", "http://example.com/")]
-        [TestCase("http://[email protected]/foo/bar", "http://example.com/foo/bar")]
-        [TestCase("https://github.com/github/Windows", "https://github.com/github/Windows")]
-        [TestCase("https://github.com/github/Windows.git", "https://github.com/github/Windows")]
-        [TestCase("https://[email protected]/github/Windows.git", "https://github.com/github/Windows")]
-        [TestCase("http://example.com:4000/github/Windows", "http://example.com:4000/github/Windows")]
-        [TestCase("[email protected]:github/Windows.git", "https://192.168.1.2/github/Windows")]
-        [TestCase("[email protected]:org/repo.git", "https://example.com/org/repo")]
-        [TestCase("ssh://[email protected]:443/shana/cef", "https://github.com/shana/cef")]
-        [TestCase("ssh://[email protected]:23/haacked/encourage", "https://example.com:23/haacked/encourage")]
-
         public void ShouldNeverThrow(string url, string expected)
         {
             Uri uri;