Merge remote-tracking branch 'official/master' into develop

ChangeLog

@@ -1,3 +1,33 @@
+Mon Apr  1 11:47:30 2019 +0200 Emmanuel Garette <egarette@cadoles.com>
+	* version 3.0 rc16
+	* tiramisu is now async
+	* add postgresql storage
+
+Mon Sep  2 14:10:40 2019 +0200 Emmanuel Garette <egarette@cadoles.com>
+	* version 3.0 rc15
+	* add parents method to MetaConfig
+
+Wed Aug 28 15:50:30 2019 +0200 Emmanuel Garette <egarette@cadoles.com>
+	* version 3.0 rc14
+	* correction in metaconfig_prefix
+	* correction in validation with parent
+
+Mon Aug 21 14:24:42 2019 +0200 Emmanuel Garette <egarette@cadoles.com>
+	* version 3.0 rc12
+	* prefix metaconfig_prefix with current name
+
+Mon Aug 19 08:02:27 2019 +0200 Emmanuel Garette <egarette@cadoles.com>
+	* version 3.0 rc11
+	* Config could have multiple parents
+	* todict works with Metaconfig
+	* separate Cache from values and settings
+
+Fri Jul 26 09:43:03 2019 +0200 Emmanuel Garette <egarette@cadoles.com>
+	* version 3.0 rc9 and rc10
+	* better todict support (especially for leadership
+	* can add display_name method to Config init to change the name a
+	option in errors
+
 Mon Jun  5 14:49:27 2019 +0200 Emmanuel Garette <egarette@cadoles.com>
 	* version 3.0 rc7
 	* retrieve metaconfig/mixconfig/config by name in a metaconfig/mixconfig

pyproject.toml

@@ -1,17 +0,0 @@
-[build-system]
-requires = ["flit"]
-build-backend = "flit.buildapi"
-
-[tool.flit.metadata]
-module = "tiramisu"
-author = "Emmanuel Garette"
-author-email = "gnunux@gnunux.info"
-home-page = "https://framagit.org/tiramisu/tiramisu"
-classifiers = [
-	"License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)",
-        "Programming Language :: Python :: 3",
-	"Natural Language :: English",
-        "Natural Language :: French",
-        "Operating System :: OS Independent",
-]
-requires-python = ">=3.5"

setup.py

@@ -1,13 +1,17 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from setuptools import setup, find_packages
-from os.path import dirname, abspath, join, normpath, isdir
-from os import listdir
+from setuptools import setup
 import os
 from tiramisu import __version__
 
 
-PACKAGE_NAME = os.environ.get('PACKAGE_DST', 'tiramisu')
+ORI_PACKAGE_NAME = 'tiramisu'
+PACKAGE_NAME = os.environ.get('PACKAGE_DST', ORI_PACKAGE_NAME)
+
+if PACKAGE_NAME != ORI_PACKAGE_NAME:
+    package_dir = {PACKAGE_NAME: ORI_PACKAGE_NAME}
+else:
+    package_dir = None
 
 setup(
     version=__version__,
@@ -17,6 +21,7 @@ setup(
     description='an options controller tool',
     url='https://framagit.org/tiramisu/tiramisu',
     license='GNU Library or Lesser General Public License (LGPL)',
+    provides=['tiramisu_api'],
     classifiers=[
         "Programming Language :: Python :: 3",
         "License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)",
@@ -41,5 +46,6 @@ producing flexible and fast options access.
 This version requires Python 3.5 or later.
 """,
     include_package_data=True,
-    packages=find_packages(include=['tiramisu'])
+    package_dir=package_dir,
+    packages=[PACKAGE_NAME],
 )

tests/auto/test_auto.py

@@ -10,7 +10,7 @@ from .autopath import do_autopath
 do_autopath()
 from tiramisu import Config, MetaConfig, \
                      StrOption, SymLinkOption, OptionDescription, Leadership, DynOptionDescription, \
-                     submulti, undefined, owners, Params, ParamOption
+                     submulti, undefined, owners, Params, ParamOption, Calculation
 from tiramisu.error import PropertiesOptionError, APIError, ConfigError, LeadershipError
 ICON = u'\u2937'
 
@@ -191,8 +191,9 @@ def _getproperties(multi, isfollower, kwargs):
     # define properties
     properties = copy(PROPERTIES_LIST)
     if multi and not isfollower:
-        default_props = ['empty']
+        default_props = ['empty', 'unique']
         properties.append('empty')
+        properties.append('unique')
     else:
         default_props = []
     extra_properties = kwargs.get('extra_properties')
@@ -248,8 +249,9 @@ def _property_permissive(cfg, mcfg, pathread, pathwrite, confread, confwrite, **
     # define properties
     properties = copy(PROPERTIES_LIST)
     if multi and not isfollower:
-        default_props = ['empty']
+        default_props = ['empty', 'unique']
         properties.append('empty')
+        properties.append('unique')
     else:
         default_props = []
     extra_properties = kwargs.get('extra_properties')
@@ -662,8 +664,11 @@ def autocheck_append_value(cfg, mcfg, pathread, pathwrite, confread, confwrite,
     with warnings.catch_warnings(record=True) as w:
         if not kwargs.get('propertyerror', False):
             leader_value = cfg_.forcepermissive.option(pathread).value.get()
+            v3 = cfg_.forcepermissive.option(pathread).value.get()
             len_value = len(leader_value)
             leader_value.append(undefined)
+            print('debut', leader_value, cfg_._config_bag.context._impl_values_cache._cache['odleader.first'][None][0])
+            print(id(leader_value), id(cfg_._config_bag.context._impl_values_cache._cache['odleader.first'][None][0]))
             assert len(cfg_.forcepermissive.option(pathread).value.get()) == len_value
             with warnings.catch_warnings(record=True) as w:
                 cfg2_.forcepermissive.option(pathread).value.set(leader_value)
@@ -683,7 +688,12 @@ def autocheck_append_value(cfg, mcfg, pathread, pathwrite, confread, confwrite,
                     value = 'value'
                 else:
                     value = ['value']
+                print('==>>>')
+                print(leader_value, cfg_._config_bag.context._impl_values_cache._cache['odleader.first'][None][0])
+                print(id(leader_value), id(cfg_._config_bag.context._impl_values_cache._cache['odleader.first'][None][0]))
                 leader_value.append(value)
+                print(leader_value, cfg_._config_bag.context._impl_values_cache._cache['odleader.first'][None][0])
+                print(id(leader_value), id(cfg_._config_bag.context._impl_values_cache._cache['odleader.first'][None][0]))
                 assert len(cfg_.forcepermissive.option(pathread).value.get()) == len(new_leader_value)
                 cfg2_.forcepermissive.option(pathread).value.set(leader_value)
                 assert cfg_.forcepermissive.option(pathread).value.get()[-1] == value
@@ -949,8 +959,6 @@ def autocheck_default_owner_with_value_permissive(cfg, mcfg, pathread, pathwrite
             else:
                 assert cfg_.forcepermissive.option(pathread, 0).owner.isdefault() is True
                 assert cfg_.forcepermissive.option(pathread, 1).owner.isdefault() is False
-        #FIXME else:
-        #    raises(PropertiesOptionError, "cfg.config(conf).forcepermissive.option(pathread).owner.isdefault()")
     do(confwrite)
     if confwrite != confread:
         do(confread)
@@ -1194,7 +1202,7 @@ def autocheck_find(cfg, mcfg, pathread, pathwrite, confread, confwrite, **kwargs
         do(confwrite)
 
 
-def check_all(cfg, paths_, path, meta, multi, default, default_multi, require, consistency, callback, symlink, weakrefs, **kwargs):
+def check_all(cfg, paths_, path, meta, multi, default, default_multi, require, callback, symlink, weakrefs, **kwargs):
     def _build_make_dict():
         dico = {}
         dico_value = {}
@@ -1286,31 +1294,6 @@ def check_all(cfg, paths_, path, meta, multi, default, default_multi, require, c
                 if symlink:
                     dico['extraoptrequirelink'] = 'value'
                     dico_value['extraoptrequirelink'] = 'value'
-        if consistency and has_value:
-            cpath = list(dico.keys())[0]
-            if "." in cpath:
-                cpath = cpath.rsplit('.', 1)[0] + '.'
-            else:
-                cpath = ''
-            if multi:
-                value = []
-            else:
-                value = None
-            if is_dyn:
-                dico[cpath + 'extraoptconsistencyval1'] = value
-                dico_value[cpath + 'extraoptconsistencyval1'] = value
-                if is_leader:
-                    spath = cpath.split('.')
-                    spath[-2] = spath[-2][:-1] + '2'
-                    spath[-3] = spath[-3][:-1] + '2'
-                    npath = '.'.join(spath) + 'extraoptconsistencyval2'
-                else:
-                    npath = cpath[:-2] + '2.' + 'extraoptconsistencyval2'
-                dico[npath] = value
-                dico_value[npath] = value
-            else:
-                dico[cpath + 'extraoptconsistency'] = value
-                dico_value[cpath + 'extraoptconsistency'] = value
         if is_leader:
             for cpath in list(paths_.keys())[len(dyns):]:
                 if cpath.endswith('.first') or cpath.endswith('.firstval1') or cpath.endswith('.firstval2'):
@@ -1374,8 +1357,6 @@ def check_all(cfg, paths_, path, meta, multi, default, default_multi, require, c
             text += u' with default multi'
         if require:
             text += u' with requirement'
-        if consistency:
-            text += u' with consistency'
         text += u', kwargs: {}'.format(kwargs)
         print(text)
     if not require:
@@ -1530,7 +1511,7 @@ def check_deref(weakrefs):
         assert wrf() is None
 
 
-def make_conf(options, multi, default, default_multi, require, consistency, callback, symlink):
+def make_conf(options, multi, default, default_multi, require, callback, symlink):
     weakrefs = []
     dyn = []
     goptions = []
@@ -1593,7 +1574,8 @@ def make_conf(options, multi, default, default_multi, require, consistency, call
         if callback:
             largs = [path + 'call', "{}'s callback option".format(path)]
             objcall = tiramisu_option(*largs, **call_kwargs)
-            kwargs['callback_params'] = Params(ParamOption(objcall))
+            kwargs['default'] = Calculation(kwargs['callback'], Params(ParamOption(objcall)))
+            del kwargs['callback']
         else:
             objcall = None
         if symlink and not path.endswith('extraoptconsistency'):
@@ -1603,16 +1585,8 @@ def make_conf(options, multi, default, default_multi, require, consistency, call
             tiramisu_option = SymLinkOption
         else:
             sobj = None
+        print(args, kwargs)
         obj = tiramisu_option(*args, **kwargs)
-        if not 'extraopt' in path and consistency:
-            if require:
-                if symlink:
-                    gopt = goptions[2]
-                else:
-                    gopt = goptions[1]
-            else:
-                gopt = goptions[0]
-            obj.impl_add_consistency('not_equal', gopt, warnings_only=True, transitive=False)
         return obj, objcall, sobj
 
     def make_optiondescriptions(path, collected):
@@ -1632,7 +1606,7 @@ def make_conf(options, multi, default, default_multi, require, consistency, call
             if symlink:
                 return
             optiondescription = DynOptionDescription
-            kwargs['callback'] = return_list
+            kwargs['suffixes'] = Calculation(return_list)
             dyn.append(path)
         options = []
         if 'options' in collected:
@@ -1651,17 +1625,10 @@ def make_conf(options, multi, default, default_multi, require, consistency, call
         return obj
             
     collect_options = {}
-    if require or consistency:
+    if require:
         noptions = OrderedDict()
         if require:
             noptions['extraoptrequire'] = {}
-        if consistency:
-            subpath = list(options.keys())[0]
-            if '.' in subpath:
-                subpath = subpath.rsplit('.', 1)[0] + '.'
-            else:
-                subpath = ''
-            noptions[subpath + 'extraoptconsistency'] = {}
         noptions.update(options)
     else:
         noptions = options
@@ -1812,53 +1779,48 @@ def test_options(paths):
 
     lpaths = list(paths.keys())
 
-    for meta in (False, True):
-        for callback in (False, True):
-            for consistency in (False, True):
-                for require in (False, True):
-                    for default_multi in (False, True):
-                        for symlink in (False, True):
-                            if callback and default_multi:
-                                continue
-                            for default in (False, True):
-                                for multi in (False, True, submulti):
-                                    pass
-#    for meta in (True,):
-#        for callback in (False,):
-#            for consistency in (True,):
-#                for require in (True,):
-#                    for default_multi in (True,):
-#                        for symlink in (False,):
-#                            if callback and default_multi:
-#                                continue
-#                            for default in (True,):
-#                                for multi in (submulti,):
-                                    if multi is submulti and default:
-                                        continue
-                                    if multi is submulti and consistency:
-                                        continue
-                                    if multi is False and default_multi:
-                                        continue
-                                    cfg, weakrefs, dyn = make_conf(paths, multi, default, default_multi, require, consistency, callback, symlink)
-                                    if cfg is None:
-                                        continue
-                                    if dyn:
-                                        cnt = 0
-                                        idx = 0
-                                        for index, lpath in enumerate(lpaths):
-                                            if paths[lpath]:
-                                                cnt += 1
-                                            else:
-                                                check_all(cfg, paths, lpaths[index], meta, multi, default,
-                                                          default_multi, require, consistency, callback, symlink,
-                                                          weakrefs, **get_kwargs(lpaths[idx]))
-                                                idx += 1
-                                                if idx == cnt:
-                                                    idx = 0
-                                    else:
-                                        for lpath in lpaths:
-                                            check_all(cfg, paths, lpath, meta, multi, default,
-                                                      default_multi, require, consistency, callback, symlink,
-                                                      weakrefs, **get_kwargs(lpath))
-                                    del cfg
-                                    check_deref(weakrefs)
+#    for meta in (False, True):
+#        for callback in (False, True):
+#            for require in (False, True):
+#                for default_multi in (False, True):
+#                    for symlink in (False, True):
+#                        if callback and default_multi:
+#                            continue
+#                        for default in (False, True):
+#                            for multi in (False, True, submulti):
+    for meta in (False,):
+        for callback in (False,):
+            for require in (False,):
+                for default_multi in (False,):
+                    for symlink in (False,):
+                        if callback and default_multi:
+                            continue
+                        for default in (False,):
+                            for multi in (True,):
+                                if multi is submulti and default:
+                                    continue
+                                if multi is False and default_multi:
+                                    continue
+                                cfg, weakrefs, dyn = make_conf(paths, multi, default, default_multi, require, callback, symlink)
+                                if cfg is None:
+                                    continue
+                                if dyn:
+                                    cnt = 0
+                                    idx = 0
+                                    for index, lpath in enumerate(lpaths):
+                                        if paths[lpath]:
+                                            cnt += 1
+                                        else:
+                                            check_all(cfg, paths, lpaths[index], meta, multi, default,
+                                                      default_multi, require, callback, symlink,
+                                                      weakrefs, **get_kwargs(lpaths[idx]))
+                                            idx += 1
+                                            if idx == cnt:
+                                                idx = 0
+                                else:
+                                    for lpath in lpaths:
+                                        check_all(cfg, paths, lpath, meta, multi, default,
+                                                  default_multi, require, callback, symlink,
+                                                  weakrefs, **get_kwargs(lpath))
+                                del cfg
+                                check_deref(weakrefs)

tests/config.py

@@ -0,0 +1,85 @@
+# from json import dumps, loads
+import asyncio
+from os import environ
+try:
+    from tiramisu_api import Config
+    class TestConfig(Config):
+        def __init__(self,
+                     config):
+            self.test_option = config.option
+            json = self.test_option.dict()
+            # assert json == loads(dumps(json))
+            super().__init__(json)
+
+        def send_data(self,
+                      updates):
+            return self.updates_data(self.test_option.updates(updates))
+    PARAMS = ['tiramisu', 'tiramisu-api']
+except:
+    PARAMS = ['tiramisu']
+
+import pytest
+
+
+async def get_config(config, type, error=False):
+    if type == 'tiramisu':
+        return config
+    if error:
+        await config.property.add('demoting_error_warning')
+    return TestConfig(config)
+
+
+def value_list(values):
+    if values[0] == '':
+        del values[0]
+    return tuple(values)
+
+
+async def global_owner(config, config_type):
+    return await config.owner.get()
+
+
+@pytest.fixture(params=PARAMS)
+def config_type(request):
+    return request.param
+
+
+LOOP = None
+@pytest.fixture(scope='session')
+def event_loop(request):
+    """Create an instance of the default event loop for each test case."""
+    global LOOP
+    if LOOP is None:
+        LOOP = asyncio.get_event_loop_policy().new_event_loop()
+    return LOOP
+
+
+async def _delete_sessions(meta):
+    if await meta.config.type() != 'config':
+        for conf in await meta.config.list():
+            await _delete_sessions(conf)
+    await meta.session.reset()
+
+
+async def delete_sessions(confs):
+    if not isinstance(confs, list):
+        confs = [confs]
+    for conf in confs:
+        await _delete_sessions(conf)
+    if environ.get('TIRAMISU_STORAGE') == 'postgres':
+        async with confs[0]._config_bag.context.getconnection() as connection:
+            assert await connection.fetchrow('SELECT * FROM session') is None
+            assert await connection.fetchrow('SELECT * FROM value') is None
+            assert await connection.fetchrow('SELECT * FROM information') is None
+            assert await connection.fetchrow('SELECT * FROM property') is None
+            assert await connection.fetchrow('SELECT * FROM permissive') is None
+    elif environ.get('TIRAMISU_STORAGE') == 'sqlite3':
+        async with confs[0]._config_bag.context.getconnection() as connection:
+            assert  await connection.select('SELECT * FROM session') is None
+            assert  await connection.select('SELECT * FROM value') is None
+            assert  await connection.select('SELECT * FROM information') is None
+            assert  await connection.select('SELECT * FROM property') is None
+            assert  await connection.select('SELECT * FROM permissive') is None
+    else:
+        from tiramisu import list_sessions
+        assert not await list_sessions()

tests/dict/data/boolean1.json

@@ -12,7 +12,26 @@
     }
   },
   "model": {},
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
+    "options.boolean": {
+      "clearable": true
+    },
     "null": [
       {
         "title": "Configurer",

tests/dict/data/boolean1_frozen.json

@@ -16,7 +16,26 @@
       "readOnly": true
     }
   },
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
+    "options.boolean": {
+      "clearable": true
+    },
     "null": [
       {
         "title": "Configurer",

tests/dict/data/choice1.json

@@ -17,8 +17,25 @@
     }
   },
   "model": {},
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.choice": {
+      "clearable": true,
       "type": "choice"
     },
     "null": [

tests/dict/data/choice1_frozen.json

@@ -21,8 +21,25 @@
       "readOnly": true
     }
   },
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.choice": {
+      "clearable": true,
       "type": "choice"
     },
     "null": [

tests/dict/data/choice1_leadership.json

@@ -54,20 +54,43 @@
   },
   "model": {
     "options.choice1.choice1": {
-      "required": true
+      "required": true,
+      "properties": [
+        "unique"
+      ]
     }
   },
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.choice1.choice1": {
+      "clearable": true,
       "type": "choice"
     },
     "options.choice1.choice2": {
+      "clearable": true,
       "type": "choice"
     },
     "options.choice1.choice3": {
+      "clearable": true,
       "type": "choice"
     },
     "options.choice1.choice4": {
+      "clearable": true,
       "type": "choice"
     },
     "null": [

tests/dict/data/choice1_leadership_hidden.json

@@ -54,26 +54,48 @@
   },
   "model": {
     "options.choice1.choice1": {
-      "required": true
+      "required": true,
+      "properties": [
+        "unique"
+      ]
     },
     "options.choice1.choice3": {
       "null": {
-        "display": false,
-        "hidden": true
+        "display": false
       }
     }
   },
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.choice1.choice1": {
+      "clearable": true,
       "type": "choice"
     },
     "options.choice1.choice2": {
+      "clearable": true,
       "type": "choice"
     },
     "options.choice1.choice3": {
+      "clearable": true,
       "type": "choice"
     },
     "options.choice1.choice4": {
+      "clearable": true,
       "type": "choice"
     },
     "null": [

tests/dict/data/choice1_leadership_value.json

@@ -55,6 +55,9 @@
   "model": {
     "options.choice1.choice1": {
       "required": true,
+      "properties": [
+        "unique"
+      ],
       "value": [
         "choice 2"
       ],
@@ -67,17 +70,37 @@
       }
     }
   },
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.choice1.choice1": {
+      "clearable": true,
       "type": "choice"
     },
     "options.choice1.choice2": {
+      "clearable": true,
       "type": "choice"
     },
     "options.choice1.choice3": {
+      "clearable": true,
       "type": "choice"
     },
     "options.choice1.choice4": {
+      "clearable": true,
       "type": "choice"
     },
     "null": [

tests/dict/data/choice1_leadership_value.py

@@ -16,10 +16,10 @@ def get_description():
     return descr
 
 
-def get_values(api, allpath=False):
+async def get_values(api, allpath=False):
     if allpath:
         root = 'choice1_leadership_value.'
     else:
         root = ''
-    api.option(root + 'options.choice1.choice1').value.set(['choice 2'])
-    api.option(root + 'options.choice1.choice2', 0).value.set('choice 4')
+    await api.option(root + 'options.choice1.choice1').value.set(['choice 2'])
+    await api.option(root + 'options.choice1.choice2', 0).value.set('choice 4')

tests/dict/data/choice1_multi.json

@@ -18,11 +18,31 @@
   },
   "model": {
     "options.choice": {
-      "required": true
+      "required": true,
+      "properties": [
+        "unique"
+      ]
     }
   },
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.choice": {
+      "clearable": true,
       "type": "choice"
     },
     "null": [

tests/dict/data/choice1_rename.json

@@ -17,8 +17,25 @@
     }
   },
   "model": {},
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.choice": {
+      "clearable": true,
       "type": "choice",
       "displayed": {
         "choice 1": "renamed 1",

tests/dict/data/choice1_requires.json

@@ -4,11 +4,11 @@
       "properties": {
         "options.choice": {
           "type": "choice",
-          "value": "hide",
           "enum": [
             "hide",
             "show"
           ],
+          "value": "hide",
           "title": "Choice description"
         },
         "options.unicode2": {
@@ -23,13 +23,29 @@
   "model": {
     "options.choice": {
       "required": true,
-      "value": "hide",
-      "owner": "default"
+      "value": "hide"
     },
     "options.unicode2": {
+      "display": false,
       "hidden": true
     }
   },
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.choice": {
       "clearable": true,
@@ -41,13 +57,13 @@
           ]
         },
         "expected": {
-          "hide": {
-            "hide": [
+          "show": {
+            "show": [
               "options.unicode2"
             ]
           },
-          "show": {
-            "show": [
+          "hide": {
+            "hide": [
               "options.unicode2"
             ]
           }
@@ -55,6 +71,7 @@
       }
     },
     "options.unicode2": {
+      "clearable": true,
       "type": "input"
     },
     "null": [

tests/dict/data/choice1_requires.py

@@ -1,12 +1,14 @@
-from tiramisu.option import ChoiceOption, StrOption, OptionDescription
+from tiramisu import ChoiceOption, StrOption, OptionDescription, Calculation, ParamValue, ParamOption, Params, calc_value
 
 def get_description():
     """generate description for this test
     """
     option1 = ChoiceOption('choice', "Choice description", ("hide", "show"), default='hide', properties=('mandatory',))
-    option2 = StrOption('unicode2', "Unicode 2", requires=[{'option': option1,
-                                                            'expected': 'hide',
-                                                            'action': 'hidden'}])
+    hidden_property = Calculation(calc_value,
+                                  Params(ParamValue('hidden'),
+                                         kwargs={'condition': ParamOption(option1, todict=True),
+                                                 'expected': ParamValue('hide')}))
+    option2 = StrOption('unicode2', "Unicode 2", properties=(hidden_property,))
     descr1 = OptionDescription("options", "Common configuration", [option1, option2])
     descr = OptionDescription("choice1_requires", "Choice with requirement", [descr1])
     return descr

tests/dict/data/date1.json

@@ -12,7 +12,27 @@
     }
   },
   "model": {},
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
+    "options.date": {
+      "clearable": true,
+      "remote": true
+    },
     "null": [
       {
         "title": "Configurer",

tests/dict/data/date1_frozen.json

@@ -16,7 +16,27 @@
       "readOnly": true
     }
   },
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
+    "options.date": {
+      "clearable": true,
+      "remote": true
+    },
     "null": [
       {
         "title": "Configurer",

tests/dict/data/filename1.json

@@ -10,8 +10,25 @@
       "required": true
     }
   },
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "usbpath": {
+      "clearable": true,
       "pattern": "^[a-zA-Z0-9\\-\\._~/+]+$",
       "type": "input"
     },

tests/dict/data/hostname1.json

@@ -24,20 +24,40 @@
     }
   },
   "model": {},
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.hostname1": {
+      "clearable": true,
       "pattern": "^((?!-)[a-z0-9-]{1,63}\\.){1,}[a-z0-9-]{1,63}$",
       "type": "input"
     },
     "options.hostname2": {
+      "clearable": true,
       "pattern": "^((?!-)[a-z0-9-]{0,63}\\.){0,}[a-z0-9-]{1,63}$",
       "type": "input"
     },
     "options.hostname3": {
+      "clearable": true,
       "pattern": "^(?:((?!-)[a-z0-9-]{1,63})|(?:(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)))$",
       "type": "input"
     },
     "options.hostname4": {
+      "clearable": true,
       "pattern": "^((?!-)[a-z0-9-]{1,15})$",
       "type": "input"
     },

tests/dict/data/hostname1.py

@@ -5,8 +5,8 @@ def get_description():
     """
     option1 = DomainnameOption('hostname1', "Domainname Description")
     option2 = DomainnameOption('hostname2', "Domainname without dot Description", allow_without_dot=True)
-    option3 = DomainnameOption('hostname3', "Hostname or IP Description", type_='hostname', allow_ip=True)
-    option4 = DomainnameOption('hostname4', "Netbios Description", type_='netbios')
+    option3 = DomainnameOption('hostname3', "Hostname or IP Description", type='hostname', allow_ip=True)
+    option4 = DomainnameOption('hostname4', "Netbios Description", type='netbios')
     descr1 = OptionDescription("options", "Common configuration", [option1, option2, option3, option4])
     descr = OptionDescription("hostname1", "Simple hostnames", [descr1])
     return descr

tests/dict/data/ip1.json

@@ -12,9 +12,26 @@
     }
   },
   "model": {},
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.ip": {
-      "pattern": "^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$",
+      "clearable": true,
+      "remote": true,
       "type": "input"
     },
     "null": [

tests/dict/data/ip1_frozen.json

@@ -16,9 +16,26 @@
       "readOnly": true
     }
   },
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.ip": {
-      "pattern": "^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$",
+      "clearable": true,
+      "remote": true,
       "type": "input"
     },
     "null": [

tests/dict/data/mail1.json

@@ -12,8 +12,25 @@
     }
   },
   "model": {},
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.mail": {
+      "clearable": true,
       "pattern": "^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\\.[a-zA-Z0-9-]+)*$",
       "type": "input"
     },

tests/dict/data/number1.json

@@ -12,8 +12,25 @@
     }
   },
   "model": {},
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.integer": {
+      "clearable": true,
       "pattern": "^[0-9]+$",
       "type": "input"
     },

tests/dict/data/number1_frozen.json

@@ -16,8 +16,25 @@
       "readOnly": true
     }
   },
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.integer": {
+      "clearable": true,
       "pattern": "^[0-9]+$",
       "type": "input"
     },

tests/dict/data/number1_mod_value.json

@@ -18,6 +18,22 @@
       "owner": "user"
     }
   },
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.integer": {
       "clearable": true,

tests/dict/data/number1_mod_value.py

@@ -10,9 +10,9 @@ def get_description():
     return descr
 
 
-def get_values(api, allpath=False):
+async def get_values(api, allpath=False):
     if allpath:
         root = 'number1_mod_value.'
     else:
         root = ''
-    api.option(root + 'options.integer').value.set(3)
+    await api.option(root + 'options.integer').value.set(3)

tests/dict/data/number1_value.json

@@ -14,10 +14,25 @@
   },
   "model": {
     "options.integer": {
-      "value": 0,
-      "owner": "default"
+      "value": 0
     }
   },
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.integer": {
       "clearable": true,

tests/dict/data/unicode1.json

@@ -12,8 +12,25 @@
     }
   },
   "model": {},
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.unicode": {
+      "clearable": true,
       "type": "input"
     },
     "null": [

tests/dict/data/unicode1_frozen.json

@@ -16,8 +16,25 @@
       "readOnly": true
     }
   },
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.unicode": {
+      "clearable": true,
       "type": "input"
     },
     "null": [

tests/dict/data/unicode1_leader_hidden_followers.json

@@ -34,23 +34,52 @@
     }
   },
   "model": {
-    "options.unicode.unicode": {
+    "options.unicode": {
       "display": false,
+      "properties": [
+        "hidden"
+      ]
+    },
+    "options.unicode.unicode": {
       "required": true,
-      "hidden": true
+      "properties": [
+        "unique"
+      ],
+      "hidden": true,
+      "display": false
     }
   },
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.unicode.unicode": {
+      "clearable": true,
       "type": "input"
     },
     "options.unicode.unicode1": {
+      "clearable": true,
       "type": "input"
     },
     "options.unicode.unicode2": {
+      "clearable": true,
       "type": "input"
     },
     "options.unicode.unicode3": {
+      "clearable": true,
       "type": "input"
     },
     "null": [

tests/dict/data/unicode1_leader_hidden_followers.py

@@ -1,15 +1,15 @@
-from tiramisu.option import UnicodeOption, OptionDescription
+from tiramisu.option import StrOption, OptionDescription
 from tiramisu import Leadership
 
 def get_description():
     """generate description for this test
     """
-    option = UnicodeOption('unicode', "Unicode leader", multi=True, properties=('hidden',))
-    option1 = UnicodeOption('unicode1', "Unicode follower 1", multi=True)
-    option2 = UnicodeOption('unicode2', "Unicode follower 2", multi=True)
-    option3 = UnicodeOption('unicode3', "Unicode follower 3", multi=True)
+    option = StrOption('unicode', "Unicode leader", multi=True)
+    option1 = StrOption('unicode1', "Unicode follower 1", multi=True)
+    option2 = StrOption('unicode2', "Unicode follower 2", multi=True)
+    option3 = StrOption('unicode3', "Unicode follower 3", multi=True)
     descr1 = Leadership("unicode", "Common configuration",
-                          [option, option1, option2, option3])
+                          [option, option1, option2, option3], properties=('hidden',))
     descr = OptionDescription("options", "Common configuration", [descr1])
     descr = OptionDescription("unicode1_leader_hidden_followers", "Leader follower with unicode and hidden leader", [descr])
     return descr

tests/dict/data/unicode1_leadership.json

@@ -35,20 +35,43 @@
   },
   "model": {
     "options.unicode.unicode": {
-      "required": true
+      "required": true,
+      "properties": [
+        "unique"
+      ]
     }
   },
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.unicode.unicode": {
+      "clearable": true,
       "type": "input"
     },
     "options.unicode.unicode1": {
+      "clearable": true,
       "type": "input"
     },
     "options.unicode.unicode2": {
+      "clearable": true,
       "type": "input"
     },
     "options.unicode.unicode3": {
+      "clearable": true,
       "type": "input"
     },
     "null": [

tests/dict/data/unicode1_leadership.py

@@ -1,13 +1,13 @@
-from tiramisu.option import UnicodeOption, OptionDescription, Leadership
+from tiramisu.option import StrOption, OptionDescription, Leadership
 
 
 def get_description():
     """generate description for this test
     """
-    option = UnicodeOption('unicode', "Unicode leader", multi=True)
-    option1 = UnicodeOption('unicode1', "Unicode follower 1", multi=True)
-    option2 = UnicodeOption('unicode2', "Unicode follower 2", multi=True)
-    option3 = UnicodeOption('unicode3', "Unicode follower 3", multi=True)
+    option = StrOption('unicode', "Unicode leader", multi=True)
+    option1 = StrOption('unicode1', "Unicode follower 1", multi=True)
+    option2 = StrOption('unicode2', "Unicode follower 2", multi=True)
+    option3 = StrOption('unicode3', "Unicode follower 3", multi=True)
     descr1 = Leadership("unicode", "Common configuration 1",
                           [option, option1, option2, option3])
     descr = OptionDescription("options", "Common configuration 2", [descr1])

tests/dict/data/unicode1_leadership_default_value.json

@@ -6,11 +6,11 @@
           "properties": {
             "options.unicode.unicode": {
               "type": "string",
+              "isMulti": true,
               "value": [
                 "val1",
                 "val2"
               ],
-              "isMulti": true,
               "title": "Unicode leader"
             },
             "options.unicode.unicode1": {
@@ -20,7 +20,7 @@
             },
             "options.unicode.unicode2": {
               "type": "string",
-              "default": "follower2",
+              "defaultmulti": "follower2",
               "isMulti": true,
               "title": "Unicode follower 2 with default multi"
             },
@@ -41,29 +41,46 @@
   "model": {
     "options.unicode.unicode": {
       "required": true,
+      "properties": [
+        "unique"
+      ],
       "value": [
         "val1",
         "val2"
-      ],
-      "owner": "default"
+      ]
     },
     "options.unicode.unicode2": {
       "0": {
-        "value": "follower2",
-        "owner": "default"
+        "value": "follower2"
       },
       "1": {
-        "value": "follower2",
-        "owner": "default"
+        "value": "follower2"
       }
     }
   },
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.unicode.unicode": {
       "clearable": true,
       "type": "input"
     },
     "options.unicode.unicode1": {
+      "clearable": true,
       "type": "input"
     },
     "options.unicode.unicode2": {
@@ -71,6 +88,7 @@
       "type": "input"
     },
     "options.unicode.unicode3": {
+      "clearable": true,
       "type": "input"
     },
     "null": [

tests/dict/data/unicode1_leadership_default_value.py

@@ -1,14 +1,14 @@
-from tiramisu.option import UnicodeOption, OptionDescription
+from tiramisu.option import StrOption, OptionDescription
 from tiramisu import Leadership
 from tiramisu.setting import groups
 
 def get_description():
     """generate description for this test
     """
-    option = UnicodeOption('unicode', "Unicode leader", ['val1', 'val2'], multi=True)
-    option1 = UnicodeOption('unicode1', "Unicode follower 1", multi=True)
-    option2 = UnicodeOption('unicode2', "Unicode follower 2 with default multi", default_multi="follower2", multi=True)
-    option3 = UnicodeOption('unicode3', "Unicode follower 3", multi=True)
+    option = StrOption('unicode', "Unicode leader", ['val1', 'val2'], multi=True)
+    option1 = StrOption('unicode1', "Unicode follower 1", multi=True)
+    option2 = StrOption('unicode2', "Unicode follower 2 with default multi", default_multi="follower2", multi=True)
+    option3 = StrOption('unicode3', "Unicode follower 3", multi=True)
     descr1 = Leadership("unicode", "Common configuration 1",
                           [option, option1, option2, option3])
     descr = OptionDescription("options", "Common configuration 2", [descr1])

tests/dict/data/unicode1_leadership_hidden.json

@@ -36,6 +36,9 @@
   "model": {
     "options.unicode.unicode": {
       "required": true,
+      "properties": [
+        "unique"
+      ],
       "value": [
         "val1",
         "val2"
@@ -54,22 +57,41 @@
         "hidden": true
       },
       "null": {
-        "display": false,
-        "hidden": true
+        "display": false
       }
     }
   },
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.unicode.unicode": {
+      "clearable": true,
       "type": "input"
     },
     "options.unicode.unicode1": {
+      "clearable": true,
       "type": "input"
     },
     "options.unicode.unicode2": {
+      "clearable": true,
       "type": "input"
     },
     "options.unicode.unicode3": {
+      "clearable": true,
       "type": "input"
     },
     "null": [

tests/dict/data/unicode1_leadership_hidden.py

@@ -1,14 +1,14 @@
-from tiramisu.option import UnicodeOption, OptionDescription
+from tiramisu.option import StrOption, OptionDescription
 from tiramisu import Leadership
 
 
 def get_description():
     """generate description for this test
     """
-    option = UnicodeOption('unicode', "Unicode leader", multi=True)
-    option1 = UnicodeOption('unicode1', "Unicode follower 1", multi=True)
-    option2 = UnicodeOption('unicode2', "Unicode follower 2 hidden", multi=True, properties=('hidden',))
-    option3 = UnicodeOption('unicode3', "Unicode follower 3", multi=True)
+    option = StrOption('unicode', "Unicode leader", multi=True)
+    option1 = StrOption('unicode1', "Unicode follower 1", multi=True)
+    option2 = StrOption('unicode2', "Unicode follower 2 hidden", multi=True, properties=('hidden',))
+    option3 = StrOption('unicode3', "Unicode follower 3", multi=True)
     descr1 = Leadership("unicode", "Common configuration",
                           [option, option1, option2, option3])
     descr = OptionDescription("options", "Common configuration", [descr1])
@@ -16,10 +16,10 @@ def get_description():
     return descr
 
 
-def get_values(api, allpath=False):
+async def get_values(api, allpath=False):
     if allpath:
         root = 'unicode1_leadership_hidden.'
     else:
         root = ''
-    api.option(root + 'options.unicode.unicode').value.set([u'val1', u'val2'])
-    api.option(root + 'options.unicode.unicode2', 0).value.set(u'super')
+    await api.option(root + 'options.unicode.unicode').value.set([u'val1', u'val2'])
+    await api.option(root + 'options.unicode.unicode2', 0).value.set(u'super')

tests/dict/data/unicode1_leadership_hidden_all_default.json

@@ -34,20 +34,43 @@
   },
   "model": {
     "options.unicode1.unicode1": {
-      "required": true
+      "required": true,
+      "properties": [
+        "unique"
+      ]
     }
   },
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.unicode": {
+      "clearable": true,
       "type": "input"
     },
     "options.unicode1.unicode1": {
+      "clearable": true,
       "type": "input"
     },
     "options.unicode1.unicode2": {
+      "clearable": true,
       "type": "input"
     },
     "options.unicode1.unicode3": {
+      "clearable": true,
       "type": "input"
     },
     "null": [

tests/dict/data/unicode1_leadership_hidden_all_default.py

@@ -1,14 +1,14 @@
-from tiramisu.option import UnicodeOption, OptionDescription
+from tiramisu.option import StrOption, OptionDescription
 from tiramisu import Leadership
 
 
 def get_description():
     """generate description for this test
     """
-    option = UnicodeOption('unicode', "Unicode leader")
-    option1 = UnicodeOption('unicode1', "Unicode follower 1", multi=True)
-    option2 = UnicodeOption('unicode2', "Unicode follower 2", multi=True)
-    option3 = UnicodeOption('unicode3', "Unicode follower 3", multi=True)
+    option = StrOption('unicode', "Unicode leader")
+    option1 = StrOption('unicode1', "Unicode follower 1", multi=True)
+    option2 = StrOption('unicode2', "Unicode follower 2", multi=True)
+    option3 = StrOption('unicode3', "Unicode follower 3", multi=True)
     descr1 = Leadership("unicode1", "Common configuration",
                           [option1, option2, option3])
     descr = OptionDescription("options", "Common configuration", [option, descr1])

tests/dict/data/unicode1_leadership_not_equal.json

@@ -38,28 +38,52 @@
       "required": true
     }
   },
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.unicode.unicode": {
+      "clearable": true,
       "type": "input"
     },
     "options.unicode.unicode1": {
+      "clearable": true,
       "type": "input"
     },
     "options.unicode.unicode2": {
+      "clearable": true,
       "type": "input",
-      "not_equal": {
-        "options": [
-          "options.unicode.unicode3"
-        ]
-      }
+      "not_equal": [
+        {
+          "options": [
+            "options.unicode.unicode3"
+          ]
+        }
+      ]
     },
     "options.unicode.unicode3": {
+      "clearable": true,
       "type": "input",
-      "not_equal": {
-        "options": [
-          "options.unicode.unicode2"
-        ]
-      }
+      "not_equal": [
+        {
+          "options": [
+            "options.unicode.unicode2"
+          ]
+        }
+      ]
     },
     "null": [
       {

tests/dict/data/unicode1_leadership_not_equal.py

@@ -1,14 +1,14 @@
-from tiramisu.option import UnicodeOption, OptionDescription
+from tiramisu.option import StrOption, OptionDescription
 from tiramisu import Leadership
 
 
 def get_description():
     """generate description for this test
     """
-    option = UnicodeOption('unicode', "Unicode leader", multi=True)
-    option1 = UnicodeOption('unicode1', "Unicode follower 1", multi=True)
-    option2 = UnicodeOption('unicode2', "Unicode follower 2 not equal", multi=True)
-    option3 = UnicodeOption('unicode3', "Unicode follower 3 not equal", multi=True)
+    option = StrOption('unicode', "Unicode leader", multi=True)
+    option1 = StrOption('unicode1', "Unicode follower 1", multi=True)
+    option2 = StrOption('unicode2', "Unicode follower 2 not equal", multi=True)
+    option3 = StrOption('unicode3', "Unicode follower 3 not equal", multi=True)
     option2.impl_add_consistency('not_equal', option3)
     descr1 = Leadership("unicode", "Common configuration 1",
                           [option, option1, option2, option3])

tests/dict/data/unicode1_leadership_requires.json

@@ -35,17 +35,39 @@
   },
   "model": {
     "options.unicode.unicode": {
-      "required": true
+      "required": true,
+      "properties": [
+        "unique"
+      ]
     }
   },
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.unicode.unicode": {
+      "clearable": true,
       "type": "input"
     },
     "options.unicode.unicode1": {
+      "clearable": true,
       "type": "input"
     },
     "options.unicode.unicode2": {
+      "clearable": true,
       "type": "input",
       "dependencies": {
         "default": {
@@ -63,6 +85,7 @@
       }
     },
     "options.unicode.unicode3": {
+      "clearable": true,
       "type": "input"
     },
     "null": [

tests/dict/data/unicode1_leadership_requires.py

@@ -1,18 +1,17 @@
-from tiramisu.option import UnicodeOption, OptionDescription
-from tiramisu import Leadership
-
+from tiramisu import StrOption, OptionDescription, Leadership, Calculation, ParamValue, ParamOption, Params, calc_value
 
 def get_description():
     """generate description for this test
     """
-    option = UnicodeOption('unicode', "Unicode leader", multi=True)
-    option1 = UnicodeOption('unicode1', "Unicode follower 1", multi=True)
-    option2 = UnicodeOption('unicode2', "Values 'test' must show 'Unicode follower 3'", multi=True)
-    option3 = UnicodeOption('unicode3', "Unicode follower 3", requires=[{'option': option2,
-                                                                      'expected': u'test',
-                                                                      'action': 'hidden',
-                                                                      'inverse': True}],
-                            multi=True)
+    option = StrOption('unicode', "Unicode leader", multi=True)
+    option1 = StrOption('unicode1', "Unicode follower 1", multi=True)
+    option2 = StrOption('unicode2', "Values 'test' must show 'Unicode follower 3'", multi=True)
+    hidden_property = Calculation(calc_value,
+                                  Params(ParamValue('hidden'),
+                                         kwargs={'condition': ParamOption(option2, todict=True),
+                                                 'expected': ParamValue('test'),
+                                                 'reverse_condition': ParamValue(True)}))
+    option3 = StrOption('unicode3', "Unicode follower 3", properties=(hidden_property,), multi=True)
     descr1 = Leadership("unicode", "Common configuration 1",
                           [option, option1, option2, option3])
     descr = OptionDescription("options", "Common configuration 2", [descr1])

tests/dict/data/unicode1_leadership_requires_all.json

@@ -36,15 +36,36 @@
     "options.unicode1": {
       "properties": [
         "hidden"
-      ],
-      "hidden": true
+      ]
     },
     "options.unicode1.unicode1": {
-      "required": true
+      "required": true,
+      "properties": [
+        "unique"
+      ],
+      "hidden": true,
+      "display": false
     }
   },
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.unicode": {
+      "clearable": true,
       "type": "input",
       "dependencies": {
         "default": {
@@ -62,12 +83,15 @@
       }
     },
     "options.unicode1.unicode1": {
+      "clearable": true,
       "type": "input"
     },
     "options.unicode1.unicode2": {
+      "clearable": true,
       "type": "input"
     },
     "options.unicode1.unicode3": {
+      "clearable": true,
       "type": "input"
     },
     "null": [

tests/dict/data/unicode1_leadership_requires_all.py

@@ -1,19 +1,20 @@
-from tiramisu.option import UnicodeOption, OptionDescription
-from tiramisu import Leadership
+from tiramisu import StrOption, OptionDescription, Leadership, Calculation, ParamValue, ParamOption, Params, calc_value
 
 
 def get_description():
     """generate description for this test
     """
-    option = UnicodeOption('unicode', "Value 'test' must show Leadership")
-    option1 = UnicodeOption('unicode1', "Unicode leader", multi=True)
-    option2 = UnicodeOption('unicode2', "Unicode follower 1", multi=True)
-    option3 = UnicodeOption('unicode3', "Unicode follower 2", multi=True)
+    option = StrOption('unicode', "Value 'test' must show Leadership")
+    option1 = StrOption('unicode1', "Unicode leader", multi=True)
+    option2 = StrOption('unicode2', "Unicode follower 1", multi=True)
+    option3 = StrOption('unicode3', "Unicode follower 2", multi=True)
+    hidden_property = Calculation(calc_value,
+                                  Params(ParamValue('hidden'),
+                                         kwargs={'condition': ParamOption(option, todict=True),
+                                                 'expected': ParamValue('test'),
+                                                 'reverse_condition': ParamValue(True)}))
     descr1 = Leadership("unicode1", "Common configuration",
-                          [option1, option2, option3], requires=[{'option': option,
-                                                                  'expected': u'test',
-                                                                  'action': 'hidden',
-                                                                  'inverse': True}])
+                          [option1, option2, option3], properties=(hidden_property,))
     descr = OptionDescription("options", "Common configuration", [option, descr1])
     descr = OptionDescription("unicode1_leadership_requires_all", "Leader follower with requirement", [descr])
     return descr

tests/dict/data/unicode1_leadership_requires_disabled_value.json

@@ -0,0 +1,132 @@
+{
+  "schema": {
+    "options": {
+      "properties": {
+        "options.unicode": {
+          "properties": {
+            "options.unicode.unicode": {
+              "type": "string",
+              "isMulti": true,
+              "title": "Values 'test' must show 'Unicode follower 3'"
+            },
+            "options.unicode.unicode1": {
+              "type": "string",
+              "isMulti": true,
+              "title": "Unicode follower 1"
+            },
+            "options.unicode.unicode2": {
+              "type": "string",
+              "isMulti": true,
+              "title": "Unicode follower 2"
+            },
+            "options.unicode.unicode3": {
+              "type": "string",
+              "isMulti": true,
+              "title": "Unicode follower 3"
+            }
+          },
+          "type": "array",
+          "title": "Common configuration 1"
+        }
+      },
+      "type": "object",
+      "title": "Common configuration 2"
+    }
+  },
+  "model": {
+    "options.unicode.unicode": {
+      "required": true,
+      "properties": [
+        "unique"
+      ],
+      "value": [
+        "test",
+        "val2"
+      ],
+      "owner": "user"
+    },
+    "options.unicode.unicode1": {
+      "0": {
+        "value": "super1",
+        "owner": "user"
+      },
+      "1": {
+        "value": "super2",
+        "owner": "user"
+      }
+    },
+    "options.unicode.unicode2": {
+      "0": {
+        "value": "pas test",
+        "owner": "user"
+      },
+      "1": {
+        "value": "test",
+        "owner": "user"
+      }
+    },
+    "options.unicode.unicode3": {
+      "1": {
+        "hidden": true,
+        "display": false,
+        "value": "super",
+        "owner": "user"
+      }
+    }
+  },
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
+  "form": {
+    "options.unicode.unicode": {
+      "clearable": true,
+      "type": "input",
+      "dependencies": {
+        "default": {
+          "hide": [
+            "options.unicode.unicode3"
+          ]
+        },
+        "expected": {
+          "test": {
+            "show": [
+              "options.unicode.unicode3"
+            ]
+          }
+        }
+      }
+    },
+    "options.unicode.unicode1": {
+      "clearable": true,
+      "type": "input"
+    },
+    "options.unicode.unicode2": {
+      "clearable": true,
+      "type": "input"
+    },
+    "options.unicode.unicode3": {
+      "clearable": true,
+      "type": "input"
+    },
+    "null": [
+      {
+        "title": "Configurer",
+        "type": "submit"
+      }
+    ]
+  },
+  "version": "1.0"
+}

tests/dict/data/unicode1_leadership_requires_disabled_value.py

@@ -0,0 +1,33 @@
+from tiramisu import StrOption, OptionDescription, Leadership, Calculation, ParamValue, ParamOption, Params, calc_value
+
+
+def get_description():
+    """generate description for this test
+    """
+    option = StrOption('unicode', "Values 'test' must show 'Unicode follower 3'", multi=True)
+    option1 = StrOption('unicode1', "Unicode follower 1", multi=True)
+    option2 = StrOption('unicode2', "Unicode follower 2", multi=True)
+    disabled_property = Calculation(calc_value,
+                                    Params(ParamValue('disabled'),
+                                           kwargs={'condition': ParamOption(option, todict=True),
+                                                   'expected': ParamValue('test'),
+                                                   'reverse_condition': ParamValue(True)}))
+    option3 = StrOption('unicode3', "Unicode follower 3", properties=(disabled_property,), multi=True)
+    descr1 = Leadership("unicode", "Common configuration 1",
+                          [option, option1, option2, option3])
+    descr = OptionDescription("options", "Common configuration 2", [descr1])
+    descr = OptionDescription("unicode1_leadership_requires_disabled_value", "Leader followers with Unicode follower 3 disabled when Unicode follower 2 is test and modified value", [descr])
+    return descr
+
+
+async def get_values(api, allpath=False):
+    if allpath:
+        root = 'unicode1_leadership_requires_disabled_value.'
+    else:
+        root = ''
+    await api.option(root + 'options.unicode.unicode').value.set([u'test', u'val2'])
+    await api.option(root + 'options.unicode.unicode1', 0).value.set(u'super1')
+    await api.option(root + 'options.unicode.unicode1', 1).value.set(u'super2')
+    await api.option(root + 'options.unicode.unicode2', 0).value.set(u'pas test')
+    await api.option(root + 'options.unicode.unicode2', 1).value.set(u'test')
+    await api.option(root + 'options.unicode.unicode3', 1).value.set(u'super')

tests/dict/data/unicode1_leadership_requires_follower.json

@@ -30,11 +30,31 @@
   },
   "model": {
     "options.unicode1.unicode1": {
-      "required": true
+      "required": true,
+      "properties": [
+        "unique"
+      ]
     }
   },
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.unicode1.unicode1": {
+      "clearable": true,
       "type": "input",
       "dependencies": {
         "default": {
@@ -52,9 +72,11 @@
       }
     },
     "options.unicode1.unicode2": {
+      "clearable": true,
       "type": "input"
     },
     "options.unicode1.unicode3": {
+      "clearable": true,
       "type": "input"
     },
     "null": [

tests/dict/data/unicode1_leadership_requires_follower.py

@@ -1,17 +1,17 @@
-from tiramisu.option import UnicodeOption, OptionDescription
-from tiramisu import Leadership
+from tiramisu import StrOption, OptionDescription, Leadership, Calculation, ParamValue, ParamOption, Params, calc_value
 
 
 def get_description():
     """generate description for this test
     """
-    option1 = UnicodeOption('unicode1', "Values 'test' must show 'Unicode follower 2'", multi=True)
-    option2 = UnicodeOption('unicode2', "Unicode follower 1", multi=True)
-    option3 = UnicodeOption('unicode3', "Unicode follower 2", multi=True,
-                            requires=[{'option': option1,
-                                       'expected': u'test',
-                                       'action': 'hidden',
-                                       'inverse': True}])
+    option1 = StrOption('unicode1', "Values 'test' must show 'Unicode follower 2'", multi=True)
+    option2 = StrOption('unicode2', "Unicode follower 1", multi=True)
+    hidden_property = Calculation(calc_value,
+                                  Params(ParamValue('hidden'),
+                                         kwargs={'condition': ParamOption(option1, todict=True),
+                                                 'expected': ParamValue('test'),
+                                                 'reverse_condition': ParamValue(True)}))
+    option3 = StrOption('unicode3', "Unicode follower 2", multi=True, properties=(hidden_property,))
     descr1 = Leadership("unicode1", "Common configuration",
                           [option1, option2, option3])
     descr = OptionDescription("options", "Common configuration", [descr1])

tests/dict/data/unicode1_leadership_requires_follower_value.json

@@ -31,6 +31,9 @@
   "model": {
     "options.unicode1.unicode1": {
       "required": true,
+      "properties": [
+        "unique"
+      ],
       "value": [
         "test",
         "pas test"
@@ -49,12 +52,30 @@
         "owner": "user"
       },
       "1": {
-        "hidden": true
+        "hidden": true,
+        "display": false
       }
     }
   },
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.unicode1.unicode1": {
+      "clearable": true,
       "type": "input",
       "dependencies": {
         "default": {
@@ -72,9 +93,11 @@
       }
     },
     "options.unicode1.unicode2": {
+      "clearable": true,
       "type": "input"
     },
     "options.unicode1.unicode3": {
+      "clearable": true,
       "type": "input"
     },
     "null": [

tests/dict/data/unicode1_leadership_requires_follower_value.py

@@ -1,29 +1,29 @@
-from tiramisu.option import UnicodeOption, OptionDescription
-from tiramisu import Leadership
+from tiramisu import StrOption, OptionDescription, Leadership, Calculation, ParamValue, ParamOption, Params, calc_value
 
 
 def get_description():
     """generate description for this test
     """
-    option1 = UnicodeOption('unicode1', "Values 'test' must show 'Unicode follower 2'", multi=True)
-    option2 = UnicodeOption('unicode2', "Unicode follower 1", multi=True)
-    option3 = UnicodeOption('unicode3', "Unicode follower 2", multi=True,
-                            requires=[{'option': option1,
-                                       'expected': u'test',
-                                       'action': 'hidden',
-                                       'inverse': True}])
+    option1 = StrOption('unicode1', "Values 'test' must show 'Unicode follower 2'", multi=True)
+    option2 = StrOption('unicode2', "Unicode follower 1", multi=True)
+    hidden_property = Calculation(calc_value,
+                                  Params(ParamValue('hidden'),
+                                         kwargs={'condition': ParamOption(option1, todict=True),
+                                                 'expected': ParamValue('test'),
+                                                 'reverse_condition': ParamValue(True)}))
+    option3 = StrOption('unicode3', "Unicode follower 2", multi=True, properties=(hidden_property,))
     descr1 = Leadership("unicode1", "Common configuration",
                           [option1, option2, option3])
     descr = OptionDescription("options", "Common configuration", [descr1])
-    descr = OptionDescription("unicode1_leadership_requires_follower_value", "Leader follower requires follower with leader value", [descr])
+    descr = OptionDescription("unicode1_leadership_requires_follower_value", "Leader follower requires follower with leader", [descr])
     return descr
 
 
-def get_values(api, allpath=False):
+async def get_values(api, allpath=False):
     if allpath:
         root = 'unicode1_leadership_requires_follower_value.'
     else:
         root = ''
-    api.option(root + 'options.unicode1.unicode1').value.set([u'test', u'pas test'])
-    api.option(root + 'options.unicode1.unicode2', 0).value.set(u'super1')
-    api.option(root + 'options.unicode1.unicode3', 0).value.set(u'super1')
+    await api.option(root + 'options.unicode1.unicode1').value.set([u'test', u'pas test'])
+    await api.option(root + 'options.unicode1.unicode2', 0).value.set(u'super1')
+    await api.option(root + 'options.unicode1.unicode3', 0).value.set(u'super1')

tests/dict/data/unicode1_leadership_requires_followers.json

@@ -30,14 +30,35 @@
   },
   "model": {
     "options.unicode1.unicode1": {
-      "required": true
+      "required": true,
+      "properties": [
+        "unique"
+      ]
     }
   },
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.unicode1.unicode1": {
+      "clearable": true,
       "type": "input"
     },
     "options.unicode1.unicode2": {
+      "clearable": true,
       "type": "input",
       "dependencies": {
         "default": {
@@ -55,6 +76,7 @@
       }
     },
     "options.unicode1.unicode3": {
+      "clearable": true,
       "type": "input"
     },
     "null": [

tests/dict/data/unicode1_leadership_requires_followers.py

@@ -1,17 +1,17 @@
-from tiramisu.option import UnicodeOption, OptionDescription
-from tiramisu import Leadership
+from tiramisu import StrOption, OptionDescription, Leadership, Calculation, ParamValue, ParamOption, Params, calc_value
 
 
 def get_description():
     """generate description for this test
     """
-    option1 = UnicodeOption('unicode1', "Unicode leader", multi=True)
-    option2 = UnicodeOption('unicode2', "Values 'test' must show 'Unicode follower 2'", multi=True)
-    option3 = UnicodeOption('unicode3', "Unicode follower 2", multi=True,
-                            requires=[{'option': option2,
-                                       'expected': u'test',
-                                       'action': 'hidden',
-                                       'inverse': True}])
+    option1 = StrOption('unicode1', "Unicode leader", multi=True)
+    option2 = StrOption('unicode2', "Values 'test' must show 'Unicode follower 2'", multi=True)
+    hidden_property = Calculation(calc_value,
+                                  Params(ParamValue('hidden'),
+                                         kwargs={'condition': ParamOption(option2, todict=True),
+                                                 'expected': ParamValue('test'),
+                                                 'reverse_condition': ParamValue(True)}))
+    option3 = StrOption('unicode3', "Unicode follower 2", multi=True, properties=(hidden_property,))
     descr1 = Leadership("unicode1", "Common configuration",
                           [option1, option2, option3])
     descr = OptionDescription("options", "Common configuration", [descr1])

tests/dict/data/unicode1_leadership_requires_leader.json

@@ -1,81 +0,0 @@
-{
-  "schema": {
-    "options": {
-      "properties": {
-        "options.unicode": {
-          "type": "string",
-          "title": "Value 'test' must show leader"
-        },
-        "options.unicode1": {
-          "properties": {
-            "options.unicode1.unicode1": {
-              "type": "string",
-              "isMulti": true,
-              "title": "Unicode leader"
-            },
-            "options.unicode1.unicode2": {
-              "type": "string",
-              "isMulti": true,
-              "title": "Unicode follower 1"
-            },
-            "options.unicode1.unicode3": {
-              "type": "string",
-              "isMulti": true,
-              "title": "Unicode follower 2"
-            }
-          },
-          "type": "array",
-          "title": "Common configuration"
-        }
-      },
-      "type": "object",
-      "title": "Common configuration"
-    }
-  },
-  "model": {
-    "options.unicode1": {
-      "properties": [
-        "hidden"
-      ],
-      "hidden": true
-    },
-    "options.unicode1.unicode1": {
-      "required": true
-    }
-  },
-  "form": {
-    "options.unicode": {
-      "type": "input",
-      "dependencies": {
-        "default": {
-          "hide": [
-            "options.unicode1"
-          ]
-        },
-        "expected": {
-          "test": {
-            "show": [
-              "options.unicode1"
-            ]
-          }
-        }
-      }
-    },
-    "options.unicode1.unicode1": {
-      "type": "input"
-    },
-    "options.unicode1.unicode2": {
-      "type": "input"
-    },
-    "options.unicode1.unicode3": {
-      "type": "input"
-    },
-    "null": [
-      {
-        "title": "Configurer",
-        "type": "submit"
-      }
-    ]
-  },
-  "version": "1.0"
-}

tests/dict/data/unicode1_leadership_requires_leader.py

@@ -1,19 +0,0 @@
-from tiramisu.option import UnicodeOption, OptionDescription
-from tiramisu import Leadership
-
-
-def get_description():
-    """generate description for this test
-    """
-    option = UnicodeOption('unicode', "Value 'test' must show leader")
-    option1 = UnicodeOption('unicode1', "Unicode leader", multi=True, requires=[{'option': option,
-                                                                                 'expected': u'test',
-                                                                                 'action': 'hidden',
-                                                                                 'inverse': True}])
-    option2 = UnicodeOption('unicode2', "Unicode follower 1", multi=True)
-    option3 = UnicodeOption('unicode3', "Unicode follower 2", multi=True)
-    descr1 = Leadership("unicode1", "Common configuration",
-                          [option1, option2, option3])
-    descr = OptionDescription("options", "Common configuration", [option, descr1])
-    descr = OptionDescription("unicode1_leadership_requires_leader", "Leader follower with requirement on leader", [descr])
-    return descr

tests/dict/data/unicode1_leadership_requires_value.json

@@ -36,6 +36,9 @@
   "model": {
     "options.unicode.unicode": {
       "required": true,
+      "properties": [
+        "unique"
+      ],
       "value": [
         "test",
         "val2"
@@ -65,13 +68,31 @@
     "options.unicode.unicode3": {
       "1": {
         "hidden": true,
+        "display": false,
         "value": "super",
         "owner": "user"
       }
     }
   },
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.unicode.unicode": {
+      "clearable": true,
       "type": "input",
       "dependencies": {
         "default": {
@@ -89,12 +110,15 @@
       }
     },
     "options.unicode.unicode1": {
+      "clearable": true,
       "type": "input"
     },
     "options.unicode.unicode2": {
+      "clearable": true,
       "type": "input"
     },
     "options.unicode.unicode3": {
+      "clearable": true,
       "type": "input"
     },
     "null": [

tests/dict/data/unicode1_leadership_requires_value.py

@@ -1,18 +1,18 @@
-from tiramisu.option import UnicodeOption, OptionDescription
-from tiramisu import Leadership
+from tiramisu import StrOption, OptionDescription, Leadership, Calculation, ParamValue, ParamOption, Params, calc_value
 
 
 def get_description():
     """generate description for this test
     """
-    option = UnicodeOption('unicode', "Values 'test' must show 'Unicode follower 3'", multi=True)
-    option1 = UnicodeOption('unicode1', "Unicode follower 1", multi=True)
-    option2 = UnicodeOption('unicode2', "Unicode follower 2", multi=True)
-    option3 = UnicodeOption('unicode3', "Unicode follower 3", requires=[{'option': option,
-                                                                         'expected': u'test',
-                                                                         'action': 'hidden',
-                                                                         'inverse': True}],
-                            multi=True)
+    option = StrOption('unicode', "Values 'test' must show 'Unicode follower 3'", multi=True)
+    option1 = StrOption('unicode1', "Unicode follower 1", multi=True)
+    option2 = StrOption('unicode2', "Unicode follower 2", multi=True)
+    hidden_property = Calculation(calc_value,
+                                  Params(ParamValue('hidden'),
+                                         kwargs={'condition': ParamOption(option, todict=True),
+                                                 'expected': ParamValue('test'),
+                                                 'reverse_condition': ParamValue(True)}))
+    option3 = StrOption('unicode3', "Unicode follower 3", properties=(hidden_property,), multi=True)
     descr1 = Leadership("unicode", "Common configuration 1",
                           [option, option1, option2, option3])
     descr = OptionDescription("options", "Common configuration 2", [descr1])
@@ -20,14 +20,14 @@ def get_description():
     return descr
 
 
-def get_values(api, allpath=False):
+async def get_values(api, allpath=False):
     if allpath:
         root = 'unicode1_leadership_requires_value.'
     else:
         root = ''
-    api.option(root + 'options.unicode.unicode').value.set([u'test', u'val2'])
-    api.option(root + 'options.unicode.unicode1', 0).value.set(u'super1')
-    api.option(root + 'options.unicode.unicode1', 1).value.set(u'super2')
-    api.option(root + 'options.unicode.unicode2', 0).value.set(u'pas test')
-    api.option(root + 'options.unicode.unicode2', 1).value.set(u'test')
-    api.option(root + 'options.unicode.unicode3', 1).value.set(u'super')
+    await api.option(root + 'options.unicode.unicode').value.set([u'test', u'val2'])
+    await api.option(root + 'options.unicode.unicode1', 0).value.set(u'super1')
+    await api.option(root + 'options.unicode.unicode1', 1).value.set(u'super2')
+    await api.option(root + 'options.unicode.unicode2', 0).value.set(u'pas test')
+    await api.option(root + 'options.unicode.unicode2', 1).value.set(u'test')
+    await api.option(root + 'options.unicode.unicode3', 1).value.set(u'super')

tests/dict/data/unicode1_leadership_submulti.json

@@ -36,20 +36,43 @@
   },
   "model": {
     "options.unicode.unicode": {
-      "required": true
+      "required": true,
+      "properties": [
+        "unique"
+      ]
     }
   },
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.unicode.unicode": {
+      "clearable": true,
       "type": "input"
     },
     "options.unicode.unicode1": {
+      "clearable": true,
       "type": "input"
     },
     "options.unicode.unicode2": {
+      "clearable": true,
       "type": "input"
     },
     "options.unicode.unicode3": {
+      "clearable": true,
       "type": "input"
     },
     "null": [

tests/dict/data/unicode1_leadership_submulti.py

@@ -1,14 +1,14 @@
-from tiramisu.option import UnicodeOption, OptionDescription, submulti
+from tiramisu.option import StrOption, OptionDescription, submulti
 from tiramisu import Leadership
 
 
 def get_description():
     """generate description for this test
     """
-    option = UnicodeOption('unicode', "Unicode leader", multi=True)
-    option1 = UnicodeOption('unicode1', "Unicode follower 1", multi=True)
-    option2 = UnicodeOption('unicode2', "Unicode follower 2 submulti", multi=submulti)
-    option3 = UnicodeOption('unicode3', "Unicode follower 3", multi=True)
+    option = StrOption('unicode', "Unicode leader", multi=True)
+    option1 = StrOption('unicode1', "Unicode follower 1", multi=True)
+    option2 = StrOption('unicode2', "Unicode follower 2 submulti", multi=submulti)
+    option3 = StrOption('unicode3', "Unicode follower 3", multi=True)
     descr1 = Leadership("unicode", "Common configuration 1",
                           [option, option1, option2, option3])
     descr = OptionDescription("options", "Common configuration 2", [descr1])

tests/dict/data/unicode1_leadership_value.json

@@ -6,11 +6,11 @@
           "properties": {
             "options.unicode.unicode": {
               "type": "string",
+              "isMulti": true,
               "value": [
                 "val1",
                 "val2"
               ],
-              "isMulti": true,
               "title": "Unicode leader"
             },
             "options.unicode.unicode1": {
@@ -20,7 +20,7 @@
             },
             "options.unicode.unicode2": {
               "type": "string",
-              "default": "follower2",
+              "defaultmulti": "follower2",
               "isMulti": true,
               "title": "Unicode follower 2 with default multi"
             },
@@ -41,6 +41,9 @@
   "model": {
     "options.unicode.unicode": {
       "required": true,
+      "properties": [
+        "unique"
+      ],
       "value": [
         "val3",
         "val4"
@@ -74,12 +77,29 @@
       }
     }
   },
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.unicode.unicode": {
       "clearable": true,
       "type": "input"
     },
     "options.unicode.unicode1": {
+      "clearable": true,
       "type": "input"
     },
     "options.unicode.unicode2": {
@@ -87,6 +107,7 @@
       "type": "input"
     },
     "options.unicode.unicode3": {
+      "clearable": true,
       "type": "input"
     },
     "null": [

tests/dict/data/unicode1_leadership_value.py

@@ -1,14 +1,14 @@
-from tiramisu.option import UnicodeOption, OptionDescription
+from tiramisu.option import StrOption, OptionDescription
 from tiramisu import Leadership
 
 
 def get_description():
     """generate description for this test
     """
-    option = UnicodeOption('unicode', "Unicode leader", ['val1', 'val2'], multi=True)
-    option1 = UnicodeOption('unicode1', "Unicode follower 1", multi=True)
-    option2 = UnicodeOption('unicode2', "Unicode follower 2 with default multi", default_multi="follower2", multi=True)
-    option3 = UnicodeOption('unicode3', "Unicode follower 3", multi=True)
+    option = StrOption('unicode', "Unicode leader", ['val1', 'val2'], multi=True)
+    option1 = StrOption('unicode1', "Unicode follower 1", multi=True)
+    option2 = StrOption('unicode2', "Unicode follower 2 with default multi", default_multi="follower2", multi=True)
+    option3 = StrOption('unicode3', "Unicode follower 3", multi=True)
     descr1 = Leadership("unicode", "Common configuration 1",
                         [option, option1, option2, option3])
     descr = OptionDescription("options", "Common configuration 2", [descr1])
@@ -16,14 +16,14 @@ def get_description():
     return descr
 
 
-def get_values(api, allpath=False):
+async def get_values(api, allpath=False):
     if allpath:
         root = 'unicode1_leadership_value.'
     else:
         root = ''
-    api.option(root + 'options.unicode.unicode').value.set([u'val3', u'val4'])
-    api.option(root + 'options.unicode.unicode1', 0).value.set(u'super1')
-    api.option(root + 'options.unicode.unicode1', 1).value.set(u'super2')
-    api.option(root + 'options.unicode.unicode2', 0).value.set(u'pas test')
-    api.option(root + 'options.unicode.unicode2', 1).value.set(u'test')
-    api.option(root + 'options.unicode.unicode3', 1).value.set(u'super')
+    await api.option(root + 'options.unicode.unicode').value.set([u'val3', u'val4'])
+    await api.option(root + 'options.unicode.unicode1', 0).value.set(u'super1')
+    await api.option(root + 'options.unicode.unicode1', 1).value.set(u'super2')
+    await api.option(root + 'options.unicode.unicode2', 0).value.set(u'pas test')
+    await api.option(root + 'options.unicode.unicode2', 1).value.set(u'test')
+    await api.option(root + 'options.unicode.unicode3', 1).value.set(u'super')

tests/dict/data/unicode1_leadership_value.updates1

@@ -1,11 +1,28 @@
-{"updates": ["options.unicode.unicode",
-             "options.unicode.unicode1",
-             "options.unicode.unicode2",
-             "options.unicode.unicode3"],
- "model": {"options.unicode.unicode": {"owner": "default",
-                                       "required": true,
-                                       "value": ["val1", "val2"]},
-           "options.unicode.unicode2": {"0": {"owner": "default",
-                                              "value": "follower2"},
-                                        "1": {"owner": "default",
-                                              "value": "follower2"}}}}
+{
+  "updates": [
+    "options.unicode.unicode",
+    "options.unicode.unicode1",
+    "options.unicode.unicode2",
+    "options.unicode.unicode3"
+  ],
+  "model": {
+    "options.unicode.unicode": {
+      "required": true,
+      "properties": [
+        "unique"
+      ],
+      "value": [
+        "val1",
+        "val2"
+      ]
+    },
+    "options.unicode.unicode2": {
+      "0": {
+        "value": "follower2"
+      },
+      "1": {
+        "value": "follower2"
+      }
+    }
+  }
+}

tests/dict/data/unicode1_leadership_value.updates2

@@ -1,11 +1,32 @@
-{"updates": ["options.unicode.unicode",
-             "options.unicode.unicode1",
-             "options.unicode.unicode2",
-             "options.unicode.unicode3"],
- "model": {"options.unicode.unicode": {"required": true,
-                                       "value": ["val3"],
-                                       "owner": "user"},
-           "options.unicode.unicode1": {"0": {"value": "super1",
-                                              "owner": "user"}},
-           "options.unicode.unicode2": {"0": {"value": "pas test",
-                                              "owner": "user"}}}}
+{
+  "updates": [
+    "options.unicode.unicode",
+    "options.unicode.unicode1",
+    "options.unicode.unicode2",
+    "options.unicode.unicode3"
+  ],
+  "model": {
+    "options.unicode.unicode": {
+      "required": true,
+      "properties": [
+        "unique"
+      ],
+      "value": [
+        "val3"
+      ],
+      "owner": "user"
+    },
+    "options.unicode.unicode1": {
+      "0": {
+        "value": "super1",
+        "owner": "user"
+      }
+    },
+    "options.unicode.unicode2": {
+      "0": {
+        "value": "pas test",
+        "owner": "user"
+      }
+    }
+  }
+}

tests/dict/data/unicode1_leadership_value.updates3

@@ -1,17 +1,49 @@
-{"updates": ["options.unicode.unicode",
-             "options.unicode.unicode2"],
- "model": {"options.unicode.unicode": {"required": true, 
-			                                 "value": ["val3", "val4", "val5"],
-			                                 "owner": "user"},
-		       "options.unicode.unicode1": {"0": {"value": "super1",
-			                                        "owner": "user"},
-                                        "1": {"value": "super2",
-			                                        "owner": "user"}},
-		       "options.unicode.unicode2": {"0": {"value": "pas test",
-			                                        "owner": "user"},
-			                                  "1": {"value": "test",
-			                                        "owner": "user"},
-			                                  "2": {"value": "follower2",
-			                                        "owner": "default"}},
-		       "options.unicode.unicode3": {"1": {"value": "super",
-			                                        "owner": "user"}}}}
+{
+  "updates": [
+    "options.unicode.unicode",
+    "options.unicode.unicode2"
+  ],
+  "model": {
+    "options.unicode.unicode": {
+      "required": true,
+      "properties": [
+        "unique"
+      ],
+      "value": [
+        "val3",
+        "val4",
+        "val5"
+      ],
+      "owner": "user"
+    },
+    "options.unicode.unicode1": {
+      "0": {
+        "value": "super1",
+        "owner": "user"
+      },
+      "1": {
+        "value": "super2",
+        "owner": "user"
+      }
+    },
+    "options.unicode.unicode2": {
+      "0": {
+        "value": "pas test",
+        "owner": "user"
+      },
+      "1": {
+        "value": "test",
+        "owner": "user"
+      },
+      "2": {
+        "value": "follower2"
+      }
+    },
+    "options.unicode.unicode3": {
+      "1": {
+        "value": "super",
+        "owner": "user"
+      }
+    }
+  }
+}

tests/dict/data/unicode1_leadership_value.updates4

@@ -1,16 +1,49 @@
-{"model": {"options.unicode.unicode": {"owner": "user",
-                                       "required": true,
-                                       "value": ["val3", "val4", "val5"]},
-           "options.unicode.unicode1": {"0": {"owner": "user",
-                                              "value": "super1"},
-                                        "1": {"owner": "user",
-                                              "value": "super2"}},
-           "options.unicode.unicode2": {"0": {"owner": "user",
-                                              "value": "pas test"},
-                                        "1": {"owner": "user",
-                                              "value": "test"},
-                                        "2": {"owner": "default",
-                                              "value": "follower2"}},
-           "options.unicode.unicode3": {"1": {"owner": "user",
-                                              "value": "super"}}},
- "updates": ["options.unicode.unicode", "options.unicode.unicode2"]}
+{
+  "updates": [
+    "options.unicode.unicode",
+    "options.unicode.unicode2"
+  ],
+  "model": {
+    "options.unicode.unicode": {
+      "required": true,
+      "properties": [
+        "unique"
+      ],
+      "value": [
+        "val3",
+        "val4",
+        "val5"
+      ],
+      "owner": "user"
+    },
+    "options.unicode.unicode1": {
+      "0": {
+        "value": "super1",
+        "owner": "user"
+      },
+      "1": {
+        "value": "super2",
+        "owner": "user"
+      }
+    },
+    "options.unicode.unicode2": {
+      "0": {
+        "value": "pas test",
+        "owner": "user"
+      },
+      "1": {
+        "value": "test",
+        "owner": "user"
+      },
+      "2": {
+        "value": "follower2"
+      }
+    },
+    "options.unicode.unicode3": {
+      "1": {
+        "value": "super",
+        "owner": "user"
+      }
+    }
+  }
+}

tests/dict/data/unicode1_leadership_value.updates5

@@ -1,14 +1,43 @@
-{"updates": ["options.unicode.unicode2"],
- "model": {"options.unicode.unicode": {"required": true,
-                                       "value": ["val3", "val4"],
-                                       "owner": "user"},
-           "options.unicode.unicode1": {"0": {"value": "super1",
-                                              "owner": "user"},
-                                        "1": {"value": "super2",
-                                              "owner": "user"}},
-           "options.unicode.unicode2": {"0": {"value": "pas test",
-                                              "owner": "user"},
-                                        "1": {"value": "follower2",
-                                              "owner": "default"}},
-           "options.unicode.unicode3": {"1": {"value": "super",
-                                              "owner": "user"}}}}
+{
+  "updates": [
+    "options.unicode.unicode2"
+  ],
+  "model": {
+    "options.unicode.unicode": {
+      "required": true,
+      "properties": [
+        "unique"
+      ],
+      "value": [
+        "val3",
+        "val4"
+      ],
+      "owner": "user"
+    },
+    "options.unicode.unicode1": {
+      "0": {
+        "value": "super1",
+        "owner": "user"
+      },
+      "1": {
+        "value": "super2",
+        "owner": "user"
+      }
+    },
+    "options.unicode.unicode2": {
+      "0": {
+        "value": "pas test",
+        "owner": "user"
+      },
+      "1": {
+        "value": "follower2"
+      }
+    },
+    "options.unicode.unicode3": {
+      "1": {
+        "value": "super",
+        "owner": "user"
+      }
+    }
+  }
+}

tests/dict/data/unicode1_leadership_value.updates6

@@ -1,14 +1,44 @@
-{"updates": ["options.unicode.unicode2"],
- "model": {"options.unicode.unicode": {"required": true,
-                                       "value": ["val3", "val4"],
-                                       "owner": "user"},
-           "options.unicode.unicode1": {"0": {"value": "super1",
-                                              "owner": "user"},
-                                        "1": {"value": "super2",
-                                              "owner": "user"}},
-           "options.unicode.unicode2": {"0": {"value": "pas test",
-                                              "owner": "user"},
-                                        "1": {"value": "test2",
-                                              "owner": "user"}},
-           "options.unicode.unicode3": {"1": {"value": "super",
-                                              "owner": "user"}}}}
+{
+  "updates": [
+    "options.unicode.unicode2"
+  ],
+  "model": {
+    "options.unicode.unicode": {
+      "required": true,
+      "properties": [
+        "unique"
+      ],
+      "value": [
+        "val3",
+        "val4"
+      ],
+      "owner": "user"
+    },
+    "options.unicode.unicode1": {
+      "0": {
+        "value": "super1",
+        "owner": "user"
+      },
+      "1": {
+        "value": "super2",
+        "owner": "user"
+      }
+    },
+    "options.unicode.unicode2": {
+      "0": {
+        "value": "pas test",
+        "owner": "user"
+      },
+      "1": {
+        "value": "test2",
+        "owner": "user"
+      }
+    },
+    "options.unicode.unicode3": {
+      "1": {
+        "value": "super",
+        "owner": "user"
+      }
+    }
+  }
+}

tests/dict/data/unicode1_mandatory.json

@@ -16,8 +16,25 @@
       "required": true
     }
   },
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.unicode": {
+      "clearable": true,
       "type": "input"
     },
     "null": [

tests/dict/data/unicode1_mandatory.py

@@ -1,11 +1,11 @@
 """just a multi unicode option
 """
-from tiramisu.option import UnicodeOption, OptionDescription
+from tiramisu.option import StrOption, OptionDescription
 
 def get_description():
     """generate description for this test
     """
-    option = UnicodeOption('unicode', "Unicode 1", properties=('mandatory',))
+    option = StrOption('unicode', "Unicode 1", properties=('mandatory',))
     descr1 = OptionDescription("options", "Common configuration", [option])
     descr = OptionDescription("unicode1_mandatory", "Mandatory unicode", [descr1])
     return descr

tests/dict/data/unicode1_mod_value.json

@@ -17,8 +17,25 @@
       "owner": "user"
     }
   },
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.unicode": {
+      "clearable": true,
       "type": "input"
     },
     "null": [

tests/dict/data/unicode1_mod_value.py

@@ -11,9 +11,9 @@ def get_description():
     return descr
 
 
-def get_values(api, allpath=False):
+async def get_values(api, allpath=False):
     if allpath:
         root = 'unicode1_mod_value.'
     else:
         root = ''
-    api.option(root + 'options.unicode').value.set('a')
+    await api.option(root + 'options.unicode').value.set('a')

tests/dict/data/unicode1_multi.json

@@ -14,11 +14,31 @@
   },
   "model": {
     "options.unicode": {
-      "required": true
+      "required": true,
+      "properties": [
+        "unique"
+      ]
     }
   },
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.unicode": {
+      "clearable": true,
       "type": "input"
     },
     "null": [

tests/dict/data/unicode1_multi.py

@@ -1,11 +1,11 @@
 """just a multi unicode option
 """
-from tiramisu.option import UnicodeOption, OptionDescription
+from tiramisu.option import StrOption, OptionDescription
 
 def get_description():
     """generate description for this test
     """
-    option = UnicodeOption('unicode', "Multi string 1", multi=True)
+    option = StrOption('unicode', "Multi string 1", multi=True)
     descr1 = OptionDescription("options", "Common configuration", [option])
     descr = OptionDescription("unicode1_multi", "Multi unicode", [descr1])
     return descr

tests/dict/data/unicode1_multi.updates1

@@ -1,4 +1,17 @@
-{"updates": ["options.unicode"],
- "model": {"options.unicode": {"owner": "user",
-                               "required": true,
-                               "value": ["val"]}}}
+{
+  "updates": [
+    "options.unicode"
+  ],
+  "model": {
+    "options.unicode": {
+      "required": true,
+      "properties": [
+        "unique"
+      ],
+      "value": [
+        "val"
+      ],
+      "owner": "user"
+    }
+  }
+}

tests/dict/data/unicode1_multi_hidden.json

@@ -14,13 +14,33 @@
   },
   "model": {
     "options.unicode": {
-      "display": false,
       "required": true,
+      "properties": [
+        "unique"
+      ],
+      "display": false,
       "hidden": true
     }
   },
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.unicode": {
+      "clearable": true,
       "type": "input"
     },
     "null": [

tests/dict/data/unicode1_multi_hidden.py

@@ -1,11 +1,11 @@
 """just a multi unicode option
 """
-from tiramisu.option import UnicodeOption, OptionDescription
+from tiramisu.option import StrOption, OptionDescription
 
 def get_description():
     """generate description for this test
     """
-    option = UnicodeOption('unicode', "Unicode 1", properties=('hidden',), multi=True)
+    option = StrOption('unicode', "Unicode 1", properties=('hidden',), multi=True)
     descr1 = OptionDescription("options", "Common configuration", [option])
     descr = OptionDescription("unicode1_multi_hidden", "Hidden multi unicode", [descr1])
     return descr

tests/dict/data/unicode1_multi_mandatory.json

@@ -15,11 +15,31 @@
   "model": {
     "options.unicode": {
       "required": true,
-      "needs_len": true
+      "needs_len": true,
+      "properties": [
+        "unique"
+      ]
     }
   },
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.unicode": {
+      "clearable": true,
       "type": "input"
     },
     "null": [

tests/dict/data/unicode1_multi_mandatory.py

@@ -1,11 +1,11 @@
 """just a multi unicode option
 """
-from tiramisu.option import UnicodeOption, OptionDescription
+from tiramisu.option import StrOption, OptionDescription
 
 def get_description():
     """generate description for this test
     """
-    option = UnicodeOption('unicode', "Unicode 1", multi=True, properties=('mandatory',))
+    option = StrOption('unicode', "Unicode 1", multi=True, properties=('mandatory',))
     descr1 = OptionDescription("options", "Common configuration", [option])
     descr = OptionDescription("unicode1_multi_mandatory", "Mandatory multi Unicode", [descr1])
     return descr

tests/dict/data/unicode1_multi_mod_value.json

@@ -4,11 +4,11 @@
       "properties": {
         "options.unicode": {
           "type": "string",
+          "isMulti": true,
           "value": [
             "a",
             "b"
           ],
-          "isMulti": true,
           "title": "String 1"
         }
       },
@@ -19,6 +19,9 @@
   "model": {
     "options.unicode": {
       "required": true,
+      "properties": [
+        "unique"
+      ],
       "value": [
         "c",
         "d",
@@ -27,6 +30,22 @@
       "owner": "user"
     }
   },
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.unicode": {
       "clearable": true,

tests/dict/data/unicode1_multi_mod_value.py

@@ -11,9 +11,9 @@ def get_description():
     return descr
 
 
-def get_values(api, allpath=False):
+async def get_values(api, allpath=False):
     if allpath:
         root = 'unicode1_multi_mod_value.'
     else:
         root = ''
-    api.option(root + 'options.unicode').value.set(['c', 'd', 'e'])
+    await api.option(root + 'options.unicode').value.set(['c', 'd', 'e'])

tests/dict/data/unicode1_multi_mod_value.updates1

@@ -1,4 +1,17 @@
-{"updates": ["options.unicode"],
- "model": {"options.unicode": {"owner": "default",
-                               "required": true,
-                               "value": ["a", "b"]}}}
+{
+  "updates": [
+    "options.unicode"
+  ],
+  "model": {
+    "options.unicode": {
+      "required": true,
+      "properties": [
+        "unique"
+      ],
+      "value": [
+        "a",
+        "b"
+      ]
+    }
+  }
+}

tests/dict/data/unicode1_multi_mod_value.updates2

@@ -1,4 +1,19 @@
-{"updates": ["options.unicode"],
- "model": {"options.unicode": {"owner": "user",
-                               "required": true,
-                               "value": ["c", "f", "e"]}}}
+{
+  "updates": [
+    "options.unicode"
+  ],
+  "model": {
+    "options.unicode": {
+      "required": true,
+      "properties": [
+        "unique"
+      ],
+      "value": [
+        "c",
+        "f",
+        "e"
+      ],
+      "owner": "user"
+    }
+  }
+}

tests/dict/data/unicode1_multi_not_equal_collapse.json

@@ -24,11 +24,11 @@
         },
         "descr2.unicode2_multi": {
           "type": "string",
+          "isMulti": true,
           "value": [
             "a",
             "b"
           ],
-          "isMulti": true,
           "title": "Multi unicode 2"
         }
       },
@@ -56,77 +56,107 @@
       "required": true
     },
     "descr2.unicode2": {
-      "value": "a",
-      "owner": "default"
+      "value": "a"
     },
     "descr2.unicode2_multi": {
       "required": true,
       "value": [
         "a",
         "b"
-      ],
-      "owner": "default"
+      ]
     },
     "descr3.unicode3_multi": {
       "required": true
     }
   },
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "descr1.unicode1": {
+      "clearable": true,
       "type": "input",
-      "not_equal": {
-        "options": [
-          "descr2.unicode2",
-          "descr3.unicode3"
-        ]
-      }
+      "not_equal": [
+        {
+          "options": [
+            "descr2.unicode2",
+            "descr3.unicode3"
+          ]
+        }
+      ]
     },
     "descr1.unicode1_multi": {
+      "clearable": true,
       "type": "input",
-      "not_equal": {
-        "options": [
-          "descr2.unicode2_multi",
-          "descr3.unicode3_multi"
-        ]
-      }
+      "not_equal": [
+        {
+          "options": [
+            "descr2.unicode2_multi",
+            "descr3.unicode3_multi"
+          ]
+        }
+      ]
     },
     "descr2.unicode2": {
       "clearable": true,
       "type": "input",
-      "not_equal": {
-        "options": [
-          "descr1.unicode1",
-          "descr3.unicode3"
-        ]
-      }
+      "not_equal": [
+        {
+          "options": [
+            "descr1.unicode1",
+            "descr3.unicode3"
+          ]
+        }
+      ]
     },
     "descr2.unicode2_multi": {
       "clearable": true,
       "type": "input",
-      "not_equal": {
-        "options": [
-          "descr1.unicode1_multi",
-          "descr3.unicode3_multi"
-        ]
-      }
+      "not_equal": [
+        {
+          "options": [
+            "descr1.unicode1_multi",
+            "descr3.unicode3_multi"
+          ]
+        }
+      ]
     },
     "descr3.unicode3": {
+      "clearable": true,
       "type": "input",
-      "not_equal": {
-        "options": [
-          "descr1.unicode1",
-          "descr2.unicode2"
-        ]
-      }
+      "not_equal": [
+        {
+          "options": [
+            "descr1.unicode1",
+            "descr2.unicode2"
+          ]
+        }
+      ]
     },
     "descr3.unicode3_multi": {
+      "clearable": true,
       "type": "input",
-      "not_equal": {
-        "options": [
-          "descr1.unicode1_multi",
-          "descr2.unicode2_multi"
-        ]
-      }
+      "not_equal": [
+        {
+          "options": [
+            "descr1.unicode1_multi",
+            "descr2.unicode2_multi"
+          ]
+        }
+      ]
     },
     "null": [
       {

tests/dict/data/unicode1_multi_not_equal_collapse.py

@@ -1,14 +1,14 @@
-from tiramisu.option import UnicodeOption, OptionDescription
+from tiramisu.option import StrOption, OptionDescription
 
 def get_description():
     """generate description for this test
     """
-    option1 = UnicodeOption('unicode1', "Unicode 1, not equal to 'a'")
-    option2 = UnicodeOption('unicode1_multi', "Multi unicode 1, not equal to 'a' or 'b'", multi=True)
-    option3 = UnicodeOption('unicode2', "Unicode 2", default='a')
-    option4 = UnicodeOption('unicode2_multi', "Multi unicode 2", multi=True, default=['a', 'b'])
-    option5 = UnicodeOption('unicode3', "Unicode 3")
-    option6 = UnicodeOption('unicode3_multi', "Multi unicode 3", multi=True)
+    option1 = StrOption('unicode1', "Unicode 1, not equal to 'a'")
+    option2 = StrOption('unicode1_multi', "Multi unicode 1, not equal to 'a' or 'b'", multi=True)
+    option3 = StrOption('unicode2', "Unicode 2", default='a')
+    option4 = StrOption('unicode2_multi', "Multi unicode 2", multi=True, default=['a', 'b'])
+    option5 = StrOption('unicode3', "Unicode 3")
+    option6 = StrOption('unicode3_multi', "Multi unicode 3", multi=True)
     #option1.impl_add_consistency('not_equal', option3, option5)
     #option2.impl_add_consistency('not_equal', option4, option6)
     option3.impl_add_consistency('not_equal', option1)

tests/dict/data/unicode1_multi_requires.json

@@ -19,11 +19,32 @@
   "model": {
     "options.unicode2": {
       "required": true,
-      "hidden": true
+      "properties": [
+        "unique"
+      ],
+      "hidden": true,
+      "display": false
     }
   },
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.unicode1": {
+      "clearable": true,
       "type": "input",
       "dependencies": {
         "default": {
@@ -41,6 +62,7 @@
       }
     },
     "options.unicode2": {
+      "clearable": true,
       "type": "input"
     },
     "null": [

tests/dict/data/unicode1_multi_requires.py

@@ -1,15 +1,16 @@
-from tiramisu.option import StrOption, OptionDescription
+from tiramisu import StrOption, OptionDescription, Calculation, ParamValue, ParamOption, Params, calc_value
 
 
 def get_description():
     """generate description for this test
     """
     option1 = StrOption('unicode1', "Value 'test' must show Unicode 2")
-    option2 = StrOption('unicode2', "Unicode 2", requires=[{'option': option1,
-                                                            'expected': u'test',
-                                                            'action': 'hidden',
-                                                            'inverse': True}],
-                        multi=True)
+    hidden_property = Calculation(calc_value,
+                                  Params(ParamValue('hidden'),
+                                         kwargs={'condition': ParamOption(option1, todict=True),
+                                                 'expected': ParamValue('test'),
+                                                 'reverse_condition': ParamValue(True)}))
+    option2 = StrOption('unicode2', "Unicode 2", properties=(hidden_property,), multi=True)
     descr1 = OptionDescription("options", "Common configuration", [option1, option2])
     descr = OptionDescription("unicode1_multi_requires", "Unicode multi with requirement", [descr1])
     return descr

tests/dict/data/unicode1_multi_value.json

@@ -4,11 +4,11 @@
       "properties": {
         "options.unicode": {
           "type": "string",
+          "isMulti": true,
           "value": [
             "a",
             "b"
           ],
-          "isMulti": true,
           "title": "String 1"
         }
       },
@@ -19,13 +19,31 @@
   "model": {
     "options.unicode": {
       "required": true,
+      "properties": [
+        "unique"
+      ],
       "value": [
         "a",
         "b"
-      ],
-      "owner": "default"
+      ]
     }
   },
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.unicode": {
       "clearable": true,

tests/dict/data/unicode1_multi_value.py

@@ -1,11 +1,11 @@
 """just a multi unicode option
 """
-from tiramisu.option import UnicodeOption, OptionDescription
+from tiramisu.option import StrOption, OptionDescription
 
 def get_description():
     """generate description for this test
     """
-    option = UnicodeOption('unicode', "String 1", ['a', 'b'], multi=True)
+    option = StrOption('unicode', "String 1", ['a', 'b'], multi=True)
     descr1 = OptionDescription("options", "Common configuration", [option])
     descr = OptionDescription("unicode1_multi_value", "Multi unicode with default value 'a' and 'b'", [descr1])
     return descr

tests/dict/data/unicode1_not_equal.json

@@ -16,22 +16,44 @@
     }
   },
   "model": {},
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.unicode1": {
+      "clearable": true,
       "type": "input",
-      "not_equal": {
-        "options": [
-          "options.unicode2"
-        ]
-      }
+      "not_equal": [
+        {
+          "options": [
+            "options.unicode2"
+          ]
+        }
+      ]
     },
     "options.unicode2": {
+      "clearable": true,
       "type": "input",
-      "not_equal": {
-        "options": [
-          "options.unicode1"
-        ]
-      }
+      "not_equal": [
+        {
+          "options": [
+            "options.unicode1"
+          ]
+        }
+      ]
     },
     "null": [
       {

tests/dict/data/unicode1_not_equal.py

@@ -1,10 +1,10 @@
-from tiramisu.option import UnicodeOption, OptionDescription
+from tiramisu.option import StrOption, OptionDescription
 
 def get_description():
     """generate description for this test
     """
-    option1 = UnicodeOption('unicode1', "Unicode 1")
-    option2 = UnicodeOption('unicode2', "Unicode 2")
+    option1 = StrOption('unicode1', "Unicode 1")
+    option2 = StrOption('unicode2', "Unicode 2")
     option2.impl_add_consistency('not_equal', option1)
     descr1 = OptionDescription("options", "Common configuration", [option1, option2])
     descr = OptionDescription("unicode1_not_equal", "Unicode 1 and unicode 2 not equal", [descr1])

tests/dict/data/unicode1_optiondescription_requires.json

@@ -29,12 +29,36 @@
     "unicode1": {
       "properties": [
         "hidden"
-      ],
-      "hidden": true
+      ]
+    },
+    "unicode1.unicode2": {
+      "hidden": true,
+      "display": false
+    },
+    "unicode1.unicode3": {
+      "hidden": true,
+      "display": false
     }
   },
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.unicode1": {
+      "clearable": true,
       "type": "input",
       "dependencies": {
         "default": {
@@ -52,9 +76,11 @@
       }
     },
     "unicode1.unicode2": {
+      "clearable": true,
       "type": "input"
     },
     "unicode1.unicode3": {
+      "clearable": true,
       "type": "input"
     },
     "null": [

tests/dict/data/unicode1_optiondescription_requires.py

@@ -1,17 +1,18 @@
-from tiramisu.option import UnicodeOption, OptionDescription
+from tiramisu import StrOption, OptionDescription, Calculation, ParamValue, ParamOption, Params, calc_value
 
 
 def get_description():
     """generate description for this test
     """
-    option1 = UnicodeOption('unicode1', "Value 'test' must show OptionDescription")
+    option1 = StrOption('unicode1', "Value 'test' must show OptionDescription")
     descr1 = OptionDescription("options", "Common configuration", [option1])
-    option2 = UnicodeOption('unicode2', "Unicode 2")
-    option3 = UnicodeOption('unicode3', "Unicode 3")
-    descr2 = OptionDescription("unicode1", "OptionDescription with 2 options",
-                               [option2, option3], requires=[{'option': option1,
-                                                              'expected': u'test',
-                                                              'action': 'hidden',
-                                                              'inverse': True}])
+    option2 = StrOption('unicode2', "Unicode 2")
+    option3 = StrOption('unicode3', "Unicode 3")
+    hidden_property = Calculation(calc_value,
+                                  Params(ParamValue('hidden'),
+                                         kwargs={'condition': ParamOption(option1, todict=True),
+                                                 'expected': ParamValue('test'),
+                                                 'reverse_condition': ParamValue(True)}))
+    descr2 = OptionDescription("unicode1", "OptionDescription with 2 options", [option2, option3], properties=(hidden_property,))
     descr = OptionDescription("unicode1_optiondescription_requires", "OptionDesciption with requirement", [descr1, descr2])
     return descr

tests/dict/data/unicode1_requires.json

@@ -17,11 +17,29 @@
   },
   "model": {
     "options.unicode2": {
+      "display": false,
       "hidden": true
     }
   },
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.unicode1": {
+      "clearable": true,
       "type": "input",
       "dependencies": {
         "default": {
@@ -39,6 +57,7 @@
       }
     },
     "options.unicode2": {
+      "clearable": true,
       "type": "input"
     },
     "null": [

tests/dict/data/unicode1_requires.py

@@ -1,14 +1,16 @@
-from tiramisu.option import StrOption, OptionDescription
+from tiramisu import StrOption, OptionDescription, Calculation, ParamValue, ParamOption, Params, calc_value
 
 
 def get_description():
     """generate description for this test
     """
     option1 = StrOption('unicode1', "Value 'test' must show Unicode 2")
-    option2 = StrOption('unicode2', "Unicode 2", requires=[{'option': option1,
-                                                            'expected': u'test',
-                                                            'action': 'hidden',
-                                                            'inverse': True}])
+    hidden_property = Calculation(calc_value,
+                                  Params(ParamValue('hidden'),
+                                         kwargs={'condition': ParamOption(option1, todict=True),
+                                                 'expected': ParamValue('test'),
+                                                 'reverse_condition': ParamValue(True)}))
+    option2 = StrOption('unicode2', "Unicode 2", properties=(hidden_property,))
     descr1 = OptionDescription("options", "Common configuration", [option1, option2])
     descr = OptionDescription("unicode1_requires", "Unicode with requirement", [descr1])
     return descr

tests/dict/data/unicode1_simple_callback.json

@@ -14,14 +14,29 @@
   },
   "model": {
     "options.unicode1": {
-      "value": "word",
-      "owner": "default"
+      "value": "word"
     }
   },
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.unicode1": {
-      "type": "input",
-      "clearable": true
+      "clearable": true,
+      "type": "input"
     },
     "null": [
       {

tests/dict/data/unicode2.json

@@ -16,11 +16,29 @@
     }
   },
   "model": {},
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.unicode1": {
+      "clearable": true,
       "type": "input"
     },
     "options.unicode2": {
+      "clearable": true,
       "type": "input"
     },
     "null": [

tests/dict/data/unicode2_copy.json

@@ -16,16 +16,33 @@
     }
   },
   "model": {},
+  "global": {
+    "owner": "user",
+    "properties": [
+      "cache",
+      "demoting_error_warning",
+      "disabled",
+      "force_store_value",
+      "frozen",
+      "hidden",
+      "validator",
+      "warnings"
+    ],
+    "permissives": [
+      "hidden"
+    ]
+  },
   "form": {
     "options.unicode1": {
+      "clearable": true,
       "type": "input",
       "copy": [
         "options.unicode2"
       ]
     },
     "options.unicode2": {
-      "type": "input",
-      "clearable": true
+      "clearable": true,
+      "type": "input"
     },
     "null": [
       {