Merge pull request #37 from hjacobs/fix-paths-with-hyphen-issue-36

Fix paths with hyphen issue 36

connexion/utils.py

@@ -12,6 +12,9 @@
 """
 
 import importlib
+import re
+
+PATH_PARAMETER = re.compile(r'\{([^}]*)\}')
 
 
 def flaskify_endpoint(identifier: str) -> str:
@@ -21,13 +24,19 @@ def flaskify_endpoint(identifier: str) -> str:
     return identifier.replace('.', '_')
 
 
+def convert_path_parameter(match):
+    return '<{}>'.format(match.group(1).replace('-', '_'))
+
+
 def flaskify_path(swagger_path: str) -> str:
     """
     Convert swagger path templates to flask path templates
+
+    >>> flaskify_path('/foo-bar/{my-param}')
+    '/foo-bar/<my_param>'
     """
-    translation_table = str.maketrans('{-}', '<_>')
     # TODO add types
-    return swagger_path.translate(translation_table)
+    return PATH_PARAMETER.sub(convert_path_parameter, swagger_path)
 
 
 def get_function_from_name(operation_id: str) -> str:

tests/test_utils.py

@@ -8,6 +8,8 @@
 def test_flaskify_path():
     assert utils.flaskify_path("{test-path}") == "<test_path>"
     assert utils.flaskify_path("api/{test-path}") == "api/<test_path>"
+    assert utils.flaskify_path("my-api/{test-path}") == "my-api/<test_path>"
+    assert utils.flaskify_path("foo_bar/{a-b}/{c_d}") == "foo_bar/<a_b>/<c_d>"
 
 
 def test_flaskify_endpoint():