Merge branch 'master' of github.com:guokr/swagger-py-codegen into 113_fix_sanic_url_prefix

Author: gusibi

.gitignore

@@ -107,4 +107,6 @@ pip-selfcheck.json
 *.swp
 example-app
 
+.DS_Store
+
 # End of https://www.gitignore.io/api/python

README.md

@@ -39,6 +39,7 @@ Command Options:
 	-t, --template-dir              Path of your custom templates directory.
 	--spec, --specification         Generate online specification json response.
 	--ui                            Generate swagger ui.
+	--validate                      Validate swagger file.
 	-tlp, --templates               gen flask/tornado/falcon templates, default flask.
 	--version                       Show current version.
 	--help                          Show this message and exit.

requirements.txt

@@ -3,4 +3,5 @@ json-spec
 click
 jinja2
 dpath
-PyYAML
+PyYAML==3.12
+flex

swagger_py_codegen/_version.py

@@ -1,4 +1,4 @@
 """Version information."""
 
 # The following line *must* be the last in the module, exactly as formatted:
-__version__ = "0.3.0"
+__version__ = "0.3.1"

swagger_py_codegen/command.py

@@ -12,6 +12,9 @@
 import yaml
 import click
 
+import flex
+from flex.exceptions import ValidationError
+
 from ._version import __version__
 from .flask import FlaskGenerator
 from .tornado import TornadoGenerator
@@ -101,6 +104,9 @@ def print_version(ctx, param, value):
 @click.option('--ui',
               default=False, is_flag=True,
               help='Generate swagger ui.')
+@click.option('--validate',
+              default=False, is_flag=True,
+              help='Validate swagger file.')
 @click.option('-tlp', '--templates',
               default='flask',
               help='gen flask/tornado/falcon/sanic templates, default flask.')
@@ -109,9 +115,15 @@ def print_version(ctx, param, value):
               help='Show current version.')
 def generate(destination, swagger_doc, force=False, package=None,
              template_dir=None, templates='flask',
-             specification=False, ui=False):
+             specification=False, ui=False, validate=False):
     package = package or destination.replace('-', '_')
     data = spec_load(swagger_doc)
+    if validate:
+        try:
+            flex.core.parse(data)
+            click.echo("Validation passed")
+        except ValidationError as e:
+            raise click.ClickException(str(e))
     swagger = Swagger(data)
     if templates == 'tornado':
         generator = TornadoGenerator(swagger)

swagger_py_codegen/templates/sanic/schemas.tpl

@@ -3,6 +3,7 @@
 # TODO: datetime support
 
 {% include '_do_not_change.tpl' %}
+import six
 
 base_path = '{{base_path}}'