Merge pull request #101 from atom/wl-better-wiki-support

Add better support for wikis

Author: Wliu

lib/github-file.js

@@ -79,7 +79,7 @@ export default class GitHubFile {
   }
 
   getLineRangeSuffix (lineRange) {
-    if (lineRange && atom.config.get('open-on-github.includeLineNumbersInUrls')) {
+    if (lineRange && !this.isGitHubWikiURL(this.githubRepoURL()) && atom.config.get('open-on-github.includeLineNumbersInUrls')) {
       lineRange = Range.fromObject(lineRange)
       const startRow = lineRange.start.row + 1
       const endRow = lineRange.end.row + 1
@@ -128,7 +128,7 @@ export default class GitHubFile {
     const repoRelativePath = this.repoRelativePath()
 
     if (this.isGitHubWikiURL(gitHubRepoURL)) {
-      return `${gitHubRepoURL.slice(0, -5)}/wiki/${this.extractFileName(repoRelativePath)}`
+      return `${gitHubRepoURL}/${this.extractFileName(repoRelativePath)}`
     } else if (this.isGistURL(gitHubRepoURL)) {
       return `${gitHubRepoURL}#file-${this.encodeSegments(repoRelativePath.replace(/\./g, '-'))}`
     } else {
@@ -138,10 +138,12 @@ export default class GitHubFile {
 
   // Internal
   blobURLForMaster () {
-    if (this.isGistURL(this.githubRepoURL())) {
+    const gitHubRepoURL = this.githubRepoURL()
+
+    if (this.isGitHubWikiURL(gitHubRepoURL) || this.isGistURL(gitHubRepoURL)) {
       return this.blobURL() // Gists do not have branches
     } else {
-      return `${this.githubRepoURL()}/blob/master/${this.encodeSegments(this.repoRelativePath())}`
+      return `${gitHubRepoURL}/blob/master/${this.encodeSegments(this.repoRelativePath())}`
     }
   }
 
@@ -151,7 +153,9 @@ export default class GitHubFile {
     const encodedSHA = this.encodeSegments(this.sha())
     const repoRelativePath = this.repoRelativePath()
 
-    if (this.isGistURL(gitHubRepoURL)) {
+    if (this.isGitHubWikiURL(gitHubRepoURL)) {
+      return `${gitHubRepoURL}/${this.extractFileName(repoRelativePath)}/${encodedSHA}`
+    } else if (this.isGistURL(gitHubRepoURL)) {
       return `${gitHubRepoURL}/${encodedSHA}#file-${this.encodeSegments(repoRelativePath.replace(/\./g, '-'))}`
     } else {
       return `${gitHubRepoURL}/blob/${encodedSHA}/${this.encodeSegments(repoRelativePath)}`
@@ -167,7 +171,9 @@ export default class GitHubFile {
   historyURL () {
     const gitHubRepoURL = this.githubRepoURL()
 
-    if (this.isGistURL(gitHubRepoURL)) {
+    if (this.isGitHubWikiURL(gitHubRepoURL)) {
+      return `${gitHubRepoURL}/${this.extractFileName(this.repoRelativePath())}/_history`
+    } else if (this.isGistURL(gitHubRepoURL)) {
       return `${gitHubRepoURL}/revisions`
     } else {
       return `${gitHubRepoURL}/commits/${this.remoteBranchName()}/${this.encodeSegments(this.repoRelativePath())}`
@@ -225,6 +231,8 @@ export default class GitHubFile {
 
     // Remove trailing .git and trailing slashes
     url = url.replace(/\.git$/, '').replace(/\/+$/, '')
+    // Change .wiki to /wiki
+    url = url.replace(/\.wiki$/, '/wiki')
 
     if (!this.isBitbucketURL(url)) {
       return url
@@ -240,7 +248,7 @@ export default class GitHubFile {
   }
 
   isGitHubWikiURL (url) {
-    return /\.wiki$/.test(url)
+    return /\/wiki$/.test(url)
   }
 
   isBitbucketURL (url) {

spec/github-file-spec.js

@@ -235,6 +235,21 @@ describe('GitHubFile', function () {
         })
       })
 
+      describe('when the file is part of a GitHub wiki', () => {
+        let fixtureName = 'github-remote-wiki'
+
+        beforeEach(async () => {
+          setupWorkingDir(fixtureName)
+          await setupGithubFile()
+        })
+
+        it('opens the GitHub.com wiki URL for the file and behaves exactly like open', () => {
+          spyOn(githubFile, 'openURLInBrowser')
+          githubFile.openOnMaster()
+          expect(githubFile.openURLInBrowser).toHaveBeenCalledWith('https://github.com/some-user/some-repo/wiki/some-file')
+        })
+      })
+
       describe('when the file is part of a GitHub gist', () => {
         let fixtureName = 'github-remote-gist'
 
@@ -340,6 +355,21 @@ describe('GitHubFile', function () {
         })
       })
 
+      describe('when the file is part of a GitHub wiki', () => {
+        let fixtureName = 'github-remote-wiki'
+
+        beforeEach(async () => {
+          setupWorkingDir(fixtureName)
+          await setupGithubFile()
+        })
+
+        it('opens the GitHub.com wiki history URL for the file', () => {
+          spyOn(githubFile, 'openURLInBrowser')
+          githubFile.history()
+          expect(githubFile.openURLInBrowser).toHaveBeenCalledWith('https://github.com/some-user/some-repo/wiki/some-file/_history')
+        })
+      })
+
       describe('when the file is part of a GitHub gist', () => {
         let fixtureName = 'github-remote-gist'
 
@@ -381,6 +411,21 @@ describe('GitHubFile', function () {
         })
       })
 
+      describe('when the file is part of a GitHub wiki', () => {
+        let fixtureName = 'github-remote-wiki'
+
+        beforeEach(async () => {
+          setupWorkingDir(fixtureName)
+          atom.config.set('open-on-github.includeLineNumbersInUrls', true)
+          await setupGithubFile()
+        })
+
+        it('copies the GitHub.com wiki URL to the clipboard and ignores any selection ranges', () => {
+          githubFile.copyURL([[0, 0], [1, 1]])
+          expect(atom.clipboard.read()).toBe('https://github.com/some-user/some-repo/wiki/some-file/80b7897ceb6bd7531708509b50afeab36a4b73fd')
+        })
+      })
+
       describe('when the file is part of a GitHub gist', () => {
         let fixtureName = 'github-remote-gist'
 
@@ -422,6 +467,21 @@ describe('GitHubFile', function () {
         })
       })
 
+      describe('when the file is part of a GitHub wiki', () => {
+        let fixtureName = 'github-remote-wiki'
+
+        beforeEach(async () => {
+          setupWorkingDir(fixtureName)
+          await setupGithubFile()
+        })
+
+        it('opens the GitHub.com wiki history URL for the file', () => {
+          spyOn(githubFile, 'openURLInBrowser')
+          githubFile.openRepository()
+          expect(githubFile.openURLInBrowser).toHaveBeenCalledWith('https://github.com/some-user/some-repo/wiki')
+        })
+      })
+
       describe('when the file is part of a GitHub gist', () => {
         let fixtureName = 'github-remote-gist'