Added snippet database to the website.

flask_website/database.py

@@ -1,9 +1,12 @@
 from datetime import datetime
 from sqlalchemy import create_engine, MetaData, Table, Column, Integer, \
      String, DateTime, ForeignKey
-from sqlalchemy.orm import scoped_session, sessionmaker, backref
+from sqlalchemy.orm import scoped_session, sessionmaker, backref, relation
 from sqlalchemy.ext.declarative import declarative_base
 
+from werkzeug import cached_property
+
+from flask import url_for
 from flask_website import config
 
 engine = create_engine(config.DATABASE_URI)
@@ -15,20 +18,25 @@ def init_db():
     Model.metadata.create_all(bind=engine)
 
 
-class Model(declarative_base()):
-    query = db_session.query_property()
+Model = declarative_base(name='Model')
+Model.query = db_session.query_property()
 
 
 class User(Model):
     __tablename__ = 'users'
     id = Column('user_id', Integer, primary_key=True)
     openid = Column('openid', String(200))
-    username = Column(String(40), unique=True)
-    password = Column(String(80))
+    name = Column(String(200), unique=True)
 
-    def __init__(self, username, password):
-        self.username = username
-        self.password = password
+    def __init__(self, name, openid):
+        self.name = name
+        self.openid = openid
+
+    def __eq__(self, other):
+        return type(self) is type(other) and self.id == other.id
+
+    def __ne__(self, other):
+        return not self.__eq__(other)
 
 
 class Category(Model):
@@ -37,40 +45,73 @@ class Category(Model):
     name = Column(String(50))
     slug = Column(String(50))
 
+    def __init__(self, name):
+        self.name = name
+        self.slug = '-'.join(name.split()).lower()
+
+    @cached_property
+    def count(self):
+        return self.snippets.count()
+
+    @property
+    def url(self):
+        return url_for('snippets.category', slug=self.slug)
+
 
 class Snippet(Model):
     __tablename__ = 'snippets'
     id = Column('snippet_id', Integer, primary_key=True)
-    author = ForeignKey(User, backref=backref('snippets', lazy='dynamic'))
-    category = ForeignKey(Category, backref=backref('snippets', lazy='dynamic'))
+    author_id = Column(Integer, ForeignKey('users.user_id'))
+    author = relation(User, backref=backref('snippets', lazy='dynamic'))
+    category_id = Column(Integer, ForeignKey('categories.category_id'))
+    category = relation(Category, backref=backref('snippets', lazy='dynamic'))
     title = Column(String(200))
     body = Column(String)
-    pub_date = DateTime()
+    pub_date = Column(DateTime)
 
-    def __init__(self, author, title, body):
+    def __init__(self, author, title, body, category):
         self.author = author
         self.title = title
         self.body = body
+        self.category = category
         self.pub_date = datetime.utcnow()
 
+    @property
+    def url(self):
+        return url_for('snippets.show', id=self.id)
+
+    @property
+    def rendered_body(self):
+        from flask_website.utils import format_creole
+        return format_creole(self.body)
+
 
 class Comment(Model):
     __tablename__ = 'comments'
     id = Column('comment_id', Integer, primary_key=True)
-    snippet = ForeignKey(Snippet, backref='lazy')
-    author = ForeignKey(User, backref=backref('comments', lazy='dynamic'))
+    snippet_id = Column(Integer, ForeignKey('snippets.snippet_id'))
+    snippet = relation(Snippet, backref=backref('comments', lazy=True))
+    author_id = Column(Integer, ForeignKey('users.user_id'))
+    author = relation(User, backref=backref('comments', lazy='dynamic'))
     title = Column(String(200))
     text = Column(String)
-    pub_date = DateTime()
+    pub_date = Column(DateTime)
 
-    def __init__(self, author, title, text):
+    def __init__(self, snippet, author, title, text):
+        self.snippet = snippet
         self.author = author
         self.title = title
         self.text = text
         self.pub_date = datetime.utcnow()
 
+    @property
+    def rendered_text(self):
+        from flask_website.utils import format_creole
+        return format_creole(self.text)
+
 
 class OpenIDAssociation(Model):
+    __tablename__ = 'openid_associations'
     id = Column('association_id', Integer, primary_key=True)
     server_url = Column(String(1024))
     handle = Column(String(255))
@@ -80,7 +121,8 @@ class OpenIDAssociation(Model):
     assoc_type = Column(String(64))
 
 
-class OpenIDUserNonces(Model):
+class OpenIDUserNonce(Model):
+    __tablename__ = 'openid_user_nonces'
     id = Column('user_nonce_id', Integer, primary_key=True)
     server_url = Column(String(1024))
     timestamp = Column(Integer)