tests/fix: fix response json property and add tests

Author: alexeev-prog

README.md

@@ -594,7 +594,7 @@ To test the web framework, PyTest with the pytest-cov plugin is used. You can lo
 
 | Statements | Miss       | Coverage |
 |------------|------------|----------|
-| 1327       | 936        | 34%      |
+| 1548       | 721        | 53%      |
 
 ## Documentation 🌍
 Extended documentation and framework specifications are available at the following links:

examples/modern.py

@@ -0,0 +1,33 @@
+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
+
+
+class IndexController(PageController):
+	def get(self, request, response, **kwargs):
+		return "Hello"
+
+	def post(self, request, response, **kwargs):
+		return "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"):
+	response.body = f"Hello {name}!"

pyechonext/app.py

@@ -4,7 +4,9 @@
 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
@@ -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
@@ -314,6 +335,8 @@ def _handle_request(self, request: Request) -> Response:
 
 			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)

pyechonext/mvc/routes.py

@@ -122,6 +122,9 @@ def add_url(self, url: URL):
 		:param		url:  The url
 		:type		url:  URL
 		"""
+		if url.path in self.routes:
+			raise RoutePathExistsError(f'Route "{url.path}" already exists.')
+
 		self.routes[url.path] = _create_url_route(url)
 
 	def resolve(

pyechonext/response.py

@@ -93,9 +93,9 @@ def __getattr__(self, item: Any) -> Union[Any, None]:
 
 	def _structuring_headers(self, environ):
 		headers = {
-			"Host": environ["HTTP_HOST"],
-			"Accept": environ["HTTP_ACCEPT"],
-			"User-Agent": environ["HTTP_USER_AGENT"],
+			"Host": environ.get("HTTP_HOST"),
+			"Accept": environ.get("HTTP_ACCEPT"),
+			"User-Agent": environ.get("HTTP_USER_AGENT"),
 		}
 
 		for name, value in headers.items():
@@ -156,7 +156,7 @@ def __call__(self, environ: dict, start_response: method) -> Iterable:
 		self._structuring_headers(environ)
 
 		logger.debug(
-			f"[{environ['REQUEST_METHOD']} {self.status_code}] Run response: {self.content_type}"
+			f"[{environ.get('REQUEST_METHOD')} {self.status_code}] Run response: {self.content_type}"
 		)
 
 		start_response(status=self.status_code, headers=self._headerslist)
@@ -173,10 +173,9 @@ def json(self) -> dict:
 		"""
 		if self.body:
 			if self.content_type == "application/json":
-				return json.loads(json.dumps(self.body))
-				# return self.body
-			else:
 				return json.loads(self.body)
+			else:
+				return json.loads(json.dumps(self.body))
 
 		return {}
 

pyproject.toml

@@ -20,6 +20,7 @@ toml = "^0.10.2"
 pyyaml = "^6.0.2"
 requests = "^2.32.3"
 orjson = "^3.10.12"
+requests-wsgi-adapter = "^0.4.1"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^8.3.0"

tests/test_app.py

@@ -0,0 +1,58 @@
+import os
+
+import pytest
+
+from pyechonext.app import ApplicationType, EchoNext
+from pyechonext.config import Settings
+from pyechonext.middleware import middlewares
+from pyechonext.mvc.controllers import PageController
+
+
+@pytest.fixture
+def echonext():
+	settings = Settings(
+		BASE_DIR=os.path.dirname(os.path.abspath(__file__)), TEMPLATES_DIR="templates"
+	)
+	echonext = EchoNext(
+		__name__,
+		settings,
+		middlewares,
+		application_type=ApplicationType.HTML,
+	)
+	return echonext
+
+
+@pytest.fixture
+def client(echonext):
+	return echonext.test_session()
+
+
+def test_basic_route(echonext, client):
+	RESPONSE_TEXT = "Hello World"
+
+	@echonext.route_page("/")
+	def index(request, response):
+		response.body = RESPONSE_TEXT
+
+	@echonext.route_page("/hello/{name}")
+	def hello(request, response, name):
+		response.body = f"hey {name}"
+
+	@echonext.route_page("/title")
+	def title(request, response):
+		return echonext.i18n_loader.get_string("title %{name}", name="Test")
+
+	@echonext.route_page("/books")
+	class BooksController(PageController):
+		def get(self, request, response, **kwargs):
+			return "Book Get"
+
+		def post(self, request, response, **kwargs):
+			return "Book Post"
+
+	assert client.get("http://echonext/").text == RESPONSE_TEXT
+	assert client.get("http://echonext/hello/matthew").text == "hey matthew"
+	assert client.get("http://echonext/hello/ashley").text == "hey ashley"
+	assert client.get("http://echonext/books").text == "Book Get"
+	assert client.post("http://echonext/books").text == "Book Post"
+	assert client.get("http://echonext/title").text == "pyEchoNext Example Website Test"