List urls with namespaces' urls (parent patterns)

Emmanouil Konstantinidis · Emmanouil Konstantinidis · commit 09b9e94a13f1 · 2015-12-12T21:54:18.000Z
diff --git a/drfdocs/api_docs.py b/drfdocs/api_docs.py
@@ -12,13 +12,17 @@ def __init__(self):
         root_urlconf = __import__(settings.ROOT_URLCONF)
         self.get_all_view_names(root_urlconf.urls.urlpatterns)
 
-    def get_all_view_names(self, urlpatterns):
+    def get_all_view_names(self, urlpatterns, parent_pattern=None):
         for pattern in urlpatterns:
             if isinstance(pattern, RegexURLResolver) and (pattern.app_name not in self.excluded_apps):
-                self.get_all_view_names(pattern.url_patterns)
+                self.get_all_view_names(urlpatterns=pattern.url_patterns, parent_pattern=pattern)
             elif isinstance(pattern, RegexURLPattern) and (pattern.callback.__name__ not in self.excluded_endpoints):
-                api_endpoint = ApiEndpoint(pattern)
+                api_endpoint = ApiEndpoint(pattern, parent_pattern)
                 self.endpoints.append(api_endpoint)
 
+    def _filter_drf_views(self, endpoints):
+        # Should keep only the endpoints with views that inherit from DRF's APIView
+        pass
+
     def get_endpoints(self):
         return self.endpoints
diff --git a/drfdocs/api_endpoint.py b/drfdocs/api_endpoint.py
@@ -4,8 +4,11 @@
 
 class ApiEndpoint(object):
 
-    def __init__(self, pattern):
+    def __init__(self, pattern, parent_pattern=None):
         self.pattern = pattern
+        self.url_parent_regex = simplify_regex(parent_pattern.regex.pattern)[:-1] if parent_pattern else None
+        self.url_regex = ("{0}{1}".format(self.url_parent_regex, simplify_regex(pattern.regex.pattern))) if self.url_parent_regex else simplify_regex(pattern.regex.pattern)
+        self.url_name = pattern.name
         self.regex = simplify_regex(pattern._regex)
         self.view_name = pattern.callback.__name__
         # self._get_api_callback(pattern)
diff --git a/drfdocs/templates/drfdocs/base.html b/drfdocs/templates/drfdocs/base.html
@@ -21,7 +21,7 @@
 
   <body>
     <a href="https://github.com/ekonstantinidis/drf-docs/" class="github-corner" target="_blank">
-      <svg width="80" height="80" viewBox="0 0 250 250" style="fill:#64CEAA; color:#fff; position: absolute; top: 0; border: 0; right: 0;">
+      <svg width="80" height="80" viewBox="0 0 250 250" style="fill:#18bc9c; color:#fff; position: absolute; top: 0; border: 0; right: 0;">
         <path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path>
         <path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path>
         <path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path>
diff --git a/drfdocs/templates/drfdocs/home.html b/drfdocs/templates/drfdocs/home.html
@@ -5,8 +5,9 @@ <h2>API Endpoints</h2>
 
   {% for endpoint in endpoints %}
     <div class="endpoint">
-      <h3 class="title">{{ endpoint.regex }}</h3>
-      <p>{{ endpoint.view_name }}</p>
+      <h3 class="title">{{ endpoint.url_regex }}</h3>
+      <p>View Name: {{ endpoint.view_name }}</p>
+      <p>URL Name: {{ endpoint.url_name }}</p>
     </div>
   {% endfor %}
 {% endblock %}
