Skip to content

Possible fix for #144. #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Dec 23, 2016
Merged

Possible fix for #144. #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3e54ed0
First step to fix nested `urls.py` files.
StyXman Nov 3, 2016
a2d8710
Second step to fix nested `urls.py` files.
StyXman Nov 3, 2016
e69fd13
Fix flake8 complaint.
StyXman Nov 3, 2016
5e238b8
Typo/missed replace.
StyXman Nov 3, 2016
fccdce9
Another bug
StyXman Nov 3, 2016
1b4e177
Merge branch 'master' into master
StyXman Dec 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions rest_framework_docs/api_docs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
10 changes: 5 additions & 5 deletions rest_framework_docs/api_endpoint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)

Expand Down