Move API URL value to constants and use it as a fallback GitHubRenderer.

joeyespo · Nov 17, 2015 · 21e5d1c · 21e5d1c
1 parent c8f2c51
commit 21e5d1c
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 9 deletions.
diff --git a/grip/__init__.py b/grip/__init__.py
@@ -14,16 +14,17 @@
     clear_cache, create_app, export, render_content, render_page, serve)
 from .command import main
 from .constants import (
-    DEFAULT_FILENAMES, DEFAULT_GRIPHOME, DEFAULT_GRIPURL,
+    DEFAULT_API_URL, DEFAULT_FILENAMES, DEFAULT_GRIPHOME, DEFAULT_GRIPURL,
     STYLE_ASSET_URLS_INLINE_FORMAT, STYLE_ASSET_URLS_RE,
     STYLE_ASSET_URLS_SUB_FORMAT, STYLE_URLS_RE, STYLE_URLS_SOURCE,
     SUPPORTED_EXTENSIONS, SUPPORTED_TITLES)
 
 
 __all__ = [
-    'DEFAULT_FILENAMES', 'DEFAULT_GRIPHOME', 'DEFAULT_GRIPURL',
-    'STYLE_ASSET_URLS_INLINE_FORMAT', 'STYLE_ASSET_URLS_RE',
-    'STYLE_ASSET_URLS_SUB_FORMAT', 'STYLE_URLS_RE', 'STYLE_URLS_SOURCE',
-    'SUPPORTED_EXTENSIONS', 'SUPPORTED_TITLES', 'create_app', 'serve',
-    'clear_cache', 'main', 'render_content', 'render_page', 'export',
+    'DEFAULT_API_URL', 'DEFAULT_FILENAMES', 'DEFAULT_FILENAME',
+    'DEFAULT_GRIPHOME', 'DEFAULT_GRIPURL', 'STYLE_ASSET_URLS_INLINE_FORMAT',
+    'STYLE_ASSET_URLS_RE', 'STYLE_ASSET_URLS_SUB_FORMAT', 'STYLE_URLS_RE',
+    'STYLE_URLS_SOURCE', 'SUPPORTED_EXTENSIONS', 'SUPPORTED_TITLES',
+    'create_app', 'serve', 'clear_cache', 'main', 'render_content',
+    'render_page', 'export',
 ]
diff --git a/grip/api.py b/grip/api.py
@@ -83,8 +83,6 @@ def render_content(text, user_content=False, context=None, username=None,
     """
     Renders the specified markup and returns the result.
     """
-    if not render_offline and api_url is None:
-        ValueError('Argument api_url is required when not rendering offline.')
     renderer = (GitHubRenderer(user_content, context, api_url)
                 if not render_offline else
                 OfflineRenderer(user_content, context))

diff --git a/grip/constants.py b/grip/constants.py
@@ -18,6 +18,11 @@
 DEFAULT_GRIPURL = '/__/grip'
 
 
+# The public GitHub API
+DEFAULT_API_URL = 'https://api.github.com'
+
+
+# Style parsing
 STYLE_URLS_SOURCE = 'https://github.com/joeyespo/grip'
 STYLE_URLS_RE = (
     '<link.+href=[\'"]?([^\'" >]+)[\'"]?.+media=[\'"]?(?:screen|all)[\'"]?.'

diff --git a/grip/renderers.py b/grip/renderers.py
@@ -11,6 +11,8 @@
     markdown = None
     UrlizeExtension = None
 
+from .constants import DEFAULT_API_URL
+
 
 class ReadmeRenderer(object):
     """
@@ -38,6 +40,8 @@ class GitHubRenderer(ReadmeRenderer):
     Renders the specified Readme using the GitHub Markdown API.
     """
     def __init__(self, user_content=None, context=None, api_url=None):
+        if api_url is None:
+            api_url = DEFAULT_API_URL
         super(GitHubRenderer, self).__init__(user_content, context)
         self.api_url = api_url
 

diff --git a/grip/settings.py b/grip/settings.py
@@ -11,7 +11,6 @@
 PORT = 6419
 DEBUG = False
 DEBUG_GRIP = False
-API_URL = 'https://api.github.com'
 CACHE_DIRECTORY = 'cache-{version}'
 AUTOREFRESH = True
 QUIET = False
@@ -24,5 +23,9 @@
 PASSWORD = None
 
 
+# Custom GitHub API
+API_URL = None
+
+
 # Custom styles
 STYLE_URLS = []