From 2b936bad4caa5d38c13820000d2056280705c16d Mon Sep 17 00:00:00 2001 From: Daniel Newell Date: Wed, 18 Feb 2015 21:36:04 -0500 Subject: [PATCH] Got upto flask-SQLAlchemy part. --- .DS_Store | Bin 0 -> 6148 bytes migrations/README | 1 + migrations/alembic.ini | 45 +++++++++++++++++ migrations/env.py | 73 ++++++++++++++++++++++++++++ migrations/script.py.mako | 22 +++++++++ migrations/versions/54da866682a_.py | 30 ++++++++++++ run.py | 14 ++++++ templates/.gitkeep | 0 todo/.DS_Store | Bin 0 -> 6148 bytes todo/__init__.py | 14 ++++++ todo/models.py | 11 +++++ todo/schema.sql | 4 ++ todo/templates/.DS_Store | Bin 0 -> 6148 bytes todo/templates/index.html | 21 ++++++++ todo/templates/layout.html | 10 ++++ todo/todo.py | 59 ++++++++++++++++++++++ todo/views.py | 32 ++++++++++++ 17 files changed, 336 insertions(+) create mode 100644 .DS_Store create mode 100755 migrations/README create mode 100644 migrations/alembic.ini create mode 100644 migrations/env.py create mode 100755 migrations/script.py.mako create mode 100644 migrations/versions/54da866682a_.py create mode 100644 run.py delete mode 100644 templates/.gitkeep create mode 100644 todo/.DS_Store create mode 100644 todo/__init__.py create mode 100644 todo/models.py create mode 100644 todo/schema.sql create mode 100644 todo/templates/.DS_Store create mode 100644 todo/templates/index.html create mode 100644 todo/templates/layout.html create mode 100644 todo/todo.py create mode 100644 todo/views.py diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..d3f7505c85bbb9fb677766c350f557fa34c8452c GIT binary patch literal 6148 zcmeHKL2KJE6qeF#bDE3CR#xam*Fg>`q-49fS$7-+ToOt%G8>ylV5|^3H6sLk-p}aP zZogx!Kcc7ojUD@*q=b~T$Cb9cXP&;Nr}rf5laVaO81GD@UB+C-m;;JfsX=jzU_0uX zRICS)V;^CWjl)ERQ2)0UO^%1i0Ipq?Yy*vNEID5 zO`~k!oBsMT%11+Yt2>ELA+;N%aZhG4l!?s0IyHQT?wi@H-D-$dd)^SU-R8T!hG@TU z&*$!6$Ju$ixBuyAJpXp~{m1#m&tJd)m_^|5y=r-7aRHZLEcrO~CuyS66YwqK7jcBd z05L!eJZ1*$p61ja^Calqi2-8Zzc7INg8)VJES3iK)&T|nK4NhR>)Pb-tQDYNKv6KRG`LIwLm$Nui%0P`s21=G XGypw|r9tq3(2szofeK>aUKzLsOl)K# literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..22992e5a258aa0f7039e62b7e267b01bfc370054 GIT binary patch literal 6148 zcmeHKO^ee&7=EW)-L$<#R201As8E(J>{7kOx(XhIVr3U`wI-Wj2eL_Q(w0&RJ^Kqh z`~5paZ~g#1dGSYhtIvFN>6gb9m3hNE&zqU|nQ5L$W;#T~8ogkf$R;8SF0fcevBpHZ z@D(fQni7!7J~-vn#FkkL~Z4b>-Ub&3g~i@rzfl-@JYI{=>&lPyoiTdP_U6aR#3etkJUH>c&wL zKSQfvZbD%(r^&kcEc`&m{Crx}$9opiVEz2d_w41|dj`6(Q&B+Ax>Y%q-c6@Q0i(db ztbkY_9JoMN<3yocI#9?X0I-N^X^6$21;KGNx*8`6(E?+N3RG04j~GnRQSazHSK~yX zq7&1H52i#d=;+^(>BL-xrZfr|1r`<9P`9?&|8M{P{J%&tcSZrDz<;FxEAF-S z8h9kVx2`;#*lQj5Q@AjZH&G}lDD-wL1F;ofhD$@6BLbkSaiS14F!M)1%3unkz#moM E7wG4{PXGV_ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..520e9b157606670073c8777ca9b1dd437425d1a9 GIT binary patch literal 6148 zcmeHKO-sW-5PhRPRD0>s;~qT;{)14W(5w9cYHh(nG$0oAmLKSU(l;L#QsYfTWCmv6 zWOv?f@*ulA0A#jZodZ(hqz(jwsOW*wnXQ;8j zHGTK~?cK6zmmF1TF6pQ5W{iMiZ19K`)_5WJo~#En^QOmn+v7~o;1;jcXUqI=SaP+; z($&&Zfm9$BNCi@XpHzTnw%T~&m~ASM3Zw!%1$2KXbj2#LbF{64jgxEf4 zC9n$Y963T0rxKkiQDTVG*Uo0I`IcA#*qyl{fwDzS< z_58o!FEd!=TS_*mKq~NG6_8QAsAv4TI9tDbr=GQienVH&yiNle*r1OW ajhR;kc8)rW_8Xm;7XcF_n^fQz6!-v4x;9V% literal 0 HcmV?d00001 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

+
+
    + {% for todo in todos %} +
  • + + +
    • + {% endfor %} +
+ +
+{% 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()