PyWSGIRef 1.1.3__tar.gz → 1.1.5__tar.gz

{pywsgiref-1.1.3/src/PyWSGIRef.egg-info → pywsgiref-1.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyWSGIRef
-Version: 1.1.3
+Version: 1.1.5
 Summary: easy server-setup
 Author-email: Leander Kafemann <leander@kafemann.berlin>
 Project-URL: Homepage, https://github.com/LeanderKafemann/PyWSGIRef
@@ -171,4 +171,9 @@ from PyWSGIRef import BETA
 #enable beta mode
 BETA.enable()
 ```
+Currently to be tested are:<br/>
+- PyHTML include static resource blocks<br/>
+- PyHTML include default modern styling block<br/><br/>
+
+Thanks a lot for helping improving PyWSGIRef!
 ### More coming soon

{pywsgiref-1.1.3 → pywsgiref-1.1.5}/README.md

@@ -153,4 +153,9 @@ from PyWSGIRef import BETA
 #enable beta mode
 BETA.enable()
 ```
+Currently to be tested are:<br/>
+- PyHTML include static resource blocks<br/>
+- PyHTML include default modern styling block<br/><br/>
+
+Thanks a lot for helping improving PyWSGIRef!
 ### More coming soon

{pywsgiref-1.1.3 → pywsgiref-1.1.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "PyWSGIRef"
-version = "1.1.3"
+version = "1.1.5"
 authors = [
   {name="Leander Kafemann", email="leander@kafemann.berlin" },
 ]

{pywsgiref-1.1.3 → pywsgiref-1.1.5}/src/PyWSGIRef/__init__.py

@@ -2,7 +2,6 @@
 PYWSGIREF
 """
 from typing import Callable
-import requests
 from wsgiref.simple_server import make_server, WSGIServer
 from cgi import FieldStorage
 
@@ -11,39 +10,17 @@ from .pyhtml import PyHTML
 from .defaults import *
 from .templateDict import TemplateDict, OneWayBoolean
 from .beta import BETA
+from .loadContent import *
+from .finished import finished
 
 def about():
     """
-    Returns information about your release and other projects by LK
+    Returns information about your release and other projects by Leander Kafemann
     """
-    return {"Version":(1, 1, 3), "Author":"Leander Kafemann", "date":"10.06.2025",\
+    return {"Version":(1, 1, 5), "Author":"Leander Kafemann", "date":"10.06.2025",\
             "recommend":("Büro by LK",  "pyimager by LK"), "feedbackTo": "leander@kafemann.berlin"}
 
 SCHABLONEN = TemplateDict()
-finished = OneWayBoolean()
-
-def loadFromWeb(url: str, data: dict = {}) -> str:
-    """
-    Loads content from the given URL with the given data.
-    """
-    if finished.value:
-        raise ServerAlreadyGeneratedError()
-    if not url.endswith(".pyhtml"):
-        raise InvalidFiletypeError()
-    rq = requests.post(url, data).content
-    return rq.decode()
-
-def loadFromFile(filename: str) -> str:
-    """
-    Loads a file from the given filename.
-    """
-    if finished.value:
-        raise ServerAlreadyGeneratedError()
-    if not filename.endswith(".pyhtml"):
-        raise InvalidFiletypeError()
-    with open(filename, "r", encoding="utf-8") as f:
-        content = f.read()
-    return content
 
 def addSchablone(name: str, content: str):
     """
@@ -93,37 +70,4 @@ def setUpServer(application: Callable, port: int = 8000) -> WSGIServer:
     """
     finished.set_true()
     server = make_server('', 8000, application)
-    return server
-
-def main():
-    """
-    Main function to set up and run the PyWSGIRef server.
-    """
-    # add Schablone 'Hallo Welt' as main
-    addSchablone("main", MAIN_HTML)
-
-    # set up application object
-    def contentGenerator(path: str) -> str:
-        """
-        Serves as the main WSGI application.
-        """
-        match path:
-            case "/":
-                content = SCHABLONEN["main"].decoded().format(about()["Version"])
-            case "/hello":
-                content = HELLO_WORLD
-            case _:
-                content = ERROR
-        return content
-
-    # make the application object
-    application = makeApplicationObject(contentGenerator)
-
-    # set up server
-    server = setUpServer(application)
-
-    # Note: This code is intended to be run as a script, not as a module.
-    print("Successfully started WSGI server on port 8000.")
-
-    # start serving
-    server.serve_forever()
+    return server

{pywsgiref-1.1.3 → pywsgiref-1.1.5}/src/PyWSGIRef/__main__.py

@@ -1,7 +1,7 @@
 """
 Set up and run the PyWSGIRef server with a simple HTML response.
 """
-from PyWSGIRef import main
+from PyWSGIRef.simpleServer import main
 
 if __name__ == "__main__":
     main()

{pywsgiref-1.1.3 → pywsgiref-1.1.5}/src/PyWSGIRef/beta.py

@@ -2,6 +2,8 @@
 BETA mode...
 """
 
+from .exceptions import BetaAlreadyEnabledError
+
 class beta:
     """
     BETA mode for PyWSGIRef.
@@ -18,7 +20,7 @@ class beta:
         Enables BETA mode.
         """
         if self._beta:
-            raise ValueError("BETA mode is already enabled.")
+            raise BetaAlreadyEnabledError()
         self._beta = True
 
 BETA = beta()

{pywsgiref-1.1.3 → pywsgiref-1.1.5}/src/PyWSGIRef/exceptions.py

@@ -44,5 +44,21 @@ class StaticResourceUsageOutsideHeadError(Exception):
     Raised when a static resource is tried to include outside the head term of a PyHTML file.
     """
     def __init__(self, message="Static resource usage out of <head> term detected."):
+        self.message = message
+        super().__init__(self.message)
+
+class BooleanAlreadyTrueError(Exception):
+    """
+    Raised when trying to set a boolean that is already True.
+    """
+    def __init__(self, message="Boolean value is already True."):
+        self.message = message
+        super().__init__(self.message)#
+
+class BetaAlreadyEnabledError(BooleanAlreadyTrueError):
+    """
+    Raised when trying to enable beta mode that is already enabled.
+    """
+    def __init__(self, message="Beta mode is already enabled."):
         self.message = message
         super().__init__(self.message)

pywsgiref-1.1.5/src/PyWSGIRef/finished.py

@@ -0,0 +1,24 @@
+"""
+Creates finished object to indicate if the server has been generated.
+"""
+
+from .exceptions import BooleanAlreadyTrueError
+
+class OneWayBoolean:
+	def __init__(self):
+		self._value = False
+
+	@property
+	def value(self) -> bool:
+		return self._value
+
+	def set_true(self):
+		"""
+		Setzt den Wert auf True, wenn er False ist.
+		"""
+		if not self._value:
+			self._value = True
+		else:
+			raise BooleanAlreadyTrueError()
+
+finished = OneWayBoolean()

pywsgiref-1.1.5/src/PyWSGIRef/loadContent.py

@@ -0,0 +1,30 @@
+"""
+Content loading helper.
+"""
+import requests
+
+from .exceptions import *
+from .finished import finished
+
+def loadFromWeb(url: str, data: dict = {}) -> str:
+    """
+    Loads content from the given URL with the given data.
+    """
+    if finished.value:
+        raise ServerAlreadyGeneratedError()
+    if not url.endswith(".pyhtml"):
+        raise InvalidFiletypeError()
+    rq = requests.post(url, data).content
+    return rq.decode()
+
+def loadFromFile(filename: str) -> str:
+    """
+    Loads a file from the given filename.
+    """
+    if finished.value:
+        raise ServerAlreadyGeneratedError()
+    if not filename.endswith(".pyhtml"):
+        raise InvalidFiletypeError()
+    with open(filename, "r", encoding="utf-8") as f:
+        content = f.read()
+    return content

{pywsgiref-1.1.3 → pywsgiref-1.1.5}/src/PyWSGIRef/pyhtml.py

@@ -1,4 +1,4 @@
-from naturalsize import replStr, replStrPassage
+from naturalsize import replStrPassage
 
 from .defaults import HELLO_WORLD as DEFAULT
 from .commons import *
@@ -8,6 +8,7 @@ from .beta import BETA
 class PyHTML:
     def __init__(self, html: str = DEFAULT):
         self.html = html
+
     def decode(self):
         """
         Decodes the HTML content.
@@ -22,7 +23,7 @@ class PyHTML:
         if self.html.endswith("<{{evalPyHTML}}>"):
             self.html = self.html[:-16] + END_REPLACE
         
-        if BETA.value():
+        if BETA.value:
             # static ressources
             idx = self.html.find("<{{evalPyHTML-include: ")
             if idx != -1:
@@ -44,6 +45,8 @@ class PyHTML:
             # PyWSGIRef's styling
             idx = self.html.find("<{{evalPyHTML-modernStyling: true}}>")
             if idx != -1:
+                if idx > self.html.find("</head>"):
+                    raise StaticResourceUsageOutsideHeadError()
                 self.html = replStrPassage(idx, idx+35, self.html, MODERN_STYLING)
 
     def decoded(self) -> str:

pywsgiref-1.1.5/src/PyWSGIRef/simpleServer.py

@@ -0,0 +1,38 @@
+"""
+Main method creating simple server example...
+"""
+
+from PyWSGIRef import *
+
+def main():
+    """
+    Main function to set up and run the PyWSGIRef server.
+    """
+    # add Schablone 'Hallo Welt' as main
+    addSchablone("main", MAIN_HTML)
+
+    # set up application object
+    def contentGenerator(path: str) -> str:
+        """
+        Serves as the main WSGI application.
+        """
+        match path:
+            case "/":
+                content = SCHABLONEN["main"].decoded().format(about()["Version"])
+            case "/hello":
+                content = HELLO_WORLD
+            case _:
+                content = ERROR
+        return content
+
+    # make the application object
+    application = makeApplicationObject(contentGenerator)
+
+    # set up server
+    server = setUpServer(application)
+
+    # Note: This code is intended to be run as a script, not as a module.
+    print("Successfully started WSGI server on port 8000.")
+
+    # start serving
+    server.serve_forever()

{pywsgiref-1.1.3 → pywsgiref-1.1.5}/src/PyWSGIRef/templateDict.py

@@ -1,5 +1,6 @@
 from .exceptions import ServerAlreadyGeneratedError
 from .pyhtml import PyHTML
+from .finished import OneWayBoolean
 
 class TemplateDict:
 	def __init__(self):
@@ -31,21 +32,4 @@ class TemplateDict:
 		return list(self.dictionary.values())
 
 	def items(self) -> list:
-		return list(self.dictionary.items())
-
-class OneWayBoolean:
-	def __init__(self):
-		self._value = False
-
-	@property
-	def value(self) -> bool:
-		return self._value
-
-	def set_true(self):
-		"""
-		Setzt den Wert auf True, wenn er False ist.
-		"""
-		if not self._value:
-			self._value = True
-		else:
-			raise ValueError("Value is already True, cannot set again.")
+		return list(self.dictionary.items())

{pywsgiref-1.1.3 → pywsgiref-1.1.5/src/PyWSGIRef.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyWSGIRef
-Version: 1.1.3
+Version: 1.1.5
 Summary: easy server-setup
 Author-email: Leander Kafemann <leander@kafemann.berlin>
 Project-URL: Homepage, https://github.com/LeanderKafemann/PyWSGIRef
@@ -171,4 +171,9 @@ from PyWSGIRef import BETA
 #enable beta mode
 BETA.enable()
 ```
+Currently to be tested are:<br/>
+- PyHTML include static resource blocks<br/>
+- PyHTML include default modern styling block<br/><br/>
+
+Thanks a lot for helping improving PyWSGIRef!
 ### More coming soon

{pywsgiref-1.1.3 → pywsgiref-1.1.5}/src/PyWSGIRef.egg-info/SOURCES.txt

@@ -7,7 +7,10 @@ src/PyWSGIRef/beta.py
 src/PyWSGIRef/commons.py
 src/PyWSGIRef/defaults.py
 src/PyWSGIRef/exceptions.py
+src/PyWSGIRef/finished.py
+src/PyWSGIRef/loadContent.py
 src/PyWSGIRef/pyhtml.py
+src/PyWSGIRef/simpleServer.py
 src/PyWSGIRef/templateDict.py
 src/PyWSGIRef.egg-info/PKG-INFO
 src/PyWSGIRef.egg-info/SOURCES.txt