etlplus 0.11.3__tar.gz → 0.11.5__tar.gz

{etlplus-0.11.3/etlplus.egg-info → etlplus-0.11.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: etlplus
-Version: 0.11.3
+Version: 0.11.5
 Summary: A Swiss Army knife for simple ETL operations
 Home-page: https://github.com/Dagitali/ETLPlus
 Author: ETLPlus Team

{etlplus-0.11.3 → etlplus-0.11.5}/etlplus/database/ddl.py

@@ -203,7 +203,7 @@ def load_table_spec(
         raise ValueError('Spec must be .json, .yml, or .yaml')
 
     try:
-        spec = File.read_file(spec_path)
+        spec = File.from_path(spec_path).read()
     except ImportError as e:
         if suffix in {'.yml', '.yaml'}:
             raise RuntimeError(

{etlplus-0.11.3 → etlplus-0.11.5/etlplus.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: etlplus
-Version: 0.11.3
+Version: 0.11.5
 Summary: A Swiss Army knife for simple ETL operations
 Home-page: https://github.com/Dagitali/ETLPlus
 Author: ETLPlus Team

{etlplus-0.11.3 → etlplus-0.11.5}/etlplus.egg-info/SOURCES.txt

@@ -114,7 +114,6 @@ tests/integration/test_i_run_profile_rate_limit_defaults.py
 tests/unit/conftest.py
 tests/unit/test_u_enums.py
 tests/unit/test_u_extract.py
-tests/unit/test_u_file.py
 tests/unit/test_u_load.py
 tests/unit/test_u_main.py
 tests/unit/test_u_mixins.py
@@ -151,5 +150,8 @@ tests/unit/database/test_u_database_ddl.py
 tests/unit/database/test_u_database_engine.py
 tests/unit/database/test_u_database_orm.py
 tests/unit/database/test_u_database_schema.py
+tests/unit/file/test_u_file_core.py
+tests/unit/file/test_u_file_enums.py
+tests/unit/file/test_u_file_yaml.py
 tests/unit/validation/test_u_validation_utils.py
 tools/update_demo_snippets.py

etlplus-0.11.3/tests/unit/test_u_file.py → etlplus-0.11.5/tests/unit/file/test_u_file_core.py

@@ -1,7 +1,7 @@
 """
-:mod:`tests.unit.test_u_file` module.
+:mod:`tests.unit.test_u_file_core` module.
 
-Unit tests for :mod:`etlplus.file`.
+Unit tests for :mod:`etlplus.file.core`.
 
 Notes
 -----
@@ -11,17 +11,13 @@ Notes
 
 from __future__ import annotations
 
-from collections.abc import Generator
 from pathlib import Path
 from typing import cast
 
 import pytest
 
-import etlplus.file.yaml as yaml_module
-from etlplus.file import CompressionFormat
 from etlplus.file import File
 from etlplus.file import FileFormat
-from etlplus.file import infer_file_format_and_compression
 from etlplus.types import JSONDict
 
 # SECTION: HELPERS ========================================================== #
@@ -30,46 +26,6 @@ from etlplus.types import JSONDict
 pytestmark = pytest.mark.unit
 
 
-class _StubYaml:
-    """Minimal PyYAML substitute to avoid optional dependency in tests."""
-
-    def __init__(self) -> None:
-        self.dump_calls: list[dict[str, object]] = []
-
-    def safe_load(
-        self,
-        handle: object,
-    ) -> dict[str, str]:
-        """Stub for PyYAML's ``safe_load`` function."""
-        text = ''
-        if hasattr(handle, 'read'):  # type: ignore[call-arg]
-            text = handle.read()
-        return {'loaded': str(text).strip()}
-
-    def safe_dump(
-        self,
-        data: object,
-        handle: object,
-        **kwargs: object,
-    ) -> None:
-        """Stub for PyYAML's ``safe_dump`` function."""
-        self.dump_calls.append({'data': data, 'kwargs': kwargs})
-        if hasattr(handle, 'write'):
-            handle.write('yaml')  # type: ignore[call-arg]
-
-
-@pytest.fixture(name='yaml_stub')
-def yaml_stub_fixture() -> Generator[_StubYaml]:
-    """Install a stub PyYAML module for YAML tests."""
-    # pylint: disable=protected-access
-
-    stub = _StubYaml()
-    yaml_module._YAML_CACHE.clear()
-    yaml_module._YAML_CACHE['mod'] = stub
-    yield stub
-    yaml_module._YAML_CACHE.clear()
-
-
 # SECTION: TESTS ============================================================ #
 
 
@@ -82,18 +38,18 @@ class TestFile:
     - Exercises JSON detection and defers errors for unknown extensions.
     """
 
-    def test_classmethods_delegate(
+    def test_instance_methods_round_trip(
         self,
         tmp_path: Path,
     ) -> None:
         """
-        Test that ``read_file`` and ``write_file`` round-trip via classmethods.
+        Test :meth:`read` and :meth:`write` round-tripping data.
         """
         path = tmp_path / 'delegated.json'
         data = {'name': 'delegated'}
 
-        File.write_file(path, data, file_format='json')
-        result = File.read_file(path, file_format='json')
+        File(path, file_format=FileFormat.JSON).write(data)
+        result = File(path, file_format=FileFormat.JSON).read()
 
         assert isinstance(result, dict)
         assert result['name'] == 'delegated'
@@ -303,107 +259,3 @@ class TestFile:
         text = path.read_text(encoding='utf-8')
         assert text.startswith('<?xml')
         assert '<records>' in text
-
-
-class TestFileFormat:
-    """Unit test suite for :class:`etlplus.enums.FileFormat`."""
-
-    @pytest.mark.parametrize(
-        'value,expected',
-        [
-            ('JSON', FileFormat.JSON),
-            ('application/xml', FileFormat.XML),
-            ('yml', FileFormat.YAML),
-        ],
-    )
-    def test_aliases(
-        self,
-        value: str,
-        expected: FileFormat,
-    ) -> None:
-        """Test alias coercions."""
-        assert FileFormat.coerce(value) is expected
-
-    def test_coerce(self) -> None:
-        """Test :meth:`coerce`."""
-        assert FileFormat.coerce('csv') is FileFormat.CSV
-
-    def test_invalid_value(self) -> None:
-        """Test that invalid values raise ValueError."""
-        with pytest.raises(ValueError, match='Invalid FileFormat'):
-            FileFormat.coerce('ini')
-
-
-class TestInferFileFormatAndCompression:
-    """Unit test suite for :func:`infer_file_format_and_compression`."""
-
-    @pytest.mark.parametrize(
-        'value,filename,expected_format,expected_compression',
-        [
-            ('data.csv.gz', None, FileFormat.CSV, CompressionFormat.GZ),
-            ('data.jsonl.gz', None, FileFormat.NDJSON, CompressionFormat.GZ),
-            ('data.zip', None, None, CompressionFormat.ZIP),
-            ('application/json; charset=utf-8', None, FileFormat.JSON, None),
-            ('application/gzip', None, None, CompressionFormat.GZ),
-            (
-                'application/octet-stream',
-                'payload.csv.gz',
-                FileFormat.CSV,
-                CompressionFormat.GZ,
-            ),
-            ('application/octet-stream', None, None, None),
-            (FileFormat.GZ, None, None, CompressionFormat.GZ),
-            (CompressionFormat.ZIP, None, None, CompressionFormat.ZIP),
-        ],
-    )
-    def test_infers_format_and_compression(
-        self,
-        value: object,
-        filename: object | None,
-        expected_format: FileFormat | None,
-        expected_compression: CompressionFormat | None,
-    ) -> None:
-        """Test mixed inputs for format and compression inference."""
-        fmt, compression = infer_file_format_and_compression(value, filename)
-        assert fmt is expected_format
-        assert compression is expected_compression
-
-
-@pytest.mark.unit
-class TestYamlSupport:
-    """Unit tests exercising YAML read/write helpers without PyYAML."""
-
-    def test_read_yaml_uses_stub(
-        self,
-        tmp_path: Path,
-        yaml_stub: _StubYaml,
-    ) -> None:
-        """
-        Test reading YAML should invoke stub ``safe_load``.
-        """
-        # pylint: disable=protected-access
-
-        assert yaml_module._YAML_CACHE['mod'] is yaml_stub
-        path = tmp_path / 'data.yaml'
-        path.write_text('name: etl', encoding='utf-8')
-
-        result = File(path, FileFormat.YAML).read()
-
-        assert result == {'loaded': 'name: etl'}
-
-    def test_write_yaml_uses_stub(
-        self,
-        tmp_path: Path,
-        yaml_stub: _StubYaml,
-    ) -> None:
-        """
-        Test writing YAML should invoke stub ``safe_dump``.
-        """
-        path = tmp_path / 'data.yaml'
-        payload = [{'name': 'etl'}]
-
-        written = File(path, FileFormat.YAML).write(payload)
-
-        assert written == 1
-        assert yaml_stub.dump_calls
-        assert yaml_stub.dump_calls[0]['data'] == payload

etlplus-0.11.5/tests/unit/file/test_u_file_enums.py

@@ -0,0 +1,90 @@
+"""
+:mod:`tests.unit.test_u_file_enums` module.
+
+Unit tests for :mod:`etlplus.file.enums`.
+
+Notes
+-----
+- Uses ``tmp_path`` for filesystem isolation.
+- Exercises JSON detection and defers errors for unknown extensions.
+"""
+
+from __future__ import annotations
+
+import pytest
+
+from etlplus.file import CompressionFormat
+from etlplus.file import FileFormat
+from etlplus.file import infer_file_format_and_compression
+
+# SECTION: HELPERS ========================================================== #
+
+
+pytestmark = pytest.mark.unit
+
+
+# SECTION: TESTS ============================================================ #
+
+
+class TestFileFormat:
+    """Unit test suite for :class:`etlplus.enums.FileFormat`."""
+
+    @pytest.mark.parametrize(
+        'value,expected',
+        [
+            ('JSON', FileFormat.JSON),
+            ('application/xml', FileFormat.XML),
+            ('yml', FileFormat.YAML),
+        ],
+    )
+    def test_aliases(
+        self,
+        value: str,
+        expected: FileFormat,
+    ) -> None:
+        """Test alias coercions."""
+        assert FileFormat.coerce(value) is expected
+
+    def test_coerce(self) -> None:
+        """Test :meth:`coerce`."""
+        assert FileFormat.coerce('csv') is FileFormat.CSV
+
+    def test_invalid_value(self) -> None:
+        """Test that invalid values raise ValueError."""
+        with pytest.raises(ValueError, match='Invalid FileFormat'):
+            FileFormat.coerce('ini')
+
+
+class TestInferFileFormatAndCompression:
+    """Unit test suite for :func:`infer_file_format_and_compression`."""
+
+    @pytest.mark.parametrize(
+        'value,filename,expected_format,expected_compression',
+        [
+            ('data.csv.gz', None, FileFormat.CSV, CompressionFormat.GZ),
+            ('data.jsonl.gz', None, FileFormat.NDJSON, CompressionFormat.GZ),
+            ('data.zip', None, None, CompressionFormat.ZIP),
+            ('application/json; charset=utf-8', None, FileFormat.JSON, None),
+            ('application/gzip', None, None, CompressionFormat.GZ),
+            (
+                'application/octet-stream',
+                'payload.csv.gz',
+                FileFormat.CSV,
+                CompressionFormat.GZ,
+            ),
+            ('application/octet-stream', None, None, None),
+            (FileFormat.GZ, None, None, CompressionFormat.GZ),
+            (CompressionFormat.ZIP, None, None, CompressionFormat.ZIP),
+        ],
+    )
+    def test_infers_format_and_compression(
+        self,
+        value: object,
+        filename: object | None,
+        expected_format: FileFormat | None,
+        expected_compression: CompressionFormat | None,
+    ) -> None:
+        """Test mixed inputs for format and compression inference."""
+        fmt, compression = infer_file_format_and_compression(value, filename)
+        assert fmt is expected_format
+        assert compression is expected_compression

etlplus-0.11.5/tests/unit/file/test_u_file_yaml.py

@@ -0,0 +1,110 @@
+"""
+:mod:`tests.unit.test_u_file_yaml` module.
+
+Unit tests for :mod:`etlplus.file.yaml`.
+
+Notes
+-----
+- Uses ``tmp_path`` for filesystem isolation.
+- Exercises JSON detection and defers errors for unknown extensions.
+"""
+
+from __future__ import annotations
+
+from collections.abc import Generator
+from pathlib import Path
+
+import pytest
+
+import etlplus.file.yaml as yaml_module
+from etlplus.file import File
+from etlplus.file import FileFormat
+
+# SECTION: HELPERS ========================================================== #
+
+
+pytestmark = pytest.mark.unit
+
+
+class _StubYaml:
+    """Minimal PyYAML substitute to avoid optional dependency in tests."""
+
+    def __init__(self) -> None:
+        self.dump_calls: list[dict[str, object]] = []
+
+    def safe_load(
+        self,
+        handle: object,
+    ) -> dict[str, str]:
+        """Stub for PyYAML's ``safe_load`` function."""
+        text = ''
+        if hasattr(handle, 'read'):  # type: ignore[call-arg]
+            text = handle.read()
+        return {'loaded': str(text).strip()}
+
+    def safe_dump(
+        self,
+        data: object,
+        handle: object,
+        **kwargs: object,
+    ) -> None:
+        """Stub for PyYAML's ``safe_dump`` function."""
+        self.dump_calls.append({'data': data, 'kwargs': kwargs})
+        if hasattr(handle, 'write'):
+            handle.write('yaml')  # type: ignore[call-arg]
+
+
+@pytest.fixture(name='yaml_stub')
+def yaml_stub_fixture() -> Generator[_StubYaml]:
+    """Install a stub PyYAML module for YAML tests."""
+    # pylint: disable=protected-access
+
+    stub = _StubYaml()
+    yaml_module._YAML_CACHE.clear()
+    yaml_module._YAML_CACHE['mod'] = stub
+    yield stub
+    yaml_module._YAML_CACHE.clear()
+
+
+# SECTION: TESTS ============================================================ #
+
+
+# TODO: Can File read/write YAML without PyYAML installed?
+# TODO: If not, remove this unit test suite.
+class TestYamlSupport:
+    """Unit tests exercising YAML read/write helpers without PyYAML."""
+
+    def test_read_yaml_uses_stub(
+        self,
+        tmp_path: Path,
+        yaml_stub: _StubYaml,
+    ) -> None:
+        """
+        Test reading YAML should invoke stub ``safe_load``.
+        """
+        # pylint: disable=protected-access
+
+        assert yaml_module._YAML_CACHE['mod'] is yaml_stub
+        path = tmp_path / 'data.yaml'
+        path.write_text('name: etl', encoding='utf-8')
+
+        result = File(path, FileFormat.YAML).read()
+
+        assert result == {'loaded': 'name: etl'}
+
+    def test_write_yaml_uses_stub(
+        self,
+        tmp_path: Path,
+        yaml_stub: _StubYaml,
+    ) -> None:
+        """
+        Test writing YAML should invoke stub ``safe_dump``.
+        """
+        path = tmp_path / 'data.yaml'
+        payload = [{'name': 'etl'}]
+
+        written = File(path, FileFormat.YAML).write(payload)
+
+        assert written == 1
+        assert yaml_stub.dump_calls
+        assert yaml_stub.dump_calls[0]['data'] == payload