Updated LeFactory. Now generating LeClass and LeType from _LeClass and _LeType

leapi/datasources/ledatasourcesql.py

@@ -7,7 +7,7 @@ import leapi
 from leapi.datasources.dummy import DummyDatasource
 from leapi.leobject import REL_SUB, REL_SUP
 
-from leapi.letype import LeType
+from leapi.lecrud import _LeCrud
 
 from mosql.db import Database, all_to_dicts, one_to_dict
 from mosql.query import select, insert, update, delete, join
@@ -268,7 +268,7 @@ class LeDataSourceSQL(DummyDatasource):
     # @param get_sub bool : If True leo is the superior and we want subordinates, else its the opposite
     # @return a list of dict { 'id_relation':.., 'rank':.., 'lesup':.., 'lesub'.., 'rel_attrs': dict() }
     def get_related(self, leo, letype, get_sub=True):
-        if leapi.letype.LeType not in letype.__bases__:
+        if LeCrud.name2class('LeType') not in letype.__bases__:
             raise ValueError("letype argument should be a LeType child class, but got %s" % type(letype))
 
         if not isinstance(leo, LeType):

leapi/leclass.py

@@ -6,7 +6,7 @@ import leapi
 
 ## @brief Represent an EmClass data instance
 # @note Is not a derivated class of LeObject because the concrete class will be a derivated class from LeObject
-class LeClass(object):
+class _LeClass(object):
 
     ## @brief Stores fieldtypes by field name
     _fieldtypes = dict()

leapi/lefactory.py

@@ -140,8 +140,8 @@ from EditorialModel.fieldtypes import {needed_fieldtypes_list}
 import leapi
 import leapi.lecrud
 import leapi.leobject
-from leapi.leclass import LeClass
-from leapi.letype import LeType
+from leapi.leclass import _LeClass
+from leapi.letype import _LeType
 """
 
         result += """
@@ -185,11 +185,18 @@ class LeCrud(leapi.lecrud._LeCrud):
 
 ## @brief _LeObject concret class
 # @see leapi.leobject._LeObject
-class LeObject(leapi.leobject._LeObject, LeCrud):
+class LeObject(LeCrud, leapi.leobject._LeObject):
     _me_uid = {me_uid_l}
     _uid_fieldtype = {leo_uid_fieldtype}
     _leo_fieldtypes = {leo_fieldtypes}
 
+
+class LeClass(LeObject, _LeClass):
+    pass
+
+
+class LeType(LeClass, _LeType):
+    pass
 """.format(
             ds_classname = datasource_cls.__module__ + '.' + datasource_cls.__name__,
             ds_kwargs = repr(datasource_args),
@@ -218,7 +225,7 @@ class {name}(LeClass, LeObject):
             result += """
 ## @brief EmType {name} LeType child class
 # @see leobject::letype::LeType
-class {name}(LeType, {leclass}):
+class {name}({leclass}, LeType):
     _type_id = {uid}
 
 """.format(

leapi/letype.py

@@ -11,12 +11,11 @@
 # @note LeObject will be generated by leapi.lefactory.LeFactory
 
 import leapi
-from leapi.leclass import LeClass
 from leapi.leobject import LeObjectError
 
 ## @brief Represent an EmType data instance
 # @note Is not a derivated class of LeClass because the concrete class will be a derivated class from LeClass
-class LeType(object):
+class _LeType(object):
     
     ## @brief Stores selected fields with key = name
     _fields = list()
@@ -193,19 +192,3 @@ class LeType(object):
     def update(cls, filters, datas):
         return leapi.lefactory.LeFactory.leobject().update(letype = cls, filters = filters, datas = datas)
         
-    ## @brief Insert a new LeType in the datasource
-    # @param **datas list : A list of dict containing the datas
-    # @return The lodel id of the new LeType or False
-    # @thorw A leo exception if invalid stuff
-    # @throw InvalidArgumentError if invalid argument
-    @classmethod
-    def insert(cls, datas):
-        return super(LeType, cls).insert(letype=cls, datas=datas)
-
-    @classmethod
-    def prepare_datas(cls, datas, complete = False, allow_internal = True):
-        ret_dats = self.check_datas_value(cls, datas, complete, allow_internal)
-        ret_datas = self.construct_data(cls, ret_datas)
-        ret_datas = self.check_data_consistency(cls, ret_datas)
-        return ret_datas
-