Merge pull request #3 from TTWShell/refactor

refactor base db and schema

Author: TTWShell

hobbit_core/flask_hobbit/__init__.py

@@ -6,37 +6,25 @@
 """
 
 from flask import Flask
-from flask_sqlalchemy import SQLAlchemy
-from flask_marshmallow import Marshmallow
 
 
 class HobbitManager:
 
-    def __init__(self, app=None, db=None, ma=None, **kwargs):
+    def __init__(self, app=None, **kwargs):
         """
         app: The Flask application instance.
-        db: An Object-Database Mapper instance such as SQLAlchemy.
-        ma: The Marshmallow instance.
         """
         self.app = app
         if app is not None:
-            self.init_app(app, db, ma, **kwargs)
+            self.init_app(app, **kwargs)
 
-    def init_app(self, app, db, ma, **kwargs):
+    def init_app(self, app, **kwargs):
         if not isinstance(app, Flask):
             raise TypeError(
                 'flask_hobbit.HobbitManager.init_app(): '
                 'Parameter "app" is an instance of class "{}" '
                 'instead of a subclass of class "flask.Flask".'.format(
                     app.__class__.__name__))
 
-        if not isinstance(db, SQLAlchemy):
-            raise TypeError('flask_hobbit be dependent on SQLAlchemy.')
-        self.db = db
-
-        if ma and not isinstance(ma, Marshmallow):
-            raise TypeError('flask_hobbit be dependent on Marshmallow.')
-        self.ma = ma
-
         # Bind Flask-Hobbit to app
         app.hobbit_manager = self

hobbit_core/flask_hobbit/db.py

@@ -1,33 +1,26 @@
 import enum
 
-from sqlalchemy.orm import relationship
-from flask import current_app
-
-db = current_app.hobbit_manager.db
-
-Column = db.Column
-Model = db.Model
-relationship = relationship
+from sqlalchemy import Integer, Column, ForeignKey, func, DateTime
 
 
 class SurrogatePK:
     __table_args__ = {'extend_existing': True}
 
-    id = db.Column(db.Integer, primary_key=True)
+    id = Column(Integer, primary_key=True)
     created_at = Column(
-        db.DateTime, nullable=False, server_default=db.func.now())
+        DateTime, nullable=False, server_default=func.now())
     updated_at = Column(
-        db.DateTime, nullable=False, server_default=db.func.now(),
-        onupdate=db.func.now())
+        DateTime, nullable=False, server_default=func.now(),
+        onupdate=func.now())
 
     def __repr__(self):
         return '<{classname}({pk}:{label!r})>'.format(
             classname=type(self).__name__, pk=self.id, label=self.label or '')
 
 
 def reference_col(tablename, nullable=False, pk_name='id', **kwargs):
-    return db.Column(
-        db.ForeignKey('{0}.{1}'.format(tablename, pk_name)),
+    return Column(
+        ForeignKey('{0}.{1}'.format(tablename, pk_name)),
         nullable=nullable, **kwargs)
 
 

hobbit_core/flask_hobbit/schemas.py

@@ -1,10 +1,7 @@
-from flask import current_app
-from marshmallow import fields
+from marshmallow import Schema, fields
 
-ma = current_app.hobbit_manager.ma
 
-
-class PagedSchema(ma.Schema):
+class PagedSchema(Schema):
     total = fields.Int()
     page = fields.Int(missing=1, default=1)
     page_size = fields.Int(missing=10, default=10)

hobbit_core/hobbit/static/bootstrap/shire/{{ project_name }}/models/example.py.jinja2

@@ -1,7 +1,8 @@
-from hobbit_core.flask_hobbit.db import db, SurrogatePK
+from hobbit_core.flask_hobbit.db import SurrogatePK, Column
+from {{ project_name }}.exts import db
 
 
 class User(SurrogatePK, db.Model):
-    username = db.Column(db.String(20), unique=True, nullable=False, doc='用户名')
-    nick = db.Column(db.String(20), unique=True, nullable=False, doc='昵称')
+    username = Column(db.String(20), unique=True, nullable=False, doc='用户名')
+    nick = Column(db.String(20), unique=True, nullable=False, doc='昵称')
 

hobbit_core/hobbit/static/bootstrap/shire/{{ project_name }}/run.py.jinja2

@@ -6,19 +6,18 @@ from hobbit_core.flask_hobbit.err_handler import ErrHandler
 
 from {{ project_name }}.exts import db, migrate, ma, hobbit
 from {{ project_name }} import config
+from {{ project_name }} import views
 
 
 def register_extensions(app):
     db.init_app(app)
     migrate.init_app(app, db)
     ma.init_app(app)
-    hobbit.init_app(app, db, ma)
+    hobbit.init_app(app)
 
 
 def register_blueprints(app):
-    with app.app_context():
-        from {{ project_name }} import views
-        app.register_blueprint(views.bp, url_prefix='/api')
+    app.register_blueprint(views.bp, url_prefix='/api')
 
 
 def register_error_handler(app):