diff --git a/examples/flaskr/flaskr/__init__.py b/examples/flaskr/flaskr/__init__.py
index d096b1e7..e69de29b 100644
--- a/examples/flaskr/flaskr/__init__.py
+++ b/examples/flaskr/flaskr/__init__.py
@@ -1 +0,0 @@
-from .flaskr import app
diff --git a/examples/flaskr/flaskr/_cliapp.py b/examples/flaskr/flaskr/_cliapp.py
new file mode 100644
index 00000000..faed660c
--- /dev/null
+++ b/examples/flaskr/flaskr/_cliapp.py
@@ -0,0 +1,3 @@
+from flaskr.factory import create_app
+
+app = create_app()
\ No newline at end of file
diff --git a/examples/flaskr/flaskr/blueprints/__init__.py b/examples/flaskr/flaskr/blueprints/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/examples/flaskr/flaskr/flaskr.py b/examples/flaskr/flaskr/blueprints/flaskr.py
similarity index 55%
rename from examples/flaskr/flaskr/flaskr.py
rename to examples/flaskr/flaskr/blueprints/flaskr.py
index b4c1d6bd..7b64dd9e 100644
--- a/examples/flaskr/flaskr/flaskr.py
+++ b/examples/flaskr/flaskr/blueprints/flaskr.py
@@ -10,29 +10,18 @@
:license: BSD, see LICENSE for more details.
"""
-import os
from sqlite3 import dbapi2 as sqlite3
-from flask import Flask, request, session, g, redirect, url_for, abort, \
- render_template, flash
+from flask import Blueprint, request, session, g, redirect, url_for, abort, \
+ render_template, flash, current_app
-# create our little application :)
-app = Flask(__name__)
-
-# Load default config and override config from an environment variable
-app.config.update(dict(
- DATABASE=os.path.join(app.root_path, 'flaskr.db'),
- DEBUG=True,
- SECRET_KEY='development key',
- USERNAME='admin',
- PASSWORD='default'
-))
-app.config.from_envvar('FLASKR_SETTINGS', silent=True)
+# create our blueprint :)
+bp = Blueprint('flaskr', __name__)
def connect_db():
"""Connects to the specific database."""
- rv = sqlite3.connect(app.config['DATABASE'])
+ rv = sqlite3.connect(current_app.config['DATABASE'])
rv.row_factory = sqlite3.Row
return rv
@@ -40,18 +29,11 @@ def connect_db():
def init_db():
"""Initializes the database."""
db = get_db()
- with app.open_resource('schema.sql', mode='r') as f:
+ with current_app.open_resource('schema.sql', mode='r') as f:
db.cursor().executescript(f.read())
db.commit()
-@app.cli.command('initdb')
-def initdb_command():
- """Creates the database tables."""
- init_db()
- print('Initialized the database.')
-
-
def get_db():
"""Opens a new database connection if there is none yet for the
current application context.
@@ -61,14 +43,7 @@ def get_db():
return g.sqlite_db
-@app.teardown_appcontext
-def close_db(error):
- """Closes the database again at the end of the request."""
- if hasattr(g, 'sqlite_db'):
- g.sqlite_db.close()
-
-
-@app.route('/')
+@bp.route('/')
def show_entries():
db = get_db()
cur = db.execute('select title, text from entries order by id desc')
@@ -76,7 +51,7 @@ def show_entries():
return render_template('show_entries.html', entries=entries)
-@app.route('/add', methods=['POST'])
+@bp.route('/add', methods=['POST'])
def add_entry():
if not session.get('logged_in'):
abort(401)
@@ -85,26 +60,26 @@ def add_entry():
[request.form['title'], request.form['text']])
db.commit()
flash('New entry was successfully posted')
- return redirect(url_for('show_entries'))
+ return redirect(url_for('flaskr.show_entries'))
-@app.route('/login', methods=['GET', 'POST'])
+@bp.route('/login', methods=['GET', 'POST'])
def login():
error = None
if request.method == 'POST':
- if request.form['username'] != app.config['USERNAME']:
+ if request.form['username'] != current_app.config['USERNAME']:
error = 'Invalid username'
- elif request.form['password'] != app.config['PASSWORD']:
+ elif request.form['password'] != current_app.config['PASSWORD']:
error = 'Invalid password'
else:
session['logged_in'] = True
flash('You were logged in')
- return redirect(url_for('show_entries'))
+ return redirect(url_for('flaskr.show_entries'))
return render_template('login.html', error=error)
-@app.route('/logout')
+@bp.route('/logout')
def logout():
session.pop('logged_in', None)
flash('You were logged out')
- return redirect(url_for('show_entries'))
+ return redirect(url_for('flaskr.show_entries'))
diff --git a/examples/flaskr/flaskr/factory.py b/examples/flaskr/flaskr/factory.py
new file mode 100644
index 00000000..e71a6704
--- /dev/null
+++ b/examples/flaskr/flaskr/factory.py
@@ -0,0 +1,52 @@
+import os
+from flask import Flask, g
+from werkzeug.utils import find_modules, import_string
+from flaskr.blueprints.flaskr import init_db
+
+
+def create_app(config=None):
+ app = Flask(__name__)
+
+ app.config.update(dict(
+ DATABASE=os.path.join(app.root_path, 'flaskr.db'),
+ DEBUG=True,
+ SECRET_KEY='development key',
+ USERNAME='admin',
+ PASSWORD='default'
+ ))
+ app.config.update(config or {})
+ app.config.from_envvar('FLASKR_SETTINGS', silent=True)
+
+ register_blueprints(app)
+ register_cli(app)
+ register_teardowns(app)
+
+ return app
+
+
+def register_blueprints(app):
+ """Register all blueprint modules
+
+ Reference: Armin Ronacher, "Flask for Fun and for Profit" PyBay 2016.
+ """
+ for name in find_modules('flaskr.blueprints'):
+ mod = import_string(name)
+ if hasattr(mod, 'bp'):
+ app.register_blueprint(mod.bp)
+ return None
+
+
+def register_cli(app):
+ @app.cli.command('initdb')
+ def initdb_command():
+ """Creates the database tables."""
+ init_db()
+ print('Initialized the database.')
+
+
+def register_teardowns(app):
+ @app.teardown_appcontext
+ def close_db(error):
+ """Closes the database again at the end of the request."""
+ if hasattr(g, 'sqlite_db'):
+ g.sqlite_db.close()
\ No newline at end of file
diff --git a/examples/flaskr/flaskr/templates/layout.html b/examples/flaskr/flaskr/templates/layout.html
index 737b51b2..862a9f4a 100644
--- a/examples/flaskr/flaskr/templates/layout.html
+++ b/examples/flaskr/flaskr/templates/layout.html
@@ -5,9 +5,9 @@
Flaskr
{% for message in get_flashed_messages() %}
diff --git a/examples/flaskr/flaskr/templates/login.html b/examples/flaskr/flaskr/templates/login.html
index ed09aeba..505d2f66 100644
--- a/examples/flaskr/flaskr/templates/login.html
+++ b/examples/flaskr/flaskr/templates/login.html
@@ -2,7 +2,7 @@
{% block body %}
Login
{% if error %}Error: {{ error }}{% endif %}
-