tina4-python 0.1.78__tar.gz → 0.1.80__tar.gz

{tina4_python-0.1.78 → tina4_python-0.1.80}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tina4-python
-Version: 0.1.78
+Version: 0.1.80
 Summary: Tina4Python - This is not another framework for Python
 Author: Andre van Zuydam
 Author-email: andrevanzuydam@gmail.com
@@ -243,21 +243,21 @@ API_KEY=somehash
 
 
 ### Features
-| Completed                  | To Do                |
-|----------------------------|----------------------|
-| Python pip package         |                      |
-| Basic environment handling |                      |
-| Basic routing              | OpenAPI (Swagger)    |
-| Enhanced routing           |                      |
-| CSS Support                |                      |
-| Image Support              |                      |
-| Localization               |                      |
-| Error Pages                |                      |
-| Template handling          |                      |
-| Form posting               |                      |
-| Migrations                 |                      |
-| Colored Debugging          |                      |
-|                            | Database Abstraction |
+| Completed                  | To Do             |
+|----------------------------|-------------------|
+| Python pip package         |                   |
+| Basic environment handling |                   |
+| Basic routing              | OpenAPI (Swagger) |
+| Enhanced routing           |                   |
+| CSS Support                |                   |
+| Image Support              |                   |
+| Localization               |                   |
+| Error Pages                |                   |
+| Template handling          |                   |
+| Form posting               |                   |
+| Migrations                 |                   |
+| Colored Debugging          |                   |
+| Database Abstraction       |                   |   
 
 ### Database
 
@@ -366,13 +366,13 @@ Migration updates:
 
 #### Using Python
 
-Building the package:
- ```bash
+Building the package without poetry - you will need to request an API key:
+```bash
 python3 -m pip install --upgrade build
 python3 -m build
 python3 -m pip install --upgrade twine
 python3 -m twine upload dist/*
- ```
+```
 
 #### Using Poetry
 

{tina4_python-0.1.78 → tina4_python-0.1.80}/README.md

@@ -222,21 +222,21 @@ API_KEY=somehash
 
 
 ### Features
-| Completed                  | To Do                |
-|----------------------------|----------------------|
-| Python pip package         |                      |
-| Basic environment handling |                      |
-| Basic routing              | OpenAPI (Swagger)    |
-| Enhanced routing           |                      |
-| CSS Support                |                      |
-| Image Support              |                      |
-| Localization               |                      |
-| Error Pages                |                      |
-| Template handling          |                      |
-| Form posting               |                      |
-| Migrations                 |                      |
-| Colored Debugging          |                      |
-|                            | Database Abstraction |
+| Completed                  | To Do             |
+|----------------------------|-------------------|
+| Python pip package         |                   |
+| Basic environment handling |                   |
+| Basic routing              | OpenAPI (Swagger) |
+| Enhanced routing           |                   |
+| CSS Support                |                   |
+| Image Support              |                   |
+| Localization               |                   |
+| Error Pages                |                   |
+| Template handling          |                   |
+| Form posting               |                   |
+| Migrations                 |                   |
+| Colored Debugging          |                   |
+| Database Abstraction       |                   |   
 
 ### Database
 
@@ -345,13 +345,13 @@ Migration updates:
 
 #### Using Python
 
-Building the package:
- ```bash
+Building the package without poetry - you will need to request an API key:
+```bash
 python3 -m pip install --upgrade build
 python3 -m build
 python3 -m pip install --upgrade twine
 python3 -m twine upload dist/*
- ```
+```
 
 #### Using Poetry
 

{tina4_python-0.1.78 → tina4_python-0.1.80}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "tina4-python"
-version = "0.1.78"
+version = "0.1.80"
 description = "Tina4Python - This is not another framework for Python"
 authors = ["Andre van Zuydam <andrevanzuydam@gmail.com>"]
 readme = "README.md"

{tina4_python-0.1.78 → tina4_python-0.1.80}/tina4_python/Auth.py

@@ -33,7 +33,7 @@ class Auth:
         # Generate a salt
         salt = bcrypt.gensalt()
         # Hash the password
-        return bcrypt.hashpw(password_bytes, salt)
+        return bcrypt.hashpw(password_bytes, salt).decode('utf-8')
 
     def check_password(self, password_hash, text):
         """
@@ -43,7 +43,7 @@ class Auth:
         :return:
         """
         password_bytes = text.encode('utf-8')
-        return bcrypt.checkpw(password_bytes, password_hash)
+        return bcrypt.checkpw(password_bytes, password_hash.encode('utf-8'))
 
     def load_private_key(self):
         if self.loaded_private_key:

{tina4_python-0.1.78 → tina4_python-0.1.80}/tina4_python/DatabaseResult.py

@@ -4,6 +4,7 @@
 # License: MIT https://opensource.org/licenses/MIT
 #
 # flake8: noqa: E501
+import base64
 import json
 
 
@@ -23,13 +24,26 @@ class DatabaseResult:
 
         self.error = _error
 
-    def to_json(self):
+    def to_array(self):
         if self.error is not None:
-            return json.dumps({"error": self.error})
+            return {"error": self.error}
         elif len(self.records) > 0:
-            return json.dumps(self.records)
+            # check all the records - if we get bytes we base64encode them for the json to work
+            json_records = []
+            for record in self.records:
+                json_record = {}
+                for key in record:
+                    if isinstance(record[key], bytes):
+                        json_record[key] = base64.b64encode(record[key]).decode('utf-8')
+                    else:
+                        json_record[key] = record[key]
+                json_records.append(json_record)
+            return json_records
         else:
-            return "[]"
+            return []
+
+    def to_json(self):
+        return json.dumps(self.to_array())
 
     def __getitem__(self, item):
         if item < len(self.records):

{tina4_python-0.1.78 → tina4_python-0.1.80}/tina4_python/Router.py

@@ -57,6 +57,8 @@ class Router:
     @staticmethod
     async def get_result(url, method, request, headers, session):
         Debug("Root Path " + tina4_python.root_path + " " + url, method, Constant.TINA4_LOG_DEBUG)
+        tina4_python.tina4_current_request["url"] = url
+        tina4_python.tina4_current_request["headers"] = headers
         # we can add other methods later but right now we validate posts
         if method in [Constant.TINA4_POST, Constant.TINA4_PUT, Constant.TINA4_PATCH, Constant.TINA4_DELETE]:
             content = Template.render_twig_template(
@@ -133,7 +135,6 @@ class Router:
                 if content != "":
                     return Response(content, Constant.HTTP_OK, Constant.TEXT_HTML)
 
-        # If no route is matched, serve 404
         if result.http_code == Constant.HTTP_NOT_FOUND:
             content = Template.render_twig_template(
                 "errors/404.twig", {"server": {"url": url}})

{tina4_python-0.1.78 → tina4_python-0.1.80}/tina4_python/Session.py

@@ -104,7 +104,6 @@ class Session:
         try:
             if not os.path.exists(self.session_path):
                 os.makedirs(self.session_path)
-            Debug("SAVING", self.session_values, self.session_path, Constant.TINA4_LOG_DEBUG)
             token = tina4_python.tina4_auth.get_token(payload_data=self.session_values)
             with open(self.session_path + os.sep + self.session_hash, "w") as file:
                 file.write(token)

{tina4_python-0.1.78 → tina4_python-0.1.80}/tina4_python/Template.py

@@ -48,6 +48,9 @@ class Template:
     def render_twig_template(template_or_file_name, data=None):
         if data is None:
             data = {"request": tina4_python.tina4_current_request}
+        else:
+            data.update({"request": tina4_python.tina4_current_request})
+
         twig = Template.init_twig(tina4_python.root_path + os.sep + "src" + os.sep + "templates")
         try:
             if twig.get_template(template_or_file_name):
@@ -58,7 +61,7 @@ class Template:
                 content = template.render(data)
 
         except Exception as e:
-            Debug("Error rendering twig file", template_or_file_name, data, e, Constant.TINA4_LOG_ERROR)
+            Debug("Error rendering twig file", template_or_file_name, e, Constant.TINA4_LOG_ERROR)
             content = str(e)
 
         return content

{tina4_python-0.1.78 → tina4_python-0.1.80}/tina4_python/__init__.py

@@ -20,7 +20,7 @@ from tina4_python import Messages, Constant
 from tina4_python.Swagger import Swagger
 from tina4_python.Env import load_env
 from tina4_python.Webserver import Webserver
-from tina4_python.Router import Router
+from tina4_python.Router import Router, get
 from tina4_python.Localization import localize
 from tina4_python.Auth import Auth
 from tina4_python.Debug import Debug
@@ -88,6 +88,9 @@ if not os.path.exists(root_path + os.sep + "src"):
             app_file.write('from tina4_python import *')
             app_file.write('\n')
 
+if not os.path.exists(root_path + os.sep + "src" + os.sep + "app"):
+    os.makedirs(root_path + os.sep + "src" + os.sep + "app")
+
 # copy over templates if needed - required for errors
 if not os.path.exists(root_path + os.sep + "src" + os.sep + "templates"):
     source_dir = library_path + os.sep + "templates"