Merge pull request #355 from Gibsondz/master

- Support For DRF 3.15 nested SimpleRouter.use_regex_path = False
- CI is back to test over DRF 3.14, that still works.
- CI is no more tested over Python 3.8, that is EOL right now.

Author: alanjds

README.md

@@ -17,11 +17,11 @@ exist without a domain, so you need it "nested" inside the domain.
 
 ## Requirements & Compatibility
 
-- Python (3.8, 3.9, 3.10, 3.11, 3.12, 3.13)
+- Python (3.9, 3.10, 3.11, 3.12, 3.13)
 - Django (4.2, 5.0, 5.1)
 - Django REST Framework (3.14, 3.15)
 
-It may work with lower versions, but since the release **0.93.5** is no more tested on CI for Python 3.6 or lower.<br/>
+It may work with lower versions, but since the release **0.94.2** is no more tested on CI for Python 3.8 or lower.<br/>
 And since **0.92.1** is no more tested on CI for Pythons 2.7 to 3.5, Django 1.11 to 2.1 or DRF 3.6 to 3.10.<br/>
 Before that, the release **0.90.2** was tested also with DRF 2.4.3 up to 3.7.
 

requirements.txt

@@ -3,5 +3,5 @@
 
 # Minimum Django and REST framework version
 Django>=4.2
-djangorestframework>=3.14.0
+djangorestframework>=3.15.0
 

rest_framework_nested/routers.py

@@ -59,6 +59,7 @@ def __init__(
         self.parent_prefix = parent_prefix
         self.nest_count = getattr(parent_router, 'nest_count', 0) + 1
         self.nest_prefix = kwargs.pop('lookup', f'nested_{self.nest_count}') + '_'
+        self.use_regex_path = kwargs.get('use_regex_path', True)
 
         super().__init__(*args, **kwargs)
 
@@ -111,7 +112,11 @@ def __init__(
             # to escape it
             escaped_parent_regex = self.parent_regex.replace('{', '{{').replace('}', '}}')
 
-            route_contents['url'] = route.url.replace('^', '^' + escaped_parent_regex)
+            if self.use_regex_path:
+                route_contents['url'] = route.url.replace('^', '^' + escaped_parent_regex)
+            else:
+                route_contents['url'] = escaped_parent_regex + route_contents['url']
+
             nested_routes.append(type(route)(**route_contents))
 
         self.routes = nested_routes

setup.py

@@ -76,7 +76,7 @@ def get_package_data(package):
     packages=get_packages(package),
     package_data=get_package_data(package),
     install_requires=[
-        'djangorestframework>=3.14.0',
+        'djangorestframework>=3.15.0',
         'Django>=4.2',
     ],
     python_requires=">=3.8",

tests/test_routers.py

@@ -51,6 +51,11 @@ class AViewSet(ModelViewSet):
     queryset = QS(A)
 
 
+class ANonRegexViewSet(ModelViewSet):
+    model = A
+    queryset = QS(A)
+
+
 class BViewSet(ModelViewSet):
     model = B
     queryset = QS(B)
@@ -90,6 +95,35 @@ def test_recursive_nested_simple_routers(self):
         self.assertEqual(get_regex_pattern(urls[1]), '^a/(?P<a_pk>[0-9a-f]{32})/b/(?P<b_pk>[^/.]+)/c/(?P<pk>[^/.]+)/$')
 
 
+class TestNonRegexNestedSimpleRouter(TestCase):
+    def setUp(self):
+        self.router = SimpleRouter(use_regex_path=False)
+        self.router.register(r'a', ANonRegexViewSet)
+        self.a_router = NestedSimpleRouter(self.router, r'a', lookup='a', use_regex_path=False)
+        self.a_router.register(r'b', BViewSet)
+        self.b_router = NestedSimpleRouter(self.a_router, r'b', lookup='b', use_regex_path=False)
+        self.b_router.register(r'c', CViewSet)
+
+    def test_non_regex_recursive_nested_simple_routers(self):
+        self.assertFalse(hasattr(self.router, 'parent_regex'))
+        urls = self.router.urls
+
+        self.assertEqual(pattern_from_url(urls[0]), 'a/')
+        self.assertEqual(pattern_from_url(urls[1]), 'a/<str:pk>/')
+
+        self.assertEqual(self.a_router.parent_regex, 'a/<str:a_pk>/')
+        urls = self.a_router.urls
+        self.assertEqual(len(urls), 2)
+        self.assertEqual(pattern_from_url(urls[0]), 'a/<str:a_pk>/b/')
+        self.assertEqual(pattern_from_url(urls[1]), 'a/<str:a_pk>/b/<str:pk>/')
+
+        self.assertEqual(self.b_router.parent_regex, 'a/<str:a_pk>/b/<str:b_pk>/')
+        urls = self.b_router.urls
+        self.assertEqual(len(urls), 2)
+        self.assertEqual(pattern_from_url(urls[0]), 'a/<str:a_pk>/b/<str:b_pk>/c/')
+        self.assertEqual(pattern_from_url(urls[1]), 'a/<str:a_pk>/b/<str:b_pk>/c/<str:pk>/')
+
+
 class TestEmptyPrefix(TestCase):
     def setUp(self):
         self.router = SimpleRouter()

tox.ini

@@ -1,14 +1,13 @@
 [tox]
 # see https://docs.djangoproject.com/en/5.1/faq/install/#what-python-version-can-i-use-with-django
 envlist =
-       py{38,39,310,311,312}-django4.2-drf{3.14,3.15}
+       py{39,310,311,312}-django4.2-drf{3.14,3.15}
        py{310,311,312}-django5.0-drf{3.14,3.15}
        py{310,311,312,313}-django5.1-drf{3.14,3.15}
        py312-mypy
 
 [gh-actions]
 python =
-       3.8: py38
        3.9: py39
        3.10: py310
        3.11: py311