models: implement multi service support

CHANGES

@@ -1,6 +1,20 @@
 Changelog
 =========
 
+2016-11-XX
+----------
+
+* Release 0.7.0
+* Introduced ResourceTreeService for nested resource management
+  (currently only PostgreSQL support is implemented)
+* added deprecation warnings
+
+**BACKWARDS INCOMPATIBLE CHANGES**
+
+- code reorganization that might break existing code
+- _ziggurat_services is now a list
+
+
 2016-07-05
 ----------
 * Release: 0.6.8

ziggurat_foundations/__init__.py

@@ -32,31 +32,32 @@ def make_passwordmanager():
     return pwd_context
 
 
-def ziggurat_model_init(*k, **kw):
+def ziggurat_model_init(*args, **kwargs):
     """
     This function handles attaching model to service if model has one specified
     as `_ziggurat_service`, Also attached a proxy object holding all model
     definitions that services might use
 
-    :param k:
-    :param kw:
+    :param args:
+    :param kwargs:
     :return:
     """
     models = ModelProxy()
-    for cls2 in k:
+    for cls2 in args:
         setattr(models, cls2.__name__, cls2)
 
-    for cls in k:
+    for cls in args:
         if cls.__name__ == 'User':
-            if kw.get('passwordmanager'):
-                cls.passwordmanager = kw['passwordmanager']
+            if kwargs.get('passwordmanager'):
+                cls.passwordmanager = kwargs['passwordmanager']
             else:
                 cls.passwordmanager = make_passwordmanager()
 
-        for cls2 in k:
+        for cls2 in args:
             setattr(models, cls2.__name__, cls2)
         setattr(cls, "_ziggurat_models", models)
         # if model has a manager attached attached the class also to manager
-        if hasattr(cls, '_ziggurat_service'):
-            setattr(cls._ziggurat_service, 'model', cls)
-            setattr(cls._ziggurat_service, 'models_proxy', models)
+        if hasattr(cls, '_ziggurat_services'):
+            for service in cls._ziggurat_services:
+                setattr(service, 'model', cls)
+                setattr(service, 'models_proxy', models)

ziggurat_foundations/models/external_identity.py

@@ -18,7 +18,7 @@ class ExternalIdentityMixin(BaseModel):
         {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8',
          })
 
-    _ziggurat_service = ExternalIdentityService
+    _ziggurat_services = [ExternalIdentityService]
 
     @declared_attr
     def __tablename__(self):

ziggurat_foundations/models/group.py

@@ -13,7 +13,7 @@
 class GroupMixin(BaseModel):
     """ base mixin for group object"""
 
-    _ziggurat_service = GroupService
+    _ziggurat_services = [GroupService]
 
     __table_args__ = {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8'}
 

ziggurat_foundations/models/group_permission.py

@@ -19,7 +19,7 @@ class GroupPermissionMixin(BaseModel):
                                               name='pk_groups_permissions'),
                       {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8'})
 
-    _ziggurat_service = GroupPermissionService
+    _ziggurat_services = [GroupPermissionService]
 
     @declared_attr
     def __tablename__(self):

ziggurat_foundations/models/resource.py

@@ -6,6 +6,8 @@
 from ziggurat_foundations.exc import ZigguratException
 from ziggurat_foundations.models.base import BaseModel
 from ziggurat_foundations.models.services.resource import ResourceService
+from ziggurat_foundations.models.services.resource_tree import \
+    ResourceTreeService
 from ziggurat_foundations.models.base import get_db_session
 
 __all__ = ['ResourceMixin']
@@ -14,7 +16,7 @@
 class ResourceMixin(BaseModel):
     __possible_permissions__ = ()
 
-    _ziggurat_service = ResourceService
+    _ziggurat_services = [ResourceService, ResourceTreeService]
 
     @declared_attr
     def __tablename__(self):