Improved consistency

Author: growvolutionary

DOCS.md

@@ -35,7 +35,7 @@ SERVER_NAME = localhost
 SECRET_KEY = supersecret
 
 [database]
-DATABASE_URL = sqlite:///appdata.db
+DATABASE_URI = sqlite:///appdata.db
 
 [redis]
 REDIS_URL = redis://localhost:6379
@@ -109,7 +109,7 @@ class DefaultConfig:
     # -------------------------------------------------
     # Flask-SQLAlchemy & Flask-Migrate
     # -------------------------------------------------
-    SQLALCHEMY_DATABASE_URI = os.getenv("DATABASE_URL", "sqlite:///database.db")
+    SQLALCHEMY_DATABASE_URI = os.getenv("DATABASE_URI", "sqlite:///database.db")
     SQLALCHEMY_TRACK_MODIFICATIONS = False
 
     # -------------------------------------------------
@@ -311,9 +311,9 @@ module = Module(
     #    "api",
     #    "jwt_extended"
     ],
-    
-    # And you can optionally turn off init_routes_on_enable (default is True):
-    False
+    # init_routes_on_enable=False
+    # -> You can optionally turn off automated route initialization when the module gets enabled.
+    # This could be especially useful, if you are working with socket i18n. (More in the later chapters.)
 )
 
 # Now if you need to do stuff when your module gets enabled:
@@ -354,11 +354,15 @@ def init_handling(mod: Module):
     for file in _package.rglob("*.py"):
         if file.stem == "__init__" or file.stem.startswith("noinit"):
             continue
-        handler_name = file.stem
+
+        rel = file.relative_to(_package).with_suffix("")
+        handler_name = ".".join(rel.parts)
+
         handler = import_module(f"{mod.import_name}.handling.{handler_name}")
         handle_request = getattr(handler, "handle_request", None)
         if not handle_request:
             continue
+
         mod.handler(handler_name)(handle_request)
 ```
 
@@ -427,7 +431,8 @@ def init_models(mod: Module):
     for file in _package.rglob("*.py"):
         if file.stem == "__init__" or file.stem.startswith("noinit"):
             continue
-        import_module(f"{mod.import_name}.data.{file.stem}")
+        rel = file.relative_to(_package).with_suffix("")
+        import_module(f"{mod.import_name}.data.{".".join(rel.parts)}")
 ```
 
 ### Working with Modules
@@ -624,7 +629,10 @@ module = Module(
         "sqlalchemy",
         "socket",
         "babel"
-    ]
+    ],
+    False
+    # -> False to install translations before route setup.
+    # This is especially useful if you are using translations inside your route setup.
 )
 
 @module.on_enable
@@ -639,6 +647,9 @@ def enable(app: FlaskPP):
             # -> default is module.name
         )   # This will register the domain_name as the modules translation domain, pass it as a variable called "DOMAIN" to the
             # context processor and automatically cause _ and ngettext to primarily resolve translation keys from that domain.
+        
+    # Now you can enable routes after you registered your translations
+    module.init_routes()
 
 # If you now do something like this, for example:
 from flask import render_template_string

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "flaskpp"
-version = "0.3.8"
+version = "0.3.10"
 description = "A Flask based framework for fast and easy app creation. Experience the real power of Flask without boilerplate, but therefore a well balanced mix of magic and the default Flask framework."
 authors = [
     { name = "Pierre", email = "pierre@growv-mail.org" }

src/flaskpp/app/config/default.py

@@ -11,7 +11,7 @@ class DefaultConfig:
     PROXY_FIX = False
     PROXY_COUNT = 1
 
-    SQLALCHEMY_DATABASE_URI = os.getenv("DATABASE_URL", "sqlite:///database.db")
+    SQLALCHEMY_DATABASE_URI = os.getenv("DATABASE_URI", "sqlite:///database.db")
     SQLALCHEMY_TRACK_MODIFICATIONS = False
 
     RATELIMIT_ENABLED = True

src/flaskpp/module.py

@@ -252,14 +252,16 @@ def version_check(v: str) -> tuple[bool, str]:
 
     first_char_invalid = False
     try:
-        if version_str.startswith("v"):
-            version_str = version_str[1:]
         int(version_str[0])
     except ValueError:
         first_char_invalid = True
 
     if  first_char_invalid \
-            or (" " in version_str and not (version_str.endswith("alpha") or version_str.endswith("beta"))):
+            or (" " in version_str and not (
+            version_str.endswith("alpha")
+            or version_str.endswith("beta")
+            or version_str.endswith("rc")
+    )):
         return False, "Invalid version string format."
 
     try:

src/flaskpp/modules/creator_templates.py

@@ -36,11 +36,15 @@ def init_handling(mod: Module):
     for file in _package.rglob("*.py"):
         if file.stem == "__init__" or file.stem.startswith("noinit"):
             continue
-        handler_name = file.stem
+
+        rel = file.relative_to(_package).with_suffix("")
+        handler_name = ".".join(rel.parts)
+
         handler = import_module(f"{mod.import_name}.handling.{handler_name}")
         handle_request = getattr(handler, "handle_request", None)
         if not handle_request:
             continue
+
         mod.handler(handler_name)(handle_request)
 """
 
@@ -118,7 +122,8 @@ def init_models(mod: Module):
     for file in _package.rglob("*.py"):
         if file.stem == "__init__" or file.stem.startswith("noinit"):
             continue
-        import_module(f"{mod.import_name}.data.{file.stem}")
+        rel = file.relative_to(_package).with_suffix("")
+        import_module(f"{mod.import_name}.data.{".".join(rel.parts)}")
 """
 
 tailwind_raw = """

src/flaskpp/utils/setup.py

@@ -3,7 +3,7 @@
 from configparser import ConfigParser
 import typer
 
-from flaskpp.utils import prompt_yes_no
+from flaskpp.utils import prompt_yes_no, sanitize_text
 from flaskpp.modules import generate_modlib
 
 counting_map = {
@@ -23,7 +23,7 @@ def base_config():
         },
 
         "database": {
-            "default_DATABASE_URL": "sqlite:///appdata.db",
+            "default_DATABASE_URI": "sqlite:///appdata.db",
         },
 
         "redis": {
@@ -84,7 +84,7 @@ def welcome():
                " ------------------\n")
     typer.echo("Thank you for using our framework to build your own")
     typer.echo("Flask++ apps! We will try our best to get you ready")
-    typer.echo("within the next two minutes. 💚 Start a timer! 😉\n")
+    typer.echo("within the next two minutes. 💚  Start a timer! 😉\n")
     typer.echo("      " +
                typer.style(
                    "~ GrowVolution 2025 - MIT License ~",
@@ -132,7 +132,7 @@ def setup_app(app_number: int):
             else:
                 input_prompt = f"{key}: "
 
-            val = input(input_prompt).strip()
+            val = sanitize_text(input(input_prompt)).strip()
             if not val:
                 val = str(value)
             config[k][key] = val
@@ -148,9 +148,9 @@ def setup_app(app_number: int):
     ) + "\n")
 
     register_app = prompt_yes_no(typer.style(
-        f"Do you want to register {app} as a service? (y/N): ",
-        fg=typer.colors.MAGENTA, bold=True
-    ) + "\n")
+        f"Do you want to register {app} as a service?",
+        fg=typer.colors.YELLOW, bold=True
+    ) + " (y/N): ")
 
     if register_app:
         from .service_registry import register