Skip to content

Allow parsing needs options as multiline rst in custom layout #1397

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions docs/layout_styles.rst
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,7 @@ Available layout functions are:
* :func:`meta_links <sphinx_needs.layout.LayoutHandler.meta_links>`
* :func:`meta_links_all <sphinx_needs.layout.LayoutHandler.meta_links_all>`
* :func:`meta_id <sphinx_needs.layout.LayoutHandler.meta_id>`
* :func:`meta_rst <sphinx_needs.layout.LayoutHandler.meta_rst>`
* :func:`image <sphinx_needs.layout.LayoutHandler.image>`
* :func:`link <sphinx_needs.layout.LayoutHandler.link>`
* :func:`permalink <sphinx_needs.layout.LayoutHandler.permalink>`
Expand All @@ -372,6 +373,8 @@ Available layout functions are:

.. autofunction:: sphinx_needs.layout.LayoutHandler.meta_links_all(prefix='', postfix='', exclude=None)

.. autofunction:: sphinx_needs.layout.LayoutHandler.meta_rst(prefix='', postfix='', exclude=None)

.. autofunction:: sphinx_needs.layout.LayoutHandler.image(url, height=None, width=None, align=None, no_link=False, prefix="", is_external=False, img_class="")

.. autofunction:: sphinx_needs.layout.LayoutHandler.link(url, text=None, image_url=None, image_height=None, image_width=None, prefix="", is_dynamic=False)
Expand Down
73 changes: 63 additions & 10 deletions sphinx_needs/layout.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,12 @@ def build_need_repr(


@lru_cache(1)
def _generate_inline_parser() -> tuple[Values, Inliner]:
def _generate_parsers() -> tuple[Values, Inliner, Parser]:
doc_settings = OptionParser(components=(Parser,)).get_default_values()
inline_parser = Inliner()
inline_parser.init_customizations(doc_settings) # type: ignore
return doc_settings, inline_parser
multiline_parser = Parser()
return doc_settings, inline_parser, multiline_parser


class LayoutHandler:
Expand Down Expand Up @@ -262,7 +263,9 @@ def __init__(
}

# Dummy Document setup
self.doc_settings, self.inline_parser = _generate_inline_parser()
self.doc_settings, self.inline_parser, self.multiline_parser = (
_generate_parsers()
)
self.dummy_doc = new_document("dummy", self.doc_settings)
self.doc_language = languages.get_language(
self.dummy_doc.settings.language_code
Expand All @@ -285,6 +288,7 @@ def __init__(
"meta_links": self.meta_links,
"meta_links_all": self.meta_links_all, # type: ignore[dict-item]
"meta_id": self.meta_id,
"meta_rst": self.meta_rst, # type: ignore[dict-item]
"image": self.image, # type: ignore[dict-item]
"link": self.link,
"collapse_button": self.collapse_button,
Expand Down Expand Up @@ -339,14 +343,14 @@ def get_section(self, section: str) -> nodes.line_block | list[nodes.Element]:
# line_block_node = nodes.line_block()
line_node = nodes.line()

line_parsed = self._parse(line)
line_parsed = self._parse_inline(line)
line_ready = self._func_replace(line_parsed)
line_node += line_ready
lines_container.append(line_node)

return lines_container

def _parse(self, line: str) -> list[nodes.Node]:
def _parse_inline(self, line: str) -> list[nodes.Node]:
"""
Parses a single line/string for inline rst statements, like strong, emphasis, literal, ...

Expand Down Expand Up @@ -485,7 +489,7 @@ def meta(
"""
data_container = nodes.inline(classes=["needs_" + name])
if prefix:
prefix_node = self._parse(prefix)
prefix_node = self._parse_inline(prefix)
label_node = nodes.inline(classes=["needs_label"])
label_node += prefix_node
data_container.append(label_node)
Expand Down Expand Up @@ -707,7 +711,7 @@ def meta_links_all(
outgoing_label = (
prefix + "{}:".format(link_type["outgoing"]) + postfix + " "
)
outgoing_line += self._parse(outgoing_label)
outgoing_line += self._parse_inline(outgoing_label)
outgoing_line += self.meta_links(link_type["option"], incoming=False)
data_container.append(outgoing_line)

Expand All @@ -717,12 +721,61 @@ def meta_links_all(
incoming_label = (
prefix + "{}:".format(link_type["incoming"]) + postfix + " "
)
incoming_line += self._parse(incoming_label)
incoming_line += self._parse_inline(incoming_label)
incoming_line += self.meta_links(link_type["option"], incoming=True)
data_container.append(incoming_line)

return data_container

def meta_rst(
self, name: str, prefix: str | None = None, show_empty: bool = False
) -> nodes.paragraph | list[nodes.Element]:
"""
Returns the specific metadata of a need inside docutils nodes, parsed as multiline rst.
Usage::

<<meta_rst('status', prefix='\\*\\*status\\*\\*: ', show_empty=True)>>

.. note::

You must escape all rst_content in your function strings! E.g. to get `**` one must use `\\\\*\\\\*`.

:param name: name of the need item
:param prefix: string as rst-code, will be added infront of the value output
:param show_empty: If false and requested need-value is None or '', no output is returned. Default: false
:return: docutils node
"""
data_container = nodes.paragraph(classes=["needs_" + name])
if prefix:
prefix_node = self._parse_inline(prefix)
label_node = nodes.inline(classes=["needs_label"])
label_node += prefix_node
data_container.append(label_node)
try:
data = self.need[name] # type: ignore[literal-required]
except KeyError:
data = ""

if data is None and not show_empty:
return []
elif data is None and show_empty:
data = ""

if isinstance(data, str):
if len(data) == 0 and not show_empty:
return []

dummy_doc = self.dummy_doc.deepcopy()
self.multiline_parser.parse(data, dummy_doc)
data_node = dummy_doc.children

data_container += data_node

else:
data_container.append(nodes.Text(data))

return data_container

def image(
self,
url: str,
Expand Down Expand Up @@ -776,7 +829,7 @@ def image(

data_container = nodes.inline()
if prefix:
prefix_node = self._parse(prefix)
prefix_node = self._parse_inline(prefix)
label_node = nodes.inline(classes=["needs_label"])
label_node += prefix_node
data_container.append(label_node)
Expand Down Expand Up @@ -901,7 +954,7 @@ def link(
"""
data_container = nodes.inline()
if prefix:
prefix_node = self._parse(prefix)
prefix_node = self._parse_inline(prefix)
label_node = nodes.inline(classes=["needs_label"])
label_node += prefix_node
data_container.append(label_node)
Expand Down