excel-orm 0.1.3__tar.gz → 0.1.5__tar.gz

{excel_orm-0.1.3 → excel_orm-0.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: excel-orm
-Version: 0.1.3
+Version: 0.1.5
 Summary: A lightweight Excel ORM for generating templates and parsing typed row models.
 Project-URL: Homepage, https://github.com/acdelrusso/excel-orm
 Project-URL: Repository, https://github.com/acdelrusso/excel-orm

{excel_orm-0.1.3 → excel_orm-0.1.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "excel-orm"
-version = "0.1.3"
+version = "0.1.5"
 description = "A lightweight Excel ORM for generating templates and parsing typed row models."
 readme = "README.md"
 requires-python = ">=3.13"

{excel_orm-0.1.3 → excel_orm-0.1.5}/src/excel_orm/__init__.py

@@ -1,4 +1,12 @@
-from .column import Column, ColumnSpec, bool_column, date_column, int_column, text_column
+from .base import RowBase
+from .column import (
+    Column,
+    ColumnSpec,
+    bool_column,
+    date_column,
+    int_column,
+    text_column,
+)
 from .orm import ExcelFile, PivotSheetSpec, SheetSpec
 
 __all__ = [
@@ -6,6 +14,7 @@ __all__ = [
     "ColumnSpec",
     "ExcelFile",
     "PivotSheetSpec",
+    "RowBase",
     "SheetSpec",
     "bool_column",
     "date_column",

excel_orm-0.1.5/src/excel_orm/base.py

@@ -0,0 +1,21 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any
+
+if TYPE_CHECKING:
+    from excel_orm import Column
+
+
+class RowBase:
+    __columns__: list[Column[Any]]
+
+    def __init__(self, **kwargs: Any) -> None:
+        self._values: dict[str, Any] = {}
+
+        for col in getattr(self, "__columns__", []):
+            if col.name is None:
+                continue
+            self._values[col.name] = col.spec.default
+
+        for k, v in kwargs.items():
+            setattr(self, k, v)

{excel_orm-0.1.3 → excel_orm-0.1.5}/src/excel_orm/column.py

@@ -41,9 +41,9 @@ class Column[T]:
     @overload
     def __get__(self, obj: None, objtype: type[Owner] | None = None) -> Column[T]: ...
     @overload
-    def __get__(self, obj: Owner, objtype: type[Owner] | None = None) -> T | None: ...
+    def __get__(self, obj: Owner, objtype: type[Owner] | None = None) -> T: ...
 
-    def __get__(self, obj: Owner | None, objtype: type[Owner] | None = None) -> T | Column | None:
+    def __get__(self, obj: Owner | None, objtype: type[Owner] | None = None) -> T | Column:
         if obj is None:
             return self
         if self.name is None:
@@ -71,7 +71,7 @@ def text_column(
     default: str | None = None,
     strip: bool = True,
     not_null: bool = False,
-):
+) -> Column[str]:
     def parse(raw: Any) -> str:
         if raw is None:
             return ""
@@ -96,7 +96,7 @@ def int_column(
     *,
     default: int | None = None,
     not_null: bool = False,
-):
+) -> Column[int]:
     def parse(raw: Any) -> int:
         if raw is None or raw == "":
             return 0
@@ -112,7 +112,7 @@ def int_column(
     )
 
 
-def bool_column(header: str | None = None, *, default: bool | None = None):
+def bool_column(header: str | None = None, *, default: bool | None = None) -> Column[bool]:
     def parse(raw: Any) -> bool:
         if raw is None or raw == "":
             return False
@@ -134,7 +134,7 @@ def bool_column(header: str | None = None, *, default: bool | None = None):
     )
 
 
-def date_column(header: str | None = None, *, default: date | None = None):
+def date_column(header: str | None = None, *, default: date | None = None) -> Column[date]:
     _DATE_FORMATS: tuple[str, ...] = (
         "%d-%b-%Y",  # 01-JUN-2025  (your requirement)
         "%d-%b-%y",  # 01-JUN-25

{excel_orm-0.1.3 → excel_orm-0.1.5}/tests/conftest.py

@@ -2,6 +2,7 @@ from datetime import date
 
 import pytest
 
+from excel_orm.base import RowBase
 from src.excel_orm import (
     Column,
     ExcelFile,
@@ -15,12 +16,12 @@ from src.excel_orm import (
 
 @pytest.fixture
 def models():
-    class Car:
+    class Car(RowBase):
         make: Column[str] = text_column(header="Make", not_null=True)
         model: Column[str] = text_column(header="Model", not_null=True)
         year: Column[int] = int_column(header="Year", not_null=True)
 
-    class ManufacturingPlant:
+    class ManufacturingPlant(RowBase):
         name: Column[str] = text_column(header="Factory Name", not_null=True)
         location: Column[str] = text_column(header="Location")
 
@@ -53,7 +54,7 @@ def demand_model():
 
 @pytest.fixture
 def demand_two_pivot():
-    class Demand:
+    class Demand(RowBase):
         dt: Column[date] = date_column(header="Date")
         region: Column[str] = text_column(header="Region", not_null=True)
         product: Column[str] = text_column(header="Product", not_null=True)

{excel_orm-0.1.3 → excel_orm-0.1.5}/tests/test_columns.py

@@ -4,11 +4,18 @@ from datetime import date, datetime
 
 import pytest
 
-from src.excel_orm import Column, bool_column, date_column, int_column, text_column
+from src.excel_orm import (
+    Column,
+    RowBase,
+    bool_column,
+    date_column,
+    int_column,
+    text_column,
+)
 
 
 def test_descriptor_stores_in_values_dict():
-    class Foo:
+    class Foo(RowBase):
         a: Column[str] = text_column(header="A")
 
     f = Foo()
@@ -20,14 +27,14 @@ def test_descriptor_stores_in_values_dict():
 
 
 def test_descriptor_class_level_access_returns_column():
-    class Foo:
+    class Foo(RowBase):
         a: Column[str] = text_column(header="A")
 
     assert isinstance(Foo.a, Column)
 
 
 def test_not_null_validation_raises_on_none_or_empty():
-    class Foo:
+    class Foo(RowBase):
         a: Column[str] = text_column(header="A", not_null=True)
 
     f = Foo()
@@ -108,3 +115,4 @@ def test_date_column_invalid_raises():
     col = date_column(header="D")
     with pytest.raises(ValueError):
         col.parse_cell("not-a-date")
+        col.parse_cell("   ")

{excel_orm-0.1.3 → excel_orm-0.1.5}/tests/test_orm.py

@@ -5,7 +5,7 @@ from datetime import date, datetime
 import pytest
 from openpyxl import load_workbook
 
-from excel_orm import Column, ExcelFile, PivotSheetSpec, text_column
+from excel_orm import Column, ExcelFile, PivotSheetSpec, RowBase, text_column
 from excel_orm.orm import SheetSpec
 
 
@@ -311,7 +311,7 @@ def test_pivot_two_row_fields_template_and_parse_end_to_end(tmp_path, demand_two
 def test_duplicate_header_names_do_not_clash(tmp_path, models):
     Car, _ = models
 
-    class ManufacturingPlant:
+    class ManufacturingPlant(RowBase):
         name: Column[str] = text_column(header="Make", not_null=True)
         location: Column[str] = text_column(header="location")
 

{excel_orm-0.1.3 → excel_orm-0.1.5}/tests/test_orm_helpers.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from excel_orm import RowBase
 from src.excel_orm import Column, int_column, text_column
 from src.excel_orm.orm import (
     _camel_to_snake,
@@ -31,7 +32,7 @@ def test_repo_and_display_name():
 
 
 def test_get_model_columns_respects_annotation_order():
-    class A:
+    class A(RowBase):
         x: Column[str] = text_column(header="X")
         y: Column[int] = int_column(header="Y")
 
@@ -40,7 +41,7 @@ def test_get_model_columns_respects_annotation_order():
 
 
 def test_instantiate_model_sets_defaults_and_requires_set_name():
-    class A:
+    class A(RowBase):
         x: Column[str] = text_column(header="X", default="dflt")
 
     a = _instantiate_model(A)

{excel_orm-0.1.3 → excel_orm-0.1.5}/uv.lock

@@ -187,7 +187,7 @@ wheels = [
 
 [[package]]
 name = "excel-orm"
-version = "0.1.3"
+version = "0.1.5"
 source = { editable = "." }
 dependencies = [
     { name = "openpyxl" },