Merge branch 'master' of github.com:jstacoder/flask-xxl

Conflicts:
	setup.py

Author: jstacoder

README.md

@@ -13,8 +13,19 @@ _to see this in a real world example take a look at my other projects_ [Flask-Cm
 
 ##What this provides:
 
+-   Installable blueprints
+    -       any blueprints listed in your settings under `BLUEPRINTS` will be imported and registered on your app and if that blueprint is a package any files it contains named `models.py` or `views.py` will be imported as well, so no more need to manually import your views and models giving odd errors if you dont do it in the exact correct order!!
+
 -   basemodels.py 
-    -   with a BaseMixin class that provides many useful CRUD operations, IE: model.save(), model.delete()
+    -   with a sqlalchemy compatible BaseMixin class
+        - provides many useful CRUD operations, IE: model.save(), model.delete()
+        - `BaseMixin` generates `__tablename__` automaticlly
+        - `BaseMixin` adds an auto incrementing `id` field, as the primary_key to each model
+        - `BaseMixin.session` is current model classes session
+        - `BaseMixin.engine` is the current db engine
+        - `BaseMixin.query` is the models sqlalchemy query from its session
+        - `BaseMixin.get_all()` `->` function to return all of a model
+        - `BaseMixin.get(*args,**kwargs)` `->` get single model by attr values, mainly for id=x
 
 -   baseviews.py
     -   with a BaseView class that is subclassed from Flask.views.MethodView to allow easy definition of view responses to get and post requests.
@@ -114,3 +125,4 @@ _to see this in a real world example take a look at my other projects_ [Flask-Cm
 
 [![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/jstacoder/flask-xxl/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
 
+for more fun checkout the [wiki](https://github.com/jstacoder/flask-xxl/wiki)

flask_xxl/apps/admin/__init__.py

@@ -7,4 +7,3 @@
                  url_prefix='/admin')
 
 
-from views import *

flask_xxl/apps/admin/models.py

@@ -1,20 +1,21 @@
-from basemodels import BaseMixin
+import sqlalchemy as sa
+from ...basemodels import BaseMixin
 from LoginUtils import check_password, encrypt_password
-from ext import db
+from ...baseviews import is_verbose
 
-for attr in dir(db):
-    globals()[attr] = getattr(db,attr)
 
+if is_verbose():
+    print 'importing flask_xxl.apps.admin.models as ',__name__
 
-class Setting(BaseMixin,Model):
-    __tablename__ = 'settings'
 
-    name = Column(String(255),nullable=False,unique=True)
-    setting_type_id = Column(Integer,ForeignKey('types.id'))
-    setting_type = relationship('Type',backref=backref(
+class Setting(BaseMixin):
+
+    name = sa.Column(sa.String(255),nullable=False,unique=True)
+    setting_type_id = sa.Column(sa.Integer,sa.ForeignKey('types.id'))
+    setting_type = sa.orm.relationship('Type',backref=sa.orm.backref(
         'settings',lazy='dynamic'))
-    default = Column(String(255))
-    value = Column(String(255))
+    default = sa.Column(sa.String(255))
+    value = sa.Column(sa.String(255))
 
     @property
     def widget(self):
@@ -23,27 +24,25 @@ def widget(self):
         else:
             return ''
 
-class Type(BaseMixin,Model):
-    __tablename__ = 'types'
+class Type(BaseMixin):
 
-    name = Column(String(255),nullable=False)
-    widgets = relationship('Widget',backref=backref(
+    name = sa.Column(sa.String(255),nullable=False)
+    widgets = sa.orm.relationship('Widget',backref=sa.orm.backref(
         'type'),lazy='dynamic')
-    html = Column(Text)
-    field_type = Column(String(255))
-    required = Column(Boolean,default=False)
-    data_type = Column(String(255))
+    html = sa.Column(sa.Text)
+    field_type = sa.Column(sa.String(255))
+    required = sa.Column(sa.Boolean,default=False)
+    data_type = sa.Column(sa.String(255))
 
     def __repr__(self):
         return self.name or ''
 
-class Widget(BaseMixin,db.Model):
-    __tablename__ = 'widgets'
+class Widget(BaseMixin):
 
-    name = Column(String(255),nullable=False)
-    title = Column(String(255))
-    content = Column(Text,nullable=False)
-    type_id = Column(Integer,ForeignKey('types.id'))
+    name = sa.Column(sa.String(255),nullable=False)
+    title = sa.Column(sa.String(255))
+    content = sa.Column(sa.Text,nullable=False)
+    type_id = sa.Column(sa.Integer,sa.ForeignKey('types.id'))
 
     def __repr__(self):
         return self.name