diff options
author | David M. Lee <dlee@digium.com> | 2013-10-11 16:36:00 +0000 |
---|---|---|
committer | David M. Lee <dlee@digium.com> | 2013-10-11 16:36:00 +0000 |
commit | 9234804a3bf81f2df18c2f9dd9680d848ff21e48 (patch) | |
tree | aa8195dfe160f7070dc72c93f4a2042287ac4fa5 /rest-api-templates | |
parent | 07e2b1d02839a4a8cb6320a0b4ee41ba613c6e56 (diff) |
Multiple revisions 400508,400842-400843,400848
........
r400508 | dlee | 2013-10-03 23:54:51 -0500 (Thu, 03 Oct 2013) | 1 line
Corrected response class for stopPlayback
........
r400842 | dlee | 2013-10-10 14:23:24 -0500 (Thu, 10 Oct 2013) | 1 line
Correct some ARI wiki rendering errors
........
r400843 | dlee | 2013-10-10 14:26:19 -0500 (Thu, 10 Oct 2013) | 1 line
Updated /play resource docs. The playback of http: resources isn't implemented... yet
........
r400848 | dlee | 2013-10-11 11:18:46 -0500 (Fri, 11 Oct 2013) | 5 lines
Fix a stupid copy/paste error in ARI docs.
Patches:
ari-doc-patch.txt uploaded by jbigelow (license 5091)
........
Merged revisions 400508,400842-400843,400848 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@400852 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'rest-api-templates')
-rw-r--r-- | rest-api-templates/api.wiki.mustache | 8 | ||||
-rw-r--r-- | rest-api-templates/asterisk_processor.py | 3 | ||||
-rw-r--r-- | rest-api-templates/models.wiki.mustache | 8 |
3 files changed, 11 insertions, 8 deletions
diff --git a/rest-api-templates/api.wiki.mustache b/rest-api-templates/api.wiki.mustache index a19e496e1..ba3a3d18c 100644 --- a/rest-api-templates/api.wiki.mustache +++ b/rest-api-templates/api.wiki.mustache @@ -13,26 +13,26 @@ h1. {{name_title}} {anchor:{{nickname}}} h2. {{http_method}} {{wiki_path}} -{{{summary}}}{{#wiki_notes}} {{{wiki_notes}}}{{/wiki_notes}} +{{{wiki_summary}}}{{#wiki_notes}} {{{wiki_notes}}}{{/wiki_notes}} {{#has_path_parameters}} h3. Path parameters {{#path_parameters}} -* {{name}}: {{data_type}}{{#default_value}} = {{default_value}}{{/default_value}} - {{description}} +* {{name}}: {{data_type}}{{#default_value}} = {{default_value}}{{/default_value}} - {{{wiki_description}}} {{/path_parameters}} {{/has_path_parameters}} {{#has_query_parameters}} h3. Query parameters {{#query_parameters}} -* {{name}}: {{data_type}}{{#default_value}} = {{default_value}}{{/default_value}} -{{#required}} *(required)*{{/required}} {{description}} +* {{name}}: {{data_type}}{{#default_value}} = {{default_value}}{{/default_value}} -{{#required}} *(required)*{{/required}} {{{wiki_description}}} {{/query_parameters}} {{/has_query_parameters}} {{#has_header_parameters}} h3. Header parameters {{#header_parameters}} -* {{name}}: {{data_type}}{{#default_value}} = {{default_value}}{{/default_value}} -{{#required}} *(required)*{{/required}} {{description}} +* {{name}}: {{data_type}}{{#default_value}} = {{default_value}}{{/default_value}} -{{#required}} *(required)*{{/required}} {{{wiki_description}}} {{/header_parameters}} {{/has_header_parameters}} {{#has_error_responses}} diff --git a/rest-api-templates/asterisk_processor.py b/rest-api-templates/asterisk_processor.py index 65013d338..2ea552932 100644 --- a/rest-api-templates/asterisk_processor.py +++ b/rest-api-templates/asterisk_processor.py @@ -187,6 +187,7 @@ class AsteriskProcessor(SwaggerPostProcessor): operation.c_http_method = 'AST_HTTP_' + operation.http_method if not operation.summary.endswith("."): raise SwaggerError("Summary should end with .", context) + operation.wiki_summary = wikify(operation.summary or "") operation.wiki_notes = wikify(operation.notes or "") def process_parameter(self, parameter, context): @@ -202,10 +203,12 @@ class AsteriskProcessor(SwaggerPostProcessor): parameter.c_space = '' else: parameter.c_space = ' ' + parameter.wiki_description = wikify(parameter.description) def process_model(self, model, context): model.description_dox = model.description.replace('\n', '\n * ') model.description_dox = re.sub(' *\n', '\n', model.description_dox) + model.wiki_description = wikify(model.description) model.c_id = snakify(model.id) return model diff --git a/rest-api-templates/models.wiki.mustache b/rest-api-templates/models.wiki.mustache index e3d3eb95c..b2e742afc 100644 --- a/rest-api-templates/models.wiki.mustache +++ b/rest-api-templates/models.wiki.mustache @@ -6,15 +6,15 @@ h1. {{id}} {{#extends}}Base type: [{{extends}}|#{{extends}}]{{/extends}} {{#has_subtypes}}Subtypes:{{#subtypes}} [{{id}}|#{{id}}]{{/subtypes}}{{/has_subtypes}} -{{#description}} +{{#wiki_description}} -{{{description}}} -{{/description}} +{{{wiki_description}}} +{{/wiki_description}} {code:language=javascript|collapse=true} {{{model_json}}} {code} {{#properties}} -* {{name}}: {{#type}}{{#is_primitive}}{{wiki_name}}{{/is_primitive}}{{^is_primitive}}[{{wiki_name}}|#{{singular_name}}]{{/is_primitive}}{{/type}}{{^required}} _(optional)_{{/required}}{{#description}} - {{{description}}}{{/description}} +* {{name}}: {{#type}}{{#is_primitive}}{{wiki_name}}{{/is_primitive}}{{^is_primitive}}[{{wiki_name}}|#{{singular_name}}]{{/is_primitive}}{{/type}}{{^required}} _(optional)_{{/required}}{{#wiki_description}} - {{{wiki_description}}}{{/wiki_description}} {{/properties}} {{/models}} |