v0.15.0: OpenAPI spec fixes, tail formula, etc.

dactyl/config.py

@@ -35,7 +35,6 @@ def __init__(self, cli_args):
         else:
             logger.debug("No config file specified, trying ./dactyl-config.yml")
             self.load_config_from_file(DEFAULT_CONFIG_FILE)
-        self.check_consistency()
         self.load_filters()
 
         self.page_cache = []
@@ -53,6 +52,8 @@ def load_config_from_file(self, config_file):
         try:
             with open(config_file, "r", encoding="utf-8") as f:
                 loaded_config = yaml.load(f)
+            if loaded_config is None:
+                loaded_config = {}
         except FileNotFoundError as e:
             if config_file == DEFAULT_CONFIG_FILE:
                 logger.info("Couldn't read a config file; using generic config")
@@ -75,6 +76,12 @@ def load_config_from_file(self, config_file):
                 logger.warning("Deprecation warning: Global field pdf_template has "
                               +"been renamed default_pdf_template")
 
+        if "flatten_default_html_paths" in loaded_config:
+            if loaded_config["flatten_default_html_paths"] == True:
+                loaded_config["default_html_names"] = "flatten"
+            else:
+                loaded_config["default_html_names"] = "path"
+
         self.config.update(loaded_config)
 
     def check_consistency(self):
@@ -96,7 +103,7 @@ def check_consistency(self):
 
         # Check page list for consistency
         for page in self.config["pages"]:
-            if "targets" not in page:
+            if "targets" not in page: #CURSOR
                 if "name" in page:
                     logger.warning("Page %s is not part of any targets." %
                                  page["name"])
@@ -132,6 +139,11 @@ def load_pages(self):
                 # OpenAPI specs are too much work to load at this time
                 self.page_cache.append(OPENAPI_SPEC_PLACEHOLDER)
 
+        # Check consistency here instead of earlier so that we have frontmatter
+        # from pages first. (Otherwise, we raise false alarms about pages not
+        # being part of any target.)
+        self.check_consistency()
+
     def load_filters(self):
         # Figure out which filters we need
         filternames = set(self.config["default_filters"])

dactyl/default-config.yml

@@ -51,10 +51,21 @@ skip_preprocessor: false
 template_allow_undefined: true
 preprocessor_allow_undefined: true
 
-## By default, generates HTML paths from md paths by replacing / with -
-## Set this to false to make default HTML paths mirror the folder structure of
-## the input md files.
-flatten_default_html_paths: true
+## How to generate default HTML paths from Markdown files. These can be
+## overwritten by the "html" field of the page definition.
+## In all cases, the file extension is changed from .md to .html.
+## Available formulas include:
+## "flatten": The default. Use the full path to the md file, except replace /
+##            with - so all files end up in one output folder.
+## "path": Use the full path to the md file including folders. This can make
+##         for prettier URLs but requires you to handle absolute paths correctly
+## "tail": Use just the filename, not the whole path. This can result in
+##         duplicates if you have files with the same name in different folders,
+##         for example if you have multiple "overview.md" docs. You should
+##         change the duplicates individually using "html" parameters in the
+##         page definitions, as needed.
+# Legacy parameter: flatten_default_html_paths: true
+default_html_names: flatten
 
 ## Set this to true to disable Dactyl's built-in syntax highlighting
 no_highlighting: false

dactyl/openapi.py

@@ -167,7 +167,7 @@ def clean_up_swag(self):
             schema["title"] = title
             if "example" in schema:
                 try:
-                    j = json.dumps(schema["example"], indent=4, default=self.json_default)
+                    j = self.json_pp(schema["example"])
                     schema["example"] = j
                 except Exception as e:
                     logger.debug("%s example isn't json: %s"%(title,j))
@@ -245,7 +245,7 @@ def get_x_example_request_body(self, path, method, endpoint):
                     return ""
 
             try:
-                ex_pp = json.dumps(ex, indent=4, separators=(',', ': '), default=self.json_default)
+                ex_pp = self.json_pp(ex)
             except TypeError as e:
                 traceback.print_tb(e.__traceback__)
                 logger.debug("json dumps failed on example '%s'"%ex)
@@ -387,6 +387,7 @@ def new_context(self):
             "debug": logger.debug,
             "slugify": slugify,
             "md_escape": self.md_escape,
+            "json_pp": self.json_pp
         }
 
     @staticmethod
@@ -403,6 +404,12 @@ def md_escape(text):
             s += c
         return s
 
+    def json_pp(self, j):
+        """
+        Pretty-print function for JSON
+        """
+        return json.dumps(j, indent=4, default=self.json_default)
+
     @staticmethod
     def json_default(o):
         """

dactyl/page.py

@@ -159,10 +159,13 @@ def provide_default_filename(self):
 
         logger.debug("Need to generate html filename for page %s" % self)
         if "md" in self.data:
-            # TODO: support other formulas including "tail" or "pretty"
             new_filename = re.sub(r"[.]md$", ".html", self.data["md"])
-            if self.config.get("flatten_default_html_paths", True):
+            name_formula = self.config.get("default_html_names", "flatten")
+            if name_formula == "flatten":
                 new_filename = new_filename.replace(os.sep, "-")
+            elif name_formula == "tail":
+                new_filename = new_filename.split(os.sep)[-1]
+            # the "path" formula is a no-op here.
             self.data["html"] = new_filename
         elif "name" in self.data:
             new_filename = slugify(self.data["name"]).lower()+".html"
@@ -173,7 +176,7 @@ def provide_default_filename(self):
         self.data[PROVIDED_FILENAME_KEY] = True
 
         logger.debug("Generated html filename '%s' for page: %s" %
-                    (new_filename, self))
+                    (self.data["html"], self))
 
     def provide_name(self):
         """

dactyl/templates/breadcrumbs.html

@@ -15,7 +15,9 @@
 
     {% if currentpage.html != "index.html" %}
     {%- for page in ns.crumbs %}
-    <li class="active breadcrumb-item"><a href="{% if "//" not in page.html %}{{ currentpage.prefix }}{% endif %}{{ page.html }}">{{ page.name }}</a></li>
+    <li class="active breadcrumb-item"><a href="
+      {%- if page is defined and "//" not in page.html %}{{ currentpage.prefix }}{% endif -%}
+      {{ page.html }}">{{ page.name }}</a></li>
     {% endfor %}
     {% endif %}
     <li class="active breadcrumb-item">{{ currentpage.name }}</li>

dactyl/templates/landing.html

@@ -4,9 +4,10 @@
   {% if content %}
 
   <section class="pt-3 p-md-3">
-    <article class="content">
+    <article class="dactyl-content">
       {{ content }}
 
+      <h2>Read More</h2>
       {% set show_blurbs = True %}
       {% set depth= 1 %}
       {% include 'children.html' %}

dactyl/templates/template-openapi_data_type.md

@@ -45,7 +45,7 @@
 {% endif -%}
 {% if example is defined %}- **Example:**
 
-        {{example|indent(8,indentfirst=False)}}
+        {{example|indent(8,first=False)}}
 
 {% endif -%}
 
@@ -54,8 +54,9 @@ This type can contain the following fields:
 
 | Field | Type | Required? | Description |
 |-------|------|-----------|-------------|
+{%- set required_fields = required if required is defined else [] -%}
 {%- for name,field in properties.items() %}
-| `{{name}}` | {{field.type|title}}{% if "items" in field.keys() and "title" in field["items"].keys() %} of [{{field["items"].title}}]({{type_link(field["items"].title)}}){% endif %} {% if field["title"] is defined %}([{{field.title}}]({{type_link(field.title)}})){% endif %} | {{"Required" if field.required else "Optional"}} | {{field.description}} |
+| `{{name}}` | {{field.type|title}}{% if "items" in field.keys() and "title" in field["items"].keys() %} of [{{field["items"].title}}]({{type_link(field["items"].title)}}){% endif %} {% if field["title"] is defined %}([{{field.title}}]({{type_link(field.title)}})){% endif %} | {{"Required" if name in required_fields else "Optional"}} | {{field.description}} |
 {%- endfor %}
 
 {% if additionalProperties is defined and additionalProperties == True %}This type MUST NOT contain any additional fields.{% endif %}

dactyl/templates/template-openapi_endpoint.md

@@ -1,18 +1,15 @@
 # {{summary}}
 
-{{description}}
-
-## Request Format
-
 ```
 {{method|upper}} {{path}}
-{%- if method in ["post","put","delete"] and requestBody is defined %}
-
-{{ x_example_request_body }}
-{% endif %}
 ```
 
+{{description}}
+
+## Request Format
+
 {% if path_params|length %}
+#### Path Parameters
 This API method uses the following path parameters:
 
 | Field | Value | Required? | Description |
@@ -24,6 +21,7 @@ This API method uses the following path parameters:
 {% endif %}
 
 {% if query_params|length %}
+#### Query Parameters
 This API method uses the following query parameters:
 
 | Field | Value | Required? | Description |
@@ -35,11 +33,28 @@ This API method uses the following query parameters:
 {% endif %}
 
 {% if requestBody is defined %}
+### Request Body
 {{requestBody.description}}
 
 {% if requestBody.content is defined %}
 
 {% for mediatype,thisbody in requestBody.content.items() %}
+{% if thisbody.examples is defined and thisbody.examples|length > 0 %}
+
+<!-- MULTICODE_BLOCK_START -->
+
+{% for body_name,body_sample in thisbody.examples.items() %}
+_{{body_name}}_
+
+```{%if mediatype == "application/json"%}json{%endif%}
+{{json_pp(body_sample)}}
+```
+{% endfor %}
+
+<!-- MULTICODE_BLOCK_END -->
+
+{% endif %}
+
 {% if thisbody.schema is defined %}
 **Media type:** {{mediatype|replace("*","\*")}}
 
@@ -51,8 +66,9 @@ The request uses the following fields:
 
 | Field | Type | Required? | Description |
 |-------|------|-----------|-------------|
+{%- set required_fields = thisbody.schema.required if thisbody.schema.required is defined else [] -%}
 {%- for name,field in thisbody.schema.properties.items() %}
-| `{{name}}` | {{field.type|title}}{% if "items" in field.keys() and "title" in field["items"].keys() %} of [{{field["items"].title}}]({{type_link(field["items"].title)}}){% endif %} {% if field["title"] is defined %}([{{field.title}}]({{type_link(field.title)}})){% endif %} | {{"Required" if field.required else "May be omitted"}} | {% if field.description is defined %}{{field.description}}{% endif %} |
+| `{{name}}` | {{field.type|title}}{% if "items" in field.keys() and "title" in field["items"].keys() %} of [{{field["items"].title}}]({{type_link(field["items"].title)}}){% endif %} {% if field["title"] is defined %}([{{field.title}}]({{type_link(field.title)}})){% endif %} | {{"Required" if name in required_fields else "Optional"}} | {% if field.description is defined %}{{field.description}}{% endif %} |
 {%- endfor %}
 {% endif %}
 
@@ -81,21 +97,27 @@ The response uses the following fields:
 
 | Field | Type | Required? | Description |
 |-------|------|-----------|-------------|
+{%- set required_fields = thisbody.schema.required if thisbody.schema.required is defined else [] -%}
 {%- for name,field in thisbody.schema.properties.items() %}
-| `{{name}}` | {{field.type|title}}{% if "items" in field.keys() and "title" in field["items"].keys() %} of [{{field["items"].title}}]({{type_link(field["items"].title)}}){% endif %} {% if field["title"] is defined %}([{{field.title}}]({{type_link(field.title)}})){% endif %} | {{ "Required" if field.required else "May be omitted"}} | {% if field.description is defined %}{{field.description}}{% endif %} |
+| `{{name}}` | {{field.type|title}}{% if "items" in field.keys() and "title" in field["items"].keys() %} of [{{field["items"].title}}]({{type_link(field["items"].title)}}){% endif %} {% if field["title"] is defined %}([{{field.title}}]({{type_link(field.title)}})){% endif %} | {{ "Required" if name in required_fields else "Optional"}} | {% if field.description is defined %}{{field.description}}{% endif %} |
 {%- endfor %}
 {% endif %}{# TODO: handle allOf, etc. #}
 
 {% if thisbody.examples is defined and thisbody.examples|length > 0 %}
 #### Example Response(s)
 
-{% for body_name,body_sample in thisbody.examples %}
+<!-- MULTICODE_BLOCK_START -->
+
+{% for body_name,body_sample in thisbody.examples.items() %}
 _{{body_name}}_
 
-```
-{{body_sample|pprint}}
+```{%if mediatype == "application/json"%}json{%endif%}
+{{json_pp(body_sample)}}
 ```
 {% endfor %}
+
+<!-- MULTICODE_BLOCK_END -->
+
 {% endif %}
 
 {% endif %}

dactyl/version.py

@@ -1 +1 @@
-__version__ = '0.14.5'
+__version__ = '0.15.0'