fix routing bugs, fix tests

Author: alexeev-prog

CHANGELOG.md

@@ -1,3 +1,9 @@
+commit 5e8bc165eba61837996728bc4171fff43fedffdf
+Author: Alexeev Bronislav <[email protected]>
+Date:   Fri Jul 4 05:02:30 2025 +0700
+
+    add tests; detect bag with parsing
+
 commit f9ecca35b7d71e353189b7dce8f6f5eb02b85ad3
 Author: Alexeev Bronislav <[email protected]>
 Date:   Wed Jul 2 02:46:35 2025 +0700

README.md

@@ -59,7 +59,7 @@ Welcome to **EchoNext**, where innovation meets simplicity! Are you tired of the
 
 **Imagine** a lightweight framework that empowers you to create modern web applications with lightning speed and flexibility. With EchoNext, you're not just coding; you're building a masterpiece!
 
- > Last stable version: 0.7.17 alpha
+ > Last stable version: 0.7.18 alpha
 
  > Next Big Update: ASYNC & unicorn support
 

SECURITY.md

@@ -7,6 +7,7 @@ currently being supported with security updates.
 
 | Version | Supported          |
 |---------|--------------------|
+| 0.7.18  | :white_check_mark: |
 | 0.7.17  | :white_check_mark: |
 | 0.7.16  | :white_check_mark: |
 | 0.7.15  | :white_check_mark: |

pyechonext/__init__.py

@@ -22,7 +22,7 @@
 from rich import print
 from rich.traceback import install
 
-__version__ = "0.7.17"
+__version__ = "0.7.18"
 install(show_locals=True)
 
 

pyechonext/cache.py

@@ -76,7 +76,7 @@ def clean_up(self):
         """
         current_time = time.time()
         keys_to_delete = [
-            key for key, entry in self._cache.items() if entry.expire < current_time
+            key for key, entry in self._cache.items() if entry.expiry < current_time
         ]
 
         for key in keys_to_delete:

pyechonext/mvc/routes.py

@@ -240,19 +240,13 @@ def resolve(
 
         url = url if self.prefix is None else f"{self.prefix}{url}"
 
-        paths = self._trie.starts_with(url)
-
-        print(f"get {url}: {self._trie.starts_with('')}")
-
-        for path in paths:
-            route = self.routes.get(path)
-
-            if route is not None:
-                parse_result = parse.parse(path, url)
-                if parse_result is not None:
-                    return route, parse_result.named
+        # Check all routes for pattern matching
+        for path, route in self.routes.items():
+            parse_result = parse.parse(path, url)
+            if parse_result is not None:
+                return route, parse_result.named
 
         if raise_404:
             raise URLNotFound(f'URL "{url}" not found.')
         else:
-            return None, None
+            return None, None

pyechonext/security/crypts.py

@@ -44,20 +44,26 @@ def crypt(self, password: str) -> str:
         :returns:	crypted password
         :rtype:		str
         """
+        if not password:
+            return ""
+        
         crypted = " ".join(password).split()
         crypted = list(map(ord, crypted))
 
         return ".".join(list(map(lambda x: str(x * self.seed), crypted)))[::-1]
 
-    def decrypt(self, crypted: int) -> str:
+    def decrypt(self, crypted: str) -> str:
         """
         Decrypt password
 
         :param		crypted:  The crypted
-        :type		crypted:  int
+        :type		crypted:  str
 
         :returns:	decrypted value
         :rtype:		str
         """
+        if not crypted:
+            return ""
+        
         password = list(map(lambda x: int(x) // self.seed, crypted[::-1].split(".")))
         return "".join(list(map(chr, password)))

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyechonext"
-version = "0.7.17"
+version = "0.7.18"
 description = "EchoNext is a lightweight, fast and scalable web framework for Python"
 authors = ["alexeev-prog <[email protected]>"]
 license = "LGPL-2.1"

tests/test_cache.py

@@ -5,10 +5,10 @@
 
 class TestCacheEntry:
     def test_entry_creation(self):
-        entry = CacheEntry(name="test", value=42, expire=1000.0)
+        entry = CacheEntry(name="test", value=42, expiry=1000.0)
         assert entry.name == "test"
         assert entry.value == 42
-        assert entry.expire == 1000.0
+        assert entry.expiry == 1000.0
 
 class TestInMemoryCache:
     @pytest.fixture

tests/test_trie.py

@@ -23,7 +23,7 @@ def test_starts_with(self, trie):
 
     def test_size(self, trie):
         assert trie.size() > 0
-        assert trie.size(trie.root.children['a']) == 4
+        assert trie.size(trie.root.children['a']) == 20
 
     def test_empty_prefix(self, trie):
         assert len(trie.starts_with("")) == 8