diff options
Diffstat (limited to 'docs/tutorials/bfgwiki2/src/models')
9 files changed, 49 insertions, 28 deletions
diff --git a/docs/tutorials/bfgwiki2/src/models/CHANGES.txt b/docs/tutorials/bfgwiki2/src/models/CHANGES.txt index e14f633ab..35a34f332 100644 --- a/docs/tutorials/bfgwiki2/src/models/CHANGES.txt +++ b/docs/tutorials/bfgwiki2/src/models/CHANGES.txt @@ -1,5 +1,4 @@ 0.0 --- -- Initial version - +- Initial version diff --git a/docs/tutorials/bfgwiki2/src/models/setup.cfg b/docs/tutorials/bfgwiki2/src/models/setup.cfg index 56fe3be14..23b2ad983 100644 --- a/docs/tutorials/bfgwiki2/src/models/setup.cfg +++ b/docs/tutorials/bfgwiki2/src/models/setup.cfg @@ -1,8 +1,27 @@ -[easy_install] -index_url = http://dist.repoze.org/bfgsite/simple - [nosetests] +match=^test nocapture=1 cover-package=tutorial with-coverage=1 cover-erase=1 + +[compile_catalog] +directory = tutorial/locale +domain = tutorial +statistics = true + +[extract_messages] +add_comments = TRANSLATORS: +output_file = tutorial/locale/tutorial.pot +width = 80 + +[init_catalog] +domain = tutorial +input_file = tutorial/locale/tutorial.pot +output_dir = tutorial/locale + +[update_catalog] +domain = tutorial +input_file = tutorial/locale/tutorial.pot +output_dir = tutorial/locale +previous = true diff --git a/docs/tutorials/bfgwiki2/src/models/setup.py b/docs/tutorials/bfgwiki2/src/models/setup.py index 764e8c0ea..fae50a1ee 100644 --- a/docs/tutorials/bfgwiki2/src/models/setup.py +++ b/docs/tutorials/bfgwiki2/src/models/setup.py @@ -13,7 +13,6 @@ requires = [ 'transaction', 'repoze.tm2', 'zope.sqlalchemy', - 'docutils' ] if sys.version_info[:3] < (2,5,0): diff --git a/docs/tutorials/bfgwiki2/src/models/tutorial.ini b/docs/tutorials/bfgwiki2/src/models/tutorial.ini index 1f8a5ccce..73b5ed9a4 100644 --- a/docs/tutorials/bfgwiki2/src/models/tutorial.ini +++ b/docs/tutorials/bfgwiki2/src/models/tutorial.ini @@ -1,17 +1,20 @@ [DEFAULT] debug = true -[app:sql] +[app:sqlalchemy] use = egg:tutorial#app reload_templates = true debug_authorization = false debug_notfound = false +debug_templates = true +default_locale_name = en db_string = sqlite:///%(here)s/tutorial.db +db_echo = false [pipeline:main] pipeline = egg:repoze.tm2#tm - sql + sqlalchemy [server:main] use = egg:Paste#http diff --git a/docs/tutorials/bfgwiki2/src/models/tutorial/configure.zcml b/docs/tutorials/bfgwiki2/src/models/tutorial/configure.zcml index f04eec9b4..6d16bd089 100644 --- a/docs/tutorials/bfgwiki2/src/models/tutorial/configure.zcml +++ b/docs/tutorials/bfgwiki2/src/models/tutorial/configure.zcml @@ -3,7 +3,7 @@ <!-- this must be included for the view declarations to work --> <include package="repoze.bfg.includes" /> - <route + <route pattern="" name="home" view=".views.my_view" @@ -11,8 +11,8 @@ /> <static - pattern="templates/static" name="static" + path="templates/static" /> </configure> diff --git a/docs/tutorials/bfgwiki2/src/models/tutorial/models.py b/docs/tutorials/bfgwiki2/src/models/tutorial/models.py index 0d062e01f..ec9d2b25c 100644 --- a/docs/tutorials/bfgwiki2/src/models/tutorial/models.py +++ b/docs/tutorials/bfgwiki2/src/models/tutorial/models.py @@ -6,16 +6,14 @@ from sqlalchemy import Integer from sqlalchemy import Text from sqlalchemy.exc import IntegrityError +from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.orm import scoped_session from sqlalchemy.orm import sessionmaker -from sqlalchemy.ext.declarative import declarative_base - from zope.sqlalchemy import ZopeTransactionExtension -DBSession = scoped_session( - sessionmaker(extension=ZopeTransactionExtension())) +DBSession = scoped_session(sessionmaker(extension=ZopeTransactionExtension())) Base = declarative_base() class Page(Base): @@ -29,8 +27,8 @@ class Page(Base): self.name = name self.data = data -def initialize_sql(db, echo=False): - engine = create_engine(db, echo=echo) +def initialize_sql(db_string, echo=False): + engine = create_engine(db_string, echo=echo) DBSession.configure(bind=engine) Base.metadata.bind = engine Base.metadata.create_all(engine) diff --git a/docs/tutorials/bfgwiki2/src/models/tutorial/run.py b/docs/tutorials/bfgwiki2/src/models/tutorial/run.py index 8e1249eab..47eb79e87 100644 --- a/docs/tutorials/bfgwiki2/src/models/tutorial/run.py +++ b/docs/tutorials/bfgwiki2/src/models/tutorial/run.py @@ -1,4 +1,5 @@ from repoze.bfg.configuration import Configurator +from paste.deploy.converters import asbool from tutorial.models import initialize_sql @@ -8,13 +9,15 @@ def app(global_config, **settings): It is usually called by the PasteDeploy framework during ``paster serve``. """ + zcml_file = settings.get('configure_zcml', 'configure.zcml') db_string = settings.get('db_string') if db_string is None: - raise ValueError("No 'db_string' value in application " - "configuration.") - initialize_sql(db_string) + raise ValueError("No 'db_string' value in application configuration.") + db_echo = settings.get('db_echo', 'false') + initialize_sql(db_string, asbool(db_echo)) config = Configurator(settings=settings) config.begin() - config.load_zcml('configure.zcml') + config.load_zcml(zcml_file) config.end() return config.make_wsgi_app() + diff --git a/docs/tutorials/bfgwiki2/src/models/tutorial/templates/mytemplate.pt b/docs/tutorials/bfgwiki2/src/models/tutorial/templates/mytemplate.pt index 767252554..2aedcad9f 100644 --- a/docs/tutorials/bfgwiki2/src/models/tutorial/templates/mytemplate.pt +++ b/docs/tutorials/bfgwiki2/src/models/tutorial/templates/mytemplate.pt @@ -48,31 +48,31 @@ <h2><code>repoze.bfg</code> links</h2> <ul> <li><a - href="http://docs.repoze.org/bfg/#narrative-documentation">Narrative + href="http://docs.repoze.org/bfg/current/#narrative-documentation">Narrative Documentation</a> </li> <li> <a - href="http://docs.repoze.org/bfg/#api-documentation">API + href="http://docs.repoze.org/bfg/current/#api-documentation">API Documentation</a> </li> <li> <a - href="http://docs.repoze.org/bfg/#tutorials">Tutorials</a> + href="http://docs.repoze.org/bfg/current/#tutorials">Tutorials</a> </li> <li> <a - href="http://docs.repoze.org/bfg/#change-history">Change + href="http://docs.repoze.org/bfg/current/#change-history">Change History</a> </li> <li> <a - href="http://docs.repoze.org/bfg/#sample-applications">Sample + href="http://docs.repoze.org/bfg/current/#sample-applications">Sample Applications</a> </li> <li> <a - href="http://docs.repoze.org/bfg/#support-and-development">Support + href="http://docs.repoze.org/bfg/current/#support-and-development">Support and Development</a> </li> <li> diff --git a/docs/tutorials/bfgwiki2/src/models/tutorial/views.py b/docs/tutorials/bfgwiki2/src/models/tutorial/views.py index dfb628269..e550e3257 100644 --- a/docs/tutorials/bfgwiki2/src/models/tutorial/views.py +++ b/docs/tutorials/bfgwiki2/src/models/tutorial/views.py @@ -1,7 +1,7 @@ from tutorial.models import DBSession -from tutorial.models import Model +from tutorial.models import MyModel def my_view(request): dbsession = DBSession() - root = dbsession.query(Model).filter(Model.name==u'root').first() + root = dbsession.query(MyModel).filter(MyModel.name==u'root').first() return {'root':root, 'project':'tutorial'} |