kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-21 12:54:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct some ARI wiki rendering errors

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@400842 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
David M. Lee
2013-10-10 19:23:24 +00:00
parent 3bc6dd4f7b
commit 76be693d83
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rest-api-templates/api.wiki.mustache
View File

@@ -13,26 +13,26 @@ h1. {{name_title}}
{anchor:{{nickname}}} {anchor:{{nickname}}}
h2. {{http_method}} {{wiki_path}} h2. {{http_method}} {{wiki_path}}
{{{summary}}}{{#wiki_notes}} {{{wiki_notes}}}{{/wiki_notes}} {{{wiki_summary}}}{{#wiki_notes}} {{{wiki_notes}}}{{/wiki_notes}}
{{#has_path_parameters}} {{#has_path_parameters}}
h3. Path parameters h3. Path parameters
{{#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}} {{/path_parameters}}
{{/has_path_parameters}} {{/has_path_parameters}}
{{#has_query_parameters}} {{#has_query_parameters}}
h3. Query parameters h3. Query parameters
{{#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}} {{/query_parameters}}
{{/has_query_parameters}} {{/has_query_parameters}}
{{#has_header_parameters}} {{#has_header_parameters}}
h3. Header parameters h3. Header parameters
{{#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}} {{/header_parameters}}
{{/has_header_parameters}} {{/has_header_parameters}}
{{#has_error_responses}} {{#has_error_responses}}

3
rest-api-templates/asterisk_processor.py
View File

@@ -187,6 +187,7 @@ class AsteriskProcessor(SwaggerPostProcessor):
operation.c_http_method = 'AST_HTTP_' + operation.http_method operation.c_http_method = 'AST_HTTP_' + operation.http_method
if not operation.summary.endswith("."): if not operation.summary.endswith("."):
raise SwaggerError("Summary should end with .", context) raise SwaggerError("Summary should end with .", context)
operation.wiki_summary = wikify(operation.summary or "")
operation.wiki_notes = wikify(operation.notes or "") operation.wiki_notes = wikify(operation.notes or "")
def process_parameter(self, parameter, context): def process_parameter(self, parameter, context):
@@ -202,10 +203,12 @@ class AsteriskProcessor(SwaggerPostProcessor):
parameter.c_space = '' parameter.c_space = ''
else: else:
parameter.c_space = ' ' parameter.c_space = ' '
parameter.wiki_description = wikify(parameter.description)
def process_model(self, model, context): def process_model(self, model, context):
model.description_dox = model.description.replace('\n', '\n * ') model.description_dox = model.description.replace('\n', '\n * ')
model.description_dox = re.sub(' *\n', '\n', model.description_dox) model.description_dox = re.sub(' *\n', '\n', model.description_dox)
model.wiki_description = wikify(model.description)
model.c_id = snakify(model.id) model.c_id = snakify(model.id)
return model return model

8
rest-api-templates/models.wiki.mustache
View File

@@ -6,15 +6,15 @@
h1. {{id}} h1. {{id}}
{{#extends}}Base type: [{{extends}}|#{{extends}}]{{/extends}} {{#extends}}Base type: [{{extends}}|#{{extends}}]{{/extends}}
{{#has_subtypes}}Subtypes:{{#subtypes}} [{{id}}|#{{id}}]{{/subtypes}}{{/has_subtypes}} {{#has_subtypes}}Subtypes:{{#subtypes}} [{{id}}|#{{id}}]{{/subtypes}}{{/has_subtypes}}
{{#description}} {{#wiki_description}}
{{{description}}} {{{wiki_description}}}
{{/description}} {{/wiki_description}}
{code:language=javascript|collapse=true} {code:language=javascript|collapse=true}
{{{model_json}}} {{{model_json}}}
{code} {code}
{{#properties}} {{#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}} {{/properties}}
{{/models}} {{/models}}