Merge remote-tracking branch 'origin/master' into markjh/swagger_examples

This commit is contained in:
Mark Haines 2015-09-18 16:11:26 +01:00
commit 7c2ccb1aeb
21 changed files with 268 additions and 205 deletions

View file

@ -8,6 +8,16 @@ import subprocess
import urllib
import yaml
V1_CLIENT_API = "../api/client-server/v1"
V1_EVENT_EXAMPLES = "../event-schemas/examples/v1"
V1_EVENT_SCHEMA = "../event-schemas/schema/v1"
CORE_EVENT_SCHEMA = "../event-schemas/schema/v1/core-event-schema"
CHANGELOG = "../CHANGELOG.rst"
ROOM_EVENT = "core-event-schema/room_event.json"
STATE_EVENT = "core-event-schema/state_event.json"
def get_json_schema_object_fields(obj, enforce_title=False):
# Algorithm:
# f.e. property => add field info (if field is object then recurse)
@ -268,7 +278,7 @@ class MatrixUnits(Units):
}
def load_swagger_apis(self):
path = "../api/client-server/v1"
path = V1_CLIENT_API
apis = {}
for filename in os.listdir(path):
if not filename.endswith(".yaml"):
@ -283,7 +293,7 @@ class MatrixUnits(Units):
return apis
def load_common_event_fields(self):
path = "../event-schemas/schema/v1/core-event-schema"
path = CORE_EVENT_SCHEMA
event_types = {}
for (root, dirs, files) in os.walk(path):
@ -322,7 +332,7 @@ class MatrixUnits(Units):
return event_types
def load_event_examples(self):
path = "../event-schemas/examples/v1"
path = V1_EVENT_EXAMPLES
examples = {}
for filename in os.listdir(path):
if not filename.startswith("m."):
@ -334,7 +344,7 @@ class MatrixUnits(Units):
return examples
def load_event_schemas(self):
path = "../event-schemas/schema/v1"
path = V1_EVENT_SCHEMA
schemata = {}
for filename in os.listdir(path):
@ -363,8 +373,8 @@ class MatrixUnits(Units):
# add typeof
base_defs = {
"core#/definitions/room_event": "Message Event",
"core#/definitions/state_event": "State Event"
ROOM_EVENT: "Message Event",
STATE_EVENT: "State Event"
}
if type(json_schema.get("allOf")) == list:
schema["typeof"] = base_defs.get(
@ -401,7 +411,6 @@ class MatrixUnits(Units):
"`m.room.message msgtypes`_."
)
# Assign state key info if it has some
if schema["typeof"] == "State Event":
skey_desc = Units.prop(
@ -415,7 +424,7 @@ class MatrixUnits(Units):
return schemata
def load_spec_meta(self):
path = "../CHANGELOG.rst"
path = CHANGELOG
title_part = None
version = None
changelog_lines = []