mkdocs2confluence 0.8.2__tar.gz → 0.8.4__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mkdocs2confluence
-Version: 0.8.2
+Version: 0.8.4
 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
@@ -326,7 +326,7 @@ confluence:
 
 **Workflow:**
 
-1. Run `mk2conf publish` first — generates `.mk2conf-pages.json` mapping source files to Confluence page IDs.
+1. Run `mk2conf publish` (full or partial) — writes/merges `.mk2conf-pages.json` mapping source files to Confluence page IDs. Every publish run merges into this file, so partial `--page` / `--section` runs and multiple configs in the same repo all accumulate correctly.
 2. Run `mk2conf sync-comments` — for each page with open Confluence comments, creates a `mk2conf/review/{slug}` branch and PR, then posts each comment as a GitHub review thread. Inline comments with a text selection are anchored to the matching source line; page-level comments fall back to file-level review threads. Every thread body includes a **View in Confluence** deep-link that opens Confluence focused on the exact comment.
 3. Developer addresses feedback on the branch, pushes changes, and merges the PR.
 4. Run `mk2conf sync-comments --check-merges` — detects merged PRs, adds a resolution reply to each Confluence comment with the commit info, and marks the comments as resolved.
@@ -335,7 +335,7 @@ confluence:
 
 | File | Purpose |
 |---|---|
-| `.mk2conf-pages.json` | Source path → Confluence page ID map, written after each `publish` |
+| `.mk2conf-pages.json` | Source path → Confluence page ID map, merged after each `publish` run |
 | `.mk2conf-sync-state.json` | Tracks open/merged review PRs and their associated comment IDs |
 
 ---

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

@@ -286,7 +286,7 @@ confluence:
 
 **Workflow:**
 
-1. Run `mk2conf publish` first — generates `.mk2conf-pages.json` mapping source files to Confluence page IDs.
+1. Run `mk2conf publish` (full or partial) — writes/merges `.mk2conf-pages.json` mapping source files to Confluence page IDs. Every publish run merges into this file, so partial `--page` / `--section` runs and multiple configs in the same repo all accumulate correctly.
 2. Run `mk2conf sync-comments` — for each page with open Confluence comments, creates a `mk2conf/review/{slug}` branch and PR, then posts each comment as a GitHub review thread. Inline comments with a text selection are anchored to the matching source line; page-level comments fall back to file-level review threads. Every thread body includes a **View in Confluence** deep-link that opens Confluence focused on the exact comment.
 3. Developer addresses feedback on the branch, pushes changes, and merges the PR.
 4. Run `mk2conf sync-comments --check-merges` — detects merged PRs, adds a resolution reply to each Confluence comment with the commit info, and marks the comments as resolved.
@@ -295,7 +295,7 @@ confluence:
 
 | File | Purpose |
 |---|---|
-| `.mk2conf-pages.json` | Source path → Confluence page ID map, written after each `publish` |
+| `.mk2conf-pages.json` | Source path → Confluence page ID map, merged after each `publish` run |
 | `.mk2conf-sync-state.json` | Tracks open/merged review PRs and their associated comment IDs |
 
 ---

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mkdocs2confluence
-Version: 0.8.2
+Version: 0.8.4
 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
@@ -326,7 +326,7 @@ confluence:
 
 **Workflow:**
 
-1. Run `mk2conf publish` first — generates `.mk2conf-pages.json` mapping source files to Confluence page IDs.
+1. Run `mk2conf publish` (full or partial) — writes/merges `.mk2conf-pages.json` mapping source files to Confluence page IDs. Every publish run merges into this file, so partial `--page` / `--section` runs and multiple configs in the same repo all accumulate correctly.
 2. Run `mk2conf sync-comments` — for each page with open Confluence comments, creates a `mk2conf/review/{slug}` branch and PR, then posts each comment as a GitHub review thread. Inline comments with a text selection are anchored to the matching source line; page-level comments fall back to file-level review threads. Every thread body includes a **View in Confluence** deep-link that opens Confluence focused on the exact comment.
 3. Developer addresses feedback on the branch, pushes changes, and merges the PR.
 4. Run `mk2conf sync-comments --check-merges` — detects merged PRs, adds a resolution reply to each Confluence comment with the commit info, and marks the comments as resolved.
@@ -335,7 +335,7 @@ confluence:
 
 | File | Purpose |
 |---|---|
-| `.mk2conf-pages.json` | Source path → Confluence page ID map, written after each `publish` |
+| `.mk2conf-pages.json` | Source path → Confluence page ID map, merged after each `publish` run |
 | `.mk2conf-sync-state.json` | Tracks open/merged review PRs and their associated comment IDs |
 
 ---

{mkdocs2confluence-0.8.2 → mkdocs2confluence-0.8.4}/src/mkdocs_to_confluence/publisher/client.py

@@ -554,7 +554,6 @@ class ConfluenceClient:
             next_url = data.get("_links", {}).get("next")
             if not next_url:
                 break
-            url = self._v2(f"/pages/{page_id}/inline-comments")
             params = {"resolution-status": "open", "body-format": "storage",
                       "limit": 250, "cursor": _extract_cursor(next_url)}
         return results
@@ -572,7 +571,6 @@ class ConfluenceClient:
             next_url = data.get("_links", {}).get("next")
             if not next_url:
                 break
-            url = self._v2(f"/pages/{page_id}/footer-comments")
             params = {"resolution-status": "open", "body-format": "storage",
                       "limit": 250, "cursor": _extract_cursor(next_url)}
         return results

{mkdocs2confluence-0.8.2 → mkdocs2confluence-0.8.4}/src/mkdocs_to_confluence/sync/command.py

@@ -57,7 +57,8 @@ def run_sync_comments(
 
     Returns the number of new PRs created.
     """
-    assert config.confluence is not None
+    if config.confluence is None:
+        raise RuntimeError("run_sync_comments called without a 'confluence:' config section")
     conf = config.confluence
 
     page_map = load_page_map(config_dir)
@@ -121,7 +122,7 @@ def run_sync_comments(
 
         state.prs[str(pr_number)] = PRRecord(
             page_id=page_id,
-            page_title=pr_title,
+            pr_title=pr_title,
             source_path=source_path,
             branch=branch,
             pr_number=pr_number,

{mkdocs2confluence-0.8.2 → mkdocs2confluence-0.8.4}/src/mkdocs_to_confluence/sync/state.py

@@ -12,7 +12,7 @@ class PRRecord:
     """Everything we need to know about one open or merged review PR."""
 
     page_id: str
-    page_title: str
+    pr_title: str                   # PR title, e.g. "Documentation review: docs/foo.md"
     source_path: str            # repo-relative, e.g. "docs/architecture/overview.md"
     branch: str
     pr_number: int

{mkdocs2confluence-0.8.2 → mkdocs2confluence-0.8.4}/tests/test_cli.py

@@ -27,7 +27,7 @@ def _minimal_config(tmp_path: Path, *, extra: str = "") -> Path:
         """),
         encoding="utf-8",
     )
-    (tmp_path / "docs").mkdir()
+    (tmp_path / "docs").mkdir(exist_ok=True)
     return yml
 
 
@@ -237,3 +237,59 @@ class TestWatchFlag:
             main(["preview", "--config", str(yml), "--page", "index.md", "--watch"])
 
         mock_render.assert_called_once()
+
+
+class TestPageMap:
+    """The page map (.mk2conf-pages.json) should merge on every publish run."""
+
+    def _run_publish(self, tmp_path: Path, plan_actions: list) -> None:
+        yml = _minimal_config(tmp_path)
+        (tmp_path / "docs").mkdir(exist_ok=True)
+        (tmp_path / "docs" / "index.md").write_text("# Home\n", encoding="utf-8")
+        mock_client = MagicMock()
+        mock_client.__enter__ = MagicMock(return_value=mock_client)
+        mock_client.__exit__ = MagicMock(return_value=False)
+        mock_client.get_space_id.return_value = "~SPACE"
+        with patch("mkdocs_to_confluence.publisher.client.ConfluenceClient", return_value=mock_client), \
+             patch("mkdocs_to_confluence.publisher.pipeline.plan_publish", return_value=plan_actions), \
+             patch("mkdocs_to_confluence.publisher.pipeline.execute_publish", return_value=MagicMock(
+                 __str__=lambda s: "0 created",
+                 errors=[],
+             )), \
+             patch("sys.stdout.isatty", return_value=False):
+            main(["publish", "--config", str(yml), "--quiet"])
+
+    def _make_action(self, docs_path: str, page_id: str) -> MagicMock:
+        action = MagicMock()
+        action.node.docs_path = docs_path
+        action.page_id = page_id
+        action.is_folder = False
+        return action
+
+    def test_page_map_written_on_full_publish(self, tmp_path: Path) -> None:
+        action = self._make_action("index.md", "111")
+        self._run_publish(tmp_path, [action])
+        import json
+        pm = json.loads((tmp_path / ".mk2conf-pages.json").read_text())
+        assert "docs/index.md" in pm
+        assert pm["docs/index.md"] == "111"
+
+    def test_page_map_merges_on_second_publish(self, tmp_path: Path) -> None:
+        import json
+        # First publish: index.md
+        self._run_publish(tmp_path, [self._make_action("index.md", "111")])
+        # Second publish: overview.md only
+        self._run_publish(tmp_path, [self._make_action("overview.md", "222")])
+        pm = json.loads((tmp_path / ".mk2conf-pages.json").read_text())
+        # Both entries should be present
+        assert pm.get("docs/index.md") == "111"
+        assert pm.get("docs/overview.md") == "222"
+
+    def test_page_map_merge_updates_existing_entry(self, tmp_path: Path) -> None:
+        import json
+        # First publish: index.md with page_id 111
+        self._run_publish(tmp_path, [self._make_action("index.md", "111")])
+        # Second publish: same file, new page_id (e.g. recreated)
+        self._run_publish(tmp_path, [self._make_action("index.md", "999")])
+        pm = json.loads((tmp_path / ".mk2conf-pages.json").read_text())
+        assert pm["docs/index.md"] == "999"

{mkdocs2confluence-0.8.2 → mkdocs2confluence-0.8.4}/tests/test_sync_command.py

@@ -88,7 +88,7 @@ def test_run_sync_comments_skips_page_with_open_pr(tmp_path: Path) -> None:
     existing = {
         "10": {
             "page_id": "111",
-            "page_title": "Overview",
+            "pr_title": "Overview",
             "source_path": "docs/overview.md",
             "branch": "mk2conf/review/overview",
             "pr_number": 10,
@@ -199,7 +199,7 @@ def test_check_and_resolve_merges_resolves_merged_pr(tmp_path: Path) -> None:
     existing = {
         "10": {
             "page_id": "111",
-            "page_title": "Overview",
+            "pr_title": "Overview",
             "source_path": "docs/overview.md",
             "branch": "mk2conf/review/overview",
             "pr_number": 10,
@@ -240,7 +240,7 @@ def test_check_and_resolve_merges_skips_already_merged(tmp_path: Path) -> None:
     existing = {
         "10": {
             "page_id": "111",
-            "page_title": "Overview",
+            "pr_title": "Overview",
             "source_path": "docs/overview.md",
             "branch": "mk2conf/review/overview",
             "pr_number": 10,
@@ -295,7 +295,7 @@ def test_run_sync_verbose_skip_message(tmp_path: Path, capsys: pytest.CaptureFix
     existing = {
         "10": {
             "page_id": "111",
-            "page_title": "Overview",
+            "pr_title": "Overview",
             "source_path": "docs/overview.md",
             "branch": "mk2conf/review/overview",
             "pr_number": 10,
@@ -508,7 +508,7 @@ def test_check_merges_verbose_output(tmp_path: Path, capsys: pytest.CaptureFixtu
     existing = {
         "5": {
             "page_id": "AAA",
-            "page_title": "Overview",
+            "pr_title": "Overview",
             "source_path": "docs/overview.md",
             "branch": "mk2conf/review/overview",
             "pr_number": 5,
@@ -542,7 +542,7 @@ def test_check_merges_verbose_no_merges(tmp_path: Path, capsys: pytest.CaptureFi
     existing = {
         "5": {
             "page_id": "AAA",
-            "page_title": "Overview",
+            "pr_title": "Overview",
             "source_path": "docs/overview.md",
             "branch": "mk2conf/review/overview",
             "pr_number": 5,
@@ -574,7 +574,7 @@ def test_check_merges_resolve_failure_warns(tmp_path: Path, capsys: pytest.Captu
     existing = {
         "6": {
             "page_id": "BBB",
-            "page_title": "Guide",
+            "pr_title": "Guide",
             "source_path": "docs/guide.md",
             "branch": "mk2conf/review/guide",
             "pr_number": 6,
@@ -609,7 +609,7 @@ def test_check_merges_no_commit_sha(tmp_path: Path) -> None:
     existing = {
         "7": {
             "page_id": "CCC",
-            "page_title": "Ops",
+            "pr_title": "Ops",
             "source_path": "docs/ops.md",
             "branch": "mk2conf/review/ops",
             "pr_number": 7,

{mkdocs2confluence-0.8.2 → mkdocs2confluence-0.8.4}/tests/test_sync_state.py

@@ -10,7 +10,7 @@ from mkdocs_to_confluence.sync.state import PRRecord, SyncState
 def _make_record(**kwargs: object) -> PRRecord:
     defaults: dict = {
         "page_id": "111",
-        "page_title": "My Page",
+        "pr_title": "My Page",
         "source_path": "docs/my-page.md",
         "branch": "mk2conf/review/my-page",
         "pr_number": 42,