Skip to content

Templating parser path parameter search fix #245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 10, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions openapi_core/templating/util.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,32 @@
from parse import Parser


class ExtendedParser(Parser):
def _handle_field(self, field):
# handle as path parameter field
field = field[1:-1]
path_parameter_field = "{%s:PathParameter}" % field
return super(ExtendedParser, self)._handle_field(
path_parameter_field)


def parse_path_parameter(text):
return text


parse_path_parameter.pattern = r"[^\/]+"
parse_path_parameter.name = "PathParameter"


def search(path_pattern, full_url_pattern):
p = Parser(path_pattern)
extra_types = {parse_path_parameter.name: parse_path_parameter}
p = ExtendedParser(path_pattern, extra_types)
p._expression = p._expression + '$'
return p.search(full_url_pattern)


def parse(server_url, server_url_pattern):
p = Parser(server_url)
extra_types = {parse_path_parameter.name: parse_path_parameter}
p = ExtendedParser(server_url, extra_types)
p._expression = '^' + p._expression
return p.parse(server_url_pattern)
24 changes: 24 additions & 0 deletions tests/unit/templating/test_util.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
from openapi_core.templating.util import search


class TestSearch:

def test_endswith(self):
path_patter = '/{test}/test'
full_url_pattern = '/test1/test/test2/test'

result = search(path_patter, full_url_pattern)

assert result.named == {
'test': 'test2',
}

def test_exact(self):
path_patter = '/{test}/test'
full_url_pattern = '/test/test'

result = search(path_patter, full_url_pattern)

assert result.named == {
'test': 'test',
}