Merge branch 'dev'

Author: alexeev-prog

.gitignore

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

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "echonext_di"]
+	path = echonext_di
+	url = [email protected]:alexeev-prog/echonext_di.git

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
 
@@ -85,7 +85,7 @@ Welcome to **EchoNext**, where innovation meets simplicity! Are you tired of the
 | Asynchronous Capabilities | COMING SOON         | ❌           | ✔️           | ❌            | ✔️           |
 | Performance               | 🔥 High             | 🐢 Moderate  | 🚀 Very High | 🐢 Moderate   | 🚀 Very High |
 | Framework Weight          | ✔️                  | ✔️           | ✔️           | ❌ Heavy      | ✔️           |
-| Ecosystem                 | 🛠️ Modular          | 🎨 Flexible  | 🎨 Modular   | ⚙️ Monolithic | ⚙️ Modular   |
+| Ecosystem                 | 🛠️ Flexible         | 🎨 Flexible  | 🎨 Modular   | ⚙️ Monolithic | ⚙️ Modular   |
 | Ease of Use               | ✔️                  | ✔️           | ✔️           | ❌            | ✔️           |
 | Configurability           | ✔️                  | ✔️           | ✔️           | ✔️            | ✔️           |
 | Documentation Quality     | 📚 Excellent        | 📚 Good      | 📚 Excellent | 📚 Very Good  | 📚 Good      |
@@ -94,7 +94,7 @@ Welcome to **EchoNext**, where innovation meets simplicity! Are you tired of the
 | Community Size            | 📢 Growing          | 📢 Large     | 📢 Growing   | 📢 Large      | 📢 Emerging  |
 | Built-in Template Engine  | ✔️ Jinja2 & builtin | ✔️ Jinja2    | ✔️ Jinja2    | ✔️ Django     | ✔️ Jinja2    |
 | Task Queue Integration    | ❌                  | ✔️ Celery    | ✔️ Celery    | ✔️ Celery     | ✔️ Celery    |
-| Static File Serving       | 🌍 Manual           | 🌍 Manual    | 🚀 Built-in  | 🚀 Built-in   | 🚀 Built-in  |
+| Static File Serving       | 🚀 Built-in         | 🌍 Manual    | 🚀 Built-in  | 🚀 Built-in   | 🚀 Built-in  |
 | Analytics Integration     | ✔️ Easy             | 🛠️ Manual    | ✔️ Easy      | ❌            | ✔️ Easy      |
 
 📈 Note: Echonext excels in performance while staying lightweight, making it a top-notch choice for your next project!
@@ -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 |
 |------------|------------|----------|
-| 1327       | 936        | 34%      |
+| 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

@@ -0,0 +1,49 @@
+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)

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

@@ -4,15 +4,17 @@
 from typing import Any, Callable, Iterable, List, Optional, Tuple, Type
 
 from loguru import logger
+from requests import Session as RequestsSession
 from socks import method
+from wsgiadapter import WSGIAdapter as RequestsWSGIAdapter
 
 from pyechonext.cache import InMemoryCache
 from pyechonext.config import Settings
 from pyechonext.i18n_l10n import JSONi18nLoader, JSONLocalizationLoader
 from pyechonext.logging import setup_logger
 from pyechonext.middleware import BaseMiddleware
 from pyechonext.mvc.controllers import PageController
-from pyechonext.mvc.routes import Router, RoutesTypes
+from pyechonext.mvc.routes import Router, RoutesTypes, Route
 from pyechonext.request import Request
 from pyechonext.response import Response
 from pyechonext.static import StaticFile, StaticFilesManager
@@ -115,6 +117,11 @@ def __init__(
 
 		logger.debug(f"Application {self.application_type.value}: {self.app_name}")
 
+	def test_session(self, host: str = "echonext"):
+		session = RequestsSession()
+		session.mount(prefix=f"http://{host}", adapter=RequestsWSGIAdapter(self))
+		return session
+
 	def _get_request(self, environ: dict) -> Request:
 		"""
 		Gets the request.
@@ -136,6 +143,20 @@ def _get_response(self, request: Request) -> Response:
 		"""
 		return Response(request, content_type=self.application_type.value)
 
+	def add_route(self, page_path: str, handler: Callable):
+		"""
+		Adds a route.
+
+		:param		page_path:	The page path
+		:type		page_path:	str
+		:param		handler:	The handler
+		:type		handler:	Callable
+		"""
+		if inspect.isclass(handler):
+			self.router.add_url(URL(path=page_path, controller=handler))
+		else:
+			self.router.add_page_route(page_path, handler)
+
 	def route_page(self, page_path: str) -> Callable:
 		"""
 		Creating a New Page Route
@@ -284,15 +305,59 @@ def _serve_static_file(
 		)
 		return response
 
-	def _handle_request(self, request: Request) -> Response:
+	def _check_handler(self, request: Request, handler: Callable) -> Callable:
 		"""
-		Handle response from request
+		Check and return handler
+		
+		:param      request:         The request
+		:type       request:         Request
+		:param      handler:         The handler
+		:type       handler:         Callable
+		
+		:returns:   handler
+		:rtype:     Callable
+		
+		:raises     MethodNotAllow:  request method not allowed
+		"""
+		if isinstance(handler, PageController) or inspect.isclass(handler):
+			handler = getattr(handler, request.method.lower(), None)
 
-		:param		request:  The request
-		:type		request:  Request
+			if handler is None:
+				raise MethodNotAllow(
+					f'Method "{request.method.lower()}" don\'t allowed: {request.path}'
+				)
 
-		:returns:	Response callable object
-		:rtype:		Response
+		return handler
+
+	def _filling_response(self, route: Route, response: Response, request: Request, result: Any, handler: Callable):
+		"""
+		Filling response
+
+		:param      route:     The route
+		:type       route:     Route
+		:param      response:  The response
+		:type       response:  Response
+		:param      handler:   The handler
+		:type       handler:   Callable
+		"""
+		if route.route_type == RoutesTypes.URL_BASED:
+			view = route.handler.get_rendered_view(request, result, self)
+			response.body = view
+		else:
+			string = self.i18n_loader.get_string(result)
+			response.body = self.get_and_save_cache_item(string, string)
+
+	def _handle_request(self, request: Request) -> Response:
+		"""
+		Handle response from request
+		
+		:param      request:      The request
+		:type       request:      Request
+		
+		:returns:   Response callable object
+		:rtype:     Response
+		
+		:raises     URLNotFound:  404 Error
 		"""
 		logger.debug(f"Handle request: {request.path}")
 		response = self._get_response(request)
@@ -302,25 +367,16 @@ def _handle_request(self, request: Request) -> Response:
 		handler = route.handler
 
 		if handler is not None:
-			if isinstance(handler, PageController) or inspect.isclass(handler):
-				handler = getattr(handler, request.method.lower(), None)
-
-				if handler is None:
-					raise MethodNotAllow(
-						f'Method "{request.method.lower()}" don\'t allowed: {request.path}'
-					)
+			handler = self._check_handler(request, handler)
 
 			result = handler(request, response, **kwargs)
 
 			if isinstance(result, Response):
 				result = result.body
+			elif result is None:
+				return response
 
-			if route.route_type == RoutesTypes.URL_BASED:
-				view = route.handler.get_rendered_view(request, result, self)
-				response.body = view
-			else:
-				string = self.i18n_loader.get_string(result)
-				response.body = self.get_and_save_cache_item(string, string)
+			self._filling_response(route, response, request, result, handler)
 		else:
 			raise URLNotFound(f'URL "{request.path}" not found.')