mkdocs2confluence 0.7.34__tar.gz → 0.7.36__tar.gz

{mkdocs2confluence-0.7.34 → mkdocs2confluence-0.7.36}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mkdocs2confluence
-Version: 0.7.34
+Version: 0.7.36
 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.34 → mkdocs2confluence-0.7.36}/pyproject.toml

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mkdocs2confluence
-Version: 0.7.34
+Version: 0.7.36
 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.34 → mkdocs2confluence-0.7.36}/src/mkdocs_to_confluence/publisher/pipeline.py

@@ -647,7 +647,7 @@ def _post_process_action(
         except Exception:
             pass  # non-fatal
 
-    # Set full-width layout on newly created or updated pages (not folders).
+    # Set full-width layout on created/updated pages (not folders).
     if full_width and action.page_id and not action.is_folder:
         try:
             client.set_page_full_width(action.page_id)
@@ -729,7 +729,13 @@ def execute_publish(
     for action in plan:
         if action.action == "skip":
             report.skipped += 1
-            # Still apply status even for unchanged pages.
+            # Still apply full-width and status even for unchanged pages so that
+            # Confluence appearance resets (e.g. after manual edits) are corrected.
+            if full_width and action.page_id and not action.is_folder:
+                try:
+                    client.set_page_full_width(action.page_id)
+                except Exception as exc:
+                    print(f"  [warn] could not set full-width on page {action.page_id!r}: {exc}")
             if action.page_id and action.confluence_status and not action.is_folder:
                 try:
                     print(

{mkdocs2confluence-0.7.34 → mkdocs2confluence-0.7.36}/tests/test_publish_client.py

@@ -192,7 +192,7 @@ def test_set_page_status_sends_put() -> None:
 
 
 def test_set_page_status_uses_space_state_when_matched() -> None:
-    """set_page_status sends {id, name, color} when a matching space state is found."""
+    """set_page_status sends {id, name, color} and ?status=current query param."""
     space_states = [{"id": 1, "name": "In Progress", "color": "#2684ff"}]
     available_resp = httpx.Response(200, json={"spaceContentStates": space_states, "customContentStates": []})
     put_resp = httpx.Response(200, json={})
@@ -202,8 +202,10 @@ def test_set_page_status_uses_space_state_when_matched() -> None:
         client._client = httpx.Client(transport=transport)  # type: ignore[assignment]
         client.set_page_status("42", "in-progress")
     import json
-    body = json.loads(transport.requests[1].content)
+    put_req = transport.requests[1]
+    body = json.loads(put_req.content)
     assert body == {"id": 1, "name": "In Progress", "color": "#2684ff"}
+    assert "status=current" in str(put_req.url)
 
 
 def test_set_page_status_caches_space_states() -> None:

{mkdocs2confluence-0.7.34 → mkdocs2confluence-0.7.36}/tests/test_publish_pipeline.py

@@ -1964,6 +1964,30 @@ def test_compile_page_returns_confluence_status(tmp_path: Path) -> None:
     assert confluence_status == "in-progress"
 
 
+def test_compile_page_returns_confluence_status_with_repo_url(tmp_path: Path) -> None:
+    """confluence_status must survive attach_source_url when repo_url is set (regression).
+
+    When repo_url is configured, attach_source_url reconstructs the FrontMatter node.
+    This test ensures confluence_status is not silently dropped in that path.
+    """
+    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 = MkDocsConfig(
+        site_name="Test",
+        docs_dir=docs,
+        repo_url="https://github.com/org/repo",
+        edit_uri="edit/main/docs/",
+        nav=None,
+    )
+    _, _, _, 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"