feat/fix/tests: improve tests, add depends injection

Author: alexeev-prog

.gitignore

@@ -165,3 +165,4 @@ ignored/
 *.db
 *.log
 translatedocs.py
+*/*.log

Doxyfile

@@ -48,7 +48,7 @@ PROJECT_NAME           = "pyEchoNext"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "0.7.12"
+PROJECT_NUMBER         = "0.7.13"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

README.md

@@ -45,7 +45,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.12 alpha
+ > Last stable version: 0.7.13 alpha
 
  > Next Big Update: ASYNC & unicorn support
 
@@ -139,9 +139,95 @@ Once installed, you can start using the library in your Python projects. Check o
 
 <p align="right">(<a href="#readme-top">back to top</a>)</p>
 
+## ⚙️ Depends Injection
+pyEchoNext is universal, and you are free to use any Dependency-Injection framework. But we recommend using the specially developed [echonextdi](https://github.com/alexeev-prog/echonext_di). It is simple and fast to use.
+
+ > echonext_di goes in echonext dependencies
+
+```python
+from echonextdi.containers.container import Container
+from echonextdi.depends import Depends
+from echonextdi.providers.callable_provider import CallableProvider
+
+
+def sqrt(a: int, b: int = 2):
+    return a**b
+
+
+class SQRT_Dependency:
+    def __init__(self, sqrt):
+        self.sqrt = sqrt
+
+
+container = Container()
+container.register("sqrt", CallableProvider(sqrt))
+
+
+def calculate(number: int, depend: Depends = Depends(container, SQRT_Dependency)):
+    print(f"{number} ^2 = {depend().sqrt(2)}")
+
+
+calculate(4) # Output: 16
+```
+
 ## 💻 Usage Examples
 You can view examples at [examples directory](./examples).
 
+### Basic With Depends Injection
+
+```python
+import os
+
+from pyechonext.app import ApplicationType, EchoNext
+from pyechonext.config import Settings
+from pyechonext.middleware import middlewares
+from pyechonext.mvc.controllers import PageController
+from pyechonext.urls import URL
+
+from echonextdi.containers.container import Container
+from echonextdi.depends import Depends
+from echonextdi.providers.callable_provider import CallableProvider
+
+
+class IndexController(PageController):
+    def get(self, request, response, **kwargs):
+        return "Hello"
+
+    def post(self, request, response, **kwargs):
+        return "Hello"
+
+
+def say_hello(name: str, phrase: str = 'Hello'):
+    return f'{phrase} {name}'
+
+
+class Hello_Dependency:
+    def __init__(self, say_hello):
+        self.say_hello = say_hello
+
+
+container = Container()
+container.register("say_hello", CallableProvider(say_hello))
+
+url_patterns = [URL(path="/", controller=IndexController)]
+settings = Settings(
+    BASE_DIR=os.path.dirname(os.path.abspath(__file__)), TEMPLATES_DIR="templates"
+)
+echonext = EchoNext(
+    __name__,
+    settings,
+    middlewares,
+    urls=url_patterns,
+    application_type=ApplicationType.HTML,
+)
+
+
+@echonext.route_page("/hello/{name}")
+def hello(request, response, name: str = "World", depend: Depends = Depends(container, Hello_Dependency)):
+    response.body = depend().say_hello(name)
+
+```
+
 ### Performance caching
 
 ```python
@@ -594,7 +680,7 @@ To test the web framework, PyTest with the pytest-cov plugin is used. You can lo
 
 | Statements | Miss       | Coverage |
 |------------|------------|----------|
-| 1548       | 721        | 53%      |
+| 1553       | 720        | 54%      |
 
 ## Documentation 🌍
 Extended documentation and framework specifications are available at the following links:

SECURITY.md

@@ -7,6 +7,7 @@ currently being supported with security updates.
 
 | Version | Supported          |
 | ------- | ------------------ |
+| 0.7.13  | :white_check_mark: |
 | 0.7.12  | :white_check_mark: |
 | 0.7.11  | :white_check_mark: |
 | 0.6.11  | :white_check_mark: |

echonext_di

@@ -6,6 +6,10 @@
 from pyechonext.mvc.controllers import PageController
 from pyechonext.urls import URL
 
+from echonextdi.containers.container import Container
+from echonextdi.depends import Depends
+from echonextdi.providers.callable_provider import CallableProvider
+
 
 class IndexController(PageController):
 	def get(self, request, response, **kwargs):
@@ -15,6 +19,18 @@ def post(self, request, response, **kwargs):
 		return "Hello"
 
 
+def say_hello(name: str, phrase: str = 'Hello'):
+	return f'{phrase} {name}'
+
+
+class Hello_Dependency:
+	def __init__(self, say_hello):
+		self.say_hello = say_hello
+
+
+container = Container()
+container.register("say_hello", CallableProvider(say_hello))
+
 url_patterns = [URL(path="/", controller=IndexController)]
 settings = Settings(
 	BASE_DIR=os.path.dirname(os.path.abspath(__file__)), TEMPLATES_DIR="templates"
@@ -29,5 +45,5 @@ def post(self, request, response, **kwargs):
 
 
 @echonext.route_page("/hello/{name}")
-def hello(request, response, name: str = "World"):
-	response.body = f"Hello {name}!"
+def hello(request, response, name: str = "World", depend: Depends = Depends(container, Hello_Dependency)):
+	response.body = depend().say_hello(name)

examples/modern.py

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

pyechonext/__init__.py

@@ -329,7 +329,7 @@ def _check_handler(self, request: Request, handler: Callable) -> Callable:
 
 		return handler
 
-	def _filling_response(self, route: Route, response: Response, handler: Callable):
+	def _filling_response(self, route: Route, response: Response, request: Request, result: Any, handler: Callable):
 		"""
 		Filling response
 
@@ -376,7 +376,7 @@ def _handle_request(self, request: Request) -> Response:
 			elif result is None:
 				return response
 
-			self._filling_response(route, response, handler)
+			self._filling_response(route, response, request, result, handler)
 		else:
 			raise URLNotFound(f'URL "{request.path}" not found.')