Refactoring the methods of the FlaskMVC class

mvc_flask/__init__.py

@@ -1,39 +1,55 @@
-import json
-from pathlib import Path
 from importlib import import_module
+import json
 
+from pathlib import Path
 from flask import Flask
+from flask.blueprints import Blueprint
+from collections import namedtuple
+
+
+Route = namedtuple("Route", ["method", "path", "controller", "action"])
 
 
 class FlaskMVC:
-    def __init__(self, app: Flask = None):
+    def __init__(self, app: Flask = None, directory: str = "app"):
+        self.directory = Path(directory)
+
         if app is not None:
             self.init_app(app)
 
     def init_app(self, app):
-        app.template_folder = "views"
-        app.config.setdefault("FLASK_MVC_DIR", "app")
-
-        self.root_path = Path(app.config["FLASK_MVC_DIR"])
-
-        self._register_router(app)
-
-    def _routes(self):
-        with open(self.root_path / "routes.json", mode="r") as f:
-            return json.load(f)
-
-    def _register_router(self, app):
-        for route in self._routes():
-            controller = route["controller"]
-
-            mod = import_module(
-                f"{self.root_path}.controllers.{controller}_controller"
+        self.create_blueprint(app)
+
+    def routes(self):
+        routes = []
+        with open(self.directory / "routes.json", mode="r") as f:
+            routes = [
+                Route(
+                    route["method"],
+                    route["path"],
+                    route["controller"],
+                    route["action"],
+                )
+                for route in json.load(f)
+            ]
+        return routes
+
+    def create_blueprint(self, app: Flask):
+        for route in self.routes():
+            dd = (
+                self.directory
+                / "controllers"
+                / f"{route.controller}_controller"
             )
-            clazz = getattr(mod, f"{controller.title()}Controller")
 
-            app.add_url_rule(
-                route["path"],
-                endpoint=f"{controller}.{route['action']}",
-                view_func=getattr(clazz(), route["action"]),
-                methods=[route["method"]],
+            obj = import_module(dd.as_posix().replace("/", "."))
+            controller = getattr(obj, f"{route.controller.title()}Controller")
+
+            blueprint = Blueprint(route.controller, route.controller)
+            blueprint.add_url_rule(
+                rule=route.path,
+                endpoint=route.action,
+                view_func=getattr(controller(), route.action),
+                methods=[route.method],
             )
+            app.register_blueprint(blueprint)

sample_app/app.py

@@ -0,0 +1,14 @@
+from flask import Flask
+from mvc_flask import FlaskMVC
+
+
+def create_app():
+    app = Flask(__name__)
+    return app
+
+
+if __name__ == "__main__":
+    app = create_app()
+    app.template_folder = "views"
+    FlaskMVC(app, ".")
+    app.run()

sample_app/controllers/home_controller.py

@@ -0,0 +1,6 @@
+from flask import render_template
+
+
+class HomeController:
+    def index(self):
+        return render_template("index.html")

example/routes.json → sample_app/routes.json

@@ -5,18 +5,6 @@
     "controller": "home",
     "action": "index"
   },
-  {
-    "method": "get",
-    "path": "/new",
-    "controller": "home",
-    "action": "new"
-  },
-  {
-    "method": "post",
-    "path": "/create",
-    "controller": "home",
-    "action": "create"
-  },
   {
     "method": "GET",
     "path": "/contact",

sample_app/views/index.html

@@ -0,0 +1 @@
+<h1>Hello, World!</h1>

tests/fixtures.py

@@ -1,21 +1,20 @@
-from example.app import create_app
-from mvc_flask import FlaskMVC
+from sample_app.app import create_app
 from ward import fixture
+from mvc_flask import FlaskMVC
 
 
 @fixture
-def test_client():
+def test_app():
     app = create_app()
     app.testing = True
-    app_contenxt = app.test_request_context()
-    app_contenxt.push()
-
-    return app.test_client()
+    app.template_folder = "views"
+    FlaskMVC(app, directory="sample_app")
+    return app
 
 
 @fixture
-def test_app():
-    app = create_app()
-    app.testing = True
+def test_client(app=test_app):
+    app_contenxt = app.test_request_context()
+    app_contenxt.push()
 
-    return app
+    return app.test_client()

tests/test_routes.py

@@ -1,5 +1,5 @@
-from ward import test, expect, skip
-from fixtures import test_app
+from ward import test, expect
+from tests.fixtures import test_app, test_client
 
 
 @test("contains routes")
@@ -8,17 +8,13 @@ def _(app=test_app):
 
     expect.assert_in("/contact", routes, None)
     expect.assert_in("/", routes, None)
-    expect.assert_in("/new", routes, None)
-    expect.assert_in("/create", routes, None)
 
 
 @test("contains endpoints")
 def _(app=test_app):
     endpoints = [route.endpoint for route in app.url_map.iter_rules()]
 
     expect.assert_in("home.index", endpoints, None)
-    expect.assert_in("home.new", endpoints, None)
-    expect.assert_in("home.create", endpoints, None)
     expect.assert_in("contact.index", endpoints, None)
 
 
@@ -30,5 +26,20 @@ def _(app=test_app):
         for route in routes.methods
     ]
 
-    expect.assert_equal(methods.count("GET"), 4, None)
-    expect.assert_equal(methods.count("POST"), 1, None)
+    expect.assert_equal(methods.count("GET"), 3, None)
+
+
+@test("must contains text")
+def _(client=test_client):
+    res = client.get("/")
+
+    expect.assert_equal(res.status_code, 200, None)
+    expect.assert_in("Hello, World!", res.get_data(as_text=True), None)
+
+
+@test("must contains text")
+def _(client=test_client):
+    res = client.get("/contact")
+
+    expect.assert_equal(res.status_code, 200, None)
+    expect.assert_in("Contact page", res.get_data(as_text=True), None)