Progress in datasource as plugin implementation

install/conf.d/datasources.ini

@@ -0,0 +1,5 @@
+[lodel2.datasources.main]
+identifier = dummy.example
+
+[lodel2.datasource.dummy.example]
+dummy =

install/conf.d/lodel2.ini

@@ -2,7 +2,7 @@
 debug = False
 sitename = noname
 plugins_path = /foo/plugins
-plugins = dummy, webui
+plugins = dummy, webui, datasources, dummy_datasource
 
 [lodel2.logging.stderr]
 level = DEBUG

install/loader.py

@@ -22,12 +22,15 @@ from lodel.settings.settings import Settings as settings
 settings('conf.d')
 from lodel.settings import Settings
 
+
 #Load plugins
 from lodel.plugin import Plugins
 Plugins.bootstrap()
 
+from lodel.plugin import LodelHook
+LodelHook.call_hook('lodel2_bootstraped', '__main__', None)
+
 if __name__ == '__main__':
-    from lodel.plugin import LodelHook
     LodelHook.call_hook('lodel2_loader_main', '__main__', None)
     #Run interative python
     import code

lodel/settings/validator.py

@@ -185,7 +185,7 @@ def none_val(value):
 
 def str_val(value):
     try:
-        str(value)
+        return str(value)
     except Exception as e:
         raise SettingsValidationError("Not able to convert value to string : " + str(e))
 
@@ -306,8 +306,4 @@ LODEL2_CONF_SPECS = {
         'editormode': ( False,
                         SettingValidator('bool')),
     },
-    'lodel2.datasources.*': {
-            'identifier': ( None,
-                            SettingValidator('string'))
-    }
 }

plugins/datasources/confspec.py

@@ -0,0 +1,8 @@
+#-*- coding: utf-8 -*-
+
+from lodel.settings.validator import SettingValidator
+
+CONFSPEC = {
+                'lodel2.datasources.*': {
+                        'identifier': ( None,
+                                        SettingValidator('string'))}}

plugins/datasources/main.py

@@ -0,0 +1,33 @@
+#-*- coding: utf-8 -*-
+
+from lodel.plugin import LodelHook
+from lodel.settings import Settings
+from lodel import logger
+
+
+##@brief Bootstrap hook to check datasources configuration
+@LodelHook('lodel2_bootstraped')
+def datasources_bootstrap_callaback(hook_name, caller, payload):
+    for ds_name in Settings.datasources._fields:
+        ds_conf = getattr(Settings.datasources, ds_name)
+        identifier = getattr(ds_conf, 'identifier')
+
+        # Now we are trying to fetch the datasource given the identifier
+        ds_family_name, ds_name = identifier.split('.',1)
+        try:
+            ds_fam = getattr(Settings.datasource, ds_family_name)
+        except AttributeError:
+            msg = "No datasource family named '%s' found"
+            msg %= ds_family_name
+            raise NameError(msg)
+        try:
+            ds = getattr(ds_fam, ds_name)
+        except AttributeError:
+            msg = "No datasource configured for identifier '%s' found"
+            msg %= identifier
+            raise NameError(msg)
+
+
+        log_msg = "Found a datasource named '%s' identified by '%s'"
+        log_msg %= (ds_name, identifier)
+        logger.debug(log_msg)

plugins/dummy_datasource/confspec.py

@@ -2,7 +2,11 @@
 
 from lodel.settings.validator import SettingValidator
 
-CONFSPEC = {}
+CONFSPEC = {
+    'lodel2.datasource.dummy.*' : {
+        'dummy': (  None,
+                    SettingValidator('dummy'))}
+}
 
 ##@page lodel2_datasources Lodel2 datasources
 #

tests/tests_conf.d/lodel2.ini

@@ -2,7 +2,7 @@
 debug = False
 sitename = noname
 plugins_path = plugins
-plugins = dummy, webui
+plugins = dummy, webui, dummy_datasource, datasources
 
 [lodel2.logging.stderr]
 level = DEBUG
@@ -15,3 +15,8 @@ emfile = editorial_model.pickle
 dyncode = leapi_dyncode.py
 editormode = True
 
+[lodel2.datasources.main]
+identifier = dummy.example
+
+[lodel2.datasource.dummy.example]
+dummy =