Switch to the Application Factory pattern and Blueprints

This allows for greater flexibility, which is usefull for testing

config.py

@@ -1,12 +0,0 @@
-# -*- coding: utf-8 -*-
-
-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
-CRAWLER_MIN_CACHE_TIME=60*60 # 1 hour
-CRAWLER_MAX_CACHE_TIME=60*60*24*14 # 2 week
-CRAWLER_DEFAULT_CACHE_TIME=60*60*12 # 12 hours
-EMAIL_SENDER='FFDN DB <no-reply@db.ffdn.org>'
-#MAIL_SERVER=''
-#SERVER_NAME = 'db.ffdn.org'

ffdnispdb/__init__.py

@@ -8,20 +8,39 @@ from werkzeug.contrib.cache import NullCache
 from .sessions import MySessionInterface
 
 
-app = Flask(__name__)
-app.config.from_object('config')
-babel = Babel(app)
-db = SQLAlchemy(app)
-app.session_interface = MySessionInterface(db)
+babel = Babel()
+db = SQLAlchemy()
+sess = MySessionInterface(db)
 cache = NullCache()
-mail = Mail(app)
+mail = Mail()
+
+
+def create_app(config={}):
+    global babel, db, mail, sess
+    app = Flask(__name__)
+    app.config.from_object('ffdnispdb.default_settings')
+    app.config.from_envvar('FFDNISPDB_SETTINGS', True)
+    if isinstance(config, dict):
+        app.config.update(config)
+    else:
+        app.config.from_object(config)
+    babel.init_app(app)
+    db.init_app(app)
+
+    with app.app_context():
+        @event.listens_for(db.engine, "connect")
+        def connect(sqlite, connection_rec):
+            sqlite.enable_load_extension(True)
+            sqlite.execute('select load_extension("libspatialite.so")')
+            sqlite.enable_load_extension(False)
+
+    app.session_interface = sess
+    mail.init_app(app)
+
+    from .views import ispdb
+    app.register_blueprint(ispdb)
+    return app
 
-@event.listens_for(db.engine, "connect")
-def connect(sqlite, connection_rec):
-    sqlite.enable_load_extension(True)
-    sqlite.execute('select load_extension("libspatialite.so")')
-    sqlite.enable_load_extension(False)
 
-from . import views
 from . import models
 

ffdnispdb/crawler.py

@@ -5,13 +5,13 @@ import cgi
 import pytz
 from datetime import datetime, timedelta
 from werkzeug.http import parse_date
-from flask import escape, json
+from flask import escape, json, current_app
 import requests
 
 from ispformat.validator import validate_isp
 from .models import ISP
 from .utils import dict_to_geojson
-from . import app, db
+from . import db
 
 
 def get_encoding(content_type):
@@ -78,7 +78,7 @@ class Crawler(object):
         pass
 
     def config(self, name):
-        return app.config.get('CRAWLER_'+name)
+        return current_app.config.get('CRAWLER_'+name)
 
     def parse_cache_control(self, _cachectl):
         cachectl={}

ffdnispdb/cron_task.py

@@ -11,9 +11,13 @@ import itsdangerous
 
 from ffdnispdb.crawler import TextValidator
 from ffdnispdb.models import ISP
-from ffdnispdb import app, db, mail
+from ffdnispdb import create_app, db, mail
 
 
+app=create_app({
+    'SERVER_NAME': 'db.ffdn.org',
+})
+
 MAX_RUNTIME=15*60
 
 class Timeout(Exception):
@@ -86,7 +90,6 @@ https://db.ffdn.org
     mail.send(msg)
 
 
-app.config['SERVER_NAME'] = 'db.ffdn.org'
 app.app_context().push()
 
 try:

ffdnispdb/default_settings.py

@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+
+SQLALCHEMY_DATABASE_URI = 'sqlite:///../ffdn-db.sqlite'
+CRAWLER_MIN_CACHE_TIME=60*60 # 1 hour
+CRAWLER_MAX_CACHE_TIME=60*60*24*14 # 2 week
+CRAWLER_DEFAULT_CACHE_TIME=60*60*12 # 12 hours

ffdnispdb/models.py

@@ -5,8 +5,9 @@ import json
 import os
 import itertools
 from datetime import datetime
-from . import db, app
+from . import db
 from .utils import dict_to_geojson
+from flask import current_app
 import flask_sqlalchemy
 from sqlalchemy.types import TypeDecorator, VARCHAR
 from sqlalchemy.ext.mutable import MutableDict
@@ -198,7 +199,7 @@ class ISPWhoosh(object):
 
     @staticmethod
     def get_index_dir():
-        return app.config.get('WHOOSH_INDEX_DIR', 'whoosh')
+        return current_app.config.get('WHOOSH_INDEX_DIR', 'whoosh')
 
     @classmethod
     def get_index(cls):

ffdnispdb/templates/add_project.html

@@ -5,11 +5,11 @@
       <div class="row-fluid">
         <div class="span5 offset1 project-choice">
           <h3>{{ _("Automatically from a JSON file") }}</h3>
-          <p>{% trans format_spec=url_for('format') %}You only have to give us the link to the hostname where you implement the <a href="{{ format_spec }}">ISP Format</a>, and we will crawl it periodicaly to update your informations.{% endtrans %}</p>
+          <p>{% trans format_spec=url_for('.format') %}You only have to give us the link to the hostname where you implement the <a href="{{ format_spec }}">ISP Format</a>, and we will crawl it periodicaly to update your informations.{% endtrans %}</p>
           <br />
           <br />
           <p class="text-center">
-            <a class="btn btn-large btn-primary" href="{{ url_for('create_project_json') }}">{{ _("Heck yeah") }}</a>
+            <a class="btn btn-large btn-primary" href="{{ url_for('.create_project_json') }}">{{ _("Heck yeah") }}</a>
           </p>
         </div>
         <div class="span5 project-choice">
@@ -17,7 +17,7 @@
           <p>{% trans %}Don't have the ressources or time to host an <em>ISP Format</em> JSON file ? Don't worry, you can also fill our simple form to give us the informations about your local ISP. Only problem, you'll have to come back here if you want to update it.{% endtrans %}</p>
           <br />
           <p class="text-center">
-            <a class="btn btn-large btn-primary" href="{{ url_for('create_project_form') }}">{{ _("That JSON thing is too cool for me") }}</a>
+            <a class="btn btn-large btn-primary" href="{{ url_for('.create_project_form') }}">{{ _("That JSON thing is too cool for me") }}</a>
           </p>
         </div>
       </div>

ffdnispdb/templates/layout.html

@@ -36,9 +36,9 @@
             <input type="text" id="search-input" class="search-query input-medium" name="q" placeholder="{{ _("Search") }}" />
           </form>
           <ul class="nav pull-right">
-            {{ menu_item(_("Home"), 'home') }}
-            {{ menu_item(_("Project List"), 'project_list') }}
-            {{ menu_item(_("Format"), 'format') }}
+            {{ menu_item(_("Home"), '.home') }}
+            {{ menu_item(_("Project List"), '.project_list') }}
+            {{ menu_item(_("Format"), '.format') }}
             {{ menu_item(_("API")) }}
             <li class="divider-vertical"></li>
           </ul>

ffdnispdb/templates/map_popup.html

@@ -2,10 +2,10 @@
 <strong>{{ name|capitalize }}</strong>
 {%- endmacro %}
 {% if isp.shortname -%}
-<a href="{{ url_for('project', projectid=isp.id) }}"><strong>{{ isp.shortname }}</strong></a><br />
+<a href="{{ url_for('.project', projectid=isp.id) }}"><strong>{{ isp.shortname }}</strong></a><br />
 {{ isp.name }}
 {% else -%}
-<a href="{{ url_for('project', projectid=isp.id) }}"><strong>{{ isp.name }}</strong></a>
+<a href="{{ url_for('.project', projectid=isp.id) }}"><strong>{{ isp.name }}</strong></a>
 {% endif %}
 <ul style="margin: 10px 0 5px 5px; list-style-type: none;">
 {%- if isp.json.website %}

ffdnispdb/templates/project_detail.html

@@ -9,7 +9,7 @@
 {%- endblock %}
 {% block page_header %}
     {{ super() }}
-    <a class="btn btn-success btn-small pull-right" style="margin: 15px 10px 0;" href="{{ url_for('edit_project', projectid=project_row.id) }}"><i class="icon-edit icon-white"></i> {{ _("Edit") }}</a>
+    <a class="btn btn-success btn-small pull-right" style="margin: 15px 10px 0;" href="{{ url_for('.edit_project', projectid=project_row.id) }}"><i class="icon-edit icon-white"></i> {{ _("Edit") }}</a>
 {% endblock %}
 {% block body %}
   <div class="row-fluid">

ffdnispdb/templates/project_json_validator.html

@@ -1,4 +1,4 @@
 {% set page_title = _("Validating the JSON URL") %}
-{% set validator_url = url_for('json_url_validator') %}
-{% set confirm_url = url_for('create_project_json_confirm') %}
+{% set validator_url = url_for('.json_url_validator') %}
+{% set confirm_url = url_for('.create_project_json_confirm') %}
 {% include 'validator_generic.html' with context %}

ffdnispdb/templates/project_list.html

@@ -4,6 +4,6 @@
 {% block body %}
 <div>
 {{ project_list(projects) }}
-  <a class="pull-right btn btn-primary btn-small" href="{{ url_for('add_project') }}">{{ _("Add my project") }}</a>
+  <a class="pull-right btn btn-primary btn-small" href="{{ url_for('.add_project') }}">{{ _("Add my project") }}</a>
 </div>
 {% endblock %}

ffdnispdb/templates/project_list_macro.html

@@ -11,7 +11,7 @@
     <tbody>
       {% for project in projects -%}
       <tr>
-        <td><a href="{{ url_for('project', projectid=project.id) }}">{{ project.name|truncate(60, True) }}</a></td>
+        <td><a href="{{ url_for('.project', projectid=project.id) }}">{{ project.name|truncate(60, True) }}</a></td>
         <td>{{ ', '.join(project.covered_areas_names())|truncate(30) }}</td>
         <td>
           {{ project.json.progressStatus|step_to_label|safe }}
@@ -19,7 +19,7 @@
           &thinsp;<a href="#" rel="tooltip" data-placement="right" title="{{ _("Member of the FDN Federation") }}"><span class="label label-info">FFDN</span></a>
           {%- endif %}
         </td>
-        <td><a class="pull-right btn btn-small" title="{{ _("Examine") }}" href="{{ url_for('project', projectid=project.id) }}"><i class="icon-search"></i></a>
+        <td><a class="pull-right btn btn-small" title="{{ _("Examine") }}" href="{{ url_for('.project', projectid=project.id) }}"><i class="icon-search"></i></a>
       </tr>
       {% endfor -%}
     </tbody>

ffdnispdb/templates/reactivate_validator.html

@@ -1,4 +1,4 @@
 {% set page_title = _("Reactivating updates on your project") %}
-{% set validator_url = url_for('reactivate_validator') %}
-{% set confirm_url = url_for('reactivate_isp', projectid=isp.id) %}
+{% set validator_url = url_for('.reactivate_validator') %}
+{% set confirm_url = url_for('.reactivate_isp', projectid=isp.id) %}
 {% include 'validator_generic.html' with context %}

ffdnispdb/views.py

@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
 
 from flask import request, g, redirect, url_for, abort, \
-    render_template, flash, json, session, Response, Markup
+    render_template, flash, json, session, Response, Markup, \
+    stream_with_context, current_app, Blueprint
 from flask.ext.babel import gettext as _
 from flask.ext.mail import Message
 import itsdangerous
@@ -17,22 +18,25 @@ import os.path
 
 from . import forms
 from .constants import *
-from . import app, db, cache, mail
+from . import db, cache, mail
 from .models import ISP, ISPWhoosh, CoveredArea, RegisteredOffice
 from .crawler import WebValidator, PrettyValidator
 
 
-@app.route('/')
+ispdb = Blueprint('ispdb', __name__)
+
+
+@ispdb.route('/')
 def home():
     return render_template('index.html', active_button="home")
 
 
-@app.route('/isp/')
+@ispdb.route('/isp/')
 def project_list():
     return render_template('project_list.html', projects=ISP.query.filter_by(is_disabled=False))
 
 # this needs to be cached
-@app.route('/isp/map_data.json', methods=['GET'])
+@ispdb.route('/isp/map_data.json', methods=['GET'])
 def isp_map_data():
     isps=ISP.query.filter_by(is_disabled=False)
     data=[]
@@ -50,7 +54,7 @@ def isp_map_data():
     return Response(json.dumps(data), mimetype='application/json')
 
 
-@app.route('/isp/find_near.json', methods=['GET'])
+@ispdb.route('/isp/find_near.json', methods=['GET'])
 def isp_find_near():
     lat=request.args.get('lat')
     lon=request.args.get('lon')
@@ -84,7 +88,7 @@ def isp_find_near():
     return Response(json.dumps(res))
 
 
-@app.route('/isp/<projectid>/covered_areas.json', methods=['GET'])
+@ispdb.route('/isp/<projectid>/covered_areas.json', methods=['GET'])
 def isp_covered_areas(projectid):
     p=ISP.query.filter_by(id=projectid, is_disabled=False)\
                .options(db.joinedload('covered_areas'),
@@ -103,7 +107,7 @@ def isp_covered_areas(projectid):
     return Response(json.dumps(cas), mimetype='application/json')
 
 
-@app.route('/isp/<projectid>/')
+@ispdb.route('/isp/<projectid>/')
 def project(projectid):
     p=ISP.query.filter_by(id=projectid, is_disabled=False).first()
     if not p:
@@ -111,7 +115,7 @@ def project(projectid):
     return render_template('project_detail.html', project_row=p, project=p.json)
 
 
-@app.route('/isp/<projectid>/edit', methods=['GET', 'POST'])
+@ispdb.route('/isp/<projectid>/edit', methods=['GET', 'POST'])
 def edit_project(projectid):
     MAX_TOKEN_AGE=3600
     isp=ISP.query.filter_by(id=projectid, is_disabled=False).first_or_404()
@@ -119,7 +123,7 @@ def edit_project(projectid):
 
     if 'token' in request.args:
         print session
-        s = itsdangerous.URLSafeTimedSerializer(app.secret_key, salt='edit')
+        s = itsdangerous.URLSafeTimedSerializer(current_app.secret_key, salt='edit')
         try:
             r = s.loads(request.args['token'], max_age=MAX_TOKEN_AGE,
                         return_timestamp=True)
@@ -132,9 +136,9 @@ def edit_project(projectid):
         tokens = session.setdefault('edit_tokens', {})
         tokens[r[0]] = r[1]
         # refresh page, without the token in the url
-        return redirect(url_for('edit_project', projectid=r[0]))
+        return redirect(url_for('.edit_project', projectid=r[0]))
     elif (sess_token is None or (datetime.utcnow()-sess_token).total_seconds() > MAX_TOKEN_AGE):
-        return redirect(url_for('gen_edit_token', projectid=isp.id))
+        return redirect(url_for('.gen_edit_token', projectid=isp.id))
 
     if isp.is_local:
         form = forms.ProjectForm.edit_json(isp)
@@ -147,7 +151,7 @@ def edit_project(projectid):
             db.session.add(isp)
             db.session.commit()
             flash(_(u'Project modified'), 'info')
-            return redirect(url_for('project', projectid=isp.id))
+            return redirect(url_for('.project', projectid=isp.id))
         return render_template('edit_project_form.html', form=form)
     else:
         form = forms.ProjectJSONForm(obj=isp)
@@ -161,11 +165,11 @@ def edit_project(projectid):
             db.session.add(isp)
             db.session.commit()
             flash(_(u'Project modified'), 'info')
-            return redirect(url_for('project', projectid=isp.id))
+            return redirect(url_for('.project', projectid=isp.id))
         return render_template('edit_project_json_form.html', form=form)
 
 
-@app.route('/isp/<projectid>/gen_edit_token', methods=['GET', 'POST'])
+@ispdb.route('/isp/<projectid>/gen_edit_token', methods=['GET', 'POST'])
 def gen_edit_token(projectid):
     isp=ISP.query.filter_by(id=projectid, is_disabled=False).first_or_404()
     form = forms.RequestEditToken()
@@ -173,7 +177,7 @@ def gen_edit_token(projectid):
         if form.tech_email.data == isp.tech_email:
             s = itsdangerous.URLSafeTimedSerializer(app.secret_key, salt='edit')
             token = s.dumps(isp.id)
-            msg = Message("Edit request of your ISP", sender=app.config['EMAIL_SENDER'])
+            msg = Message("Edit request of your ISP", sender=current_app.config['EMAIL_SENDER'])
             msg.body="""
 Hello,
 You are receiving this message because your are listed as technical contact for "%s" on the FFDN ISP database.
@@ -189,7 +193,7 @@ Thanks,
 The FFDN ISP Database team
 https://db.ffdn.org
             """.strip() % (isp.complete_name,
-                           url_for('edit_project', projectid=isp.id, _external=True),
+                           url_for('.edit_project', projectid=isp.id, _external=True),
                            token)
             msg.add_recipient(isp.tech_email)
             mail.send(msg)
@@ -197,17 +201,17 @@ https://db.ffdn.org
         # if the email provided is not the correct one, we still redirect
         flash(_(u'If you provided the correct email adress, '
                  'you must will receive a message shortly (check your spam folder)'), 'info')
-        return redirect(url_for('project', projectid=isp.id))
+        return redirect(url_for('.project', projectid=isp.id))
 
     return render_template('gen_edit_token.html', form=form)
 
 
-@app.route('/add-a-project', methods=['GET'])
+@ispdb.route('/add-a-project', methods=['GET'])
 def add_project():
     return render_template('add_project.html')
 
 
-@app.route('/isp/create/form', methods=['GET', 'POST'])
+@ispdb.route('/isp/create/form', methods=['GET', 'POST'])
 def create_project_form():
     form = forms.ProjectForm()
     if form.validate_on_submit():
@@ -220,11 +224,11 @@ def create_project_form():
         db.session.add(isp)
         db.session.commit()
         flash(_(u'Project created'), 'info')
-        return redirect(url_for('project', projectid=isp.id))
+        return redirect(url_for('.project', projectid=isp.id))
     return render_template('add_project_form.html', form=form)
 
 
-@app.route('/isp/create/validator', methods=['GET'])
+@ispdb.route('/isp/create/validator', methods=['GET'])
 def json_url_validator():
     if 'form_json' not in session or \
        session['form_json'].get('validated', False):
@@ -239,11 +243,12 @@ def json_url_validator():
         session['form_json']['validator']=time()
 
     validator=WebValidator(session._get_current_object(), 'form_json')
-    return Response(validator(session['form_json']['url']),
-                    mimetype="text/event-stream")
+    return Response(stream_with_context(
+        validator(session['form_json']['url'])
+    ), mimetype="text/event-stream")
 
 
-@app.route('/isp/create', methods=['GET', 'POST'])
+@ispdb.route('/isp/create', methods=['GET', 'POST'])
 def create_project_json():
     form = forms.ProjectJSONForm()
     if form.validate_on_submit():
@@ -255,7 +260,7 @@ def create_project_json():
     return render_template('add_project_json_form.html', form=form)
 
 
-@app.route('/isp/create/confirm', methods=['POST'])
+@ispdb.route('/isp/create/confirm', methods=['POST'])
 def create_project_json_confirm():
     if 'form_json' in session and session['form_json'].get('validated', False):
         if not forms.is_url_unique(session['form_json']['url']):
@@ -276,12 +281,12 @@ def create_project_json_confirm():
         db.session.add(isp)
         db.session.commit()
         flash(_(u'Project created'), 'info')
-        return redirect(url_for('project', projectid=isp.id))
+        return redirect(url_for('.project', projectid=isp.id))
     else:
-        return redirect(url_for('create_project_json'))
+        return redirect(url_for('.create_project_json'))
 
 
-@app.route('/isp/reactivate-validator', methods=['GET'])
+@ispdb.route('/isp/reactivate-validator', methods=['GET'])
 def reactivate_validator():
     if 'form_reactivate' not in session or \
        session['form_reactivate'].get('validated', False):
@@ -300,11 +305,12 @@ def reactivate_validator():
         session['form_reactivate']['validator']=time()
 
     validator=PrettyValidator(session._get_current_object(), 'form_reactivate')
-    return Response(validator(p.json_url, p.cache_info or {}),
-                    mimetype="text/event-stream")
+    return Response(stream_with_context(
+        validator(p.json_url, p.cache_info or {})
+    ), mimetype="text/event-stream")
 
 
-@app.route('/isp/<projectid>/reactivate',  methods=['GET', 'POST'])
+@ispdb.route('/isp/<projectid>/reactivate',  methods=['GET', 'POST'])
 def reactivate_isp(projectid):
     """
     Allow to reactivate an ISP after it has been disabled
@@ -315,7 +321,7 @@ def reactivate_isp(projectid):
     if request.method == 'GET':
         key = request.args.get('key')
         try:
-            s=itsdangerous.URLSafeSerializer(app.secret_key,
+            s=itsdangerous.URLSafeSerializer(current_app.secret_key,
                                              salt='reactivate')
             d=s.loads(key)
         except Exception as e:
@@ -342,20 +348,20 @@ def reactivate_isp(projectid):
         db.session.commit()
 
         flash(_(u'Automatic updates activated'), 'info')
-        return redirect(url_for('project', projectid=p.id))
+        return redirect(url_for('.project', projectid=p.id))
 
 
-@app.route('/search', methods=['GET', 'POST'])
+@ispdb.route('/search', methods=['GET', 'POST'])
 def search():
     terms=request.args.get('q')
     if not terms:
-        return redirect(url_for('home'))
+        return redirect(url_for('.home'))
 
     res=ISPWhoosh.search(terms)
     return render_template('search_results.html', results=res, search_terms=terms)
 
 
-@app.route('/format', methods=['GET'])
+@ispdb.route('/format', methods=['GET'])
 def format():
     parts = cache.get('format-spec')
     if parts is None:
@@ -371,7 +377,7 @@ def format():
     return render_template('format_spec.html', spec=Markup(parts['html_body']))
 
 
-@app.route('/humans.txt', methods=['GET'])
+@ispdb.route('/humans.txt', methods=['GET'])
 def humans():
     import os.path
     authors_file=os.path.join(os.path.dirname(__file__), '../AUTHORS')
@@ -381,14 +387,14 @@ def humans():
 #------
 # Filters
 
-@app.template_filter('step_to_label')
+@ispdb.app_template_filter('step_to_label')
 def step_to_label(step):
     if step:
         return u"<a href='#' rel='tooltip' data-placement='right' title='" + STEPS[step] + "'><span class='badge badge-" + STEPS_LABELS[step] + "'>" + str(step) + "</span></a>"
     else:
         return u'-'
 
-@app.template_filter('stepname')
+@ispdb.app_template_filter('stepname')
 def stepname(step):
     return STEPS[step]
 

run.py

@@ -1,13 +1,16 @@
+#!/usr/bin/env python2
+import os; os.environ['FFDNISPDB_SETTINGS'] = '../settings_dev.py'
 import gevent.pywsgi
 from gevent import monkey; monkey.patch_all()
 import werkzeug.serving
 from werkzeug.debug import DebuggedApplication
-from ffdnispdb import app
+from ffdnispdb import create_app
 
 
+app=create_app()
+
 @werkzeug.serving.run_with_reloader
 def runServer():
-    app.debug = True
     ws = gevent.pywsgi.WSGIServer(('', 5000), DebuggedApplication(app, evalex=True))
     ws.serve_forever()
 

settings_dev.py

@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+
+EMAIL_SENDER='FFDN DB <no-reply@db.ffdn.org>'
+#MAIL_SERVER=''
+#SERVER_NAME = 'db.ffdn.org'
+DEBUG = True
+SECRET_KEY = '{J@uRKO,xO-PK7B,jF?>iHbxLasF9s#zjOoy=+:'

settings_prod.py.dist

@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+
+EMAIL_SENDER='FFDN DB <no-reply@db.ffdn.org>'
+#MAIL_SERVER=''
+#SERVER_NAME = 'db.ffdn.org'
+DEBUG = False
+SECRET_KEY = None # Generate one

shell.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python2
+import os; os.environ['FFDNISPDB_SETTINGS'] = '../settings_dev.py'
 import os
 import readline
 from pprint import pprint
@@ -6,4 +7,7 @@ from pprint import pprint
 from flask import *
 from ffdnispdb import *
 
+app=create_app()
+
+app.app_context().push()
 os.environ['PYTHONINSPECT'] = 'True'

test_ffdnispdb.py

@@ -1,5 +1,5 @@
 
-from ffdnispdb import app, db
+from ffdnispdb import create_app, db
 from ffdnispdb.models import ISP
 from flask import Flask
 from flask.ext.sqlalchemy import SQLAlchemy
@@ -9,19 +9,33 @@ import os
 
 class TestCase(unittest.TestCase):
 
+    def create_app(self, **kwargs):
+        test_cfg={
+            'TESTING': True,
+            'WTF_CSRF_ENABLED': False,
+            'SQLALCHEMY_DATABASE_URI': 'sqlite://',
+        }
+        test_cfg.update(kwargs)
+        return create_app(test_cfg)
+
     def setUp(self):
-        app.config['TESTING'] = True
-        app.config['WTF_CSRF_ENABLED'] = False
-        # Ugly, but should work in this context... ?
-        app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite://'
-        self.app = app.test_client()
-        db.create_all()
+        self.app = self.create_app()
+        self.client = self.app.test_client()
+        with self.app.app_context():
+            db.create_all()
+        self._ctx = self.app.test_request_context()
+        self._ctx.push()
 
     def tearDown(self):
+        db.session.remove()
         db.drop_all()
+        self._ctx.pop()
+
+
+class TestForm(TestCase):
 
     def test_projectform(self):
-        resp = self.app.post('/isp/create/form', data={
+        resp = self.client.post('/isp/create/form', data={
             'tech_email': 'admin@isp.com',
             'name': 'Test',
             'step': '1',