cleanup

README.md

@@ -1,5 +1,11 @@
 # Molten-Boilerplate
 
+## What's included?
+- SQLAlchemy
+- alembic
+- camelCase API
+- py.test
+
 ## Usage
 Install requirements
 

__init__.py

@@ -1 +0,0 @@
-from api.user.models import User

alembic.ini

@@ -35,7 +35,7 @@ script_location = migrations
 # are written from script.py.mako
 # output_encoding = utf-8
 
-# OVERWRITTEN IN migrations/env.py
+# !!! Overwritten in migrations/env.py !!!
 sqlalchemy.url = sqlite:///db.sqlite3
 
 

api/user/__init__.py

@@ -0,0 +1,2 @@
+from . import views
+from . import models

custom/parsers.py

@@ -4,7 +4,7 @@
 from molten import RequestBody
 from molten.errors import ParseError
 
-from animal_case.convert import parse_keys
+from .animal_case.convert import parse_keys
 
 
 class JSONParser:

custom/renderers.py

@@ -5,7 +5,7 @@
 from molten import Response
 from molten.validation import dump_schema, is_schema
 
-from animal_case.convert import parse_keys
+from .animal_case.convert import parse_keys
 
 
 class JSONRenderer:

db.py

@@ -5,9 +5,6 @@
 
 Base = declarative_base()
 
-from api.comment.models import *
-from api.user.models import *
-
 
 def init_db(engine_data: EngineData):
     Base.metadata.create_all(engine_data.engine)

index.py

@@ -7,15 +7,13 @@
 from molten import URLEncodingParser, MultiPartParser
 from molten.contrib.sqlalchemy import (
     SQLAlchemyEngineComponent, SQLAlchemyMiddleware,
-    SQLAlchemySessionComponent,
-    EngineData)
+    SQLAlchemySessionComponent)
 from molten.contrib.toml_settings import TOMLSettingsComponent
 from molten.openapi import HTTPSecurityScheme, Metadata, OpenAPIHandler, OpenAPIUIHandler
 
 from api.comment.views import list_comments, create_comment, get_comment, delete_comment
 from api.user.views import list_users, create_user, get_user, delete_user
 from custom import JSONParser, JSONRenderer
-from db import Base
 
 get_docs = OpenAPIUIHandler()
 
@@ -62,7 +60,7 @@
 ]
 
 
-def create_app(_components=None, _middleware=None, _routes=None, _setup_db=False):
+def create_app(_components=None, _middleware=None, _routes=None):
     app = App(
         components=_components or components,
         middleware=_middleware or middleware,
@@ -74,16 +72,4 @@ def create_app(_components=None, _middleware=None, _routes=None, _setup_db=False
         ],
         renderers=[JSONRenderer()]
     )
-    if _setup_db:
-        setup_db(app)
     return app
-
-
-def init_db(engine_data: EngineData):
-    Base.metadata.create_all(engine_data.engine)
-
-
-def setup_db(app):
-    # Initialize the DB by injecting EngineData into initdb and calling it.
-    resolver = app.injector.get_resolver()
-    resolver.resolve(init_db)()

tests/conftest.py

@@ -1,14 +1,28 @@
 import pytest
 from molten import testing
+from molten.contrib.sqlalchemy import (
+    EngineData)
 
+from db import Base
 from index import create_app
 
 
+def init_db(engine_data: EngineData):
+    Base.metadata.create_all(engine_data.engine)
+
+
+def setup_db(app):
+    # Initialize the DB by injecting EngineData into init_db and calling it.
+    resolver = app.injector.get_resolver()
+    resolver.resolve(init_db)()
+
+
 # requires function scope so that database is removed on every tests
 # TODO - find a less hacky way to clear database after each test
 @pytest.fixture(scope="function")
 def app():
-    app = create_app(_setup_db=True)
+    app = create_app()
+    setup_db(app)
     yield app
     import os
     test_db = "test.db.sqlite3"