♻️ Move saving files out of adapters.

src/rybak/adapter.py

@@ -1,5 +1,4 @@
 import abc
-from pathlib import Path
 
 from ._types import LoopOverFn, TemplateData
 from .pycompat import Traversable
@@ -11,7 +10,7 @@ def render_str(self, template: str, data: TemplateData, loop_over: LoopOverFn) -
         pass
 
     @abc.abstractmethod
-    def render_file(self, template_path: str, target_file: Path, data: TemplateData) -> None:
+    def render_file(self, template_path: str, data: TemplateData) -> str:
         pass
 
     @property

src/rybak/jinja.py

@@ -44,13 +44,12 @@ def render_str(self, template: str, data: TemplateData, loop_over: Optional[Loop
         except (jinja2.TemplateError, ValueError) as e:
             raise RenderError(template) from e
 
-    def render_file(self, template_path: str, target_file: Path, data: TemplateData) -> None:
+    def render_file(self, template_path: str, data: TemplateData) -> str:
         try:
             template_obj = self._env.get_template(template_path)
-            text = template_obj.render(**data)
+            return template_obj.render(**data)
         except (jinja2.TemplateError, ValueError) as e:
-            raise RenderError(template_path, target_file) from e
-        target_file.write_text(text)
+            raise RenderError(template_path) from e
 
     @property
     def template_root(self) -> Traversable:

src/rybak/mako.py

@@ -26,13 +26,12 @@ def render_str(self, template: str, data: TemplateData, loop_over: Optional[Loop
         except (AttributeError, mako.exceptions.MakoException, ValueError, TypeError) as e:
             raise RenderError(template) from e
 
-    def render_file(self, template_path: str, target_file: Path, data: TemplateData) -> None:
+    def render_file(self, template_path: str, data: TemplateData) -> str:
         try:
             template = self._loader.get_template(template_path)
-            text = template.render(**data)
+            return template.render(**data)
         except (AttributeError, mako.exceptions.MakoException, ValueError) as e:
-            raise RenderError(template_path, target_file) from e
-        target_file.write_text(text)
+            raise RenderError(template_path) from e
 
     @property
     def template_root(self) -> Traversable:

src/rybak/tree_renderer.py

@@ -175,11 +175,8 @@ def _render_file_name(self, template: str, data: TemplateData, loop_over: LoopOv
     def _render_file(self, template_path: PurePath, target_path: Path, data: TemplateData) -> None:
         target_path.parent.mkdir(parents=True, exist_ok=True)
 
-        self._adapter.render_file(
-            template_path.as_posix(),
-            target_path,
-            data,
-        )
+        text = self._adapter.render_file(template_path.as_posix(), data)
+        target_path.write_text(text)
 
     @property
     def template_root(self) -> PurePath:

tests/test_render.py

@@ -73,7 +73,7 @@ def test_remove_stale(tmp_path: pathlib.Path):
         remove_stale=True,
     )
 
-    assert dir_content(root / 'output' / 'simple') == dir_content(tmp_path)
+    assert dir_content(tmp_path) == dir_content(root / 'output' / 'simple')
 
 
 def test_no_remove_stale(tmp_path: pathlib.Path):
@@ -95,4 +95,14 @@ def test_no_remove_stale(tmp_path: pathlib.Path):
         remove_stale=False,
     )
 
-    assert dir_content(root / 'output' / 'simple') != dir_content(tmp_path)
+    assert set(dir_content(tmp_path)) == {
+        ('file1.txt', 'foo'),
+        ('stale_dir', None),
+        ('stale_dir/stale_file.txt', 'another test file'),
+        ('stale_file.txt', 'test file'),
+        ('subdir', None),
+        ('subdir/file3.txt', 'baz'),
+        ('target_dir', None),
+        ('target_dir/file2.txt', 'bar'),
+        ('target_dir/suffixed.txt', 'test suffix removal\n'),
+    }