improve versioning schemes support

close #98
close #71

drf_openapi/utils.py

@@ -13,7 +13,9 @@ def decorator(view_method):
         view_method.response_serializer = response_serializer
 
         @wraps(view_method)
-        def wrapper(instance, request, version=None, *args, **kwargs):
+        def wrapper(instance, request, *args, **kwargs):
+            version, _ = instance.determine_version(request, *args, **kwargs)
+
             if request_serializer and issubclass(request_serializer, VersionedSerializers):
                 instance.request_serializer = request_serializer.get(version)
             else:
@@ -24,7 +26,7 @@ def wrapper(instance, request, version=None, *args, **kwargs):
             else:
                 instance.response_serializer = response_serializer
 
-            response = view_method(instance, request, version=version, *args, **kwargs)
+            response = view_method(instance, request, *args, **kwargs)
             if validate_response:
                 response_validator = instance.response_serializer(data=response.data)
                 response_validator.is_valid(raise_exception=True)

drf_openapi/views.py

@@ -13,7 +13,8 @@ class SchemaView(APIView):
     url = ''
     title = 'API Documentation'
 
-    def get(self, request, version):
+    def get(self, request, *args, **kwargs):
+        version, _ = self.determine_version(request, *args, **kwargs)
         generator = OpenApiSchemaGenerator(
             version=version,
             url=self.url,

examples/snippets/views.py

@@ -28,7 +28,7 @@ class SnippetList(APIView):
     """
 
     @view_config(response_serializer=SnippetSerializer)
-    def get(self, request, version, format=None):
+    def get(self, request, version=None, format=None):
         res = self.response_serializer(data=_FAKE_SNIPPETS, many=True)
         res.is_valid(raise_exception=True)
         return Response(res.validated_data)