tilemap-editor 3.1.4__tar.gz → 3.1.6__tar.gz

{tilemap_editor-3.1.4/src/tilemap_editor.egg-info → tilemap_editor-3.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tilemap-editor
-Version: 3.1.4
+Version: 3.1.6
 Summary: Pygame tilemap editor with SVG icons, professional UI, and sprite animation tools
 Author: tilemap editor contributors
 License: Proprietary

{tilemap_editor-3.1.4 → tilemap_editor-3.1.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tilemap-editor"
-version = "3.1.4"
+version = "3.1.6"
 description = "Pygame tilemap editor with SVG icons, professional UI, and sprite animation tools"
 readme = "README.md"
 requires-python = ">=3.10"

{tilemap_editor-3.1.4 → tilemap_editor-3.1.6}/src/tilemap.py

@@ -302,7 +302,7 @@ class Tilemap:
                 save_data["resources"]["tilesets"].append(ts_data)
 
         if hasattr(self.editor, "autotiler") and self.editor.autotiler:
-            if not hasattr(save_data["project_state"], "groups"):
+            if "groups" not in save_data["project_state"]:
                 save_data["project_state"]["groups"] = []
 
             for group in self.editor.autotiler.groups:
@@ -320,7 +320,7 @@ class Tilemap:
             save_data["project_state"]["rules"] = []
             for rule in self.editor.autotiler.rules:
                 save_data["project_state"]["rules"].append(
-                    self._serialize_autotile_rule(rule, base_path)
+                    self._serialize_autotile_rule(rule, map_dir)
                 )
 
         # Save automap pattern rules
@@ -409,10 +409,10 @@ class Tilemap:
             "Cannot determine base_path - Editor not initialized with settings.json"
         )
 
-    def _serialize_autotile_rule(self, rule: "AutotileRule", base_path: Path) -> dict:
+    def _serialize_autotile_rule(self, rule: "AutotileRule", save_dir: Path) -> dict:
         data = rule.to_dict()
         if data.get("tileset_path"):
-            data["tileset_path"] = to_project_path(data["tileset_path"], base_path)
+            data["tileset_path"] = to_project_path(data["tileset_path"], save_dir)
         return data
 
     def _path_matches_project_path(self, stored_path: str, actual_path: Path) -> bool:
@@ -520,8 +520,8 @@ class Tilemap:
 
                 p = resolve_project_path(
                     path_str,
-                    self._project_base_path(),
-                    fallback_roots=[path.parent],
+                    path.parent,
+                    fallback_roots=[self._project_base_path()],
                     must_exist=True,
                 )
 

{tilemap_editor-3.1.4 → tilemap_editor-3.1.6/src/tilemap_editor.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tilemap-editor
-Version: 3.1.4
+Version: 3.1.6
 Summary: Pygame tilemap editor with SVG icons, professional UI, and sprite animation tools
 Author: tilemap editor contributors
 License: Proprietary

{tilemap_editor-3.1.4 → tilemap_editor-3.1.6}/src/tilemap_editor.egg-info/SOURCES.txt

@@ -176,4 +176,5 @@ src/widgets/ui/tooltip.py
 tests/test_collision_layer_mask.py
 tests/test_collision_layer_sidebar.py
 tests/test_project_paths.py
-tests/test_render_scale.py
+tests/test_render_scale.py
+tests/test_tilemap_save.py

tilemap_editor-3.1.6/tests/test_tilemap_save.py

@@ -0,0 +1,154 @@
+"""
+Tests for Tilemap.save_map.
+
+Catches regressions like referencing undefined variables in the
+save path (e.g., `base_path` instead of `map_dir` when serializing
+autotile rules).
+"""
+
+import json
+import tempfile
+from pathlib import Path
+
+import pytest
+
+import sys
+sys.path.insert(0, str(Path(__file__).parent.parent / "src"))
+
+
+class TestSaveMapAutotileRules:
+    """save_map must handle autotile rules without NameError"""
+
+    @pytest.fixture
+    def fake_autotiler(self):
+        class FakeRule:
+            def __init__(self, name: str):
+                self.name = name
+                self.tileset_path = ""
+                self.tileset_index = None
+                self.variant_ids = []
+                self.group_id = name
+
+            def to_dict(self):
+                return {
+                    "name": self.name,
+                    "neighbors": [],
+                    "tileset_path": self.tileset_path,
+                    "tileset_index": self.tileset_index,
+                    "variant_ids": self.variant_ids,
+                    "group_id": self.group_id,
+                }
+
+        class FakeGroup:
+            def __init__(self, name: str, rules):
+                self.name = name
+                self.rules = rules
+
+        class FakeAutotiler:
+            groups = [FakeGroup("Test", [FakeRule("rule_a"), FakeRule("rule_b")])]
+
+            @property
+            def rules(self):
+                all_rules = []
+                for g in self.groups:
+                    all_rules.extend(g.rules)
+                return all_rules
+
+        return FakeAutotiler()
+
+    @pytest.fixture
+    def editor(self, fake_autotiler):
+        class FakeTilesetWidget:
+            tilesets = []
+
+        class FakeTileGrid:
+            zoom_level = 1.0
+            scroll_x = 0
+            scroll_y = 0
+
+        class FakeEditor:
+            tileset_widget = FakeTilesetWidget()
+            tile_grid_widget = FakeTileGrid()
+            autotiler = fake_autotiler
+            base_path = None
+            data_root = None
+            regex_automap_designer = None
+
+        return FakeEditor()
+
+    def test_save_map_with_autotile_rules_succeeds(self, editor):
+        """save_map must not raise when autotiler is configured with rules"""
+        from tilemap import Tilemap
+
+        tm = Tilemap(editor)
+        tm.init_size((16, 16), (10, 10))
+
+        with tempfile.TemporaryDirectory() as tmp:
+            path = Path(tmp) / "test.json"
+            tm.save_map(path)
+            with open(path) as f:
+                data = json.load(f)
+
+        assert "project_state" in data
+        assert "rules" in data["project_state"]
+        assert "groups" in data["project_state"]
+
+    def test_save_map_autotile_rules_serialized_correctly(self, editor):
+        """saved autotile rules should appear in project_state.rules"""
+        from tilemap import Tilemap
+
+        tm = Tilemap(editor)
+        tm.init_size((16, 16), (10, 10))
+
+        with tempfile.TemporaryDirectory() as tmp:
+            path = Path(tmp) / "test.json"
+            tm.save_map(path)
+            with open(path) as f:
+                data = json.load(f)
+
+        rule_names = [r["name"] for r in data["project_state"]["rules"]]
+        assert "rule_a" in rule_names
+        assert "rule_b" in rule_names
+
+    def test_save_map_autotile_groups_serialized_correctly(self, editor):
+        """saved autotile groups should appear in project_state.groups"""
+        from tilemap import Tilemap
+
+        tm = Tilemap(editor)
+        tm.init_size((16, 16), (10, 10))
+
+        with tempfile.TemporaryDirectory() as tmp:
+            path = Path(tmp) / "test.json"
+            tm.save_map(path)
+            with open(path) as f:
+                data = json.load(f)
+
+        group_names = [g["name"] for g in data["project_state"]["groups"]]
+        assert "Test" in group_names
+
+    def test_save_map_without_autotiler_still_works(self):
+        """Regression: save_map must work when autotiler is absent"""
+        from tilemap import Tilemap
+
+        class FakeTilesetWidget:
+            tilesets = []
+
+        class FakeTileGrid:
+            zoom_level = 1.0
+            scroll_x = 0
+            scroll_y = 0
+
+        class FakeEditor:
+            tileset_widget = FakeTilesetWidget()
+            tile_grid_widget = FakeTileGrid()
+            autotiler = None
+            base_path = None
+            data_root = None
+            regex_automap_designer = None
+
+        tm = Tilemap(FakeEditor())
+        tm.init_size((16, 16), (10, 10))
+
+        with tempfile.TemporaryDirectory() as tmp:
+            path = Path(tmp) / "test.json"
+            tm.save_map(path)