mkdocs2confluence 0.7.26__tar.gz → 0.7.28__tar.gz

{mkdocs2confluence-0.7.26 → mkdocs2confluence-0.7.28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mkdocs2confluence
-Version: 0.7.26
+Version: 0.7.28
 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

{mkdocs2confluence-0.7.26 → mkdocs2confluence-0.7.28}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mkdocs2confluence"
-version = "0.7.26"
+version = "0.7.28"
 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.7.26 → mkdocs2confluence-0.7.28}/src/mkdocs2confluence.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mkdocs2confluence
-Version: 0.7.26
+Version: 0.7.28
 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

{mkdocs2confluence-0.7.26 → mkdocs2confluence-0.7.28}/src/mkdocs_to_confluence/publisher/client.py

@@ -371,7 +371,6 @@ class ConfluenceClient:
         Sends ``{id, name, color}`` when a matching space state is found, otherwise
         falls back to ``{name, color}`` with a sensible default colour.
         """
-        import sys as _sys
         def _normalize(s: str) -> str:
             return s.lower().replace("-", " ").strip()
 
@@ -383,7 +382,6 @@ class ConfluenceClient:
             self._space_states[cache_key] = self._fetch_available_states(page_id)
             print(
                 f"  [status] space states fetched: {[s.get('name') for s in self._space_states[cache_key]]}",
-                file=_sys.stderr,
             )
 
         matched: dict[str, Any] | None = None
@@ -398,7 +396,7 @@ class ConfluenceClient:
                 "name": matched["name"],
                 "color": matched["color"],
             }
-            print(f"  [status] matched space state: {body}", file=_sys.stderr)
+            print(f"  [status] matched space state: {body}")
         else:
             # Fall back: name + color (required together when no id)
             _default_colors = {
@@ -410,13 +408,13 @@ class ConfluenceClient:
                 "outdated": "#ff7452",
             }
             body = {"name": name, "color": _default_colors.get(_normalize(name), "#2684ff")}
-            print(f"  [status] no space state match — using fallback: {body}", file=_sys.stderr)
+            print(f"  [status] no space state match — using fallback: {body}")
 
         url = self._v1(f"/content/{page_id}/state")
         resp = self._http.put(url, json=body)
-        print(f"  [status] PUT {url} → HTTP {resp.status_code}", file=_sys.stderr)
+        print(f"  [status] PUT {url} → HTTP {resp.status_code}")
         if not resp.is_success:
-            print(f"  [status] response body: {resp.text[:300]}", file=_sys.stderr)
+            print(f"  [status] response body: {resp.text[:300]}")
         self._raise_for_status(resp, f"set_page_status({page_id!r}, {status_key!r})")
 
     def _fetch_available_states(self, page_id: str) -> list[dict[str, Any]]:
@@ -429,7 +427,8 @@ class ConfluenceClient:
         resp = self._http.get(self._v1(f"/content/{page_id}/state/available"))
         if resp.is_success:
             data: dict[str, Any] = resp.json()
-            return data.get("spaceContentStates") or []
+            return list(data.get("spaceContentStates") or [])
+        print(f"  [warn] could not fetch available states (HTTP {resp.status_code}) — using fallback")
         return []
 
     def list_attachments(self, page_id: str) -> dict[str, dict[str, Any]]:

{mkdocs2confluence-0.7.26 → mkdocs2confluence-0.7.28}/src/mkdocs_to_confluence/publisher/pipeline.py

@@ -277,6 +277,8 @@ def _plan_nodes(
                         xhtml, attachments, labels, confluence_status = compile_page(
                             index_child, config, link_map, quiet=quiet
                         )
+                        if confluence_status:
+                            print(f"  [debug] '{clean_title}' (index) has frontmatter status: {confluence_status!r}")
                         existing = client.find_page(space_id, clean_title)
                         xhtml_h = _xhtml_hash(xhtml)
                         if existing is not None and client.get_content_hash(str(existing["id"])) == xhtml_h:
@@ -388,6 +390,9 @@ def _plan_nodes(
                 )
                 continue
 
+            if confluence_status:
+                print(f"  [debug] '{clean_title}' has frontmatter status: {confluence_status!r}")
+
             existing = client.find_page(space_id, clean_title)
             xhtml_h = _xhtml_hash(xhtml)
             if existing is not None and client.get_content_hash(str(existing["id"])) == xhtml_h:
@@ -664,12 +669,12 @@ def _post_process_action(
     # Set Confluence page status (rough-draft / in-progress / etc.) — non-fatal.
     if action.page_id and action.confluence_status and not action.is_folder:
         try:
-            print(f"  [status] setting '{action.confluence_status}' on page {action.page_id!r}...", file=sys.stderr)
+            print(f"  [status] setting '{action.confluence_status}' on page {action.page_id!r}...")
             client.set_page_status(action.page_id, action.confluence_status, space_key=space_key)
-            print("  [status] ok", file=sys.stderr)
+            print("  [status] ok")
         except Exception as exc:
             # Always print status errors — user configured status explicitly
-            print(f"  [warn] could not set page status '{action.confluence_status}': {exc}", file=sys.stderr)
+            print(f"  [warn] could not set page status '{action.confluence_status}': {exc}")
 
     # Upload assets — skip files whose mtime is not newer than Confluence.
     if action.page_id and action.attachments:
@@ -734,14 +739,12 @@ def execute_publish(
                 try:
                     print(
                         f"  [status] setting '{action.confluence_status}' on page {action.page_id!r}...",
-                        file=sys.stderr,
                     )
                     client.set_page_status(action.page_id, action.confluence_status, space_key=space_key)
-                    print("  [status] ok", file=sys.stderr)
+                    print("  [status] ok")
                 except Exception as exc:
                     print(
                         f"  [warn] could not set page status '{action.confluence_status}': {exc}",
-                        file=sys.stderr,
                     )
             continue
 

{mkdocs2confluence-0.7.26 → mkdocs2confluence-0.7.28}/tests/test_publish_pipeline.py

@@ -1945,3 +1945,100 @@ def test_execute_publish_quiet_suppresses_stdout(tmp_path: Path, capsys: pytest.
 
     out, _ = capsys.readouterr()
     assert out == ""
+
+
+# ── Status: end-to-end flow ───────────────────────────────────────────────────
+
+
+def test_compile_page_returns_confluence_status(tmp_path: Path) -> None:
+    """compile_page must return the status: value from front matter."""
+    docs = tmp_path / "docs"
+    docs.mkdir()
+    md = docs / "page.md"
+    md.write_text("---\nstatus: in-progress\n---\n\n# My Page\n\nContent.\n", encoding="utf-8")
+
+    node = _page_node("My Page", md)
+    config = _make_config(docs)
+    _, _, _, confluence_status = compile_page(node, config)
+
+    assert confluence_status == "in-progress"
+
+
+def test_plan_publish_sets_confluence_status_on_create(tmp_path: Path) -> None:
+    """plan_publish must carry confluence_status into a create PageAction."""
+    docs = tmp_path / "docs"
+    docs.mkdir()
+    md = docs / "page.md"
+    md.write_text("---\nstatus: in-progress\n---\n\n# My Page\n\nContent.\n", encoding="utf-8")
+
+    node = _page_node("My Page", md)
+    config = _make_config(docs)
+    conf_config = _make_conf_config()
+
+    client = MagicMock()
+    client.find_page.return_value = None
+
+    plan = plan_publish([node], client, config, conf_config, space_id="42")
+
+    assert plan[0].action == "create"
+    assert plan[0].confluence_status == "in-progress"
+
+
+def test_plan_publish_sets_confluence_status_on_skip(tmp_path: Path) -> None:
+    """plan_publish must carry confluence_status into a skip (unchanged) PageAction."""
+    from mkdocs_to_confluence.publisher.pipeline import _xhtml_hash
+
+    docs = tmp_path / "docs"
+    docs.mkdir()
+    md = docs / "page.md"
+    md.write_text("---\nstatus: in-progress\n---\n\n# My Page\n\nContent.\n", encoding="utf-8")
+
+    node = _page_node("My Page", md)
+    config = _make_config(docs)
+    conf_config = _make_conf_config()
+
+    xhtml, _, _, _ = compile_page(node, config)
+    stored_hash = _xhtml_hash(xhtml)
+
+    existing_page = {"id": "77", "version": {"number": 2}}
+    client = MagicMock()
+    client.find_page.return_value = existing_page
+    client.get_content_hash.return_value = stored_hash
+
+    plan = plan_publish([node], client, config, conf_config, space_id="42")
+
+    assert plan[0].action == "skip"
+    assert plan[0].confluence_status == "in-progress"
+
+
+def test_execute_publish_calls_set_page_status_on_create(tmp_path: Path) -> None:
+    """execute_publish must call client.set_page_status for a created page with confluence_status."""
+    from mkdocs_to_confluence.publisher.pipeline import execute_publish
+
+    node = _make_section_node("P", [])
+    action = PageAction(
+        node=node, title="P", action="create",
+        parent_id=None, xhtml="<p/>", confluence_status="in-progress",
+    )
+    client = MagicMock()
+    client.create_page.return_value = {"id": "99"}
+
+    execute_publish([action], client, space_id="42", docs_dir=tmp_path)
+
+    client.set_page_status.assert_called_once_with("99", "in-progress", space_key=None)
+
+
+def test_execute_publish_calls_set_page_status_on_skip(tmp_path: Path) -> None:
+    """execute_publish must call client.set_page_status even for skipped (unchanged) pages."""
+    from mkdocs_to_confluence.publisher.pipeline import execute_publish
+
+    node = _make_section_node("P", [])
+    action = PageAction(
+        node=node, title="P", action="skip",
+        parent_id=None, page_id="88", confluence_status="in-progress",
+    )
+    client = MagicMock()
+
+    execute_publish([action], client, space_id="42", docs_dir=tmp_path)
+
+    client.set_page_status.assert_called_once_with("88", "in-progress", space_key=None)