diff options
author | David M. Lee <dlee@digium.com> | 2013-08-29 16:21:31 +0000 |
---|---|---|
committer | David M. Lee <dlee@digium.com> | 2013-08-29 16:21:31 +0000 |
commit | 417230848f177763d06d0d851253df17348fed79 (patch) | |
tree | d0d49ab9b118a9e9b7f5f83e2e8a74e0b9068a3c | |
parent | 3f0148cd678dc4f61ac624985bc0a54e253abbd9 (diff) |
Account for {} in Swagger notes
........
Merged revisions 397927 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@397932 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r-- | rest-api-templates/api.wiki.mustache | 2 | ||||
-rw-r--r-- | rest-api-templates/asterisk_processor.py | 1 | ||||
-rwxr-xr-x | rest-api-templates/make_ari_stubs.py | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/rest-api-templates/api.wiki.mustache b/rest-api-templates/api.wiki.mustache index c70e58fc3..a19e496e1 100644 --- a/rest-api-templates/api.wiki.mustache +++ b/rest-api-templates/api.wiki.mustache @@ -13,7 +13,7 @@ h1. {{name_title}} {anchor:{{nickname}}} h2. {{http_method}} {{wiki_path}} -{{{summary}}}{{#notes}} {{{notes}}}{{/notes}} +{{{summary}}}{{#wiki_notes}} {{{wiki_notes}}}{{/wiki_notes}} {{#has_path_parameters}} h3. Path parameters diff --git a/rest-api-templates/asterisk_processor.py b/rest-api-templates/asterisk_processor.py index 6f69b4865..65013d338 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_notes = wikify(operation.notes or "") def process_parameter(self, parameter, context): if not parameter.data_type in self.type_mapping: diff --git a/rest-api-templates/make_ari_stubs.py b/rest-api-templates/make_ari_stubs.py index 8058862fd..a08b9bfa8 100755 --- a/rest-api-templates/make_ari_stubs.py +++ b/rest-api-templates/make_ari_stubs.py @@ -16,13 +16,15 @@ # at the top of the source tree. # +import sys + try: import pystache except ImportError: print >> sys.stderr, "Pystache required. Please sudo pip install pystache." + sys.exit(1) import os.path -import sys from asterisk_processor import AsteriskProcessor from optparse import OptionParser |