mkdocs2confluence 0.8.4__tar.gz → 0.9.0__tar.gz

{mkdocs2confluence-0.8.4 → mkdocs2confluence-0.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mkdocs2confluence
-Version: 0.8.4
+Version: 0.9.0
 Summary: Publish MkDocs Material pages to Confluence Cloud — admonitions, Mermaid diagrams, tabs, page properties and more
 Author: Anders Hybertz
 License: GPL-3.0-or-later
@@ -423,7 +423,15 @@ status: in-progress
 | `status` | Sets the Confluence page status badge — common values: `rough-draft`, `in-progress`, `ready-for-review` (space-specific values are also supported). Not shown in the properties table. |
 | *other fields* | Title-cased key, value stringified |
 
-If `repo_url` + `edit_uri` are set in `mkdocs.yml`, an **Edit Source** row links to the source file. If `site_url` is set, a **Published Page** row links to the rendered MkDocs site.
+If `site_url` is set in `mkdocs.yml`, a **Published Page** row links to the rendered MkDocs site.
+
+### Source footer
+
+When `repo_url` + `edit_uri` are set in `mkdocs.yml`, a **Page source** footer panel is appended to the bottom of each published page containing:
+
+- **Edit this page** — links to the source file in your VCS (GitHub/GitLab/etc.)
+- **View history** — links to the file's commit history (derived automatically for GitHub and GitLab URLs)
+- **Last commit** — short commit SHA, message, author, and relative date from `git log` at publish time (omitted if git is unavailable or the file is untracked)
 
 ### Abbreviation expansion
 

{mkdocs2confluence-0.8.4 → mkdocs2confluence-0.9.0}/README.md

@@ -383,7 +383,15 @@ status: in-progress
 | `status` | Sets the Confluence page status badge — common values: `rough-draft`, `in-progress`, `ready-for-review` (space-specific values are also supported). Not shown in the properties table. |
 | *other fields* | Title-cased key, value stringified |
 
-If `repo_url` + `edit_uri` are set in `mkdocs.yml`, an **Edit Source** row links to the source file. If `site_url` is set, a **Published Page** row links to the rendered MkDocs site.
+If `site_url` is set in `mkdocs.yml`, a **Published Page** row links to the rendered MkDocs site.
+
+### Source footer
+
+When `repo_url` + `edit_uri` are set in `mkdocs.yml`, a **Page source** footer panel is appended to the bottom of each published page containing:
+
+- **Edit this page** — links to the source file in your VCS (GitHub/GitLab/etc.)
+- **View history** — links to the file's commit history (derived automatically for GitHub and GitLab URLs)
+- **Last commit** — short commit SHA, message, author, and relative date from `git log` at publish time (omitted if git is unavailable or the file is untracked)
 
 ### Abbreviation expansion
 

{mkdocs2confluence-0.8.4 → mkdocs2confluence-0.9.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mkdocs2confluence"
-version = "0.8.4"
+version = "0.9.0"
 description = "Publish MkDocs Material pages to Confluence Cloud — admonitions, Mermaid diagrams, tabs, page properties and more"
 readme = "README.md"
 license = { text = "GPL-3.0-or-later" }

{mkdocs2confluence-0.8.4 → mkdocs2confluence-0.9.0}/src/mkdocs2confluence.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mkdocs2confluence
-Version: 0.8.4
+Version: 0.9.0
 Summary: Publish MkDocs Material pages to Confluence Cloud — admonitions, Mermaid diagrams, tabs, page properties and more
 Author: Anders Hybertz
 License: GPL-3.0-or-later
@@ -423,7 +423,15 @@ status: in-progress
 | `status` | Sets the Confluence page status badge — common values: `rough-draft`, `in-progress`, `ready-for-review` (space-specific values are also supported). Not shown in the properties table. |
 | *other fields* | Title-cased key, value stringified |
 
-If `repo_url` + `edit_uri` are set in `mkdocs.yml`, an **Edit Source** row links to the source file. If `site_url` is set, a **Published Page** row links to the rendered MkDocs site.
+If `site_url` is set in `mkdocs.yml`, a **Published Page** row links to the rendered MkDocs site.
+
+### Source footer
+
+When `repo_url` + `edit_uri` are set in `mkdocs.yml`, a **Page source** footer panel is appended to the bottom of each published page containing:
+
+- **Edit this page** — links to the source file in your VCS (GitHub/GitLab/etc.)
+- **View history** — links to the file's commit history (derived automatically for GitHub and GitLab URLs)
+- **Last commit** — short commit SHA, message, author, and relative date from `git log` at publish time (omitted if git is unavailable or the file is untracked)
 
 ### Abbreviation expansion
 

{mkdocs2confluence-0.8.4 → mkdocs2confluence-0.9.0}/src/mkdocs2confluence.egg-info/SOURCES.txt

@@ -49,6 +49,7 @@ src/mkdocs_to_confluence/transforms/__init__.py
 src/mkdocs_to_confluence/transforms/abbrevs.py
 src/mkdocs_to_confluence/transforms/assets.py
 src/mkdocs_to_confluence/transforms/editlink.py
+src/mkdocs_to_confluence/transforms/footer.py
 src/mkdocs_to_confluence/transforms/images.py
 src/mkdocs_to_confluence/transforms/internallinks.py
 src/mkdocs_to_confluence/transforms/mermaid.py
@@ -57,6 +58,7 @@ tests/test_cli.py
 tests/test_editlink.py
 tests/test_emitter.py
 tests/test_extra_css.py
+tests/test_footer.py
 tests/test_frontmatter.py
 tests/test_icons.py
 tests/test_images.py

{mkdocs2confluence-0.8.4 → mkdocs2confluence-0.9.0}/src/mkdocs_to_confluence/emitter/xhtml.py

@@ -19,7 +19,6 @@ from __future__ import annotations
 import html
 from pathlib import Path
 from typing import Sequence
-from urllib.parse import urlparse
 
 from mkdocs_to_confluence.ir.nodes import (
     AbbrevFootnoteNode,
@@ -52,6 +51,7 @@ from mkdocs_to_confluence.ir.nodes import (
     RawHTML,
     RawInlineHtml,
     Section,
+    SourceFooter,
     StrikethroughNode,
     SubscriptNode,
     SuperscriptNode,
@@ -196,6 +196,8 @@ def _emit_node(node: IRNode) -> str:
         return _emit_abbrev_glossary_block(node)
     if isinstance(node, GridCards):
         return _emit_grid_cards(node)
+    if isinstance(node, SourceFooter):
+        return _emit_source_footer(node)
     if isinstance(node, UnsupportedBlock):
         return _emit_unsupported(node)
     # Inline nodes at block level (shouldn't normally appear, but be safe)
@@ -216,29 +218,6 @@ def _emit_section(node: Section) -> str:
     return heading + body
 
 
-def _source_link_label(url: str) -> str:
-    """Return a platform-aware label for the source edit link.
-
-    Detects GitHub, GitLab and Bitbucket from the URL hostname and returns
-    "Edit in <Platform> ↗".  Falls back to "Edit source ↗" for anything else.
-    Only the proven-safe ↗ arrow is used — no emoji that may render as ??? on
-    Confluence Cloud.
-    """
-    try:
-        hostname = urlparse(url).hostname or ""
-    except ValueError:
-        hostname = ""
-    if hostname == "github.com" or hostname.endswith(".github.com"):
-        platform = "GitHub"
-    elif hostname == "gitlab.com" or hostname.endswith(".gitlab.com") or "gitlab" in hostname:
-        platform = "GitLab"
-    elif hostname == "bitbucket.org" or hostname.endswith(".bitbucket.org"):
-        platform = "Bitbucket"
-    else:
-        return "Edit source \u2197"
-    return f"Edit in {platform} \u2197"
-
-
 def _emit_front_matter(node: FrontMatter) -> str:
     """Emit front matter as an optional subtitle paragraph + Page Properties macro."""
     parts: list[str] = []
@@ -246,20 +225,13 @@ def _emit_front_matter(node: FrontMatter) -> str:
     if node.subtitle:
         parts.append(f"<p><em>{html.escape(node.subtitle)}</em></p>\n")
 
-    has_table = node.properties or node.source_url or node.site_url
+    has_table = node.properties or node.site_url
     if has_table:
         rows = "".join(
             f"    <tr><th>{html.escape(display)}</th>"
             f"<td>{html.escape(value)}</td></tr>\n"
             for display, value in node.properties
         )
-        if node.source_url:
-            label = html.escape(_source_link_label(node.source_url))
-            href = html.escape(node.source_url)
-            rows += (
-                f'    <tr><th>Source</th>'
-                f'<td><a href="{href}">{label}</a></td></tr>\n'
-            )
         if node.site_url:
             href = html.escape(node.site_url)
             rows += (
@@ -279,6 +251,27 @@ def _emit_front_matter(node: FrontMatter) -> str:
     return "".join(parts)
 
 
+def _emit_source_footer(node: SourceFooter) -> str:
+    """Emit a 'Page source' panel macro with edit/history links and last-commit info."""
+    edit_href = html.escape(node.edit_url)
+    links = f'<a href="{edit_href}">Edit this page</a>'
+    if node.history_url:
+        hist_href = html.escape(node.history_url)
+        links += f' \u00b7 <a href="{hist_href}">View history</a>'
+    body = f"<p>{links}</p>\n"
+    if node.last_commit:
+        body += f"<p><em>Last commit: {html.escape(node.last_commit)}</em></p>\n"
+    return (
+        '<ac:structured-macro ac:name="panel">\n'
+        '  <ac:parameter ac:name="title">Page source</ac:parameter>\n'
+        '  <ac:parameter ac:name="borderStyle">solid</ac:parameter>\n'
+        "  <ac:rich-text-body>\n"
+        f"    {body}"
+        "  </ac:rich-text-body>\n"
+        "</ac:structured-macro>\n"
+    )
+
+
 def _emit_paragraph(node: Paragraph) -> str:
     return f"<p>{_emit_inlines(node.children)}</p>\n"
 

{mkdocs2confluence-0.8.4 → mkdocs2confluence-0.9.0}/src/mkdocs_to_confluence/ir/nodes.py

@@ -413,9 +413,6 @@ class FrontMatter(IRNode):
                     front matter extractor.
         labels:     Confluence page labels derived from the ``tags:`` field.
                     Applied via the REST API at publish time (not in XHTML).
-        source_url: Optional URL to the source file in the version-control
-                    repository.  Rendered as a clickable link row ("Source")
-                    at the bottom of the Page Properties table.
         site_url:   Optional URL to the rendered page on the published MkDocs
                     site.  Rendered as a "Published Page" row in the table.
     """
@@ -424,7 +421,6 @@ class FrontMatter(IRNode):
     subtitle: str | None
     properties: tuple[tuple[str, str], ...]
     labels: tuple[str, ...]
-    source_url: str | None = None
     site_url: str | None = None
     confluence_status: str | None = None
 
@@ -432,6 +428,26 @@ class FrontMatter(IRNode):
 # ── Abbreviation footnotes ────────────────────────────────────────────────────
 
 
+@dataclass(frozen=True)
+class SourceFooter(IRNode):
+    """Footer panel showing source-control links and last-commit info.
+
+    Emitted as a Confluence ``panel`` macro at the bottom of the page.
+
+    Attributes:
+        edit_url:     URL to edit the source file (e.g. GitHub edit link).
+        history_url:  URL to the file's commit history.  ``None`` when it
+                      cannot be derived from ``edit_url``.
+        last_commit:  Human-readable last-commit summary from ``git log``,
+                      e.g. ``"abc1234 · Fix typo · Jane · 2 days ago"``.
+                      ``None`` when git is unavailable or the file is untracked.
+    """
+
+    edit_url: str
+    history_url: str | None = None
+    last_commit: str | None = None
+
+
 @dataclass(frozen=True)
 class AbbrevFootnoteNode(IRNode):
     """Inline: abbreviated term with a superscript anchor-link to the glossary.

{mkdocs2confluence-0.8.4 → mkdocs2confluence-0.9.0}/src/mkdocs_to_confluence/publisher/pipeline.py

@@ -49,6 +49,7 @@ from mkdocs_to_confluence.publisher.client import ConfluenceError
 from mkdocs_to_confluence.transforms.abbrevs import apply_abbreviations
 from mkdocs_to_confluence.transforms.assets import _make_attachment_name, resolve_local_assets
 from mkdocs_to_confluence.transforms.editlink import attach_source_url
+from mkdocs_to_confluence.transforms.footer import build_source_footer
 from mkdocs_to_confluence.transforms.internallinks import build_link_map, resolve_internal_links
 from mkdocs_to_confluence.transforms.mermaid import DEFAULT_KROKI_URL, render_mermaid_diagrams
 
@@ -187,8 +188,12 @@ def compile_page(
         ir_nodes = (front_matter,) + ir_nodes
     edit_url = config.page_edit_url(node.docs_path or "")
     site_url = config.page_site_url(node.docs_path or "")
-    if edit_url or site_url:
-        ir_nodes = attach_source_url(ir_nodes, edit_url or "", site_url)
+    if site_url:
+        ir_nodes = attach_source_url(ir_nodes, "", site_url)
+    if edit_url:
+        abs_path = str(config.docs_dir / (node.docs_path or ""))
+        footer = build_source_footer(edit_url, abs_path)
+        ir_nodes = ir_nodes + (footer,)
 
     # Extract labels and confluence_status from FrontMatter node.
     labels: tuple[str, ...] = ()

{mkdocs2confluence-0.8.4 → mkdocs2confluence-0.9.0}/src/mkdocs_to_confluence/transforms/editlink.py

@@ -1,16 +1,13 @@
 """Edit-link injection transform.
 
-Attaches the source-file URL and optional published-page URL to the page's
-:class:`~ir.nodes.FrontMatter` node so they appear as rows in the Confluence
-Page Properties table.
-
-- **Source** row: the VCS edit URL (from ``repo_url`` + ``edit_uri``)
-- **Published Page** row: the rendered MkDocs URL (from ``site_url``)
+Attaches the published-page URL (from ``site_url``) to the page's
+:class:`~ir.nodes.FrontMatter` node so it appears as a row in the
+Confluence Page Properties table.
 
 If the page has no front matter a minimal :class:`~ir.nodes.FrontMatter`
-node is created and prepended so the rows always appear.
+node is created and prepended so the row always appears.
 
-Rows are only injected when the corresponding URL is non-empty.
+The row is only injected when the URL is non-empty.
 """
 
 from __future__ import annotations
@@ -23,42 +20,44 @@ def attach_source_url(
     edit_url: str,
     site_url: str | None = None,
 ) -> tuple[IRNode, ...]:
-    """Attach *edit_url* (and optionally *site_url*) to the page's FrontMatter.
+    """Attach *site_url* to the page's FrontMatter for the Page Properties table.
 
     Parameters
     ----------
     nodes:
         Top-level IR nodes for the page.
     edit_url:
-        Full URL to the source file edit view (e.g. GitHub edit URL).
+        Kept for backwards compatibility; no longer stored on FrontMatter.
+        Pass an empty string or ``None`` — it is ignored.
     site_url:
         Full URL to the rendered page on the MkDocs site.  When provided,
-        a "Published Page" row is added after the "Source" row.
+        a "Published Page" row is added to the Page Properties table.
 
     Returns
     -------
     tuple[IRNode, ...]
-        New nodes tuple with URL(s) attached to the FrontMatter.
+        New nodes tuple with ``site_url`` attached to the FrontMatter.
     """
+    if not site_url:
+        return nodes
+
     if nodes and isinstance(nodes[0], FrontMatter):
         updated = FrontMatter(
             title=nodes[0].title,
             subtitle=nodes[0].subtitle,
             properties=nodes[0].properties,
             labels=nodes[0].labels,
-            source_url=edit_url,
             site_url=site_url,
             confluence_status=nodes[0].confluence_status,
         )
         return (updated,) + nodes[1:]
 
-    # No existing front matter — create a minimal one just for the link rows.
+    # No existing front matter — create a minimal one just for the link row.
     minimal = FrontMatter(
         title=None,
         subtitle=None,
         properties=(),
         labels=(),
-        source_url=edit_url,
         site_url=site_url,
     )
     return (minimal,) + nodes

mkdocs2confluence-0.9.0/src/mkdocs_to_confluence/transforms/footer.py

@@ -0,0 +1,69 @@
+"""Source-footer transform.
+
+Builds a :class:`~ir.nodes.SourceFooter` node from a VCS edit URL and the
+absolute path of the source file.  The node is appended to the IR node list
+by the publish pipeline so it renders as a footer panel on each Confluence page.
+"""
+
+from __future__ import annotations
+
+import subprocess
+
+from mkdocs_to_confluence.ir.nodes import SourceFooter
+
+
+def _derive_history_url(edit_url: str) -> str | None:
+    """Derive a commit-history URL from a VCS edit URL.
+
+    Supports GitHub (``/edit/``) and GitLab (``/-/edit/``).
+    Returns ``None`` for any other URL shape.
+    """
+    if "/-/edit/" in edit_url:
+        return edit_url.replace("/-/edit/", "/-/commits/", 1)
+    if "/edit/" in edit_url:
+        return edit_url.replace("/edit/", "/commits/", 1)
+    return None
+
+
+def _last_commit(abs_path: str) -> str | None:
+    """Return a human-readable last-commit summary for *abs_path*.
+
+    Runs ``git log -1 --format=... --date=relative`` on the file.
+    Returns ``None`` when git is unavailable, the path is untracked, or the
+    command fails for any reason.
+    """
+    try:
+        result = subprocess.run(
+            [
+                "git", "log", "-1",
+                "--format=%h \u00b7 %s \u00b7 %an \u00b7 %ad",
+                "--date=relative",
+                "--",
+                abs_path,
+            ],
+            capture_output=True,
+            text=True,
+            timeout=5,
+        )
+        output = result.stdout.strip()
+        return output if output else None
+    except Exception:  # noqa: BLE001
+        return None
+
+
+def build_source_footer(edit_url: str, abs_path: str) -> SourceFooter:
+    """Build a :class:`SourceFooter` for the given *edit_url* and source file.
+
+    Parameters
+    ----------
+    edit_url:
+        Full URL to edit the source file (e.g. GitHub edit link).
+    abs_path:
+        Absolute filesystem path to the source Markdown file.  Used to
+        query ``git log`` for the last-commit summary.
+    """
+    return SourceFooter(
+        edit_url=edit_url,
+        history_url=_derive_history_url(edit_url),
+        last_commit=_last_commit(abs_path),
+    )

{mkdocs2confluence-0.8.4 → mkdocs2confluence-0.9.0}/tests/test_editlink.py

@@ -1,4 +1,4 @@
-"""Tests for the edit-link / source-url attachment transform."""
+"""Tests for the edit-link / site-url attachment transform."""
 
 from __future__ import annotations
 
@@ -8,31 +8,29 @@ from mkdocs_to_confluence.transforms.editlink import attach_source_url
 # ── attach_source_url ─────────────────────────────────────────────────────────
 
 
-def test_source_url_added_to_existing_front_matter():
-    """source_url is set on an existing FrontMatter node."""
+def test_source_url_ignored_when_only_edit_url_provided():
+    """edit_url is now ignored; attach_source_url with no site_url returns nodes unchanged."""
     fm = FrontMatter(title="My Page", subtitle=None, properties=(), labels=())
     original = (fm, Paragraph(children=(TextNode(text="Hello"),)))
     result = attach_source_url(original, "https://github.com/org/repo/edit/main/docs/index.md")
-    assert isinstance(result[0], FrontMatter)
-    assert result[0].source_url == "https://github.com/org/repo/edit/main/docs/index.md"
-    assert result[1] is original[1]
+    assert result is original
 
 
 def test_existing_front_matter_fields_preserved():
-    """Attaching source_url does not lose other FrontMatter fields."""
+    """Attaching site_url does not lose other FrontMatter fields."""
     fm = FrontMatter(
         title="My Page",
         subtitle="A subtitle",
         properties=(("Version", "1.0"),),
         labels=("arch",),
     )
-    result = attach_source_url((fm,), "https://example.com/edit")
+    result = attach_source_url((fm,), "", site_url="https://site.io/page/")
     updated: FrontMatter = result[0]  # type: ignore[assignment]
     assert updated.title == "My Page"
     assert updated.subtitle == "A subtitle"
     assert updated.properties == (("Version", "1.0"),)
     assert updated.labels == ("arch",)
-    assert updated.source_url == "https://example.com/edit"
+    assert updated.site_url == "https://site.io/page/"
 
 
 def test_confluence_status_preserved_by_attach_source_url():
@@ -44,7 +42,7 @@ def test_confluence_status_preserved_by_attach_source_url():
         labels=("arch",),
         confluence_status="in-progress",
     )
-    result = attach_source_url((fm,), "https://example.com/edit")
+    result = attach_source_url((fm,), "", site_url="https://site.io/page/")
     updated: FrontMatter = result[0]  # type: ignore[assignment]
     assert updated.confluence_status == "in-progress"
 
@@ -52,20 +50,27 @@ def test_confluence_status_preserved_by_attach_source_url():
 def test_minimal_front_matter_created_when_none_present():
     """A minimal FrontMatter is prepended when the page has no front matter."""
     body = (Paragraph(children=(TextNode(text="Content"),)),)
-    result = attach_source_url(body, "https://example.com/edit")
+    result = attach_source_url(body, "", site_url="https://site.io/page/")
     assert len(result) == 2
     assert isinstance(result[0], FrontMatter)
-    assert result[0].source_url == "https://example.com/edit"
+    assert result[0].site_url == "https://site.io/page/"
     assert result[0].title is None
     assert result[0].properties == ()
     assert result[1] is body[0]
 
 
 def test_empty_nodes_gets_minimal_front_matter():
-    result = attach_source_url((), "https://example.com/edit")
+    result = attach_source_url((), "", site_url="https://site.io/")
     assert len(result) == 1
     assert isinstance(result[0], FrontMatter)
-    assert result[0].source_url == "https://example.com/edit"
+    assert result[0].site_url == "https://site.io/"
+
+
+def test_no_site_url_returns_nodes_unchanged():
+    """When site_url is absent, nodes are returned as-is (no FrontMatter injected)."""
+    body = (Paragraph(children=(TextNode(text="Content"),)),)
+    result = attach_source_url(body, "")
+    assert result is body
 
 
 # ── page_edit_url ─────────────────────────────────────────────────────────────
@@ -258,5 +263,4 @@ def test_site_url_attached_by_transform():
         (fm,), "https://github.com/edit", site_url="https://site.io/page/"
     )
     assert isinstance(result[0], FrontMatter)
-    assert result[0].source_url == "https://github.com/edit"
     assert result[0].site_url == "https://site.io/page/"

mkdocs2confluence-0.9.0/tests/test_footer.py

@@ -0,0 +1,119 @@
+"""Tests for transforms/footer.py and the SourceFooter emitter."""
+
+from __future__ import annotations
+
+from unittest.mock import patch
+
+from mkdocs_to_confluence.emitter.xhtml import emit
+from mkdocs_to_confluence.ir.nodes import SourceFooter
+from mkdocs_to_confluence.transforms.footer import _derive_history_url, _last_commit, build_source_footer
+
+# ── _derive_history_url ───────────────────────────────────────────────────────
+
+
+def test_derive_history_url_github():
+    url = "https://github.com/org/repo/edit/main/docs/guide/setup.md"
+    assert _derive_history_url(url) == "https://github.com/org/repo/commits/main/docs/guide/setup.md"
+
+
+def test_derive_history_url_gitlab():
+    url = "https://gitlab.com/org/repo/-/edit/main/docs/guide/setup.md"
+    assert _derive_history_url(url) == "https://gitlab.com/org/repo/-/commits/main/docs/guide/setup.md"
+
+
+def test_derive_history_url_unknown_returns_none():
+    url = "https://bitbucket.org/org/repo/src/main/docs/guide/setup.md"
+    assert _derive_history_url(url) is None
+
+
+def test_derive_history_url_empty_string():
+    assert _derive_history_url("") is None
+
+
+# ── _last_commit ──────────────────────────────────────────────────────────────
+
+
+def test_last_commit_returns_output(tmp_path):
+    fake_file = str(tmp_path / "docs" / "page.md")
+    with patch("mkdocs_to_confluence.transforms.footer.subprocess.run") as mock_run:
+        mock_run.return_value.stdout = "abc1234 · Fix typo · Jane · 2 days ago\n"
+        result = _last_commit(fake_file)
+    assert result == "abc1234 · Fix typo · Jane · 2 days ago"
+
+
+def test_last_commit_returns_none_when_empty(tmp_path):
+    fake_file = str(tmp_path / "docs" / "untracked.md")
+    with patch("mkdocs_to_confluence.transforms.footer.subprocess.run") as mock_run:
+        mock_run.return_value.stdout = ""
+        result = _last_commit(fake_file)
+    assert result is None
+
+
+def test_last_commit_returns_none_on_exception(tmp_path):
+    fake_file = str(tmp_path / "docs" / "page.md")
+    with patch("mkdocs_to_confluence.transforms.footer.subprocess.run", side_effect=FileNotFoundError):
+        result = _last_commit(fake_file)
+    assert result is None
+
+
+# ── build_source_footer ───────────────────────────────────────────────────────
+
+
+def test_build_source_footer_full(tmp_path):
+    edit_url = "https://github.com/org/repo/edit/main/docs/guide.md"
+    abs_path = str(tmp_path / "docs" / "guide.md")
+    with patch("mkdocs_to_confluence.transforms.footer._last_commit", return_value="abc · msg · Jane · 1 day ago"):
+        footer = build_source_footer(edit_url, abs_path)
+    assert footer.edit_url == edit_url
+    assert footer.history_url == "https://github.com/org/repo/commits/main/docs/guide.md"
+    assert footer.last_commit == "abc · msg · Jane · 1 day ago"
+
+
+def test_build_source_footer_no_commit(tmp_path):
+    edit_url = "https://github.com/org/repo/edit/main/docs/guide.md"
+    abs_path = str(tmp_path / "docs" / "guide.md")
+    with patch("mkdocs_to_confluence.transforms.footer._last_commit", return_value=None):
+        footer = build_source_footer(edit_url, abs_path)
+    assert footer.last_commit is None
+    assert footer.history_url is not None
+
+
+# ── _emit_source_footer ───────────────────────────────────────────────────────
+
+
+def test_emit_footer_contains_edit_link():
+    footer = SourceFooter(
+        edit_url="https://github.com/org/repo/edit/main/docs/page.md",
+        history_url="https://github.com/org/repo/commits/main/docs/page.md",
+        last_commit="abc1234 · Fix typo · Jane · 2 days ago",
+    )
+    out = emit((footer,))
+    assert "Edit this page" in out
+    assert "View history" in out
+    assert "abc1234" in out
+    assert "Fix typo" in out
+    assert 'ac:name="panel"' in out
+
+
+def test_emit_footer_no_history_url():
+    footer = SourceFooter(
+        edit_url="https://example.com/edit/docs/page.md",
+        history_url=None,
+        last_commit=None,
+    )
+    out = emit((footer,))
+    assert "Edit this page" in out
+    assert "View history" not in out
+    assert "Last commit" not in out
+
+
+def test_emit_footer_escapes_html():
+    footer = SourceFooter(
+        edit_url='https://example.com/edit/path?a=1&b=2',
+        history_url=None,
+        last_commit='abc · <script>alert(1)</script> · Jane · today',
+    )
+    out = emit((footer,))
+    assert "<script>" not in out
+    assert "&lt;script&gt;" in out
+    assert "a=1&amp;b=2" in out

{mkdocs2confluence-0.8.4 → mkdocs2confluence-0.9.0}/tests/test_frontmatter.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from mkdocs_to_confluence.emitter.xhtml import _source_link_label, emit
+from mkdocs_to_confluence.emitter.xhtml import emit
 from mkdocs_to_confluence.ir.nodes import FrontMatter
 from mkdocs_to_confluence.preprocess.frontmatter import extract_front_matter
 
@@ -194,70 +194,3 @@ def test_special_chars_escaped_in_properties():
     assert "&" in xhtml
     assert "<" in xhtml
     assert "O'Brien" in xhtml or "O'Brien" in xhtml or "O'" in xhtml or "O'" not in xhtml
-
-
-def test_source_url_renders_as_link_row():
-    fm = FrontMatter(
-        title=None,
-        subtitle=None,
-        properties=(),
-        labels=(),
-        source_url="https://github.com/org/repo/edit/main/docs/index.md",
-    )
-    xhtml = emit((fm,))
-    assert 'ac:name="details"' in xhtml
-    assert '<th>Source</th>' in xhtml
-    assert 'href="https://github.com/org/repo/edit/main/docs/index.md"' in xhtml
-
-
-def test_source_url_appears_after_other_properties():
-    fm = FrontMatter(
-        title=None,
-        subtitle=None,
-        properties=(("Version", "2.0"),),
-        labels=(),
-        source_url="https://example.com/edit",
-    )
-    xhtml = emit((fm,))
-    version_pos = xhtml.index("Version")
-    source_pos = xhtml.index("Source")
-    assert source_pos > version_pos, "Source row should appear after other properties"
-
-
-def test_source_url_alone_still_emits_details_macro():
-    """A page with no front matter but a source_url should show the table."""
-    fm = FrontMatter(title=None, subtitle=None, properties=(), labels=(), source_url="https://example.com/edit")
-    xhtml = emit((fm,))
-    assert 'ac:name="details"' in xhtml
-    assert '<th>Source</th>' in xhtml
-
-
-# --- _source_link_label ---
-
-def test_source_link_label_github():
-    assert _source_link_label("https://github.com/org/repo/edit/main/docs/page.md") == "Edit in GitHub ↗"
-
-
-def test_source_link_label_gitlab_dot_com():
-    assert _source_link_label("https://gitlab.com/org/repo/-/edit/main/docs/page.md") == "Edit in GitLab ↗"
-
-
-def test_source_link_label_self_hosted_gitlab():
-    assert _source_link_label("https://gitlab.mycompany.com/org/repo/-/edit/main/docs/page.md") == "Edit in GitLab ↗"
-
-
-def test_source_link_label_bitbucket():
-    assert _source_link_label("https://bitbucket.org/org/repo/src/main/docs/page.md") == "Edit in Bitbucket ↗"
-
-
-def test_source_link_label_unknown_host_fallback():
-    assert _source_link_label("https://example.com/edit") == "Edit source ↗"
-
-
-def test_source_link_label_renders_in_xhtml():
-    fm = FrontMatter(
-        title=None, subtitle=None, properties=(), labels=(),
-        source_url="https://github.com/org/repo/edit/main/docs/index.md",
-    )
-    xhtml = emit((fm,))
-    assert "Edit in GitHub" in xhtml