Move path finder to separate templating module

Author: p1c2u

openapi_core/templating/__init__.py

@@ -0,0 +1,30 @@
+from parse import parse
+from six.moves.urllib.parse import urljoin
+
+from openapi_core.templating.paths.exceptions import PathNotFound
+from openapi_core.templating.paths.util import get_operation_pattern
+
+
+class PathFinder(object):
+
+    def __init__(self, spec):
+        self.spec = spec
+
+    def find(self, request):
+        operation_pattern = self._get_operation_pattern(request)
+
+        path = self.spec[operation_pattern]
+        path_variables = {}
+        operation = self.spec.get_operation(operation_pattern, request.method)
+        servers = path.servers or operation.servers or self.spec.servers
+        server = servers[0]
+        server_variables = {}
+
+        return path, operation, server, path_variables, server_variables
+
+    def _get_operation_pattern(self, request):
+        server = self.spec.get_server(request.full_url_pattern)
+
+        return get_operation_pattern(
+            server.default_url, request.full_url_pattern
+        )

openapi_core/templating/paths/__init__.py

@@ -1,11 +1,7 @@
-"""OpenAPI core validation util module"""
+"""OpenAPI core templating paths util module"""
 from six.moves.urllib.parse import urlparse
 
 
-def is_absolute(url):
-    return url.startswith('//') or '://' in url
-
-
 def path_qs(url):
     pr = urlparse(url)
     result = pr.path
@@ -14,6 +10,10 @@ def path_qs(url):
     return result
 
 
+def is_absolute(url):
+    return url.startswith('//') or '://' in url
+
+
 def get_operation_pattern(server_url, request_url_pattern):
     """Return an updated request URL pattern with the server URL removed."""
     if server_url[-1] == "/":

openapi_core/templating/paths/finders.py

@@ -21,7 +21,6 @@
 from openapi_core.validation.request.datatypes import (
     RequestParameters, RequestValidationResult,
 )
-from openapi_core.validation.util import get_operation_pattern
 from openapi_core.validation.validators import BaseValidator
 
 

openapi_core/validation/util.py renamed to openapi_core/templating/paths/util.py

@@ -13,7 +13,6 @@
     UnmarshalError, ValidateError,
 )
 from openapi_core.validation.response.datatypes import ResponseValidationResult
-from openapi_core.validation.util import get_operation_pattern
 from openapi_core.validation.validators import BaseValidator
 
 

openapi_core/validation/request/validators.py

@@ -12,7 +12,6 @@
     UnmarshalError, ValidateError,
 )
 from openapi_core.validation.response.datatypes import ResponseValidationResult
-from openapi_core.validation.util import get_operation_pattern
 
 
 class BaseValidator(object):
@@ -26,16 +25,9 @@ def __init__(
         self.custom_media_type_deserializers = custom_media_type_deserializers
 
     def _find_path(self, request):
-        operation_pattern = self._get_operation_pattern(request)
-
-        path = self.spec[operation_pattern]
-        path_variables = {}
-        operation = self.spec.get_operation(operation_pattern, request.method)
-        servers = path.servers or operation.servers or self.spec.servers
-        server = servers[0]
-        server_variables = {}
-
-        return path, operation, server, path_variables, server_variables
+        from openapi_core.templating.paths.finders import PathFinder
+        finder = PathFinder(self.spec)
+        return finder.find(request)
 
     def _get_operation_pattern(self, request):
         server = self.spec.get_server(request.full_url_pattern)

openapi_core/validation/response/validators.py

@@ -1,4 +1,4 @@
-from openapi_core.validation.util import path_qs
+from openapi_core.templating.paths.util import path_qs
 
 
 class TestPathQs(object):