Add 'options' to more directives

Author: i80and

snooty/parser.py

@@ -130,17 +130,18 @@ def handle_directive(self, node: docutils.nodes.Node, doc: Dict[str, Serializabl
         name = node['name']
         doc['name'] = name
 
+        options = node['options'] or {}
+        if options:
+            doc['options'] = options
+
         if node.children and node.children[0].__class__.__name__ == 'directive_argument':
             visitor = self.__make_child_visitor()
             node.children[0].walkabout(visitor)
             argument = visitor.state[-1]['children']
             doc['argument'] = argument
-            options = node['options']
-            doc['options'] = options
             node.children = node.children[1:]
         else:
             argument = []
-            options = {}
             doc['argument'] = argument
 
         argument_text = None

snooty/test_parser.py

@@ -15,16 +15,18 @@ def test_tabs() -> None:
     assert ast_to_testing_string(page.ast) == ''.join((
         '<root>',
 
-        '<directive name="tabs"><directive name="tab"><text>bionic</text>',
+        '<directive name="tabs" hidden="True"><directive name="tab"><text>bionic</text>',
         '<paragraph><text>Bionic content</text></paragraph></directive>',
-
         '<directive name="tab"><text>xenial</text><paragraph><text>',
         'Xenial content</text></paragraph></directive>',
-
         '<directive name="tab"><text>trusty</text><paragraph><text>',
         'Trusty content</text></paragraph></directive></directive>',
 
-        '<directive name="tabs"><directive name="tab"><text>trusty</text><paragraph><text>',
+        '<directive name="tabs" tabset="platforms"><directive name="tab"><text>windows</text>',
+        '<paragraph><text>Windows content</text></paragraph></directive></directive>',
+
+        '<directive name="tabs" hidden="true"><directive name="tab">',
+        '<text>trusty</text><paragraph><text>',
         'Trusty content</text></paragraph></directive>',
 
         '<directive name="tab"><text>xenial</text><paragraph><text>',
@@ -35,7 +37,7 @@ def test_tabs() -> None:
 
     assert len(diagnostics) == 1 and \
         diagnostics[0].message.startswith('Unexpected field') and \
-        diagnostics[0].start[0] == 36
+        diagnostics[0].start[0] == 44
 
 
 def test_codeblock() -> None:

snooty/util.py

@@ -51,9 +51,11 @@ def line_of_node(node: docutils.nodes.Node) -> Optional[int]:
 def ast_to_testing_string(ast: Any) -> str:
     value = ast.get('value', '')
     children = ast.get('children', [])
+    attr_pairs = [(k, v) for k, v in ast.items() if k not in (
+        'argument', 'value', 'children', 'type', 'position', 'options') and v]
+    attr_pairs.extend((k, v) for k, v in ast.get('options', {}).items())
     attrs = ' '.join(
-        '{}="{}"'.format(k, v) for k, v in ast.items() if k not in (
-            'argument', 'value', 'children', 'type', 'position') and v)
+        '{}="{}"'.format(k, v) for k, v in attr_pairs)
     contents = value if value else (''.join(
         ast_to_testing_string(child) for child in children)
         if children else '')

test_data/test_tabs.rst

@@ -20,6 +20,14 @@
 
            Trusty content
 
+.. tabs-platforms::
+
+   tabs:
+      - id: windows
+        content: |
+
+           Windows content
+
 .. tabs::
    :hidden: true