Merge pull request #2 from guokr/master

merge

Author: zrq495

.gitignore

@@ -7,3 +7,5 @@ dist/
 *.egg-info
 *.egg
 .idea
+*~
+*.pyc

.travis.yml

@@ -1,6 +1,7 @@
 language: python
 python:
     - "2.7"
+    - "3.5"
 install:
     - python setup.py install
 before_script:

AUTHORS

@@ -7,6 +7,9 @@ Contributors:
 
 * yimiqisan (yimiqisan@gmail.com);
 * softlns (softliunaisen@gmai.com);
+* Justin (justinli.ljt@gmail.com);
 * teknolog2000 (https://github.com/teknolog2000);
 * ChaosEternal (https://github.com/ChaosEternal);
 * SimplicityGuy (https://github.com/SimplicityGuy);
+* Roy Williams (https://github.com/rowillia);
+* Vinod Gupta (https://github.com/codervinod)

setup.py

@@ -1,10 +1,11 @@
+from __future__ import absolute_import
 import re
 import ast
 from setuptools import setup
 
 _version_re = re.compile(r'__version__\s+=\s+(.*)')
 
-with open('swagger_py_codegen/__init__.py', 'rb') as f:
+with open('swagger_py_codegen/_version.py', 'rb') as f:
     version = str(ast.literal_eval(_version_re.search(
         f.read().decode('utf-8')).group(1)))
 
@@ -23,11 +24,12 @@
             'swagger_py_codegen=swagger_py_codegen:generate'
         ]
     },
-    install_requires=['PyYAML', 'click', 'jinja2', 'dpath'],
+    install_requires=['PyYAML', 'click', 'jinja2', 'dpath', 'six'],
     tests_require=['pytest'],
     classifiers=[
         'Development Status :: 3 - Alpha',
         'License :: OSI Approved :: MIT License',
         'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
     ],
 )

swagger_py_codegen/__init__.py

@@ -1,3 +1,4 @@
-from .command import generate
+from __future__ import absolute_import
 
-__version__ = '0.1.19'
+from ._version import __version__
+from .command import generate

swagger_py_codegen/__main__.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from .command import generate
 
 generate()

swagger_py_codegen/_version.py

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

swagger_py_codegen/base.py

@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import os
 
 from jinja2 import Environment, FileSystemLoader

swagger_py_codegen/command.py

@@ -1,14 +1,17 @@
+from __future__ import absolute_import
 import codecs
 try:
     import simplejson as json
 except ImportError:
     import json
+from multiprocessing import Pool
 from os import makedirs
 from os.path import join, exists, dirname
 
 import yaml
 import click
 
+from ._version import __version__
 from .flask import FlaskGenerator
 from .parser import Swagger
 from .base import Template
@@ -53,6 +56,13 @@ def _copy_ui_dir(ui_dest, ui_src):
     return status
 
 
+def print_version(ctx, param, value):
+    if not value or ctx.resilient_parsing:
+        return
+    click.echo('current version: %s' % __version__)
+    ctx.exit()
+
+
 @click.command()
 @click.argument('destination', required=True)
 @click.option('-s', '--swagger', '--swagger-doc',
@@ -69,12 +79,17 @@ def _copy_ui_dir(ui_dest, ui_src):
 @click.option('--ui',
               default=False, is_flag=True,
               help='Generate swagger ui.')
+@click.option('-j', '--jobs',
+              default=4, help='Parallel jobs for processing.')
+@click.option('--version', is_flag=True, callback=print_version,
+              expose_value=False, is_eager=True,
+              help='Show current version.')
 def generate(destination, swagger_doc, force=False, package=None,
-             template_dir=None, specification=False, ui=False):
-
+             template_dir=None, specification=False, ui=False, jobs=4):
+    pool = Pool(processes=int(jobs))
     package = package or destination.replace('-', '_')
     data = spec_load(swagger_doc)
-    swagger = Swagger(data)
+    swagger = Swagger(data, pool)
     generator = FlaskGenerator(swagger)
     generator.with_spec = specification
     generator.with_ui = ui

swagger_py_codegen/flask.py

@@ -1,8 +1,10 @@
+from __future__ import absolute_import
 import re
 from collections import OrderedDict
 
 from .base import Code, CodeGenerator
 from .jsonschema import Schema, SchemaGenerator, build_default
+import six
 
 SUPPORT_METHODS = ['get', 'post', 'put', 'delete', 'patch', 'options', 'head']
 
@@ -94,13 +96,21 @@ def _type(parameters):
 
     return url, params
 
+if six.PY3:
+    def _remove_characters(text, deletechars):
+        return text.translate({ord(x): None for x in deletechars})
+else:
+    def _remove_characters(text, deletechars):
+        return text.translate(None, deletechars)
 
 def _path_to_endpoint(swagger_path):
-    return swagger_path.strip('/').replace('/', '_').replace('-', '_').translate(None, '{}')
+    return _remove_characters(
+        swagger_path.strip('/').replace('/', '_').replace('-', '_'),
+        '{}')
 
 
 def _path_to_resource_name(swagger_path):
-    return swagger_path.title().translate(None, '{}/_-')
+    return _remove_characters(swagger_path.title(), '{}/_-')
 
 
 def _location(swagger_location):
@@ -130,18 +140,18 @@ def _dependence_callback(self, code):
         # use flask endpoint to replace default validator's key,
         # example: `('some_path_param', 'method')`
         validators = OrderedDict()
-        for k, v in schemas.data['validators'].iteritems():
-            locations = {_location(loc): val for loc, val in v.iteritems()}
+        for k, v in six.iteritems(schemas.data['validators']):
+            locations = {_location(loc): val for loc, val in six.iteritems(v)}
             validators[(_path_to_endpoint(k[0]), k[1])] = locations
 
         # filters
         filters = OrderedDict()
-        for k, v in schemas.data['filters'].iteritems():
+        for k, v in six.iteritems(schemas.data['filters']):
             filters[(_path_to_endpoint(k[0]), k[1])] = v
 
         # scopes
         scopes = OrderedDict()
-        for k, v in schemas.data['scopes'].iteritems():
+        for k, v in six.iteritems(schemas.data['scopes']):
             scopes[(_path_to_endpoint(k[0]), k[1])] = v
 
         schemas.data['validators'] = validators
@@ -169,11 +179,12 @@ def _process_data(self):
                 methods[method] = {}
                 validator = self.validators.get((endpoint, method.upper()))
                 if validator:
-                    methods[method]['requests'] = validator.keys()
+                    methods[method]['requests'] = list(validator.keys())
 
-                for status, res_data in data[method].get('responses', {}).iteritems():
+                for status, res_data in six.iteritems(data[method].get('responses', {})):
                     if isinstance(status, int) or status.isdigit():
-                        example = res_data.get('schema', {}).get('application/json')
+                        example = res_data.get('examples', {}).get('application/json')
+
                         if not example:
                             example = build_default(res_data.get('schema'))
                         response = example, int(status), build_default(res_data.get('headers'))