Changeset 3581 for sample

Timestamp:

06/24/10 09:10:37 (2 years ago)

Author:

elemoine

Message:

base Map Fish Sample? on Pylons 1.0 and Map Fish? 2.0 (related to #575), r=bbinet

Location:

sample/trunk

Files:

• buildout.cfg (modified) (1 diff)
• mapfishsample/config/environment.py (modified) (4 diffs)
• mapfishsample/config/middleware.py (modified) (3 diffs)
• mapfishsample/config/routing.py (modified) (1 diff)
• mapfishsample/controllers/cities.py (modified) (1 diff)
• mapfishsample/controllers/countries.py (modified) (1 diff)
• mapfishsample/controllers/epfl.py (modified) (1 diff)
• mapfishsample/controllers/lines.py (modified) (1 diff)
• mapfishsample/controllers/points.py (modified) (1 diff)
• mapfishsample/controllers/polygons.py (modified) (1 diff)
• mapfishsample/controllers/summits.py (modified) (1 diff)
• mapfishsample/lib/app_globals.py (modified) (3 diffs)
• mapfishsample/lib/base.py (modified) (2 diffs)
• mapfishsample/model/__init__.py (modified) (3 diffs)
• mapfishsample/model/cities.py (modified) (2 diffs)
• mapfishsample/model/countries.py (modified) (2 diffs)
• mapfishsample/model/epfl.py (modified) (2 diffs)
• mapfishsample/model/meta.py (modified) (1 diff)
• mapfishsample/model/summits.py (modified) (2 diffs)
• mapfishsample/tests/__init__.py (modified) (3 diffs)
• mapfishsample/websetup.py (modified) (2 diffs)

sample/trunk/buildout.cfg

@@ -1 +1 @@
 [buildout]
-parts = eggs activate print modwsgi template jsbuild
+#parts = eggs activate print modwsgi template jsbuild
+parts = template jsbuild
 develop = . MapFish GeoFormAlchemy/GeoFormAlchemy
 newest = false

sample/trunk/mapfishsample/config/environment.py

@@ -4 +4 @@
 from mako.lookup import TemplateLookup
 from pylons.error import handle_mako_error
-from pylons import config
+from pylons.configuration import PylonsConfig
 from sqlalchemy import engine_from_config
 
@@ -16 +16 @@
     object
     """
+    config = PylonsConfig()
+
     # Pylons paths
     root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -26 +28 @@
     config.init_app(global_conf, app_conf, package='mapfishsample', paths=paths)
 
-    config['routes.map'] = make_map()
-    config['pylons.app_globals'] = app_globals.Globals()
+    config['routes.map'] = make_map(config)
+    config['pylons.app_globals'] = app_globals.Globals(config)
     config['pylons.h'] = mapfishsample.lib.helpers
+
+    # Setup cache object as early as possible
+    import pylons
+    pylons.cache._push_object(config['pylons.app_globals'].cache)
 
     # Create the Mako TemplateLookup, with the default auto-escaping
@@ -38 +44 @@
         imports=['from webhelpers.html import escape'],
         default_filters=['escape'])
-    
+
     # Setup SQLAlchemy database engine
     engine = engine_from_config(config, 'sqlalchemy.')
     init_model(engine)
-    
+
     # CONFIGURATION OPTIONS HERE (note: all config options will override
     # any Pylons config options)
+
+    return config

sample/trunk/mapfishsample/config/middleware.py

@@ -32 +32 @@
     """
     # Configure the Pylons environment
-    load_environment(global_conf, app_conf)
+    config = load_environment(global_conf, app_conf)
 
     # The Pylons WSGI app
-    app = PylonsApp()
+    app = PylonsApp(config=config)
     
     # CUSTOM MIDDLEWARE HERE (filtered by error handling middlewares)
@@ -42 +42 @@
     app = RoutesMiddleware(app, config['routes.map'])
     app = SessionMiddleware(app, config)
-    app = CacheMiddleware(app, config)
-    
+
     if asbool(full_stack):
         # Handle Python exceptions
@@ -61 +60 @@
     # server is handling this static content, remove the following 2 lines)
     static_app = StaticURLParser(config['pylons.paths']['static_files'])
+
     app = Cascade([static_app, app])
+
+    app.config = config
+
     return app

sample/trunk/mapfishsample/config/routing.py

@@ -9 +9 @@
 from mapfish.controllers import printer
 
-def make_map():
+def make_map(config):
     """Create, configure and return the routes Mapper"""
     map = Mapper(directory=config['pylons.paths']['controllers'],

sample/trunk/mapfishsample/controllers/cities.py

@@ -19 +19 @@
 
 from pylons import request, response, session, tmpl_context as c
-from pylons.controllers.util import abort, redirect_to
+from pylons.controllers.util import abort, redirect
 
 from mapfishsample.lib.base import BaseController

sample/trunk/mapfishsample/controllers/countries.py

@@ -19 +19 @@
 
 from pylons import request, response, session, tmpl_context as c
-from pylons.controllers.util import abort, redirect_to
+from pylons.controllers.util import abort, redirect
 
 from mapfishsample.lib.base import BaseController

sample/trunk/mapfishsample/controllers/epfl.py

@@ -21 +21 @@
 
 from pylons import request, response, session, tmpl_context as c
-from pylons.controllers.util import abort, redirect_to
+from pylons.controllers.util import abort, redirect
 from pylons.decorators import jsonify
 

sample/trunk/mapfishsample/controllers/lines.py

@@ -19 +19 @@
 
 from pylons import request, response, session, tmpl_context as c
-from pylons.controllers.util import abort, redirect_to
+from pylons.controllers.util import abort, redirect
 
 from mapfishsample.lib.base import BaseController

sample/trunk/mapfishsample/controllers/points.py

@@ -19 +19 @@
 
 from pylons import request, response, session, tmpl_context as c
-from pylons.controllers.util import abort, redirect_to
+from pylons.controllers.util import abort, redirect
 
 from mapfishsample.lib.base import BaseController

sample/trunk/mapfishsample/controllers/polygons.py

@@ -19 +19 @@
 
 from pylons import request, response, session, tmpl_context as c
-from pylons.controllers.util import abort, redirect_to
+from pylons.controllers.util import abort, redirect
 
 from mapfishsample.lib.base import BaseController

sample/trunk/mapfishsample/controllers/summits.py

@@ -19 +19 @@
 
 from pylons import request, response, session, tmpl_context as c
-from pylons.controllers.util import abort, redirect_to
+from pylons.controllers.util import abort, redirect
 
 from mapfishsample.lib.base import BaseController

sample/trunk/mapfishsample/lib/app_globals.py

@@ -1 +1 @@
 """The application's Globals object"""
+
+from beaker.cache import CacheManager
+from beaker.util import parse_cache_config_options
 
 class Globals(object):
@@ -6 +9 @@
 
     """
-    def __init__(self):
+    def __init__(self, config):
         """One instance of Globals is created during application
         initialization and is available during requests via the
@@ -12 +15 @@
 
         """
-        pass
+        self.cache = CacheManager(**parse_cache_config_options(config))

sample/trunk/mapfishsample/lib/base.py

@@ -6 +6 @@
 from pylons.templating import render_mako as render
 
-from mapfishsample.model import meta
+from mapfishsample.model.meta import Session
 
 class BaseController(WSGIController):
@@ -18 +18 @@
             return WSGIController.__call__(self, environ, start_response)
         finally:
-            meta.Session.remove()
+            Session.remove()
         

sample/trunk/mapfishsample/model/__init__.py

@@ -26 +26 @@
 from geojson import Feature
 
-from mapfishsample.model import meta
+from mapfishsample.model.meta import Session, Base
 
 from mapfishsample.model.lines import Line
@@ -35 +35 @@
     """Call me before using any of the tables or classes in the model"""
     ## Reflected tables must be defined and mapped here
-    sm = orm.sessionmaker(autoflush=True, autocommit=False, bind=engine)
 
-    meta.engine = engine
-    meta.Session = orm.scoped_session(sm)
+    Session.configure(bind=engine)
     
     if isinstance(engine.dialect, SQLiteDialect):
@@ -52 +50 @@
                 
         engine.pool.add_listener(SpatialiteConnectionListener()) 
-        

sample/trunk/mapfishsample/model/cities.py

@@ -21 +21 @@
 
 from mapfish.sqlalchemygeom import GeometryTableMixIn
-from mapfishsample.model.meta import engine, Base
+from mapfishsample.model.meta import Session, Base
 
 
@@ -28 +28 @@
     __table_args__ = {
             'autoload' : True,
-            'autoload_with' : engine
+            'autoload_with' : Session.bind
         }
     

sample/trunk/mapfishsample/model/countries.py

@@ -23 +23 @@
 
 from mapfish.sqlalchemygeom import GeometryTableMixIn
-from mapfishsample.model.meta import engine, Base
+from mapfishsample.model.meta import Session, Base
 
 
@@ -30 +30 @@
     __table_args__ = {
             'autoload' : True,
-            'autoload_with' : engine
+            'autoload_with' : Session.bind
         }
     

sample/trunk/mapfishsample/model/epfl.py

@@ -21 +21 @@
 
 from mapfish.sqlalchemygeom import GeometryTableMixIn
-from mapfishsample.model.meta import engine, Base
+from mapfishsample.model.meta import Session, Base
 
 from geojson import Feature
@@ -30 +30 @@
     __table_args__ = {
             'autoload' : True,
-            'autoload_with' : engine
+            'autoload_with' : Session.bind
         }
     

sample/trunk/mapfishsample/model/meta.py

@@ -1 +1 @@
 """SQLAlchemy Metadata and Session object"""
-from sqlalchemy import MetaData
 from sqlalchemy.orm import scoped_session, sessionmaker
 from sqlalchemy.ext.declarative import declarative_base
 
-__all__ = ['Session', 'metadata', 'Base']
-
-# SQLAlchemy database engine.  Updated by model.init_model()
-engine = None
+__all__ = ['Session', 'Base']
 
 # SQLAlchemy session manager.  Updated by model.init_model()
-Session = None
+Session = scoped_session(sessionmaker())
 
-# Global metadata. If you have multiple databases with overlapping table
-# names, you'll need a metadata for each database
-metadata = MetaData()
-
-Base = declarative_base(metadata=metadata)
+# The declarative Base
+Base = declarative_base()

sample/trunk/mapfishsample/model/summits.py

@@ -21 +21 @@
 
 from mapfish.sqlalchemygeom import GeometryTableMixIn
-from mapfishsample.model.meta import engine, Base
+from mapfishsample.model.meta import Session, Base
 
 
@@ -28 +28 @@
     __table_args__ = {
             'autoload' : True,
-            'autoload_with' : engine
+            'autoload_with' : Session.bind
         }
     

sample/trunk/mapfishsample/tests/__init__.py

@@ -12 +12 @@
 from paste.deploy import loadapp
 from paste.script.appinstall import SetupCommand
-from pylons import config, url
+from pylons import url
 from routes.util import URLGenerator
 from webtest import TestApp
@@ -21 +21 @@
 
 # Invoke websetup with the current config file
-SetupCommand('setup-app').run([config['__file__']])
+SetupCommand('setup-app').run([pylons.test.pylonsapp.config['__file__']])
 
 environ = {}
@@ -28 +28 @@
 
     def __init__(self, *args, **kwargs):
-        if pylons.test.pylonsapp:
-            wsgiapp = pylons.test.pylonsapp
-        else:
-            wsgiapp = loadapp('config:%s' % config['__file__'])
+        wsgiapp = pylons.test.pylonsapp
+        config = wsgiapp.config
         self.app = TestApp(wsgiapp)
         url._push_object(URLGenerator(config['routes.map'], environ))

sample/trunk/mapfishsample/websetup.py

@@ -2 +2 @@
 import logging
 
+import pylons
+
 from mapfishsample.config.environment import load_environment
-from mapfishsample.model import meta
+from mapfishsample.model.meta import Session, Base
 
 log = logging.getLogger(__name__)
@@ -13 +15 @@
     paster setup-app development.ini [--name=main_pylons]
     """
-    load_environment(conf.global_conf, conf.local_conf)
+    # Don't reload the app if it was loaded under the testing environment
+    if not pylons.test.pylonsapp:
+        load_environment(conf.global_conf, conf.local_conf)
 
     # Create the tables for the editing example (if they aren't there already)
-    meta.metadata.create_all(bind=meta.engine)
+    Base.metadata.create_all(bind=Session.bind)