Merge pull request #145 from StyXman/master

Possible fix for #144.

Author: StyXman

rest_framework_docs/api_docs.py

@@ -21,13 +21,13 @@ def __init__(self, drf_router=None):
         else:
             self.get_all_view_names(root_urlconf.urlpatterns)
 
-    def get_all_view_names(self, urlpatterns, parent_pattern=None):
+    def get_all_view_names(self, urlpatterns, parent_regex=''):
         for pattern in urlpatterns:
             if isinstance(pattern, RegexURLResolver):
-                parent_pattern = None if pattern._regex == "^" else pattern
-                self.get_all_view_names(urlpatterns=pattern.url_patterns, parent_pattern=parent_pattern)
+                regex = '' if pattern._regex == "^" else pattern._regex
+                self.get_all_view_names(urlpatterns=pattern.url_patterns, parent_regex=parent_regex + regex)
             elif isinstance(pattern, RegexURLPattern) and self._is_drf_view(pattern) and not self._is_format_endpoint(pattern):
-                api_endpoint = ApiEndpoint(pattern, parent_pattern, self.drf_router)
+                api_endpoint = ApiEndpoint(pattern, parent_regex, self.drf_router)
                 self.endpoints.append(api_endpoint)
 
     def _is_drf_view(self, pattern):

rest_framework_docs/api_endpoint.py

@@ -7,14 +7,14 @@
 
 class ApiEndpoint(object):
 
-    def __init__(self, pattern, parent_pattern=None, drf_router=None):
+    def __init__(self, pattern, parent_regex=None, drf_router=None):
         self.drf_router = drf_router
         self.pattern = pattern
         self.callback = pattern.callback
         # self.name = pattern.name
         self.docstring = self.__get_docstring__()
-        self.name_parent = simplify_regex(parent_pattern.regex.pattern).strip('/') if parent_pattern else None
-        self.path = self.__get_path__(parent_pattern)
+        self.name_parent = simplify_regex(parent_regex).strip('/') if parent_regex else None
+        self.path = self.__get_path__(parent_regex)
         self.allowed_methods = self.__get_allowed_methods__()
         # self.view_name = pattern.callback.__name__
         self.errors = None
@@ -26,8 +26,8 @@ def __init__(self, pattern, parent_pattern=None, drf_router=None):
 
         self.permissions = self.__get_permissions_class__()
 
-    def __get_path__(self, parent_pattern):
-        if parent_pattern:
+    def __get_path__(self, parent_regex):
+        if parent_regex:
             return "/{0}{1}".format(self.name_parent, simplify_regex(self.pattern.regex.pattern))
         return simplify_regex(self.pattern.regex.pattern)