tina4-python 3.13.0__tar.gz → 3.13.2__tar.gz

{tina4_python-3.13.0 → tina4_python-3.13.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tina4-python
-Version: 3.13.0
+Version: 3.13.2
 Summary: Tina4 Python v3 — Zero-dependency, lightweight web framework
 Author-email: Andre van Zuydam <andrevanzuydam@gmail.com>
 License: MIT

{tina4_python-3.13.0 → tina4_python-3.13.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "tina4-python"
-version = "3.13.0"
+version = "3.13.2"
 description = "Tina4 Python v3 — Zero-dependency, lightweight web framework"
 authors = [
     {name = "Andre van Zuydam", email = "andrevanzuydam@gmail.com"}

{tina4_python-3.13.0 → tina4_python-3.13.2}/tina4_python/__init__.py

@@ -8,7 +8,7 @@ Tina4 Python v3.0 — Zero-dependency, lightweight web framework.
 
 One import, everything works.
 """
-__version__ = "3.13.0"
+__version__ = "3.13.2"
 
 # ── Route decorators ──
 from tina4_python.core.router import (  # noqa: E402, F401

{tina4_python-3.13.0 → tina4_python-3.13.2}/tina4_python/database/connection.py

@@ -725,8 +725,9 @@ class Database:
     def from_env(env_key: str = "TINA4_DATABASE_URL", pool: int = 0) -> "Database | None":
         """Construct a Database instance from environment variables.
 
-        Reads the connection URL from the named env var (default DATABASE_URL),
-        and DATABASE_USERNAME / DATABASE_PASSWORD for credentials.
+        Reads the connection URL from the named env var (default
+        TINA4_DATABASE_URL), and TINA4_DATABASE_USERNAME /
+        TINA4_DATABASE_PASSWORD for credentials.
 
         Args:
             env_key: Environment variable name holding the connection URL.

{tina4_python-3.13.0 → tina4_python-3.13.2}/tina4_python/dev_admin/__init__.py

@@ -1743,7 +1743,7 @@ def _tina4_robot_fallback(message: str) -> str:
     elif "orm" in msg or "model" in msg:
         return "Define ORM models in src/orm/ — one class per file. Use IntegerField, StringField, etc. Call model.save(), model.load(), model.select(). Don't forget to create a migration for the table."
     elif "database" in msg or "db" in msg:
-        return "Set DATABASE_URL in .env. Supports sqlite, postgres, mysql, firebird, mssql, mongodb. Use db.fetch(), db.insert(), db.update(), db.delete()."
+        return "Set TINA4_DATABASE_URL in .env. Supports sqlite, postgres, mysql, firebird, mssql, mongodb. Use db.fetch(), db.insert(), db.update(), db.delete()."
     elif "queue" in msg:
         return "Use Queue(topic='name') with queue.produce() to enqueue, queue.consume() to process. Supports litequeue, RabbitMQ, Kafka, MongoDB backends."
     elif "template" in msg or "twig" in msg:
@@ -1848,14 +1848,18 @@ async def _api_connections_save(request, response):
                 new_lines.append(line)
                 continue
             key = stripped.split("=", 1)[0].strip()
+            # Preserve the TINA4_ prefix when rewriting — the boot guard
+            # rejects bare DATABASE_URL / DATABASE_USERNAME / DATABASE_PASSWORD
+            # since v3.12, so stripping the prefix here would break the next
+            # restart. Bug filed as tina4-python#45.
             if key == "TINA4_DATABASE_URL":
-                new_lines.append(f"DATABASE_URL={url}")
+                new_lines.append(f"TINA4_DATABASE_URL={url}")
                 keys_found["TINA4_DATABASE_URL"] = True
             elif key == "TINA4_DATABASE_USERNAME":
-                new_lines.append(f"DATABASE_USERNAME={username}")
+                new_lines.append(f"TINA4_DATABASE_USERNAME={username}")
                 keys_found["TINA4_DATABASE_USERNAME"] = True
             elif key == "TINA4_DATABASE_PASSWORD":
-                new_lines.append(f"DATABASE_PASSWORD={password}")
+                new_lines.append(f"TINA4_DATABASE_PASSWORD={password}")
                 keys_found["TINA4_DATABASE_PASSWORD"] = True
             else:
                 new_lines.append(line)

{tina4_python-3.13.0 → tina4_python-3.13.2}/tina4_python/orm/model.py

@@ -278,7 +278,7 @@ class ORM(metaclass=ORMMeta):
             return cls._db  # Direct Database instance
 
         if _database is None:
-            # Try auto-discovery from DATABASE_URL
+            # Try auto-discovery from TINA4_DATABASE_URL
             import os
             url = os.environ.get("TINA4_DATABASE_URL")
             if url:
@@ -289,7 +289,7 @@ class ORM(metaclass=ORMMeta):
                 orm_bind(db)
                 return db
             raise RuntimeError(
-                "No database bound. Call orm_bind(db) or set DATABASE_URL in .env"
+                "No database bound. Call orm_bind(db) or set TINA4_DATABASE_URL in .env"
             )
         return _database
 

{tina4_python-3.13.0 → tina4_python-3.13.2}/tina4_python/scss/__init__.py

@@ -249,41 +249,79 @@ def _resolve_extends(scss: str, placeholders: dict) -> str:
 
 
 def _eval_math(scss: str) -> str:
-    """Evaluate simple math in property values (e.g., 10px + 5px)."""
+    """Evaluate simple math in property values (e.g., 10px + 5px).
+
+    Mixed-unit arithmetic is left verbatim — that is exactly what CSS calc()
+    is for, and folding it silently produces invalid output (see #42). Math
+    inside calc(...) is preserved untouched on the same principle: the author
+    asked the browser to compute it.
+
+    Rules for folding:
+      * Both operands unitless                  → fold
+      * Same unit on both operands              → fold, keep unit
+      * One operand unitless for * or /         → fold, keep the other unit
+      * Anything else (mixed units on +/-, etc) → leave verbatim
+    """
+    # Step 1 — mask calc(...) ranges so the math regex cannot eat into them.
+    # CSS calc() is the contract for mixed-unit arithmetic; the browser does it.
+    placeholders: list[str] = []
+
+    def _mask(m):
+        placeholders.append(m.group(0))
+        return f"\x00CALC{len(placeholders) - 1}\x00"
+
+    masked = re.sub(r'calc\([^()]*\)', _mask, scss)
+
+    # Step 2 — run the math fold on what remains.
     def _calc(m):
         full = m.group(0)
         try:
-            # Extract numbers and operator
-            num1 = float(re.search(r'[\d.]+', m.group(1)).group())
-            num2 = float(re.search(r'[\d.]+', m.group(3)).group())
-            op = m.group(2).strip()
-            # Extract unit from first operand
-            unit_match = re.search(r'[a-z%]+', m.group(1))
-            unit = unit_match.group() if unit_match else ""
-
-            if op == "+":
-                result = num1 + num2
-            elif op == "-":
-                result = num1 - num2
-            elif op == "*":
-                result = num1 * num2
-            elif op == "/":
-                result = num1 / num2 if num2 != 0 else 0
-            else:
-                return full
-
-            # Format result
-            if result == int(result):
-                return f"{int(result)}{unit}"
-            return f"{result:.2f}{unit}"
+            num1 = float(m.group(1))
+            unit1 = m.group(2) or ""
+            op = m.group(3)
+            num2 = float(m.group(4))
+            unit2 = m.group(5) or ""
         except (ValueError, AttributeError):
             return full
 
-    return re.sub(
-        r'([\d.]+[a-z%]*)\s*([+\-*/])\s*([\d.]+[a-z%]*)',
-        _calc, scss
+        # Decide result unit; bail (leave verbatim) if units are incompatible.
+        if unit1 == unit2:
+            unit = unit1
+        elif op in ("*", "/") and not unit1:
+            unit = unit2
+        elif op in ("*", "/") and not unit2:
+            unit = unit1
+        else:
+            return full
+
+        if op == "+":
+            result = num1 + num2
+        elif op == "-":
+            result = num1 - num2
+        elif op == "*":
+            result = num1 * num2
+        elif op == "/":
+            if num2 == 0:
+                return full
+            result = num1 / num2
+        else:
+            return full
+
+        if result == int(result):
+            return f"{int(result)}{unit}"
+        return f"{result:.2f}{unit}"
+
+    folded = re.sub(
+        r'([\d.]+)([a-z%]*)\s*([+\-*/])\s*([\d.]+)([a-z%]*)',
+        _calc, masked
     )
 
+    # Step 3 — restore the calc() ranges verbatim.
+    def _unmask(m):
+        return placeholders[int(m.group(1))]
+
+    return re.sub(r'\x00CALC(\d+)\x00', _unmask, folded)
+
 
 def _resolve_color_functions(scss: str, variables: dict) -> str:
     """Resolve lighten(), darken(), rgba() functions."""

{tina4_python-3.13.0 → tina4_python-3.13.2}/tina4_python/service/__init__.py

@@ -177,6 +177,72 @@ class ServiceContext:
         self.log = _get_log()
 
 
+# ---------------------------------------------------------------------------
+# Service base class (3.13.1) — class-based pattern with run/stop/should_stop
+# ---------------------------------------------------------------------------
+
+
+class Service:
+    """Base class for class-based background services managed by ServiceRunner.
+
+    Cross-framework parity with PHP ``Tina4\\Service``, Ruby ``Tina4::Service``
+    and Node ``Tina4Service``. Subclasses implement ``run()`` (the work
+    loop); the base provides ``stop()`` and ``should_stop()`` helpers
+    backed by an internal flag.
+
+        class EmailQueueWorker(Service):
+            def run(self):
+                while not self.should_stop():
+                    job = queue.pop()
+                    if job is None:
+                        time.sleep(1); continue
+                    process(job)
+                    job.complete()
+
+        runner = ServiceRunner()
+        runner.register_service("emails", EmailQueueWorker())
+        runner.start()
+
+    Function-style services without state can still register directly via
+    ``runner.register('name', callable, interval=N)``. The two patterns
+    coexist.
+    """
+
+    def __init__(self):
+        self._running = True
+
+    def run(self) -> None:
+        """Main work loop — subclasses MUST override."""
+        raise NotImplementedError(
+            f"{self.__class__.__name__}.run() must be implemented by the subclass"
+        )
+
+    def stop(self) -> None:
+        """Signal this service to stop. Override for custom shutdown behaviour
+        but always call ``super().stop()`` so the internal flag gets set —
+        ``should_stop()`` reads from it.
+        """
+        self._running = False
+
+    def should_stop(self) -> bool:
+        """Returns True once ``stop()`` has been called. Use inside ``run()``
+        loops as the exit condition::
+
+            def run(self):
+                while not self.should_stop():
+                    # do work
+        """
+        return not self._running
+
+    def __call__(self, *args, **kwargs):
+        """Make the Service instance callable so it can be passed directly
+        to ``ServiceRunner.register('name', service_instance, daemon=True)``.
+        Cleanly dispatches to ``run()`` while ignoring the runner's
+        ServiceContext argument (Service subclasses manage their own state).
+        """
+        return self.run()
+
+
 # ---------------------------------------------------------------------------
 # ServiceRunner
 # ---------------------------------------------------------------------------
@@ -221,6 +287,43 @@ class ServiceRunner:
             "started_at": None,
         })
 
+    def register_service(self, name: str, service: "Service", max_retries: int = 3):
+        """Register a class-based service (:class:`Service` instance) by name.
+
+        Wraps the Service's ``run()`` method as the handler callable that
+        ``start()`` invokes. Defaults to ``daemon=True`` because Service
+        subclasses manage their own loop inside ``run()``.
+
+            class EmailWorker(Service):
+                def run(self):
+                    while not self.should_stop():
+                        process_one()
+
+            runner.register_service("emails", EmailWorker())
+            runner.start()
+
+        Cross-framework parity with PHP ``ServiceRunner::registerService``,
+        Ruby ``ServiceRunner.register_service``, Node
+        ``ServiceRunner.registerService``.
+        """
+        if not isinstance(service, Service):
+            raise TypeError(
+                f"service must be a Service instance, got {type(service).__name__}"
+            )
+        self.services.append({
+            "name": name,
+            "handler": service,  # Service instances are callable (see __call__)
+            "interval": 0,
+            "cron": None,
+            "daemon": True,  # Service subclasses manage their own loop
+            "max_retries": max_retries,
+            "retries": 0,
+            "running": False,
+            "last_run": None,
+            "started_at": None,
+            "instance": service,  # keep reference so stop() can route to service.stop()
+        })
+
     # -- Lifecycle ----------------------------------------------------------
 
     def start(self):