diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..d3f7505 Binary files /dev/null and b/.DS_Store differ diff --git a/migrations/README b/migrations/README new file mode 100755 index 0000000..98e4f9c --- /dev/null +++ b/migrations/README @@ -0,0 +1 @@ +Generic single-database configuration. \ No newline at end of file diff --git a/migrations/alembic.ini b/migrations/alembic.ini new file mode 100644 index 0000000..f8ed480 --- /dev/null +++ b/migrations/alembic.ini @@ -0,0 +1,45 @@ +# A generic, single database configuration. + +[alembic] +# template used to generate migration files +# file_template = %%(rev)s_%%(slug)s + +# set to 'true' to run the environment during +# the 'revision' command, regardless of autogenerate +# revision_environment = false + + +# Logging configuration +[loggers] +keys = root,sqlalchemy,alembic + +[handlers] +keys = console + +[formatters] +keys = generic + +[logger_root] +level = WARN +handlers = console +qualname = + +[logger_sqlalchemy] +level = WARN +handlers = +qualname = sqlalchemy.engine + +[logger_alembic] +level = INFO +handlers = +qualname = alembic + +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = NOTSET +formatter = generic + +[formatter_generic] +format = %(levelname)-5.5s [%(name)s] %(message)s +datefmt = %H:%M:%S diff --git a/migrations/env.py b/migrations/env.py new file mode 100644 index 0000000..70961ce --- /dev/null +++ b/migrations/env.py @@ -0,0 +1,73 @@ +from __future__ import with_statement +from alembic import context +from sqlalchemy import engine_from_config, pool +from logging.config import fileConfig + +# this is the Alembic Config object, which provides +# access to the values within the .ini file in use. +config = context.config + +# Interpret the config file for Python logging. +# This line sets up loggers basically. +fileConfig(config.config_file_name) + +# add your model's MetaData object here +# for 'autogenerate' support +# from myapp import mymodel +# target_metadata = mymodel.Base.metadata +from flask import current_app +config.set_main_option('sqlalchemy.url', current_app.config.get('SQLALCHEMY_DATABASE_URI')) +target_metadata = current_app.extensions['migrate'].db.metadata + +# other values from the config, defined by the needs of env.py, +# can be acquired: +# my_important_option = config.get_main_option("my_important_option") +# ... etc. + +def run_migrations_offline(): + """Run migrations in 'offline' mode. + + This configures the context with just a URL + and not an Engine, though an Engine is acceptable + here as well. By skipping the Engine creation + we don't even need a DBAPI to be available. + + Calls to context.execute() here emit the given string to the + script output. + + """ + url = config.get_main_option("sqlalchemy.url") + context.configure(url=url) + + with context.begin_transaction(): + context.run_migrations() + +def run_migrations_online(): + """Run migrations in 'online' mode. + + In this scenario we need to create an Engine + and associate a connection with the context. + + """ + engine = engine_from_config( + config.get_section(config.config_ini_section), + prefix='sqlalchemy.', + poolclass=pool.NullPool) + + connection = engine.connect() + context.configure( + connection=connection, + target_metadata=target_metadata + ) + + try: + with context.begin_transaction(): + context.run_migrations() + finally: + connection.close() + +if context.is_offline_mode(): + run_migrations_offline() +else: + run_migrations_online() + diff --git a/migrations/script.py.mako b/migrations/script.py.mako new file mode 100755 index 0000000..9570201 --- /dev/null +++ b/migrations/script.py.mako @@ -0,0 +1,22 @@ +"""${message} + +Revision ID: ${up_revision} +Revises: ${down_revision} +Create Date: ${create_date} + +""" + +# revision identifiers, used by Alembic. +revision = ${repr(up_revision)} +down_revision = ${repr(down_revision)} + +from alembic import op +import sqlalchemy as sa +${imports if imports else ""} + +def upgrade(): + ${upgrades if upgrades else "pass"} + + +def downgrade(): + ${downgrades if downgrades else "pass"} diff --git a/migrations/versions/54da866682a_.py b/migrations/versions/54da866682a_.py new file mode 100644 index 0000000..52929fa --- /dev/null +++ b/migrations/versions/54da866682a_.py @@ -0,0 +1,30 @@ +"""empty message + +Revision ID: 54da866682a +Revises: None +Create Date: 2015-02-18 20:11:08.184592 + +""" + +# revision identifiers, used by Alembic. +revision = '54da866682a' +down_revision = None + +from alembic import op +import sqlalchemy as sa + + +def upgrade(): + ### commands auto generated by Alembic - please adjust! ### + op.create_table('todo', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('text', sa.String(length=255), nullable=True), + sa.PrimaryKeyConstraint('id') + ) + ### end Alembic commands ### + + +def downgrade(): + ### commands auto generated by Alembic - please adjust! ### + op.drop_table('todo') + ### end Alembic commands ### diff --git a/run.py b/run.py new file mode 100644 index 0000000..29bc1a7 --- /dev/null +++ b/run.py @@ -0,0 +1,14 @@ +from flask.ext.script import Manager +from flask.ext.migrate import Migrate, MigrateCommand +from flask.ext.script.commands import ShowUrls, Clean + +from todo import app, db + + +migrate = Migrate(app, db) +manager = Manager(app) +manager.add_command('db', MigrateCommand) +manager.add_command("show-urls", ShowUrls()) +manager.add_command("clean", Clean()) + +manager.run() diff --git a/templates/.gitkeep b/templates/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/todo/.DS_Store b/todo/.DS_Store new file mode 100644 index 0000000..22992e5 Binary files /dev/null and b/todo/.DS_Store differ diff --git a/todo/__init__.py b/todo/__init__.py new file mode 100644 index 0000000..e96e0c4 --- /dev/null +++ b/todo/__init__.py @@ -0,0 +1,14 @@ +from flask import Flask +from flask.ext.sqlalchemy import SQLAlchemy + + +DATABASE = '/tmp/todo.db' +DEBUG = True +SECRET_KEY = 'development-key' +SQLALCHEMY_DATABASE_URI = "sqlite:///" + DATABASE + +app = Flask(__name__) +app.config.from_object(__name__) +db = SQLAlchemy(app) + +from . import views diff --git a/todo/models.py b/todo/models.py new file mode 100644 index 0000000..36d0c02 --- /dev/null +++ b/todo/models.py @@ -0,0 +1,11 @@ +from . import db + +class Todo(db.Model): + id = db.Column(db.Integer, primary_key=True) + text = db.Column(db.String(255), nullable=False) + + def __init__(self, text): + self.text = text + + def __repr__(self): + return "".format(self.text) diff --git a/todo/schema.sql b/todo/schema.sql new file mode 100644 index 0000000..7fcc732 --- /dev/null +++ b/todo/schema.sql @@ -0,0 +1,4 @@ +CREATE TABLE todo ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + text VARCHAR(255) +) diff --git a/todo/templates/.DS_Store b/todo/templates/.DS_Store new file mode 100644 index 0000000..520e9b1 Binary files /dev/null and b/todo/templates/.DS_Store differ diff --git a/todo/templates/index.html b/todo/templates/index.html new file mode 100644 index 0000000..da4f15f --- /dev/null +++ b/todo/templates/index.html @@ -0,0 +1,21 @@ +{% extends "layout.html" %} + +{% block body %} +

Create a new todo

+
+ + +
+

All todos

+
+ + +
+{% endblock %} diff --git a/todo/templates/layout.html b/todo/templates/layout.html new file mode 100644 index 0000000..3290e5c --- /dev/null +++ b/todo/templates/layout.html @@ -0,0 +1,10 @@ + + + + Todo List + + + +{% block body %}{% endblock %} + + diff --git a/todo/todo.py b/todo/todo.py new file mode 100644 index 0000000..70ef203 --- /dev/null +++ b/todo/todo.py @@ -0,0 +1,59 @@ +from flask import Flask, render_template, request, redirect, url_for +from flask.ext.sqlalchemy import SQLAlchemy +from flask.ext.script import Manager +from flask.ext.migrate import Migrate, MigrateCommand + +DATABASE = '/tmp/todo.db' +DEBUG = True +SECRET_KEY = 'development-key' +SQLALCHEMY_DATABASE_URI = "sqlite:///" + DATABASE + +app = Flask(__name__) +app.config.from_object(__name__) + +db = SQLAlchemy(app) +migrate = Migrate(app, db) + +manager = Manager(app) +manager.add_command('db', MigrateCommand) + + + +class Todo(db.Model): + id = db.Column(db.Integer, primary_key=True) + text = db.Column(db.String(255)) + + def __init__(self, text): + self.text = text + + def __repr__(self): + return "".format(self.text) + +@app.route("/") +def index(): + todo_list = Todo.query.all() + return render_template("index.html", + todos=todo_list) + + +@app.route("/add", methods=['POST']) +def make_a_todo(): + text = request.form['text'] + todo = Todo(text) + db.session.add(todo) + db.session.commit() + return redirect(url_for('index')) + + +@app.route("/complete_tasks", methods=['POST']) +def complete_tasks(): + ids = request.form.getlist('todo') + for id in ids: + todo = Todo.query.get(id) + db.session.delete(todo) + db.session.commit() + return redirect(url_for('index')) + + +if __name__ == "__main__": + manager.run() diff --git a/todo/views.py b/todo/views.py new file mode 100644 index 0000000..6b4c817 --- /dev/null +++ b/todo/views.py @@ -0,0 +1,32 @@ +from flask import Flask, render_template, request, redirect, url_for +from .models import Todo +from . import app, db + +@app.route("/") +def index(): + todo_list = Todo.query.all() + return render_template("index.html", + todos=todo_list) + + +@app.route("/add", methods=['POST']) +def make_a_todo(): + text = request.form['text'] + todo = Todo(text) + db.session.add(todo) + db.session.commit() + return redirect(url_for('index')) + + +@app.route("/complete_tasks", methods=['POST']) +def complete_tasks(): + ids = request.form.getlist('todo') + for id in ids: + todo = Todo.query.get(id) + db.session.delete(todo) + db.session.commit() + return redirect(url_for('index')) + + +if __name__ == "__main__": + manager.run()