updates to get working, bumping to 0.10.0

Author: jstacoder

MANIFEST.in

@@ -5,7 +5,7 @@ include manage.py
 
 include flask_xxl/templates/project/.mrbob.ini
 include flask_xxl/templates/blueprint/.mrbob.ini
-recursive-include ./flask_xxl/templates *
+recursive-include flask_xxl/templates *
 recursive-include flask_xxl/templates/project *
 recursive-include flask_xxl/templates/blueprint *
-
+recursive-include flask_xxl/apps *

flask_xxl/apps/menu/urls.py

@@ -0,0 +1,2 @@
+## TEST
+routes = []

flask_xxl/basemodels.py

@@ -31,7 +31,7 @@ def __get__(self, instance, owner):
 
 Base = declarative_base()
 
-    
+
 class SQLAlchemyMissingException(Exception):
     pass
 
@@ -56,7 +56,7 @@ def engine(cls):
            BaseMixin._engine = get_engine()
         BaseMixin._engine.echo = echo_sql()
         return BaseMixin._engine
-        
+
     @declared_attr
     def id(self):
         return Column(Integer,primary_key=True)
@@ -66,17 +66,17 @@ def session(cls):
         if BaseMixin._session is None:
             BaseMixin._session = scoped_session(sessionmaker(bind=cls.engine))()
         return BaseMixin._session
-        
+
     @classproperty
     def query(cls):
         if cls._query is None:
             cls._query = cls.session.query(cls)
         return cls._query
-    
+
     @declared_attr
     def __tablename__(self):
         return underscore(pluralize(self.__name__))
-    
+
     @classmethod
     def get_by_id(cls, id):
         if any(
@@ -85,9 +85,9 @@ def get_by_id(cls, id):
         ):
             return cls.query.get(int(id))
         return None
-    
+
     @classmethod
-    def get_all(cls):        
+    def get_all(cls):
         return cls.query.all()
 
     @classmethod
@@ -108,7 +108,7 @@ def save(self,commit=True,testing=False):
         except Exception, e:
             if not testing:
                 raise e
-            print e.message            
+            print e.message
             return False
         return self
 
@@ -135,11 +135,11 @@ def get_all_columns(cls,exclude=['id']):
             if not attr in exclude:
                 if not attr in [x[0] for x in rtn]:
                     if not attr.startswith('_') and not attr.endswith('id'):
-                        if not callable(getattr(cls,attr)):  
+                        if not callable(getattr(cls,attr)):
                             rtn.append((attr,_clean_name(attr)))
         return rtn
 
-    
+
 class AuditMixin(object):
     __abstract__ = True
 
@@ -170,7 +170,7 @@ class DBObject(object):
     @staticmethod
     def check_ctx():
         return stack.top is not None
-    
+
     @classproperty
     def session(cls):
         sess = cls._session
@@ -180,11 +180,11 @@ def session(cls):
 
     @classproperty
     def engine(cls):
-        engine = cls._engine 
+        engine = cls._engine
         if engine is None:
-            engine = cls._engine = cls.check_ctx() and current_app.config.get('DATABASE_URI') or os.environ.get('DATABASE_URI')
+            engine = cls._engine = cls.check_ctx() and create_engine(current_app.config.get('DATABASE_URI') or os.environ.get('DATABASE_URI'))
         return engine
-    
+
     @classproperty
     def metadata(cls):
         meta = cls._metadata

flask_xxl/main.py

@@ -56,7 +56,7 @@ def get_app(self, app_module_name, **kwargs):
         self._bind_extensions()
         #self._register_blueprints()
         self._register_routes()
-        #self._load_models()
+        self._load_models()
         self._load_views()
         self._register_context_processors()
         self._register_template_filters()
@@ -153,7 +153,7 @@ def _register_blueprints(self):
         self._bp = {}
         for blueprint_path in self.app.config.get('BLUEPRINTS', []):
             module, b_name = self._get_imported_stuff_by_path(blueprint_path)
-            if hasattr(module, b_name):    
+            if hasattr(module, b_name):
                 #self.app.register_blueprint(getattr(module, b_name))
                 self._bp[b_name] = getattr(module,b_name)
                 if self.app.config.get('VERBOSE',False):
@@ -162,16 +162,16 @@ def _register_blueprints(self):
                 raise NoBlueprintException('No {bp_name} blueprint found'.format(bp_name=b_name))
 
     def _register_routes(self):
-	if AppFactory._routes_registered is None:
+        if AppFactory._routes_registered is None:
             AppFactory._routes_registered = True
             if self.app.config.get('VERBOSE',False):
                 print 'starting routing'
             for url_module in self.app.config.get('URL_MODULES',[]):
-                if self.app.config.get('VERBOSE',False):                
+                if self.app.config.get('VERBOSE',False):
                     pass
                 module,r_name = self._get_imported_stuff_by_path(url_module)
                 if self.app.config.get('VERBOSE',False):
-                    pass                
+                    pass
                 if r_name == 'routes' and hasattr(module,r_name):
                     if self.app.config.get('VERBOSE',False):
                         print '\tsetting up routing for {} with\n\troute module {}\n'.format(module.__package__,module.__name__)
@@ -182,7 +182,7 @@ def _register_routes(self):
                 print 'Finished registering blueprints and url routes'
         else:
             if self.app.config.get('VERBOSE',False):
-                print 'skipped'    
+                print 'skipped'
 
     def _check_for_registered_blueprint(self, bp):
         found = False

setup.py

@@ -1,4 +1,4 @@
-VERSION = '0,9,20'
+VERSION = '0,10,0'
 import os
 from setuptools import setup, find_packages,findall
 from glob import glob
@@ -49,7 +49,7 @@ def get_pkg_data():
             'WTForms==2.0.1',
             'Werkzeug==0.9.6',
             'alembic==0.6.7',
-            'argparse==1.2.1',        
+            'argparse==1.2.1',
             'itsdangerous==0.24',
             'wsgiref==0.1.2',
             'six==1.8.0',