nbsync 0.3.4__tar.gz → 0.3.6__tar.gz

{nbsync-0.3.4 → nbsync-0.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nbsync
-Version: 0.3.4
+Version: 0.3.6
 Summary: A core library to synchronize Jupyter notebooks and Markdown documents, enabling seamless integration and dynamic content execution
 Project-URL: Documentation, https://daizutabi.github.io/nbsync/
 Project-URL: Source, https://github.com/daizutabi/nbsync
@@ -39,7 +39,7 @@ Classifier: Topic :: Documentation
 Classifier: Topic :: Software Development :: Documentation
 Classifier: Topic :: Text Processing :: Markup :: Markdown
 Requires-Python: >=3.10
-Requires-Dist: nbstore>=0.4.11
+Requires-Dist: nbstore>=0.5.2
 Description-Content-Type: text/markdown
 
 # nbsync

{nbsync-0.3.4 → nbsync-0.3.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "nbsync"
-version = "0.3.4"
+version = "0.3.6"
 description = "A core library to synchronize Jupyter notebooks and Markdown documents, enabling seamless integration and dynamic content execution"
 readme = "README.md"
 license = { file = "LICENSE" }
@@ -31,7 +31,7 @@ classifiers = [
   "Topic :: Text Processing :: Markup :: Markdown",
 ]
 requires-python = ">=3.10"
-dependencies = ["nbstore>=0.4.11"]
+dependencies = ["nbstore>=0.5.2"]
 
 [project.urls]
 Documentation = "https://daizutabi.github.io/nbsync/"

{nbsync-0.3.4 → nbsync-0.3.6}/src/nbsync/cell.py

@@ -50,10 +50,8 @@ class Cell:
                 include_attrs=True,
                 include_identifier=bool(identifier),
             )
-            result, self.image.url = self.content, ""
-            result = result.rstrip()
-            if escape and self.mime == "text/plain":
-                result = html.escape(result)
+            self.image.url = ""
+            result = get_text_markdown(self, escape=escape)
 
         else:
             source = get_source(
@@ -61,7 +59,7 @@ class Cell:
                 include_attrs=False,
                 include_identifier=bool(identifier),
             )
-            result = get_result(self)
+            result = get_image_markdown(self)
 
         if markdown := get_markdown(kind, source, result, tabs):
             return textwrap.indent(markdown, self.image.indent)
@@ -77,7 +75,8 @@ def get_source(
 ) -> str:
     attrs = [cell.language]
     if include_attrs:
-        attrs.extend(cell.image.iter_parts())
+        parts = cell.image.iter_parts(exclude_attributes=["result"])
+        attrs.extend(parts)
     attr = " ".join(attrs)
 
     source = cell.image.source
@@ -87,7 +86,19 @@ def get_source(
     return f"```{attr}\n{source}\n```"
 
 
-def get_result(cell: Cell) -> str:
+def get_text_markdown(cell: Cell, *, escape: bool = False) -> str:
+    text = str(cell.content.rstrip())
+
+    if lang := cell.image.attributes.get("result", ""):
+        return f"```{lang}\n{text}\n```"
+
+    if escape and cell.mime == "text/plain":
+        return html.escape(text)
+
+    return text
+
+
+def get_image_markdown(cell: Cell) -> str:
     msg = f"{cell.image.url}#{cell.image.identifier} [{cell.mime}]"
     logger.debug(f"Converting image: {msg}")
 
@@ -115,7 +126,7 @@ def get_markdown(kind: str, source: str, result: str, tabs: str) -> str:
         return f"{result}\n\n{source}"
 
     if kind == "material-block":
-        result = f'<div class="result" markdown="1">{result}</div>'
+        result = f'<div class="result" markdown="1">\n{result}\n</div>'
         return f"{source}\n\n{result}"
 
     if kind == "tabbed-left":

{nbsync-0.3.4 → nbsync-0.3.6}/src/nbsync/markdown.py

@@ -15,7 +15,7 @@ Element: TypeAlias = str | CodeBlock | Image
 def convert_code_block(code_block: CodeBlock) -> Iterator[Element]:
     for elem in _convert_code_block_tabbed(code_block):
         if isinstance(elem, CodeBlock):
-            yield _convert_code_block_exec(elem)
+            yield _convert_code_block_attrs(elem)
         else:
             yield elem
 
@@ -35,7 +35,7 @@ def _convert_code_block_tabbed(code_block: CodeBlock) -> Iterator[Element]:
     yield from nbstore.markdown.parse(text)
 
 
-def _convert_code_block_exec(code_block: CodeBlock) -> CodeBlock | Image:
+def _convert_code_block_attrs(code_block: CodeBlock) -> CodeBlock | Image:
     exec_ = code_block.attributes.get("exec", None)
     if exec_ != "1" or not code_block.classes:
         return code_block

{nbsync-0.3.4 → nbsync-0.3.6}/tests/test_cell.py

@@ -1,3 +1,5 @@
+import textwrap
+
 import nbformat
 import nbstore.notebook
 import pytest
@@ -77,7 +79,7 @@ def test_below(convert):
 
 def test_material_block(convert):
     x = convert("![a](a.ipynb){#fig source='material-block' a b=c}")
-    assert '<div class="result" markdown="1">![a]' in x
+    assert '<div class="result" markdown="1">\n![a]' in x
 
 
 def test_tabbed_left(convert):
@@ -116,3 +118,45 @@ def test_code_block_exec_escape_print(convert):
 def test_code_block_exec_escape_stream(convert):
     x = convert('```python exec="1" source="1"\n"<1>"\n```')
     assert x == '```python\n"<1>"\n```\n\n&#x27;&lt;1&gt;&#x27;'
+
+
+def test_code_block_exec_result(convert):
+    x = convert('```python exec="1" result="text"\nprint(1+1)\nprint("<1>")\n```')
+    assert x == "```text\n2\n<1>\n```"
+
+
+def test_code_block_exec_result_source(convert):
+    t = '```python exec="1" source="material-block" result="text"\n'
+    t += 'print(1+1)\nprint("<1>")\n```'
+    x = convert(t)
+    y = textwrap.dedent("""\
+    ```python
+    print(1+1)
+    print("<1>")
+    ```
+
+    <div class="result" markdown="1">
+    ```text
+    2
+    <1>
+    ```
+    </div>""")
+    assert x == y
+
+
+def test_code_block_html(convert):
+    src = textwrap.dedent("""\
+    from IPython.display import HTML
+    HTML("<div>a</div>")
+    """)
+    x = convert(f'```python exec="1"\n{src}```')
+    assert x == "<div>a</div>"
+
+
+def test_code_block_html_result(convert):
+    src = textwrap.dedent("""\
+    from IPython.display import HTML
+    HTML("<div>a</div>")
+    """)
+    x = convert(f'```python exec="1" result="html"\n{src}```')
+    assert x == "```html\n<div>a</div>\n```"