Start migrating to SQLAlchemy

config.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-DATABASE = './ffdn-db.sqlite'
+SQLALCHEMY_DATABASE_URI = 'sqlite:///../ffdn-db.sqlite'
 #PASSWD_SALT = 'change this value to some random chars!'
 SECRET_KEY = '{J@uRKO,xO-PK7B,jF?>iHbxLasF9s#zjOoy=+:'
 DEBUG = True

ffdnispdb/__init__.py

@@ -2,22 +2,24 @@
 
 from flask import Flask, g
 from flask.ext.babel import Babel
+from flask.ext.sqlalchemy import SQLAlchemy
 import sqlite3
 
 app = Flask(__name__)
 app.config.from_object('config')
 babel = Babel(app)
+db = SQLAlchemy(app)
 
 
 def connect_db():
     return sqlite3.connect(app.config['DATABASE'])
 
-@app.before_request
+#@app.before_request
 def before_request():
     g.db = connect_db()
     #g.db.execute("PRAGMA foreign_keys = ON")
 
-@app.teardown_request
+#@app.teardown_request
 def teardown_request(exception):
     g.db.close()
 
@@ -35,4 +37,5 @@ def init_db():
 
 
 from . import views
+from . import models
 

ffdnispdb/forms.py

@@ -2,11 +2,12 @@ from functools import partial
 import itertools
 from flask.ext.wtf import Form
 from wtforms import Form as InsecureForm
-from wtforms import TextField, DecimalField, SelectField, SelectMultipleField, FieldList, FormField
+from wtforms import TextField, DateField, DecimalField, SelectField, SelectMultipleField, FieldList, FormField
 from wtforms.widgets import TextInput, ListWidget, html_params, HTMLString, CheckboxInput, Select
-from wtforms.validators import DataRequired, Optional, URL, Email, Length
+from wtforms.validators import DataRequired, Optional, URL, Email, Length, NumberRange, ValidationError
 from flask.ext.babel import Babel, gettext as _
 from .constants import STEPS
+from .models import ISP
 
 
 class InputListWidget(ListWidget):
@@ -34,6 +35,21 @@ class MyFormField(FormField):
     def flattened_errors(self):
         return list(itertools.chain.from_iterable(self.errors.values()))
 
+class Unique(object):
+    """ validator that checks field uniqueness """
+    def __init__(self, model, field, message=None):
+        self.model = model
+        self.field = field
+        if not message:
+            message = u'this element already exists'
+        self.message = message
+
+    def __call__(self, form, field):
+        check = self.model.query.filter(self.field == field.data).first()
+        print "lol", check, self.field, field.data
+        if check:
+            raise ValidationError(self.message)
+
 
 TECHNOLOGIES_CHOICES=(
     ('ftth', _('FTTH')),
@@ -48,16 +64,29 @@ class CoveredArea(InsecureForm):
 
 
 class ProjectForm(Form):
-    name          = TextField(_(u'full name'), validators=[DataRequired(), Length(min=2)], description=[_(u'E.g. French Data Network')])
-    short_name    = TextField(_(u'short name'), validators=[Optional(), Length(min=2, max=15)], description=[_(u'E.g. FDN')])
+    name          = TextField(_(u'full name'), description=[_(u'E.g. French Data Network')],
+                              validators=[DataRequired(), Length(min=2), Unique(ISP, ISP.name)])
+    shortname     = TextField(_(u'short name'), description=[_(u'E.g. FDN')],
+                              validators=[Optional(), Length(min=2, max=15), Unique(ISP, ISP.shortname)])
     description   = TextField(_(u'description'), description=[None, _(u'Short text describing the project')])
+    logo_url      = TextField(_(u'logo url'), validators=[Optional(), URL(require_tld=True)])
     website       = TextField(_(u'website'), validators=[Optional(), URL(require_tld=True)])
-    contact_email = TextField(_(u'contact email'), validators=[Optional(), Email()])
+    contact_email = TextField(_(u'contact email'), validators=[Optional(), Email()],
+                              description=[None, _(u'General contact email address')])
+    main_ml       = TextField(_(u'main mailing list'), validators=[Optional(), Email()],
+                              description=[None, u'Address of your main <b>public</b> mailing list'])
+    creation_date = DateField(_(u'creation date'), validators=[Optional()],
+                              description=[None, u'Date at which the legal structure for your project was created'])
     chatrooms     = FieldList(TextField(_(u'chatrooms')), min_entries=1, widget=InputListWidget(),
-                              description=[None, _(u'In URI form, e.g. <code>irc://irc.isp.net/#isp</code> or <code>xmpp:isp@chat.isp.net?join</code>')])
+                              description=[None, _(u'In URI form, e.g. <code>irc://irc.isp.net/#isp</code> or '+
+                                                    '<code>xmpp:isp@chat.isp.net?join</code>')])
     covered_areas = FieldList(MyFormField(CoveredArea, widget=partial(InputListWidget(), class_='formfield')), min_entries=1, widget=InputListWidget(),
-                                        description=[None, _(u'Descriptive name of the covered areas and technologies deployed')])
+                                          description=[None, _(u'Descriptive name of the covered areas and technologies deployed')])
     latitude      = DecimalField(_(u'latitude'), validators=[Optional()],
                              description=[None, _(u'Geographical coordinates of your registered office or usual meeting location.')])
     longitude     = DecimalField(_(u'longitude'), validators=[Optional()])
     step          = SelectField(_(u'step'), choices=[(k, u'%u - %s' % (k, STEPS[k])) for k in STEPS], coerce=int)
+    member_count     = DecimalField(_(u'Members'), validators=[Optional(), NumberRange(min=0)],
+                                    description=[None, _('Number of members')])
+    subscriber_count = DecimalField(_(u'Subscribers'), validators=[Optional(), NumberRange(min=0)],
+                                    description=[None, _('Number of subscribers to an internet access')])

ffdnispdb/models.py

@@ -0,0 +1,20 @@
+
+from . import db
+
+
+class ISP(db.Model):
+    id = db.Column(db.Integer, primary_key=True)
+    name = db.Column(db.String, nullable=False, index=True, unique=True)
+    shortname = db.Column(db.String(12), index=True, unique=True)
+    url = db.Column(db.String)
+    lastSuccessfulUpdate = db.Column(db.DateTime)
+    lastUpdateAttempt = db.Column(db.DateTime)
+    isUpdatable = db.Column(db.Boolean, default=True) # set to False to disable JSON updates
+    techEmailContact = db.Column(db.String)
+    cacheInfo = db.Column(db.Text)
+    json = db.Column(db.Text)
+
+    def __repr__(self):
+        return '<ISP %r>' % self.shortname if self.shortname else self.name
+
+        

ffdnispdb/templates/project_form.html

@@ -30,12 +30,16 @@
       {{ form.csrf_token }}
       <fieldset><legend>{{ _("Add a new project") }}</legend>
         {{ render_field(form.name) }}
-        {{ render_field(form.short_name) }}
+        {{ render_field(form.shortname) }}
         {{ render_field(form.description) }}
+        {{ render_field(form.logo_url) }}
         {{ render_field(form.website) }}
         {{ render_field(form.contact_email) }}
+        {{ render_field(form.main_ml) }}
+        {{ render_field(form.creation_date) }}
+        {{ render_field(form.member_count, class_="input-small") }}
+        {{ render_field(form.subscriber_count, class_="input-small") }}
         {{ render_field(form.chatrooms, class="fieldlist") }}
-{#        {{ render_field(form.covered_areas, class="fieldlist") }}#}
         <div class="control-group{% if form.covered_areas.errors %} error{% endif %}">
           <label class="control-label" for="coordinates">{{ form.covered_areas.label.text }}</label>
           <div class="controls">

ffdnispdb/views.py

@@ -10,7 +10,8 @@ import string
 
 from . import forms
 from .constants import *
-from . import app, query_db
+from . import app, query_db, db
+from .models import ISP
 
 
 @app.route('/')
@@ -98,8 +99,15 @@ def add_project():
 def create_project():
     form = forms.ProjectForm()
     if form.validate_on_submit():
-        flash(_(u'Thanks !'))
-        return redirect('/')
+        isp=ISP()
+        isp.name = form.name.data
+        isp.shortname = form.shortname.data or None
+        isp.json='TODO'
+
+        db.session.add(isp)
+        db.session.commit()
+        flash(_(u'Project created'))
+        return redirect(url_for('project', projectid=isp.id))
     return render_template('project_form.html', form=form)
 
 

requirements.txt

@@ -1,5 +1,6 @@
 Flask==0.10.1
 Flask-Babel==0.9
+Flask-SQLAlchemy==1.0
 Flask-WTF==0.9.1
 Jinja2==2.7.1
 MarkupSafe==0.18