Merge pull request #41 from lendingblock/master

0.2.5

openapi/__init__.py

@@ -1,3 +1,3 @@
 """Minimal OpenAPI asynchronous server application
 """
-__version__ = '0.2.4'
+__version__ = '0.2.5'

openapi/cli.py

@@ -18,7 +18,8 @@
 
 class OpenApiClient(click.Group):
 
-    def __init__(self, spec, setup_app=None, base_path=None, **extra):
+    def __init__(self, spec, setup_app=None, base_path=None,
+                 commands=None, **extra) -> None:
         params = list(extra.pop('params', None) or ())
         self.spec = spec
         self.debug = get_debug_flag()
@@ -38,6 +39,8 @@ def __init__(self, spec, setup_app=None, base_path=None, **extra):
         )
         super().__init__(params=params, **extra)
         self.add_command(serve)
+        for command in commands or ():
+            self.add_command(command)
         self._web = None
 
     def web(self):

openapi/rest.py

@@ -6,11 +6,13 @@
 from .spec.pagination import MAX_PAGINATION_LIMIT
 
 
-def rest(setup_app=None, base_path=None, **kwargs):
+def rest(setup_app=None, base_path=None, commands=None, **kwargs):
     """Create the OpenApi application server
     """
     spec = OpenApi(**kwargs)
-    return OpenApiClient(spec, base_path=base_path, setup_app=setup_app)
+    return OpenApiClient(
+        spec, base_path=base_path, commands=commands, setup_app=setup_app
+    )
 
 
 @dataclass

tests/example/models.py

@@ -22,7 +22,7 @@ class Task(TaskAdd):
 @dataclass
 class TaskQuery:
     done: bool = data_field()
-    severity: int = decimal_field(ops=('lt', 'gt'))
+    severity: int = decimal_field(ops=('lt', 'le', 'gt', 'ge', 'ne'))
 
 
 @dataclass

tests/test_cli.py

@@ -1,4 +1,6 @@
 from unittest.mock import patch
+
+import click
 from click.testing import CliRunner
 
 from openapi.rest import rest
@@ -27,3 +29,17 @@ def test_serve():
         assert mock.call_count == 1
         app = mock.call_args[0][0]
         assert app.router is not None
+
+
+def test_commands():
+    runner = CliRunner()
+    cli = rest(base_path='/v1', commands=[hello])
+    result = runner.invoke(cli, ['hello'])
+    assert result.exit_code == 0
+    assert result.output.startswith('Hello!')
+
+
+@click.command('hello')
+@click.pass_context
+def hello(ctx):
+    click.echo('Hello!')

tests/test_filters.py

@@ -13,7 +13,10 @@ async def test_spec(test_app):
         'done',
         'severity',
         'severity:lt',
-        'severity:gt'
+        'severity:le',
+        'severity:gt',
+        'severity:ge',
+        'severity:ne',
     }
 
 
@@ -41,8 +44,12 @@ async def assert_query(params, expected):
             d.pop('id')
         assert body == expected
 
-    await assert_query({'severity:gt': 2}, [test2])
-    await assert_query({'severity:lt': 2}, [test1])
+    await assert_query({'severity:gt': 1}, [test2])
+    await assert_query({'severity:ge': 1}, [test1, test2])
+    await assert_query({'severity:lt': 3}, [test1])
+    await assert_query({'severity:le': 2}, [test1])
+    await assert_query({'severity:le': 3}, [test1, test2])
+    await assert_query({'severity:ne': 3}, [test1])
     await assert_query({'severity': 2}, [])
     await assert_query({'severity': 1}, [test1])
     await assert_query({'severity': 'NULL'}, [test3])