new version (0.5)

tests/test_simple.py

@@ -0,0 +1,14 @@
+from json import loads
+from tiramisu_api import Config
+from pytest import raises
+
+
+def test_list_option():
+    filename = 'tests/data/boolean1.json'
+    with open(filename, 'r') as fh:
+        json = loads(fh.read())
+    #
+    config = Config(json)
+    opts = []
+    raises(AttributeError, "config.option('unknown').value.get()")
+    raises(AttributeError, "config.option('options.unknown').value.get()")

tiramisu_api/__init__.py

@@ -1,5 +1,5 @@
 from .api import Config
 
-__version__ = "0.2"
+__version__ = "0.5"
 __all__ = ('Config',)
 

tiramisu_api/api.py

@@ -26,7 +26,8 @@ TYPE = {'boolean': bool,
         'broadcast_address': str,
         'port': str,
         'domainname': str,
-        'date': str}
+        'date': str,
+        'float': float}
 
 
 class Option:
@@ -225,13 +226,14 @@ class _Value:
              withwarning: bool=False,
              flatten: bool=False):
         ret = {}
-        self._dict_walk(ret,
+        if self.schema:
-                        self.schema,
+            self._dict_walk(ret,
-                        self.path,
+                            self.schema,
-                        fullpath,
+                            self.path,
-                        withwarning,
+                            fullpath,
-                        flatten,
+                            withwarning,
-                        None)
+                            flatten,
+                            None)
         return ret
 
 
@@ -326,11 +328,11 @@ class TiramisuOptionValue(_Value):
     def set(self, value):
         type_ = self.schema['type']
         leader_old_value = undefined
-        if self.config.is_hidden(self.path, self.index):
+        remote = self.config.form.get(self.path, {}).get('remote', False)
+        if not remote and self.config.is_hidden(self.path, self.index):
             raise PropertiesOptionError(None, {'disabled'}, None, opt_type='option')
         if self.config.isleader(self.path):
             leader_old_value = self.config.get_value(self.path)
-        remote = self.config.form.get(self.path, {}).get('remote', False)
         if self.index is None and self.schema.get('isMulti', False):
             if not isinstance(value, list):
                 raise ValueError('value must be a list')
@@ -574,7 +576,7 @@ class ContextOption(_Option):
                  schema: Dict) -> None:
         self.config = config
         self.schema = {'properties': schema}
-        self.index = None 
+        self.index = None
 
     def __call__(self,
                  path: str,
@@ -597,7 +599,7 @@ class ContextOwner:
                  schema: Dict) -> None:
         self.config = config
         self.schema = {'properties': schema}
-        self.index = None 
+        self.index = None
 
     def get(self):
         return self.config.global_model.get('owner', 'tmp')
@@ -609,9 +611,12 @@ class ContextValue(_Value):
                  config: 'Config',
                  schema: Dict) -> None:
         self.config = config
-        first = next(iter(schema.keys()))
+        if schema:
-        self.path = first.rsplit('.', 1)[0]
+            first = next(iter(schema.keys()))
-        self.schema = {'properties': schema}
+            self.path = first.rsplit('.', 1)[0]
+            self.schema = {'properties': schema}
+        else:
+            self.schema = {}
 
     def __call__(self) -> TiramisuOptionValue:
         return TiramisuOptionValue(self.config,
@@ -644,6 +649,7 @@ class Config:
     # config
     def __init__(self,
                  dico):
+        self._unrestraint = False
         if DEBUG:
             from pprint import pprint
             pprint(dico)
@@ -668,6 +674,7 @@ class Config:
             self.root = first_path.rsplit('.', 1)[0]
         else:
             self.root = ''
+        self.dico = dico
 
     def __getattr__(self,
                     subfunc: str) -> Any:
@@ -682,6 +689,11 @@ class Config:
         if subfunc == 'owner':
             return ContextOwner(self,
                                 self.schema)
+        if subfunc == 'unrestraint':
+            ret = Config(self.dico)
+            ret._unrestraint = True
+            ret.temp = self.temp
+            return ret
         raise APIError(_('please specify a valid sub function ({})').format(subfunc))
 
     def add_value(self,
@@ -811,12 +823,16 @@ class Config:
             subpaths = path.split('.')[len(root):]
         else:
             subpaths = path.split('.')
+        current_subpath = 'root'
         for subpath in subpaths:
             if root_path:
                 root_path += '.' + subpath
             else:
                 root_path = subpath
-            schema = schema['properties'][root_path]
+            schema = schema['properties'].get(root_path)
+            if schema is None:
+                raise AttributeError(_('option "{0}" inconnue dans l\'optiondescription "{1}"').format(subpath, current_subpath))
+            current_subpath = subpath
         return schema
 
     def isleader(self,
@@ -843,6 +859,8 @@ class Config:
                    path: str,
                    index: Optional[int],
                    permissive: bool=False) -> bool:
+        if self._unrestraint:
+            return False
         if permissive:
             property_ = 'hidden'
             needs = True

tiramisu_api/error.py

@@ -1,6 +1,6 @@
 try:
     from tiramisu.error import APIError, ValueWarning, ValueOptionError, ValueErrorWarning, PropertiesOptionError, ConfigError, display_list
-except ModuleNotFoundError:
+except ImportError:
     import weakref
     from .i18n import _
 
@@ -130,7 +130,7 @@ except ModuleNotFoundError:
             if self.msg:
                 return self.msg
             if self._option_bag is None:
-                return "unknown error"
+                return "option désactivée"
             req = self._settings.apply_requires(self._option_bag,
                                                 True)
             # if req != {} or self._orig_opt is not None:

tiramisu_api/i18n.py

@@ -1,6 +1,6 @@
 try:
     from tiramisu.i18n import _
-except ModuleNotFoundError:
+except ImportError:
     # FIXME
     def _(val):
         return val

tiramisu_api/setting.py

@@ -1,6 +1,6 @@
 try:
     from tiramisu.setting import undefined
-except ModuleNotFoundError:
+except ImportError:
     class Undefined(object):
         def __str__(self):
             return 'Undefined'