demo update

#12
OnroerendErfgoed · Apr 11, 2014 · cc08f5c · cc08f5c
1 parent 05e7550
commit cc08f5c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 22 deletions.
diff --git a/atramhasis/__init__.py b/atramhasis/__init__.py
@@ -12,6 +12,7 @@ def includeme(config):
     config.include('pyramid_jinja2')
     config.add_static_view('static', 'static', cache_max_age=3600)
     config.add_route('home', '/')
+    config.scan()
 
 
 def main(global_config, **settings):
@@ -22,5 +23,5 @@ def main(global_config, **settings):
     Base.metadata.bind = engine
     config = Configurator(settings=settings)
     includeme(config)
-    config.scan()
+
     return config.make_wsgi_app()
diff --git a/atramhasis/scaffolds/atramhasis_demo/+package+/__init__.py_tmpl b/atramhasis/scaffolds/atramhasis_demo/+package+/__init__.py_tmpl
@@ -1,15 +1,26 @@
 from pyramid.config import Configurator
+from sqlalchemy import engine_from_config
 
+from atramhasis.models import (
+    DBSession,
+    Base,
+)
 
 def main(global_config, **settings):
     """ This function returns a Pyramid WSGI application.
     """
 
-    print("--{{project}}--MAIN--")
+    # Set up sqlalchemy
+    engine = engine_from_config(settings, 'sqlalchemy.')
+    DBSession.configure(bind=engine)
+    Base.metadata.bind = engine
 
     # Set up pyramid
     config = Configurator(settings=settings)
 
+    # Set up atramhasis
+    config.include('atramhasis')
+
     #Add skos support
     config.include('{{package}}.skos')
 

diff --git a/atramhasis/scaffolds/atramhasis_demo/+package+/skos/__init__.py_tmpl b/atramhasis/scaffolds/atramhasis_demo/+package+/skos/__init__.py_tmpl
@@ -54,28 +54,9 @@ TREES = DictionaryProvider(
     [larch, chestnut, species]
 )
 
-
-def unicode_csv_reader(utf8_data, dialect=csv.excel, **kwargs):
-    csv_reader = csv.reader(utf8_data, dialect=dialect, **kwargs)
-    for row in csv_reader:
-        yield [unicode(cell, 'utf-8') for cell in row]
-
-reader = unicode_csv_reader(
-    open(os.path.join(os.path.dirname(__file__), 'menu.csv'), 'r'),
-    delimiter=',',
-    quotechar='"'
-)
-
-MENU = SimpleCsvProvider(
-    {'id': 'MENU'},
-    reader
-)
-
-
 def includeme(config):
     config.include('pyramid_skosprovider')
     config.scan('pyramid_skosprovider')
     skosregis = config.get_skos_registry()
     skosregis.register_provider(TREES)
-    skosregis.register_provider(MENU)
 
diff --git a/atramhasis/scaffolds/atramhasis_demo/development.ini_tmpl b/atramhasis/scaffolds/atramhasis_demo/development.ini_tmpl
@@ -4,7 +4,7 @@
 ###
 
 [app:main]
-use = egg:atramhasis
+use = egg:{{project}}
 
 pyramid.reload_templates = true
 pyramid.debug_authorization = false