organizing into tree

Author: bashwork

speleo.service/handlers/__init__.py

@@ -5,10 +5,8 @@
 import tornado.ioloop
 import tornado.web
 from tornado.options import define, options
-import handlers
-import models
-import security
-from webassets.loaders import PythonLoader
+import service
+
 
 # ------------------------------------------------------------ 
 # options
@@ -48,7 +46,7 @@ def __init__(self):
         # ---------------------------------------------------- 
         # handlers
         # ---------------------------------------------------- 
-        search = inspect.getmembers(handlers)
+        search = inspect.getmembers(service.handlers)
         routes = [(h.RoutePath, h) for n, h in search if 'Handler' in n]
 
         # ---------------------------------------------------- 
@@ -65,9 +63,9 @@ def __init__(self):
         # ---------------------------------------------------- 
         # shared
         # ---------------------------------------------------- 
-        self.assets   = PythonLoader('assets').load_environment()
-        self.security = security.get_security(options.security, options)
-        self.database = models.get_database(options.database, options.debug)
+        self.assets   = service.environment#PythonLoader('assets').load_environment()
+        self.security = service.get_security(options.security, options)
+        self.database = service.get_database(options.database, options.debug)
         #self.cache = memcache.Client([options.cache], debug=options.debug)
 
         # ---------------------------------------------------- 

speleo.service/handlers/root_handler.py

@@ -6,3 +6,4 @@ wsgiref==0.1.2
 webassets==0.6
 closure==20110811
 cssutils==0.9.9
+alembic==0.2.1

speleo.service/main.py

@@ -0,0 +1,4 @@
+from service.security import get_security
+from service.models import get_database
+from service.assets import environment
+import service.handlers

speleo.service/requirements.txt

@@ -32,6 +32,12 @@
 environment.register('template', template)
 environment.config['jst_compiler'] = '_.template'
 
+
+# ------------------------------------------------------------ 
+# exports
+# ------------------------------------------------------------ 
+__all__ = ['Environment']
+
 if __name__ == "__main__":
     print "Compiled stylesheets: ", environment['stylesheet'].urls()
     print "Compiled javascripts: ", environment['javascript'].urls()

speleo.service/service/__init__.py

@@ -0,0 +1,9 @@
+from service.handlers.root_handler import *
+from service.handlers.contact_handler import *
+from service.handlers.search_handler import *
+from service.handlers.settings_handler import *
+from service.handlers.dashboard_handler import *
+from service.handlers.blockboard_handler import *
+from service.handlers.auth_handler import *
+from service.handlers.simple_handler import *
+from service.handlers.elastic_handler import *

speleo.service/assets.py renamed to speleo.service/service/assets.py

@@ -1,14 +1,14 @@
 import logging
-import common
 import tornado.escape
 import tornado.auth
 import tornado.web
+from service.handlers.common import BaseHandler
 
 
 # ------------------------------------------------------------
 # page handlers
 # ------------------------------------------------------------
-class LoginHandler(common.BaseHandler):
+class LoginHandler(BaseHandler):
 
     RoutePath = r'/auth/login'
 
@@ -25,7 +25,7 @@ def post(self):
         else: self.redirect('/auth/login')
 
 
-class GoogleAuthHandler(common.BaseHandler, tornado.auth.GoogleMixin):
+class GoogleAuthHandler(BaseHandler, tornado.auth.GoogleMixin):
 
     RoutePath = r'/auth/google'
 
@@ -43,7 +43,7 @@ def _on_auth(self, user):
         self.redirect(self.get_argument("next", "/"))
 
 
-class TwitterAuthHandler(common.BaseHandler, tornado.auth.TwitterMixin):
+class TwitterAuthHandler(BaseHandler, tornado.auth.TwitterMixin):
 
     RoutePath = r'/auth/twitter'
 
@@ -61,7 +61,7 @@ def _on_auth(self, user):
         self.redirect(self.get_argument("next", "/"))
 
 
-class FacebookAuthHandler(common.BaseHandler, tornado.auth.FacebookMixin):
+class FacebookAuthHandler(BaseHandler, tornado.auth.FacebookMixin):
 
     RoutePath = r'/auth/facebook'
 
@@ -79,7 +79,7 @@ def _on_auth(self, user):
         self.redirect(self.get_argument("next", "/"))
 
 
-class LogoutHandler(common.BaseHandler):
+class LogoutHandler(BaseHandler):
 
     RoutePath = r'/auth/logout'
 

speleo.service/service/handlers/__init__.py

@@ -1,7 +1,7 @@
-import common
 import tornado.web
+from service.handlers.common import BaseHandler
 
-class BlockboardHandler(common.BaseHandler):
+class BlockboardHandler(BaseHandler):
 
     RoutePath = r'/blockboard'