Merge branch 'newlodel' of git.labocleo.org:lodel2 into newlodel

lodel/leapi/datahandlers/datas.py

@@ -26,7 +26,7 @@ build its content'
             datas[fname] for fname in self._field_list)
         if len(ret) > self.max_length:
             warnings.warn("Format field overflow. Truncating value")
-            ret = ret[:self.max_length-1]
+            ret = ret[:self.max_length]
         return ret
     
 ##@brief Varchar validated by a regex

lodel/plugin/plugins.py

@@ -148,6 +148,35 @@ to generic PluginVersion comparison function : '%s'" % cmp_fun_name)
         return {'major': self.major, 'minor': self.minor,
             'revision': self.revision}
 
+##@brief Stores plugin class registered
+__all_ptypes = list()
+
+##@brief Plugin metaclass that allows to "catch" child class
+#declaration
+#
+#Automatic script registration on child class declaration
+class MetaPlugType(type):
+    
+    def __init__(self, name, bases, attrs):
+        #Here we can store all child classes of Plugin
+        super().__init__(name, bases, attrs)
+        if len(bases) == 1 and bases[0] == object:
+            print("Dropped : ", name, bases)
+            return
+        self.__register_types()
+        #list_name= [cls.__name__ for cls in __all_ptypes] 
+        #if self.name in list_name:
+        #    return
+        #else:
+        #    plug_type_register(self)
+
+    def __register_types(self):
+        plug_type_register(self)
+
+def plug_type_register(cls):
+    __all_ptypes.append(cls)
+    logger.info("New child class registered : %s" % cls.__name__)
+
 
 ##@brief Handle plugins
 #
@@ -158,7 +187,7 @@ to generic PluginVersion comparison function : '%s'" % cmp_fun_name)
 # 1. Settings call start method to instanciate all plugins found in confs
 # 2. Settings fetch all confspecs
 # 3. the loader call load_all to register hooks etc
-class Plugin(object):
+class Plugin(object, metaclass=MetaPlugType):
     
     ##@brief Stores plugin directories paths
     _plugin_directories = None
@@ -625,6 +654,11 @@ file : '%s'. Running discover again..." % DISCOVER_CACHE_FILENAME)
         cls._plugin_list = infos['plugins']
         return cls._plugin_list
 
+    ##@brief Return a list of child Class Plugin
+    @classmethod
+    def plugin_types(cls):
+        return cls.__all_ptypes
+
     ##@brief Attempt to open and load plugin discover cache
     #@return discover cache
     #@throw PluginError when open or load fails

tests/datahandlers/test_concat.py

@@ -0,0 +1,22 @@
+import unittest
+
+from lodel.leapi.datahandlers.datas import Concat
+from lodel.editorial_model.components import EmClass
+
+class ConcatTestCase(unittest.TestCase):
+
+    def test_construct_data(self):
+        test_class = EmClass('testing', display_name='testing class')
+        test_class.new_field('field1', 'varchar')
+        test_class.new_field('field2', 'varchar')
+
+        test_concat = Concat(['field1', 'field2'], '*')
+        concat_string_value = test_concat.construct_data(test_class, 'field', {'field1': 'o'*5, 'field2': 'k'*4}, '')
+        self.assertEqual('%s*%s' % ('o'*5, 'k'*4), concat_string_value)
+
+        test_concat.max_length=10
+        concat_string_value = test_concat.construct_data(test_class, 'field', {'field1': 'o'*5, 'field2': 'k'*10}, '')
+        test_value = '%s*%s' % ('o'*5, 'k'*10)
+        self.assertNotEqual(test_value, concat_string_value)
+        self.assertEqual(len(concat_string_value), test_concat.max_length)
+        self.assertTrue(concat_string_value in test_value)

tests/datahandlers/test_formatstring.py

@@ -0,0 +1,28 @@
+import unittest
+
+from lodel.leapi.datahandlers.datas import FormatString
+from lodel.editorial_model.components import EmClass
+
+
+class FormatStringTestCase(unittest.TestCase):
+
+    def test_construct_data(self):
+        test_class = EmClass('testing',display_name='testing class')
+        test_class.new_field('field1', 'varchar')
+        test_class.new_field('field2', 'varchar')
+
+        test_formatstring = FormatString('%s_%s',['field1', 'field2'], max_length=10)
+        formatted_string_value = test_formatstring.construct_data(test_class, 'field', {'field1': 'o'*5, 'field2': 'k'*4}, '')
+        self.assertEqual('%s_%s' % ('o'*5, 'k'*4), formatted_string_value)
+
+    def test_construct_too_long_data(self):
+        test_class = EmClass('testing', display_name='testing class')
+        test_class.new_field('field1', 'varchar')
+        test_class.new_field('field2', 'varchar')
+        test_formatstring = FormatString('%s-%s', ['field2', 'field1'], max_length=10)
+        formatted_string_value = test_formatstring.construct_data(test_class, 'field', {'field1': 'o'*300, 'field2': 'k'*500},'')
+        test_value = '%s-%s' % ('k'*500, 'o'*300)
+        self.assertNotEqual(test_value, formatted_string_value)
+        self.assertTrue(formatted_string_value in test_value)
+        self.assertTrue(len(formatted_string_value) == test_formatstring.max_length)
+        self.assertEqual(formatted_string_value, test_value[:test_formatstring.max_length])