Add support for image and tabs-pillstrip; and ignore raw

Author: i80and

snooty/parser.py

@@ -211,18 +211,17 @@ def handle_directive(self, node: docutils.nodes.Node, doc: Dict[str, Serializabl
         except (IndexError, KeyError):
             pass
 
-        if name == 'figure':
+        if name in {'figure', 'image'}:
             if argument_text is None:
                 self.diagnostics.append(
-                    Diagnostic.error('"figure" expected a path argument', util.get_line(node)))
+                    Diagnostic.error(f'"{name}" expected a path argument', util.get_line(node)))
                 return
 
             try:
                 static_asset = self.add_static_asset(Path(argument_text))
                 options['checksum'] = static_asset.checksum
             except OSError as err:
-                msg = '"figure" could not open "{}": {}'.format(
-                    argument_text, os.strerror(err.errno))
+                msg = f'"{name}" could not open "{argument_text}": {os.strerror(err.errno)}'
                 self.diagnostics.append(Diagnostic.error(msg, util.get_line(node)))
         elif name == 'literalinclude':
             if argument_text is None:

snooty/rstparser.py

@@ -180,7 +180,7 @@ def run(self) -> List[docutils.nodes.Node]:
                 node.append(argument)
 
         # Parse the content
-        if self.name in {'include', 'only'}:
+        if self.name in {'include', 'only', 'raw'}:
             raw = docutils.nodes.FixedTextElement()
             raw.document = self.state.document
             raw.source, raw.line = source, line

snooty/rstspec.toml

@@ -91,6 +91,9 @@ options.width = "length"
 options.align = "alignment"
 options.lightbox = "flag"
 
+[directive.image]
+inherit = "figure"
+
 [directive.example]
 help = """A section providing an example related to the surrounding text."""
 content_type = "block"
@@ -125,6 +128,10 @@ content_type = "block"
 options.titlesonly = "flag"
 options.hidden = "flag"
 
+[directive.tabs-pillstrip]
+deprecated = true
+argument_type = "string"
+
 [directive.tabs]
 content_type = "block"
 argument_type = "string"

snooty/specparser.py

@@ -70,6 +70,10 @@ class LinkRoleType:
     None]
 
 
+class MissingDict(Dict[str, ArgumentType]):
+    pass
+
+
 @checked
 @dataclass
 class Meta:
@@ -88,7 +92,7 @@ class Directive:
     argument_type: ArgumentType
     required_context: Optional[str]
     deprecated: bool = field(default=False)
-    options: Dict[str, ArgumentType] = field(default_factory=dict)
+    options: Dict[str, ArgumentType] = field(default_factory=MissingDict)
 
 
 @checked
@@ -211,9 +215,14 @@ def resolve_value(key: str, inheritable: _T) -> _T:
                     msg = f'Cannot inherit from non-existent directive {inheritable.inherit}'
                     raise ValueError(msg)
 
-                inheritable = dataclasses.replace(base, **{
-                    k: v for k, v in dataclasses.asdict(inheritable).items() if v is not None
-                })
+                inheritable = dataclasses.replace(
+                    base,
+                    **{
+                        k: v
+                        for k, v in dataclasses.asdict(inheritable).items()
+                        if v is not None and not isinstance(v, MissingDict)
+                    },
+                )
                 inheritable_index[key] = inheritable
                 pending.remove(key)
 

snooty/test_specparser.py

@@ -12,12 +12,12 @@ def test_load() -> None:
 
     [directive._parent]
     content_type = "block"
+    options.foo = ["path", "uri"]
 
     [directive.child]
     inherit = "_parent"
     argument_type = "user_level"
     deprecated = true
-    options.foo = ["path", "uri"]
 
     [role._parent]
     help = "test-role"