xhtm 0.5__tar.gz → 0.7__tar.gz

{xhtm-0.5 → xhtm-0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xhtm
-Version: 0.5
+Version: 0.7
 Summary: Rendering HTML Text
 Home-page: https://github.com/bondbox/xhtm
 Author: Mingzhe Zou
@@ -16,7 +16,8 @@ Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: xlc>=0.6
+Requires-Dist: xkits-lib>=0.2
+Requires-Dist: xlc>=1.0
 Requires-Dist: jinja2
 
 # xhtm

{xhtm-0.5 → xhtm-0.7}/xhtm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xhtm
-Version: 0.5
+Version: 0.7
 Summary: Rendering HTML Text
 Home-page: https://github.com/bondbox/xhtm
 Author: Mingzhe Zou
@@ -16,7 +16,8 @@ Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: xlc>=0.6
+Requires-Dist: xkits-lib>=0.2
+Requires-Dist: xlc>=1.0
 Requires-Dist: jinja2
 
 # xhtm

xhtm-0.7/xhtm.egg-info/requires.txt

@@ -0,0 +1,3 @@
+xkits-lib>=0.2
+xlc>=1.0
+jinja2

{xhtm-0.5 → xhtm-0.7}/xhtml/attribute.py

@@ -1,7 +1,7 @@
 # coding:utf-8
 
 __project__ = "xhtm"
-__version__ = "0.5"
+__version__ = "0.7"
 __urlhome__ = "https://github.com/bondbox/xhtm"
 __description__ = "Rendering HTML Text"
 

{xhtm-0.5 → xhtm-0.7}/xhtml/header/accept.py

@@ -41,7 +41,7 @@ class AcceptLanguage():
     def __contains__(self, langtag: LangT) -> bool:
         return LangTag.get_name(langtag) in self.__languages
 
-    def __iter__(self) -> Iterator[LangTag]:
+    def __iter__(self) -> Iterator[str]:
         return iter(self.__languages)
 
     def __len__(self) -> int:

{xhtm-0.5 → xhtm-0.7}/xhtml/header/headers.py

@@ -1,6 +1,8 @@
 # coding:utf-8
 
 from enum import Enum
+from typing import Dict
+from typing import Iterator
 
 
 class Headers(Enum):
@@ -65,3 +67,28 @@ class Headers(Enum):
     VARY = "Vary"
     VIA = "Via"
     WARNING = "Warning"
+
+
+class Cookies():
+    def __init__(self, *cookies: str):
+        self.__cookies: Dict[str, str] = {}
+        for items in cookies:
+            for item in items.split(";"):
+                if cookie := item.strip():
+                    k, v = cookie.split("=", maxsplit=1)
+                    self.__cookies[k.strip()] = v.strip()
+
+    def __len__(self) -> int:
+        return len(self.__cookies)
+
+    def __iter__(self) -> Iterator[str]:
+        return iter(self.__cookies)
+
+    def __getitem__(self, key: str) -> str:
+        return self.__cookies[key]
+
+    def __contains__(self, key: str) -> bool:
+        return key in self.__cookies
+
+    def get(self, key: str, default: str = "") -> str:
+        return self.__cookies.get(key, default)

{xhtm-0.5 → xhtm-0.7}/xhtml/locale/template.py

@@ -2,6 +2,7 @@
 
 from os.path import join
 
+from xkits_lib import TimeUnit
 from xlc.language.message import Message
 from xlc.language.segment import Section
 
@@ -10,9 +11,9 @@ from xhtml.template import Template
 
 
 class LocaleTemplate(Template):
-    def __init__(self, base: str):
-        self.__message: Message = Message.load(join(base, "locale"))
-        super().__init__(base)
+    def __init__(self, base: str, lifetime: TimeUnit = 0):
+        self.__message: Message = Message(join(base, "locale"))
+        super().__init__(base=base, lifetime=lifetime)
 
     def search(self, accept_language: str, section: str) -> Section:
         language: AcceptLanguage = AcceptLanguage(accept_language)

{xhtm-0.5 → xhtm-0.7}/xhtml/resource/__init__.py

@@ -9,6 +9,9 @@ from os.path import splitext
 from typing import Optional
 
 from jinja2 import Environment
+from xkits_lib import CacheMiss
+from xkits_lib import CachePool
+from xkits_lib import TimeUnit
 
 BASE_DIR = dirname(abspath(__file__))
 
@@ -19,6 +22,7 @@ class FileResource():
             message = f"No such file: {path}"
             raise FileNotFoundError(message)
         self.__ext: str = splitext(path)[1]
+        self.__data: Optional[bytes] = None
         self.__path: str = path
 
     @property
@@ -29,13 +33,14 @@ class FileResource():
     def path(self) -> str:
         return self.__path
 
-    def loads(self) -> str:
-        with open(self.path, "r", encoding="utf-8") as rhdl:
-            return rhdl.read()
-
     def loadb(self) -> bytes:
-        with open(self.path, "rb") as rhdl:
-            return rhdl.read()
+        if self.__data is None:
+            with open(self.path, "rb") as rhdl:
+                self.__data = rhdl.read()
+        return self.__data
+
+    def loads(self, encoding: str = "utf-8") -> str:
+        return self.loadb().decode(encoding=encoding)
 
     def render(self, **context: str) -> str:
         """render html template"""
@@ -45,7 +50,8 @@ class FileResource():
 class Resource():
     FAVICON: str = "favicon.ico"
 
-    def __init__(self, base: Optional[str] = None):
+    def __init__(self, base: Optional[str] = None, lifetime: TimeUnit = 0):
+        self.__cache: CachePool[str, FileResource] = CachePool(lifetime)
         self.__base: str = base if base and isdir(base) else BASE_DIR
 
     @property
@@ -56,13 +62,23 @@ class Resource():
     def favicon(self) -> FileResource:
         return self.seek(self.FAVICON)
 
-    def find(self, *args: str) -> Optional[str]:
+    def find(self, *args: str) -> Optional[FileResource]:
         def check(base: str, real: str) -> Optional[str]:
             return path if isfile(path := join(base, real)) else check(BASE_DIR, real) if base != BASE_DIR else None  # noqa:E501
-        return check(self.base, join(*args))
+
+        if (real := join(*args)) in self.__cache:
+            try:
+                return self.__cache.get(real)
+            except CacheMiss:
+                pass
+
+        resource: Optional[FileResource] = None
+        if isinstance(path := check(self.base, real), str):
+            resource = FileResource(path)
+            self.__cache.put(real, resource)
+        return resource
 
     def seek(self, *args: str) -> FileResource:
-        path: Optional[str] = self.find(*args)
-        if not isinstance(path, str):
+        if not isinstance(resource := self.find(*args), FileResource):
             raise FileNotFoundError(f"No such file: {join(*args)}")
-        return FileResource(path)
+        return resource

{xhtm-0.5 → xhtm-0.7}/xhtml/template/__init__.py

@@ -5,6 +5,8 @@ from os.path import dirname
 from os.path import isdir
 from typing import Optional
 
+from xkits_lib import TimeUnit
+
 from xhtml.resource import Resource
 
 BASE_DIR = dirname(abspath(__file__))
@@ -13,5 +15,5 @@ BASE_DIR = dirname(abspath(__file__))
 class Template(Resource):
     FAVICON: str = "favicon.ico"
 
-    def __init__(self, base: Optional[str] = None):
-        super().__init__(base if base and isdir(base) else BASE_DIR)
+    def __init__(self, base: Optional[str] = None, lifetime: TimeUnit = 0):
+        super().__init__(base if base and isdir(base) else BASE_DIR, lifetime)

xhtm-0.5/xhtm.egg-info/requires.txt

@@ -1,2 +0,0 @@
-xlc>=0.6
-jinja2