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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-pfx
-Version: 1.2.dev36
+Version: 1.2.dev38
 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.dev36 → django-pfx-1.2.dev38}/django_pfx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-pfx
-Version: 1.2.dev36
+Version: 1.2.dev38
 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.dev36 → django-pfx-1.2.dev38}/pfx/pfxcore/__init__.py

@@ -1,3 +1,5 @@
 from .shortcuts import register_views
 
 default_app_config = 'pfx.pfxcore.apps.PfxCoreConfig'
+
+__PFX_VIEWS__ = []

{django-pfx-1.2.dev36 → django-pfx-1.2.dev38}/pfx/pfxcore/management/commands/makeapidoc.py

@@ -5,6 +5,7 @@ from django.core.management.base import BaseCommand
 
 from apispec import APISpec
 
+from pfx.pfxcore import __PFX_VIEWS__
 from pfx.pfxcore.settings import PFXSettings
 
 settings = PFXSettings()
@@ -15,7 +16,13 @@ DEFAULT_TEMPLATE = dict(
 
 
 def get_spec():
-    return APISpec(**{**DEFAULT_TEMPLATE, **settings.PFX_OPENAPI_TEMPLATE})
+    spec = APISpec(**{**DEFAULT_TEMPLATE, **settings.PFX_OPENAPI_TEMPLATE})
+    for view in __PFX_VIEWS__:
+        for url in view.get_urls():
+            spec.path(
+                path=url['path'],
+                operations={k: {} for k, v in url['methods'].items()})
+    return spec
 
 
 class Command(BaseCommand):

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

@@ -12,6 +12,7 @@ from django.urls import path
 from django.utils.translation import gettext_lazy as _
 from django.views import View
 
+from pfx.pfxcore import __PFX_VIEWS__
 from pfx.pfxcore.decorator import rest_api
 from pfx.pfxcore.exceptions import (
     APIError,
@@ -553,7 +554,8 @@ class BaseRestView(SecuredRestViewMixin, View):
     @classmethod
     def get_urls(cls, as_pattern=False):
         def fullpath(p2):
-            return f'{cls.rest_view_path}{p2}'.lstrip('/')
+            res = f'{cls.rest_view_path}{p2}'.lstrip('/')
+            return res if as_pattern else f'/{res}'
 
         paths = {}
         for name in dir(cls):
@@ -577,6 +579,8 @@ class BaseRestView(SecuredRestViewMixin, View):
 
     @classmethod
     def as_urlpatterns(cls):
+        if cls not in __PFX_VIEWS__:
+            __PFX_VIEWS__.append(cls)
         return cls.get_urls(as_pattern=True)
 
 

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

@@ -24,24 +24,30 @@ class ApiDocTest(TestAssertMixin, TestCase):
         self.assertEqual(info['version'], "1.0.0")
         self.assertEqual(info['description'], "A test API")
 
+    def test_paths_generation(self):
+        def assertMethods(paths, p, methods):
+            self.assertEqual(set(paths[p].keys()), methods)
+
+        spec = get_spec().to_dict()
+        paths = spec['paths']
+        assertMethods(paths, '/authors', {'get', 'post'})
+        assertMethods(paths, '/authors/<int:id>', {'get', 'put', 'delete'})
+        assertMethods(paths, '/authors/slug/<slug:slug>', {'get'})
+        assertMethods(paths, '/authors/cache/<int:id>', {'get'})
+
     def test_view_get_urls(self):
-        def get_methods(url, p):
-            return next(filter(lambda u: u['path'] == p, urls))['methods']
+        def assertMethods(urls, p, methods):
+            self.assertEqual(next(filter(
+                lambda u: u['path'] == p, urls))['methods'], 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'))
+        assertMethods(urls, '/authors', dict(get='get_list', post='post'))
+        assertMethods(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'))
+        assertMethods(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'))
+        assertMethods(urls, '/authors/cache/<int:id>', dict(get='cache_get'))