Merge branch 'master' into step6

Author: parente

nbviewer/providers/gist/handlers.py

@@ -1,6 +1,7 @@
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 
+import os
 import json
 
 from tornado import web
@@ -17,6 +18,7 @@
     clean_filename,
     quote,
     response_text,
+    url_path_join,
 )
 
 from ..github.handlers import GithubClientMixin
@@ -95,9 +97,14 @@ async def get(self, user, **namespace):
                     notebooks=notebooks,
                     description=gist['description'] or '',
                 ))
-        provider_url = u"https://gist.github.com/{user}".format(user=user)
+        if self.github_url == 'https://github.com/':
+            gist_base_url = 'https://gist.github.com/'
+        else:
+            gist_base_url = url_path_join(self.github_url, 'gist/')
+        provider_url = url_path_join(gist_base_url, u"{user}".format(user=user))
         html = self.render_usergists_template(entries=entries, user=user, provider_url=provider_url, 
                                               prev_url=prev_url, next_url=next_url, **namespace
+
         )
         await self.cache_and_finish(html)
 
@@ -152,11 +159,15 @@ async def tree_get(self, user, gist_id, gist, files):
                 e['class'] = 'fa-book'
                 ipynbs.append(e)
             else:
-                provider_url = u"https://gist.github.com/{user}/{gist_id}#file-{clean_name}".format(
+                if self.github_url == 'https://github.com/':
+                    gist_base_url = 'https://gist.github.com/'
+                else:
+                    gist_base_url = url_path_join(self.github_url, 'gist/')
+                provider_url = url_path_join(gist_base_url, u"{user}/{gist_id}#file-{clean_name}".format(
                     user=user,
                     gist_id=gist_id,
                     clean_name=clean_filename(file['filename']),
-                )
+                ))
                 e['url'] = provider_url
                 e['class'] = 'fa-share'
                 others.append(e)
@@ -298,9 +309,19 @@ def default_handlers(handlers=[], **handler_names):
 
 
 def uri_rewrites(rewrites=[]):
-    return [
+    gist_rewrites = [
         (r'^([a-f0-9]+)/?$',
             u'/{0}'),
-        ('^https?://gist.github.com/([^\/]+/)?([a-f0-9]+)/?$',
+        (r'^https?://gist.github.com/([^\/]+/)?([a-f0-9]+)/?$',
             u'/{1}'),
-    ] + rewrites
+    ] 
+    # github enterprise
+    if os.environ.get('GITHUB_API_URL', '') != '':
+        gist_base_url = url_path_join(os.environ.get('GITHUB_API_URL').split('/api/v3')[0], 'gist/')
+        gist_rewrites.extend([
+            # Fetching the Gist ID which is embedded in the URL, but with a different base URL
+            (r'^' + gist_base_url + r'([^\/]+/)?([a-f0-9]+)/?$',
+                u'/{1}'),
+        ])
+
+    return gist_rewrites + rewrites

nbviewer/providers/github/handlers.py

@@ -29,6 +29,7 @@
     base64_decode,
     quote,
     response_text,
+    url_path_join,
 )
 
 from .client import AsyncGitHubClient
@@ -286,9 +287,14 @@ class GitHubBlobHandler(GithubClientMixin, RenderingHandler):
     - directory, redirect to tree
     """
     async def get_notebook_data(self, user, repo, ref, path):
-        raw_url = u"https://raw.githubusercontent.com/{user}/{repo}/{ref}/{path}".format(
-            user=user, repo=repo, ref=ref, path=quote(path)
-        )
+        if os.environ.get('GITHUB_API_URL', '') == '':
+            raw_url = u"https://raw.githubusercontent.com/{user}/{repo}/{ref}/{path}".format(
+                user=user, repo=repo, ref=ref, path=quote(path)
+            )
+        else: #Github Enterprise has a different URL pattern for accessing raw files
+            raw_url = url_path_join(
+                self.github_url, user, repo, 'raw', ref, quote(path)
+            )
         blob_url = u"{github_url}{user}/{repo}/blob/{ref}/{path}".format(
             user=user, repo=repo, ref=ref, path=quote(path), github_url=self.github_url
         )
@@ -429,17 +435,27 @@ def uri_rewrites(rewrites=[]):
     ]
     # github enterprise
     if os.environ.get('GITHUB_API_URL', '') != '':
-        github_api_url = os.environ.get('GITHUB_API_URL')
+        github_base_url = os.environ.get('GITHUB_API_URL').split('api/v3')[0]
 
         github_rewrites.extend([
             # raw view
-            (r'^' + github_api_url.split('/api/v3/')[0]
-                + '/([^\/]+)/([^\/]+)/raw/([^\/]+)/(.*)',
+            (r'^' + github_base_url
+                + r'([^\/]+)/([^\/]+)/raw/([^\/]+)/(.*)',
                 u'/github/{0}/{1}/blob/{2}/{3}'),
 
             # trees & blobs
-            (r'^' + github_api_url.split('/api/v3/')[0]
-                + '/([\w\-]+)/([^\/]+)/(blob|tree)/(.*)$',
+            (r'^' + github_base_url
+                + r'([\w\-]+)/([^\/]+)/(blob|tree)/(.*)$',
                 u'/github/{0}/{1}/{2}/{3}'),
+
+            # user/repo
+            (r'^' + github_base_url
+                + r'([\w\-]+)/([^\/]+)/?$',
+                u'/github/{0}/{1}/tree/master'),
+
+            # user
+            (r'^' + github_base_url
+                + r'([\w\-]+)/?$',
+                u'/github/{0}/'),
         ])
     return rewrites + github_rewrites