wholetrans/docs-matrix-spec
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improve handling of $ref in swagger files

Browse source 
It turns out that swagger merges $refed attributes with those defined inline,
so do the same here.
This commit is contained in:
Richard van der Hoff 2016-05-04 14:24:01 +01:00
parent 4c46c95d0e
commit 262c9ea113
1 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
templating/matrix_templates/units.py
View file

@ -36,15 +36,19 @@ logger = logging.getLogger(__name__)
def resolve_references(path, schema): def resolve_references(path, schema):
if isinstance(schema, dict): if isinstance(schema, dict):
result = {} # do $ref first
if '$ref' in schema:
value = schema['$ref']
path = os.path.join(os.path.dirname(path), value)
with open(path) as f:
ref = yaml.load(f)
result = resolve_references(path, ref)
del schema['$ref']
else:
result = {}
for key, value in schema.items(): for key, value in schema.items():
if key == "$ref": result[key] = resolve_references(path, value)
path = os.path.join(os.path.dirname(path), value)
with open(path) as f:
schema = yaml.load(f)
return resolve_references(path, schema)
else:
result[key] = resolve_references(path, value)
return result return result
elif isinstance(schema, list): elif isinstance(schema, list):
return [resolve_references(path, value) for value in schema] return [resolve_references(path, value) for value in schema]
@ -342,7 +346,7 @@ class MatrixUnits(Units):
# have either "x-example" or a "schema" with an "example". # have either "x-example" or a "schema" with an "example".
params_missing_examples = [ params_missing_examples = [
p for p in single_api.get("parameters", []) if ( p for p in single_api.get("parameters", []) if (
"x-example" not in p and "x-example" not in p and
not Units.prop(p, "schema/example") not Units.prop(p, "schema/example")
) )
] ]
@ -600,7 +604,7 @@ class MatrixUnits(Units):
# { # {
# title: "<title> key" # title: "<title> key"
# rows: [ # rows: [
# { key: <key_name>, type: <string>, # { key: <key_name>, type: <string>,
# desc: <desc>, required: <bool> } # desc: <desc>, required: <bool> }
# ] # ]
# } # }