Small changes in datahandlers

lodel/leapi/datahandlers/field_data_handler.py

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 import importlib
 
+class FieldValidationError(Exception):
+    pass
 
 class FieldDataHandler(object):
 

lodel/leapi/datahandlers/reference.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from lodel.leapi.datahandlers.field_data_handler import FieldDataHandler
+from lodel.leapi.datahandlers.field_data_handler import FieldDataHandler, FieldValidationError
 from lodel.editorial_model.components import EmClass
 
 
@@ -10,32 +10,20 @@ class Reference(FieldDataHandler):
     # @param internal bool : if False, the field is not internal
     # @param **kwargs : other arguments
     def __init__(self, allowed_classes = None, internal=False, **kwargs):
-        self.allowed_classes = None if allowed_classes is None else set(allowed_classes)
+        self.__allowed_classes = None if allowed_classes is None else set(allowed_classes)
         super().__init__(internal=internal, **kwargs)
 
-    ## @brief gets the target of the reference
-    def get_relateds(self):
-        return self._refs
-
-    ## @brief checks if the data value is valid
-    # @param value
-    # @return
+    ## @brief Check value
+    # @param value *
+    # @return tuple(value, exception)
     def _check_data_value(self, value):
-
-        if not isinstance(value, self._refs_class):
-            return value, "The reference should be an instance of %s, %s gotten" % (self._refs_class, value.__class__)
-
         if isinstance(value, EmClass):
             value = [value]
+        for elt in value:
+            if not issubclass(elt.__class__, EmClass):
+                return None, FieldValidationError("Some elements of this references are not EmClass instances")
+            if self.__allowed_classes is not None:
+                if not isinstance(elt, self.__allowed_classes):
+                    return None, FieldValidationError("Some element of this references are not valids (don't fit with allowed_classes")
+        return value
 
-        if isinstance(value, dict):
-            ref_values = value.values()
-
-        for related in value:
-            if not isinstance(related, EmClass):
-                return value, "The reference %s should be an instance of EmClass, %s gotten" % (related.display_name,
-                                                                                                related.__class__)
-            if self.allowed_classes is not None and related.__class__.display_name not in self.allowed_classes:
-                return value, "The reference %s should be an instance of either one of those classes : %s, %s gotten" % \
-                              (related.display_name, self.allowed_classes, related.__class__)
-        return value, None

lodel/leapi/datahandlers/references/dict.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from lodel.leapi.datahandlers.field_data_handler import FieldValidationError
 from lodel.leapi.datahandlers.reference import Reference
 from lodel.editorial_model.components import EmClass
 
@@ -12,12 +13,13 @@ class DataHandler(Reference):
     def __init__(self, allowed_classes=None, internal=False, **kwargs):
         super().__init__(allowed_classes=allowed_classes, internal=internal, **kwargs)
 
-    ## @brief adds a referenced element
-    # @param ref_name str : key of the item in the reference dict
-    # @param emclass EmClass
-    # @return bool
-    def add_ref(self, ref_name, emclass):
-        if isinstance(emclass, EmClass) and isinstance(ref_name, str):
-            self._refs[ref_name] = emclass
-            return True
-        return False
+    ## @brief Check value
+    # @param value *
+    # @return tuple(value, exception)
+    def _check_data_value(self, value):
+        if not isinstance(value, dict):
+            return None, FieldValidationError("Values for dict fields should be dict")
+        val, expt = super()._check_data_value(value.values())
+        return (
+                None if isinstance(expt, Exception) else value,
+                expt)

lodel/leapi/datahandlers/references/list.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from lodel.leapi.datahandlers.field_data_handler import FieldValidationError
 from lodel.editorial_model.components import EmClass
 from lodel.leapi.datahandlers.reference import Reference
 
@@ -12,11 +13,11 @@ class DataHandler(Reference):
     def __init__(self, allowed_classes=None, internal=False, **kwargs):
         super().__init__(allowed_classes=allowed_classes, internal=internal, **kwargs)
 
-    ## @brief adds a referenced element
-    # @param emclass EmClass
-    # @return bool
-    def add_ref(self, emclass):
-        if isinstance(emclass, EmClass):
-            self._refs.append(emclass)
-            return True
-        return False
+    ## @brief Check value
+    # @param value *
+    # @return tuple(value, exception)
+    def _check_data_value(self, value):
+        val, expt = super()._check_data_value()
+        if not isinstance(expt, Exception):
+            val = list(val)
+        return val, expt

lodel/leapi/datahandlers/references/multiple.py

@@ -0,0 +1,10 @@
+#-*- coding: utf-8 -*-
+from lodel.leapi.datahandlers.reference import Reference
+from lodel.editorial_model.components import EmClass
+
+## @brief This class represent a data_handler for multiple references to another object
+class MultipleRef(Reference):
+    
+    def __init__(self, allowed_classes = None, **kwargs):
+        super().__init__(allowed_classes = allowed_classes
+    

lodel/leapi/datahandlers/references/single.py

@@ -0,0 +1,17 @@
+#-*- coding: utf-8 -*-
+from lodel.leapi.datahandlers.reference import Reference
+from lodel.editorial_model.components import EmClass
+
+## @brief This class represent a data_handler for single reference to another object
+class SingleRef(Reference):
+    
+    def __init__(self, allowed_classes = None, **kwargs):
+        super().__init__(allowed_classes = allowed_classes
+ 
+    def _check_data_value(self, value):
+        val, expt = super()._check_data_value(value)
+        if not isinstance(expt, Exception):
+            if len(val) > 1:
+               return None, FieldValidationError("Only single values are allowed for SingleRef fields")
+        return val, expt
+