refactor: got rid of _ziggurat_services on models

ziggurat_foundations/__init__.py

@@ -3,21 +3,35 @@
 
 __version__ = {'major': 0, 'minor': 7, 'patch': 3}
 
-
-class ModelProxy(object):
-    pass
-
-
-class NOOP(object):
-    def __nonzero__(self):
-        return False
-
-        # py3 compat
-
-    __bool__ = __nonzero__
-
-
-noop = NOOP()
+from ziggurat_foundations.utils import ModelProxy, noop
+from ziggurat_foundations.models.services.user import UserService
+from ziggurat_foundations.models.services.group import GroupService
+from ziggurat_foundations.models.services.group_permission import \
+    GroupPermissionService
+from ziggurat_foundations.models.services.user_permission import \
+    UserPermissionService
+from ziggurat_foundations.models.services.user_resource_permission import \
+    UserResourcePermissionService
+from ziggurat_foundations.models.services.group_resource_permission import \
+    GroupResourcePermissionService
+from ziggurat_foundations.models.services.resource import ResourceService
+from ziggurat_foundations.models.services.resource_tree import \
+    ResourceTreeService
+from ziggurat_foundations.models.services.external_identity import \
+    ExternalIdentityService
+
+model_service_mapping = {
+    'User': [UserService],
+    'Group': [GroupService],
+    'GroupPermission': [GroupPermissionService],
+    'UserPermission': [UserPermissionService],
+    'UserResourcePermission': [
+        UserResourcePermissionService],
+    'GroupResourcePermission': [
+        GroupResourcePermissionService],
+    'Resource': [ResourceService, ResourceTreeService],
+    'ExternalIdentity': [ExternalIdentityService]
+}
 
 
 def make_passwordmanager(schemes=None):
@@ -52,20 +66,22 @@ def ziggurat_model_init(*args, **kwargs):
     """
     models = ModelProxy()
     for cls2 in args:
-        setattr(models, cls2.__name__, cls2)
+        models[cls2.__name__] = cls2
 
     for cls in args:
         if cls.__name__ == 'User':
             if kwargs.get('passwordmanager'):
                 cls.passwordmanager = kwargs['passwordmanager']
             else:
-                cls.passwordmanager = make_passwordmanager(kwargs.get('passwordmanager_schemes'))
+                cls.passwordmanager = make_passwordmanager(
+                    kwargs.get('passwordmanager_schemes'))
 
         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_services'):
-            for service in cls._ziggurat_services:
-                setattr(service, 'model', cls)
-                setattr(service, 'models_proxy', models)
+        services = model_service_mapping.get(cls.__name__, [])
+        for service in services:
+            setattr(service, 'model', cls)
+            setattr(service, 'models_proxy', models)

ziggurat_foundations/models/external_identity.py

@@ -25,8 +25,6 @@ class ExternalIdentityMixin(BaseModel):
         {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8',
          })
 
-    _ziggurat_services = [ExternalIdentityService]
-
     @declared_attr
     def __tablename__(self):
         return 'external_identities'

ziggurat_foundations/models/group.py

@@ -15,8 +15,6 @@
 class GroupMixin(BaseModel):
     """ Mixin for Group model """
 
-    _ziggurat_services = [GroupService]
-
     __table_args__ = {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8'}
 
     @declared_attr

ziggurat_foundations/models/group_permission.py

@@ -21,8 +21,6 @@ class GroupPermissionMixin(BaseModel):
                                               name='pk_groups_permissions'),
                       {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8'})
 
-    _ziggurat_services = [GroupPermissionService]
-
     @declared_attr
     def __tablename__(self):
         return 'groups_permissions'

ziggurat_foundations/models/group_resource_permission.py

@@ -21,8 +21,6 @@ class GroupResourcePermissionMixin(BaseModel):
         name='pk_users_resources_permissions '),
                       {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8'})
 
-    _ziggurat_services = [GroupResourcePermissionService]
-
     @declared_attr
     def __tablename__(self):
         return 'groups_resources_permissions'

ziggurat_foundations/models/resource.py

@@ -22,8 +22,6 @@ class ResourceMixin(BaseModel):
 
     __possible_permissions__ = ()
 
-    _ziggurat_services = [ResourceService, ResourceTreeService]
-
     @declared_attr
     def __tablename__(self):
         return 'resources'

ziggurat_foundations/models/services/resource_tree.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from ziggurat_foundations import noop
+from ziggurat_foundations.utils import noop
 
 __all__ = ['ResourceTreeService']
 

ziggurat_foundations/models/services/resource_tree_postgres.py

@@ -5,7 +5,7 @@
 
 import sqlalchemy as sa
 
-from ziggurat_foundations import noop
+from ziggurat_foundations.utils import noop
 from ziggurat_foundations.exc import (
     ZigguratResourceTreeMissingException,
     ZigguratResourceTreePathException,

ziggurat_foundations/models/user.py

@@ -25,8 +25,6 @@ class UserMixin(BaseModel):
     __table_args__ = {'mysql_engine': 'InnoDB',
                       'mysql_charset': 'utf8'}
 
-    _ziggurat_services = [UserService]
-
     @declared_attr
     def __tablename__(self):
         return 'users'

ziggurat_foundations/models/user_permission.py

@@ -22,8 +22,6 @@ class UserPermissionMixin(BaseModel):
                                               name='pk_users_permissions'),
                       {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8'})
 
-    _ziggurat_services = [UserPermissionService]
-
     @declared_attr
     def __tablename__(self):
         return 'users_permissions'

ziggurat_foundations/models/user_resource_permission.py

@@ -23,8 +23,6 @@ class UserResourcePermissionMixin(BaseModel):
         name='pk_users_resources_permissions '),
                       {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8'})
 
-    _ziggurat_services = [UserResourcePermissionService]
-
     @declared_attr
     def __tablename__(self):
         return 'users_resources_permissions'

ziggurat_foundations/utils.py

@@ -15,3 +15,31 @@ def match(self, encoded):
 
     def check(self, encoded, password):
         return False
+
+
+class ModelProxy(dict):
+    """
+    Holds model references used in services
+    """
+
+    def __setattr__(self, key, value):
+        self[key] = value
+
+    def __getattr__(self, key):
+        return self[key]
+
+
+class NOOP(object):
+    """
+    For tree manager
+    """
+
+    def __nonzero__(self):
+        return False
+
+        # py3 compat
+
+    __bool__ = __nonzero__
+
+
+noop = NOOP()