django-pfx 1.2.dev34__tar.gz → 1.2.dev36__tar.gz

{django-pfx-1.2.dev34 → django-pfx-1.2.dev36}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-pfx
-Version: 1.2.dev34
+Version: 1.2.dev36
 Summary: Django PFX is a toolkit to build web APIs dedicated to be used by React progressive web app.
 Author: Hervé Martinet
 Author-email: herve.martinet@gmail.com

{django-pfx-1.2.dev34 → django-pfx-1.2.dev36}/django_pfx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-pfx
-Version: 1.2.dev34
+Version: 1.2.dev36
 Summary: Django PFX is a toolkit to build web APIs dedicated to be used by React progressive web app.
 Author: Hervé Martinet
 Author-email: herve.martinet@gmail.com

{django-pfx-1.2.dev34 → django-pfx-1.2.dev36}/pfx/pfxcore/views/rest_views.py

@@ -551,7 +551,7 @@ class BaseRestView(SecuredRestViewMixin, View):
             process, path.lstrip('/').split('/'))
 
     @classmethod
-    def as_urlpatterns(cls):
+    def get_urls(cls, as_pattern=False):
         def fullpath(p2):
             return f'{cls.rest_view_path}{p2}'.lstrip('/')
 
@@ -568,11 +568,17 @@ class BaseRestView(SecuredRestViewMixin, View):
                             "you cannot set different priority for same path")
                     methods['priority'] = m.rest_api_priority
         return [
-            path(fullpath(p), cls.as_view(pfx_methods=ms))
+            path(fullpath(p), cls.as_view(pfx_methods=ms)) if as_pattern
+            else dict(path=fullpath(p), methods={
+                k: v for k, v in ms.items() if k != 'priority'})
             for p, ms in sorted(
                 paths.items(), key=lambda e: cls._path_order(*e),
                 reverse=True)]
 
+    @classmethod
+    def as_urlpatterns(cls):
+        return cls.get_urls(as_pattern=True)
+
 
 class RestView(
         ListRestViewMixin,

{django-pfx-1.2.dev34 → django-pfx-1.2.dev36}/tests/tests/test_api_doc.py

@@ -2,6 +2,7 @@ from django.test import TestCase, override_settings
 
 from pfx.pfxcore.management.commands.makeapidoc import get_spec
 from pfx.pfxcore.test import TestAssertMixin
+from tests.views import AuthorRestView
 
 
 class ApiDocTest(TestAssertMixin, TestCase):
@@ -22,3 +23,25 @@ class ApiDocTest(TestAssertMixin, TestCase):
         self.assertEqual(info['title'], "MyAPI")
         self.assertEqual(info['version'], "1.0.0")
         self.assertEqual(info['description'], "A test API")
+
+    def test_view_get_urls(self):
+        def get_methods(url, p):
+            return next(filter(lambda u: u['path'] == p, urls))['methods']
+
+        urls = AuthorRestView.get_urls()
+
+        # Methods from RestView
+        self.assertEqual(
+            get_methods(urls, 'authors'),
+            dict(get='get_list', post='post'))
+        self.assertEqual(
+            get_methods(urls, 'authors/<int:id>'),
+            dict(delete='delete', get='get', put='put'))
+        # A method from SlugDetailRestViewMixin
+        self.assertEqual(
+            get_methods(urls, 'authors/slug/<slug:slug>'),
+            dict(get='get_by_slug'))
+        # A method from AuthorRestView itself
+        self.assertEqual(
+            get_methods(urls, 'authors/cache/<int:id>'),
+            dict(get='cache_get'))