split views and models

Author: davidism

examples/flaskr/flaskr/auth/__init__.py

@@ -0,0 +1 @@
+from .views import bp

examples/flaskr/flaskr/auth/models.py

@@ -0,0 +1,23 @@
+from sqlalchemy.ext.hybrid import hybrid_property
+from werkzeug.security import check_password_hash
+from werkzeug.security import generate_password_hash
+
+from flaskr import db
+
+
+class User(db.Model):
+    id = db.Column(db.Integer, primary_key=True)
+    username = db.Column(db.String, unique=True, nullable=False)
+    _password = db.Column("password", db.String, nullable=False)
+
+    @hybrid_property
+    def password(self):
+        return self._password
+
+    @password.setter
+    def password(self, value):
+        """Store the password as a hash for security."""
+        self._password = generate_password_hash(value)
+
+    def check_password(self, value):
+        return check_password_hash(self.password, value)

examples/flaskr/flaskr/auth.py renamed to examples/flaskr/flaskr/auth/views.py

@@ -8,30 +8,9 @@
 from flask import request
 from flask import session
 from flask import url_for
-from sqlalchemy.ext.hybrid import hybrid_property
-from werkzeug.security import check_password_hash
-from werkzeug.security import generate_password_hash
 
 from flaskr import db
-
-
-class User(db.Model):
-    id = db.Column(db.Integer, primary_key=True)
-    username = db.Column(db.String, unique=True, nullable=False)
-    _password = db.Column("password", db.String, nullable=False)
-
-    @hybrid_property
-    def password(self):
-        return self._password
-
-    @password.setter
-    def password(self, value):
-        """Store the password as a hash for security."""
-        self._password = generate_password_hash(value)
-
-    def check_password(self, value):
-        return check_password_hash(self.password, value)
-
+from flaskr.auth.models import User
 
 bp = Blueprint("auth", __name__, url_prefix="/auth")
 

examples/flaskr/flaskr/blog/__init__.py

@@ -0,0 +1 @@
+from .views import bp

examples/flaskr/flaskr/blog/models.py

@@ -0,0 +1,26 @@
+from flask import url_for
+
+from flaskr import db
+from flaskr.auth.models import User
+
+
+class Post(db.Model):
+    id = db.Column(db.Integer, primary_key=True)
+    author_id = db.Column(db.ForeignKey(User.id), nullable=False)
+    created = db.Column(
+        db.DateTime, nullable=False, server_default=db.func.current_timestamp()
+    )
+    title = db.Column(db.String, nullable=False)
+    body = db.Column(db.String, nullable=False)
+
+    # User object backed by author_id
+    # lazy="joined" means the user is returned with the post in one query
+    author = db.relationship(User, lazy="joined", backref="posts")
+
+    @property
+    def update_url(self):
+        return url_for("blog.update", id=self.id)
+
+    @property
+    def delete_url(self):
+        return url_for("blog.delete", id=self.id)

examples/flaskr/flaskr/blog.py renamed to examples/flaskr/flaskr/blog/views.py

@@ -8,31 +8,8 @@
 from werkzeug.exceptions import abort
 
 from flaskr import db
-from flaskr.auth import login_required
-from flaskr.auth import User
-
-
-class Post(db.Model):
-    id = db.Column(db.Integer, primary_key=True)
-    author_id = db.Column(db.ForeignKey(User.id), nullable=False)
-    created = db.Column(
-        db.DateTime, nullable=False, server_default=db.func.current_timestamp()
-    )
-    title = db.Column(db.String, nullable=False)
-    body = db.Column(db.String, nullable=False)
-
-    # User object backed by author_id
-    # lazy="joined" means the user is returned with the post in one query
-    author = db.relationship(User, lazy="joined", backref="posts")
-
-    @property
-    def update_url(self):
-        return url_for("blog.update", id=self.id)
-
-    @property
-    def delete_url(self):
-        return url_for("blog.delete", id=self.id)
-
+from flaskr.auth.views import login_required
+from flaskr.blog.models import Post
 
 bp = Blueprint("blog", __name__)
 

examples/flaskr/tests/conftest.py

@@ -6,8 +6,8 @@
 from flaskr import create_app
 from flaskr import db
 from flaskr import init_db
-from flaskr.auth import User
-from flaskr.blog import Post
+from flaskr.auth.models import User
+from flaskr.blog.models import Post
 
 _user1_pass = generate_password_hash("test")
 _user2_pass = generate_password_hash("other")

examples/flaskr/tests/test_auth.py

@@ -2,7 +2,7 @@
 from flask import g
 from flask import session
 
-from flaskr.auth import User
+from flaskr.auth.models import User
 
 
 def test_register(client, app):

examples/flaskr/tests/test_blog.py

@@ -1,8 +1,8 @@
 import pytest
 
 from flaskr import db
-from flaskr.auth import User
-from flaskr.blog import Post
+from flaskr.auth.models import User
+from flaskr.blog.models import Post
 
 
 def test_index(client, auth):