Skip to content

properly anchor ends of url patterns #697

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 3 commits into from
Aug 31, 2019
Merged

properly anchor ends of url patterns #697

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
93c8852
properly anchor urls
n2ygk Aug 30, 2019
b52e09e
Update CHANGELOG.md
sliverc Aug 31, 2019
8171a86
Merge branch 'master' into anchor_urls
sliverc Aug 31, 2019
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ This release is not backwards compatible. For easy migration best upgrade first
`JSON_API_PLURALIZE_RELATION_TYPE`
* Removed obsolete util methods `format_keys` and `format_relation_name`
* Removed obsolete pagination classes `PageNumberPagination` and `LimitOffsetPagination`
* Added `$` anchor to example urls to use the best practice of having a full URL match.

### Fixed

Expand Down
18 changes: 9 additions & 9 deletions example/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,37 +30,37 @@

urlpatterns = [
url(r'^', include(router.urls)),
url(r'^entries/(?P<entry_pk>[^/.]+)/suggested/',
url(r'^entries/(?P<entry_pk>[^/.]+)/suggested/$',
EntryViewSet.as_view({'get': 'list'}),
name='entry-suggested'
),
url(r'entries/(?P<entry_pk>[^/.]+)/blog',
url(r'entries/(?P<entry_pk>[^/.]+)/blog$',
BlogViewSet.as_view({'get': 'retrieve'}),
name='entry-blog'),
url(r'entries/(?P<entry_pk>[^/.]+)/comments',
url(r'entries/(?P<entry_pk>[^/.]+)/comments$',
CommentViewSet.as_view({'get': 'list'}),
name='entry-comments'),
url(r'entries/(?P<entry_pk>[^/.]+)/authors',
url(r'entries/(?P<entry_pk>[^/.]+)/authors$',
AuthorViewSet.as_view({'get': 'list'}),
name='entry-authors'),
url(r'entries/(?P<entry_pk>[^/.]+)/featured',
url(r'entries/(?P<entry_pk>[^/.]+)/featured$',
EntryViewSet.as_view({'get': 'retrieve'}),
name='entry-featured'),

url(r'^authors/(?P<pk>[^/.]+)/(?P<related_field>\w+)/$',
AuthorViewSet.as_view({'get': 'retrieve_related'}),
name='author-related'),

url(r'^entries/(?P<pk>[^/.]+)/relationships/(?P<related_field>\w+)',
url(r'^entries/(?P<pk>[^/.]+)/relationships/(?P<related_field>\w+)$',
EntryRelationshipView.as_view(),
name='entry-relationships'),
url(r'^blogs/(?P<pk>[^/.]+)/relationships/(?P<related_field>\w+)',
url(r'^blogs/(?P<pk>[^/.]+)/relationships/(?P<related_field>\w+)$',
BlogRelationshipView.as_view(),
name='blog-relationships'),
url(r'^comments/(?P<pk>[^/.]+)/relationships/(?P<related_field>\w+)',
url(r'^comments/(?P<pk>[^/.]+)/relationships/(?P<related_field>\w+)$',
CommentRelationshipView.as_view(),
name='comment-relationships'),
url(r'^authors/(?P<pk>[^/.]+)/relationships/(?P<related_field>\w+)',
url(r'^authors/(?P<pk>[^/.]+)/relationships/(?P<related_field>\w+)$',
AuthorRelationshipView.as_view(),
name='author-relationships'),
]
Expand Down
22 changes: 11 additions & 11 deletions example/urls_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,47 +44,47 @@
url(r'^', include(router.urls)),

# old tests
url(r'identities/default/(?P<pk>\d+)',
url(r'identities/default/(?P<pk>\d+)$',
GenericIdentity.as_view(), name='user-default'),


url(r'^entries/(?P<entry_pk>[^/.]+)/blog',
url(r'^entries/(?P<entry_pk>[^/.]+)/blog$',
BlogViewSet.as_view({'get': 'retrieve'}),
name='entry-blog'
),
url(r'^entries/(?P<entry_pk>[^/.]+)/comments',
url(r'^entries/(?P<entry_pk>[^/.]+)/comments$',
CommentViewSet.as_view({'get': 'list'}),
name='entry-comments'
),
url(r'^entries/(?P<entry_pk>[^/.]+)/suggested/',
url(r'^entries/(?P<entry_pk>[^/.]+)/suggested/$',
EntryViewSet.as_view({'get': 'list'}),
name='entry-suggested'
),
url(r'^drf-entries/(?P<entry_pk>[^/.]+)/suggested/',
url(r'^drf-entries/(?P<entry_pk>[^/.]+)/suggested/$',
DRFEntryViewSet.as_view({'get': 'list'}),
name='drf-entry-suggested'
),
url(r'entries/(?P<entry_pk>[^/.]+)/authors',
url(r'entries/(?P<entry_pk>[^/.]+)/authors$',
AuthorViewSet.as_view({'get': 'list'}),
name='entry-authors'),
url(r'entries/(?P<entry_pk>[^/.]+)/featured',
url(r'entries/(?P<entry_pk>[^/.]+)/featured$',
EntryViewSet.as_view({'get': 'retrieve'}),
name='entry-featured'),

url(r'^authors/(?P<pk>[^/.]+)/(?P<related_field>\w+)/$',
AuthorViewSet.as_view({'get': 'retrieve_related'}),
name='author-related'),

url(r'^entries/(?P<pk>[^/.]+)/relationships/(?P<related_field>\w+)',
url(r'^entries/(?P<pk>[^/.]+)/relationships/(?P<related_field>\w+)$',
EntryRelationshipView.as_view(),
name='entry-relationships'),
url(r'^blogs/(?P<pk>[^/.]+)/relationships/(?P<related_field>\w+)',
url(r'^blogs/(?P<pk>[^/.]+)/relationships/(?P<related_field>\w+)$',
BlogRelationshipView.as_view(),
name='blog-relationships'),
url(r'^comments/(?P<pk>[^/.]+)/relationships/(?P<related_field>\w+)',
url(r'^comments/(?P<pk>[^/.]+)/relationships/(?P<related_field>\w+)$',
CommentRelationshipView.as_view(),
name='comment-relationships'),
url(r'^authors/(?P<pk>[^/.]+)/relationships/(?P<related_field>\w+)',
url(r'^authors/(?P<pk>[^/.]+)/relationships/(?P<related_field>\w+)$',
AuthorRelationshipView.as_view(),
name='author-relationships'),
]