confpub-cli 1.7.1__tar.gz → 1.7.2__tar.gz

{confpub_cli-1.7.1 → confpub_cli-1.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: confpub-cli
-Version: 1.7.1
+Version: 1.7.2
 Summary: Agent-first CLI to publish Markdown to Confluence
 Project-URL: Homepage, https://github.com/ThomasRohde/confpub-cli
 Project-URL: Repository, https://github.com/ThomasRohde/confpub-cli.git

{confpub_cli-1.7.1 → confpub_cli-1.7.2}/confpub/__init__.py

@@ -1,3 +1,3 @@
 """confpub — Agent-first CLI to publish Markdown to Confluence."""
 
-__version__ = "1.7.1"
+__version__ = "1.7.2"

{confpub_cli-1.7.1 → confpub_cli-1.7.2}/confpub/reverse_converter.py

@@ -452,14 +452,18 @@ def _preprocess_storage_format(html: str) -> tuple[BeautifulSoup, list[str]]:
             if next_sib and next_sib.name == "ol":
                 hr.decompose()
 
-    # 5. Transform ac:layout → div[data-layout-macro]
+    # 5. Transform ac:layout → div[data-layout-macro] per section
     for layout in soup.find_all("ac:layout"):
-        layout_div = soup.new_tag("div")
-        layout_div["data-layout-macro"] = "layout"
-        section = layout.find("ac:layout-section")
-        if section:
+        sections = layout.find_all("ac:layout-section", recursive=False)
+        if not sections:
+            layout.decompose()
+            continue
+        # Build one layout div per section, then replace the ac:layout
+        section_divs = []
+        for section in sections:
+            layout_div = soup.new_tag("div")
+            layout_div["data-layout-macro"] = "layout"
             layout_type = section.get("ac:type", "single")
-            # Convert underscores back to hyphens
             layout_type = layout_type.replace("_", "-")
             layout_div["data-layout-type"] = layout_type
             for cell in section.find_all("ac:layout-cell", recursive=False):
@@ -468,7 +472,11 @@ def _preprocess_storage_format(html: str) -> tuple[BeautifulSoup, list[str]]:
                 for child in list(cell.children):
                     cell_div.append(child.extract())
                 layout_div.append(cell_div)
-        layout.replace_with(layout_div)
+            section_divs.append(layout_div)
+        # Insert all section divs after the layout, then remove it
+        for div in reversed(section_divs):
+            layout.insert_after(div)
+        layout.decompose()
 
     # 6. Transform ac:link → a
     for link in soup.find_all("ac:link"):

{confpub_cli-1.7.1 → confpub_cli-1.7.2}/tests/test_reverse_converter.py

@@ -355,6 +355,50 @@ class TestLayoutReverse:
         assert "Right" in result.markdown
         assert "::::" in result.markdown
 
+    def test_layout_multiple_sections(self):
+        """Multiple ac:layout-section elements must all be converted (bug fix)."""
+        html = (
+            '<ac:layout>'
+            '<ac:layout-section ac:type="single">'
+            '<ac:layout-cell><p>Section one</p></ac:layout-cell>'
+            '</ac:layout-section>'
+            '<ac:layout-section ac:type="single">'
+            '<ac:layout-cell>'
+            '<h1>Main heading</h1>'
+            '<p>Body paragraph with <strong>bold</strong> text.</p>'
+            '<ul><li>Item A</li><li>Item B</li></ul>'
+            '</ac:layout-cell>'
+            '</ac:layout-section>'
+            '</ac:layout>'
+        )
+        result = convert_storage_to_markdown(html)
+        assert "Section one" in result.markdown
+        assert "# Main heading" in result.markdown
+        assert "Body paragraph" in result.markdown
+        assert "**bold**" in result.markdown
+        assert "Item A" in result.markdown
+        assert "Item B" in result.markdown
+
+    def test_layout_mixed_section_types(self):
+        """Sections with different layout types preserve their types."""
+        html = (
+            '<ac:layout>'
+            '<ac:layout-section ac:type="single">'
+            '<ac:layout-cell><p>Full width</p></ac:layout-cell>'
+            '</ac:layout-section>'
+            '<ac:layout-section ac:type="two_left_sidebar">'
+            '<ac:layout-cell><p>Sidebar</p></ac:layout-cell>'
+            '<ac:layout-cell><p>Main content</p></ac:layout-cell>'
+            '</ac:layout-section>'
+            '</ac:layout>'
+        )
+        result = convert_storage_to_markdown(html)
+        assert ":::: layout single" in result.markdown
+        assert ":::: layout two-left-sidebar" in result.markdown
+        assert "Full width" in result.markdown
+        assert "Sidebar" in result.markdown
+        assert "Main content" in result.markdown
+
 
 class TestPluginRoundTrips:
     """Test round-trip conversion for new plugin features."""