add minimal Gee.HashMap support

.berel.yml

@@ -4,7 +4,7 @@
 !v!Pluie.Berel.Meta meta :
   keys :
     software    : pluie-yaml; <https://git.pluie.org/pluie/lib-yaml>
-    version     : 0.56
+    version     : 0.60
     type        : library
     date        : 2018
     license     : GPLv3.0; <http://www.gnu.org/licenses/>
@@ -38,6 +38,7 @@
     - vala :
         dir         :
             - src
+            - samples
         extension   : 
             - .vala
             - .c

.gitignore

@@ -2,3 +2,7 @@ build/
 bin/
 doc/
 pluie-yaml-*.tar.gz
+.geany
+docfix*
+docsvg.tar.gz
+tag-generated.yml

README.md

@@ -45,15 +45,32 @@ sudo ninja install -C build
 ## Compilation
 
 ```
-valac  --pkg pluie-echo-0.2 --pkg pluie-yaml-0.4 main.vala
+valac --pkg glib-2.0 \
+--pkg gobject-2.0 \
+--pkg gmodule-2.0 \
+--pkg gio-2.0 \
+--pkg gee-0.8 \
+--pkg pluie-echo-0.2 \
+--pkg pluie-yaml-0.4 \
+main.vala
 ```
 
 You can use `./build.sh` to rebuild/install the **pluie-yaml** lib and compile samples files
 
+```
+# rebuild lib + build all samples
+./build.sh
+# rebuild lib + build only single sample (give sample file name without extension)
+./build.sh yaml-serialize
+# rebuild lib in local mode 
+# local mode avoid to rebuild when modifying yaml files in resources dir
+# must be in the root directory
+./build.sh yaml-serialize 1
+```
 
 ## Api / Documentation
 
-https://pluie.org/pluie-yaml-0.5/index.htm  
+https://pluie.org/pluie-yaml-0.6/index.htm  
 
 
 ## Docker
@@ -379,9 +396,9 @@ Once your class has this glue, you can deal with complex object and populate the
 directly from yaml files.
 
 for more details see :
-* `src/vala/Pluie/Yaml.Example.vala`
+* `src/vala/Pluie/Samples.YamlObject.vala`
-* `src/vala/Pluie/Yaml.ExampleChild.vala`
+* `src/vala/Pluie/Samples.YamlChild.vala`
-* `src/vala/Pluie/Yaml.ExampleStruct.vala`
+* `src/vala/Pluie/Samples.YamlStruct.vala`
 * `samples/yaml-tag.vala`
 
 code from samples/yaml-tag.vala :

build.sh

@@ -2,7 +2,7 @@
 #^# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # 
 #
 #  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
-#  @version     :    0.56
+#  @version     :    0.60
 #  @type        :    library
 #  @date        :    2018
 #  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>
@@ -30,7 +30,7 @@
 
 # --------------------------------------------------------
     DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-    lib="pluie-yaml-0.5"
+    lib="pluie-yaml-0.6"
 samples=" src/vala/Pluie/Samples.YamlObject.vala \
 src/vala/Pluie/Samples.YamlChild.vala \
 src/vala/Pluie/Samples.YamlStruct.vala "
@@ -65,6 +65,11 @@ function build.lib()
     cd "$DIR"
     build.title "$lib LIB BUILD"
     meson --prefix=/usr ./ build
+    if [ "$1" -eq 1 ]; then
+        meson configure -DLOCAL=true build
+    else 
+        meson configure -DLOCAL=false build
+    fi
     if [ "$UID" != "0" ]; then
         sudo ninja -v install -C build
     else
@@ -112,10 +117,10 @@ function build.main()
     if [ ! -z "$1" ]; then
         onefile="./samples/$1.vala"
     fi
-    build.lib
+    build.lib "$2"
     if [ $? -eq 0 ]; then
         build.samples $onefile
     fi
 }
 
-build.main "$1"
+build.main "$1" "${2:-0}"

meson.build

@@ -1,7 +1,7 @@
 #^# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # 
 #
 #  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
-#  @version     :    0.56
+#  @version     :    0.60
 #  @type        :    library
 #  @date        :    2018
 #  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>
@@ -27,7 +27,7 @@
 #
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #^#
 
-project('pluie-yaml', ['vala', 'c'], version:'0.5')
+project('pluie-yaml', ['vala', 'c'], version:'0.6')
 
 cc            = meson.get_compiler('c')
 version       = meson.project_version()
@@ -38,10 +38,14 @@ incdir        = join_paths(get_option('prefix'), get_option('includedir'), 'plui
 conf          = configuration_data()
 conf.set('VERSION'     , version)
 conf.set('INSTALL_PATH', bindir)
+if get_option('LOCAL')
+    conf.set('DATA_PATH'   , './resources')
+else
     conf.set('DATA_PATH'   , datadir)
+endif
 
 configure_file(
-  input: 'src/install.vala',
+  input: 'src/vala/install.vala.in',
   output: 'install.vala',
   configuration: conf
 )
@@ -49,6 +53,7 @@ configure_file(
 install_data([
         'resources/main.yml',
         'resources/tag.yml',
+        'resources/bug.yml',
         'resources/test.yml',
         'resources/test.json'
     ],
@@ -59,9 +64,12 @@ install_data('resources/config/subdir/test.yml', install_dir : join_paths(datadi
 
 subdir('src')
 
+add_global_arguments('-D DEBUG', language : 'valac')
+
+
 libpluie_yaml = library(
     'pluie-yaml-' + version, 
-    src_files + [ 'build/install.vala' ],
+    src_files,
     vala_header  : 'pluie_yaml.h',
     vala_vapi    : 'pluie-yaml-' +version+'.vapi',
     dependencies : [

meson_options.txt

@@ -0,0 +1 @@
+option('LOCAL', type : 'boolean', value : false)

resources/bug.yml

@@ -0,0 +1,82 @@
+%YAML 1.2
+%TAG !v! tag:pluie.org,2018:vala/
+---
+!v!Pluie.Berel.Meta meta :
+  !v!Gee.ArrayList keys :
+    - software    : berel; <https://git.pluie.org/pluie/berel>
+    - version     : 0.24
+    - type        : program
+    - date        : 2018
+    - license     : GPLv3.0; <http://www.gnu.org/licenses/>
+    - author      : a-Sansara; <[dev]at[pluie]dot[org]>
+    - copyright   : pluie.org; <http://www.pluie.org>
+
+  !v!Gee.ArrayList headers :
+    - !v!Pluie.Berel.HeaderDef sh :
+        file        :
+            - build.sh
+        startline   : 2 # to embed shebang before header tpl
+        sepline     :
+            motif       : "# "
+            repeat      : 40
+        comment     :
+            start       : "#^#"
+            end         : "#^#"
+            begin       : "#  "
+    - !v!Pluie.Berel.HeaderDef meson :
+        file        :
+            - meson.build
+            - src/meson.build
+        sepline     :
+            motif       : "# "
+            repeat      : 40
+        comment     :
+            start       : "#^#"
+            end         : "#^#"
+            begin       : "#  "
+    - !v!Pluie.Berel.HeaderDef vala :
+        dir         :
+            - src
+        extension   : 
+            - .vala
+        sepline     :
+            motif       : " *"
+            repeat      : 40
+        comment     :
+            start       : "/*^"
+            end         : "^*/"
+            begin       : " *  "
+
+  tpl : |
+    ^sepline^
+
+    ^keys^
+
+    ^sepline^
+
+    This file is part of ^software.name^.
+
+    ^software.name^ is free software (free as in speech) : you can redistribute it
+    and/or modify it under the terms of the GNU General Public License as
+    published by the Free Software Foundation, either version 3 of the License,
+    or (at your option) any later version.
+
+    ^software.name^ is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+    more details.
+
+    You should have received a copy of the GNU General Public License
+    along with ^software.name^.  If not, see <http://www.gnu.org/licenses/>.
+
+    ^sepline^
+
+  product:
+    - sku         : BL394D
+      quantity    : 5
+      description : Basketball
+      price       : 450.00
+    - sku         : BL394D
+      quantity    : 5
+      description : Basketball
+      price       : 450.00

resources/tag.yml

@@ -43,3 +43,35 @@
           tata : tatavalue4
           titi : 44
           tutu : 0
+    !v!Gee.HashMap type_gee_hmap :
+        - key : key1
+          !v!Pluie.Samples.YamlChild val :
+            toto : key1toto
+            tata : kay1tata
+            titi : 5
+            tutu : 0
+        - key : key2
+          val :
+            toto : key2toto
+            tata : kay2tata
+            titi : 46
+            tutu : 1
+    !v!Gee.HashMap type_gee_hmap2 :
+        - !v!Pluie.Samples.YamlStruct key :
+            red   : !v!uint8 214
+            green : !v!uint8 78
+            blue  : 153
+          !v!Pluie.Samples.YamlChild val :
+            toto : key1toto
+            tata : kay1tata
+            titi : 5
+            tutu : 0
+        - key :
+            red   : !v!uint8 82
+            green : !v!uint8 109
+            blue  : 35
+          val :
+            toto : key2toto
+            tata : kay2tata
+            titi : 46
+            tutu : 1

samples/json-loader.vala

@@ -1,3 +1,32 @@
+/*^* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
+ *  @version     :    0.60
+ *  @type        :    library
+ *  @date        :    2018
+ *  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>
+ *  @author      :    a-Sansara        <[dev]at[pluie]dot[org]>
+ *  @copyright   :    pluie.org        <http://www.pluie.org>
+ *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  This file is part of pluie-yaml.
+ *
+ *  pluie-yaml is free software (free as in speech) : you can redistribute it
+ *  and/or modify it under the terms of the GNU General Public License as
+ *  published by the Free Software Foundation, either version 3 of the License,
+ *  or (at your option) any later version.
+ *
+ *  pluie-yaml is distributed in the hope that it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ *  more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with pluie-yaml.  If not, see  <http://www.gnu.org/licenses/>.
+ *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *^*/
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  @software  : pluie-yaml  <https://git.pluie.org/pluie/lib-yaml>
@@ -40,7 +69,7 @@ int main (string[] args)
     var done     = false;
 
     of.title ("Pluie Yaml Library", Pluie.Yaml.VERSION, "a-sansara");
-    Pluie.Yaml.DEBUG = false;
+    Pluie.Yaml.DEBUG = true;
     var loader = new Yaml.Loader (path, true, true);
     if ((done = loader.done)) {
         var root = loader.get_nodes ();

samples/yaml-bug.vala

@@ -0,0 +1,85 @@
+/*^* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
+ *  @version     :    0.60
+ *  @type        :    library
+ *  @date        :    2018
+ *  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>
+ *  @author      :    a-Sansara        <[dev]at[pluie]dot[org]>
+ *  @copyright   :    pluie.org        <http://www.pluie.org>
+ *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  This file is part of pluie-yaml.
+ *
+ *  pluie-yaml is free software (free as in speech) : you can redistribute it
+ *  and/or modify it under the terms of the GNU General Public License as
+ *  published by the Free Software Foundation, either version 3 of the License,
+ *  or (at your option) any later version.
+ *
+ *  pluie-yaml is distributed in the hope that it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ *  more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with pluie-yaml.  If not, see  <http://www.gnu.org/licenses/>.
+ *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *^*/
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  @software  : pluie-yaml  <https://git.pluie.org/pluie/lib-yaml>
+ *  @version   : 0.5
+ *  @type      : library
+ *  @date      : 2018
+ *  @licence   : GPLv3.0     <http://www.gnu.org/licenses/>
+ *  @author    : a-Sansara   <[dev]at[pluie]dot[org]>
+ *  @copyright : pluie.org   <http://www.pluie.org/>
+ * 
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  This file is part of pluie-yaml.
+ *  
+ *  pluie-yaml is free software (free as in speech) : you can redistribute it
+ *  and/or modify it under the terms of the GNU General Public License as
+ *  published by the Free Software Foundation, either version 3 of the License,
+ *  or (at your option) any later version.
+ *  
+ *  pluie-yaml is distributed in the hope that it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ *  more details.
+ *  
+ *  You should have received a copy of the GNU General Public License
+ *  along with pluie-yaml.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ */
+
+
+using GLib;
+using Gee;
+using Pluie;
+
+int main (string[] args)
+{
+    Echo.init(false);
+
+    var path     = Yaml.DATA_PATH + "/bug.yml";
+    var done     = false;
+
+    of.title ("Pluie Yaml Library", Pluie.Yaml.VERSION, "a-sansara");
+    Pluie.Yaml.DEBUG = false;
+    Yaml.Loader.PACK_NESTED_ENTRIES = true;
+    var loader = new Yaml.Loader (path, true, true);
+    if ((done = loader.done)) {
+        var root = loader.get_nodes ();
+        done = root != null; 
+    }
+
+    of.rs (done);
+    of.echo ();
+    return (int) done;
+
+}

samples/yaml-config.vala

@@ -1,3 +1,32 @@
+/*^* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
+ *  @version     :    0.60
+ *  @type        :    library
+ *  @date        :    2018
+ *  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>
+ *  @author      :    a-Sansara        <[dev]at[pluie]dot[org]>
+ *  @copyright   :    pluie.org        <http://www.pluie.org>
+ *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  This file is part of pluie-yaml.
+ *
+ *  pluie-yaml is free software (free as in speech) : you can redistribute it
+ *  and/or modify it under the terms of the GNU General Public License as
+ *  published by the Free Software Foundation, either version 3 of the License,
+ *  or (at your option) any later version.
+ *
+ *  pluie-yaml is distributed in the hope that it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ *  more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with pluie-yaml.  If not, see  <http://www.gnu.org/licenses/>.
+ *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *^*/
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  @software  : pluie-yaml  <https://git.pluie.org/pluie/lib-yaml>

samples/yaml-dump.vala

@@ -1,3 +1,32 @@
+/*^* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
+ *  @version     :    0.60
+ *  @type        :    library
+ *  @date        :    2018
+ *  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>
+ *  @author      :    a-Sansara        <[dev]at[pluie]dot[org]>
+ *  @copyright   :    pluie.org        <http://www.pluie.org>
+ *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  This file is part of pluie-yaml.
+ *
+ *  pluie-yaml is free software (free as in speech) : you can redistribute it
+ *  and/or modify it under the terms of the GNU General Public License as
+ *  published by the Free Software Foundation, either version 3 of the License,
+ *  or (at your option) any later version.
+ *
+ *  pluie-yaml is distributed in the hope that it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ *  more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with pluie-yaml.  If not, see  <http://www.gnu.org/licenses/>.
+ *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *^*/
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  @software  : pluie-yaml  <https://git.pluie.org/pluie/lib-yaml>

samples/yaml-finder.vala

@@ -1,3 +1,32 @@
+/*^* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
+ *  @version     :    0.60
+ *  @type        :    library
+ *  @date        :    2018
+ *  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>
+ *  @author      :    a-Sansara        <[dev]at[pluie]dot[org]>
+ *  @copyright   :    pluie.org        <http://www.pluie.org>
+ *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  This file is part of pluie-yaml.
+ *
+ *  pluie-yaml is free software (free as in speech) : you can redistribute it
+ *  and/or modify it under the terms of the GNU General Public License as
+ *  published by the Free Software Foundation, either version 3 of the License,
+ *  or (at your option) any later version.
+ *
+ *  pluie-yaml is distributed in the hope that it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ *  more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with pluie-yaml.  If not, see  <http://www.gnu.org/licenses/>.
+ *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *^*/
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  @software  : pluie-yaml  <https://git.pluie.org/pluie/lib-yaml>

samples/yaml-imports.vala

@@ -1,3 +1,32 @@
+/*^* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
+ *  @version     :    0.60
+ *  @type        :    library
+ *  @date        :    2018
+ *  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>
+ *  @author      :    a-Sansara        <[dev]at[pluie]dot[org]>
+ *  @copyright   :    pluie.org        <http://www.pluie.org>
+ *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  This file is part of pluie-yaml.
+ *
+ *  pluie-yaml is free software (free as in speech) : you can redistribute it
+ *  and/or modify it under the terms of the GNU General Public License as
+ *  published by the Free Software Foundation, either version 3 of the License,
+ *  or (at your option) any later version.
+ *
+ *  pluie-yaml is distributed in the hope that it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ *  more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with pluie-yaml.  If not, see  <http://www.gnu.org/licenses/>.
+ *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *^*/
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  @software  : pluie-yaml  <https://git.pluie.org/pluie/lib-yaml>

samples/yaml-loader.vala

@@ -1,3 +1,32 @@
+/*^* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
+ *  @version     :    0.60
+ *  @type        :    library
+ *  @date        :    2018
+ *  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>
+ *  @author      :    a-Sansara        <[dev]at[pluie]dot[org]>
+ *  @copyright   :    pluie.org        <http://www.pluie.org>
+ *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  This file is part of pluie-yaml.
+ *
+ *  pluie-yaml is free software (free as in speech) : you can redistribute it
+ *  and/or modify it under the terms of the GNU General Public License as
+ *  published by the Free Software Foundation, either version 3 of the License,
+ *  or (at your option) any later version.
+ *
+ *  pluie-yaml is distributed in the hope that it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ *  more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with pluie-yaml.  If not, see  <http://www.gnu.org/licenses/>.
+ *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *^*/
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  @software  : pluie-yaml  <https://git.pluie.org/pluie/lib-yaml>

samples/yaml-node.vala

@@ -1,3 +1,32 @@
+/*^* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
+ *  @version     :    0.60
+ *  @type        :    library
+ *  @date        :    2018
+ *  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>
+ *  @author      :    a-Sansara        <[dev]at[pluie]dot[org]>
+ *  @copyright   :    pluie.org        <http://www.pluie.org>
+ *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  This file is part of pluie-yaml.
+ *
+ *  pluie-yaml is free software (free as in speech) : you can redistribute it
+ *  and/or modify it under the terms of the GNU General Public License as
+ *  published by the Free Software Foundation, either version 3 of the License,
+ *  or (at your option) any later version.
+ *
+ *  pluie-yaml is distributed in the hope that it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ *  more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with pluie-yaml.  If not, see  <http://www.gnu.org/licenses/>.
+ *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *^*/
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  @software  : pluie-yaml  <https://git.pluie.org/pluie/lib-yaml>

samples/yaml-serialize.vala

@@ -1,12 +1,12 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+/*^* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
- *  @version   : 0.5
+ *  @version     :    0.60
  *  @type        :    library
  *  @date        :    2018
- *  @licence   : GPLv3.0     <http://www.gnu.org/licenses/>
+ *  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>
  *  @author      :    a-Sansara        <[dev]at[pluie]dot[org]>
- *  @copyright : pluie.org   <http://www.pluie.org/>
+ *  @copyright   :    pluie.org        <http://www.pluie.org>
  *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
@@ -25,8 +25,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with pluie-yaml.  If not, see  <http://www.gnu.org/licenses/>.
  *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *^*/
- */
 
 using GLib;
 using Gee;
@@ -68,6 +67,31 @@ public void test_object(Samples.YamlObject obj)
             of.keyval("    tutu"     , "%s (bool)"   .printf(child.tutu.to_string ()));
             child.method_a ();
         }
+        if (obj.type_gee_hmap != null) {
+            of.keyval("type_gee_hmap", "(%s<%s, %s>)" .printf(obj.type_gee_hmap.get_type ().name (), obj.type_gee_hmap.key_type.name (), obj.type_gee_hmap.value_type.name ()));
+            foreach (var child in obj.type_gee_hmap.entries) {
+                of.echo("        == entry (%s) ==".printf(child.key));
+                of.keyval("    toto"     , "%s (string)" .printf(child.value.toto));
+                of.keyval("    tapa"     , "%s (string)" .printf(child.value.tata));
+                of.keyval("    titi"     , "%d (int)"    .printf(child.value.titi));
+                of.keyval("    tutu"     , "%s (bool)"   .printf(child.value.tutu.to_string ()));
+            }
+        }
+        if (obj.type_gee_hmap2 != null) {
+            of.keyval("type_gee_hmap", "(%s<%s, %s>)" .printf(obj.type_gee_hmap2.get_type ().name (), obj.type_gee_hmap2.key_type.name (), obj.type_gee_hmap2.value_type.name ()));
+            foreach (var child in obj.type_gee_hmap2.entries) {
+                of.echo("        == key ==");
+                of.keyval("    obj :"    , "%s" .printf(child.key.to_string ()));
+                of.echo("        == val (%s) ==".printf(child.value.get_type ( ).name ()));
+                of.keyval("    toto"     , "%s (string)" .printf(child.value.toto));
+                of.keyval("    tapa"     , "%s (string)" .printf(child.value.tata));
+                of.keyval("    titi"     , "%d (int)"    .printf(child.value.titi));
+                of.keyval("    tutu"     , "%s (bool)"   .printf(child.value.tutu.to_string ()));
+            }
+        }
+        else {
+            of.echo ("hmap2 null");
+        }
     }
 }
 

samples/yaml-tag.vala

@@ -1,3 +1,32 @@
+/*^* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
+ *  @version     :    0.60
+ *  @type        :    library
+ *  @date        :    2018
+ *  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>
+ *  @author      :    a-Sansara        <[dev]at[pluie]dot[org]>
+ *  @copyright   :    pluie.org        <http://www.pluie.org>
+ *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  This file is part of pluie-yaml.
+ *
+ *  pluie-yaml is free software (free as in speech) : you can redistribute it
+ *  and/or modify it under the terms of the GNU General Public License as
+ *  published by the Free Software Foundation, either version 3 of the License,
+ *  or (at your option) any later version.
+ *
+ *  pluie-yaml is distributed in the hope that it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ *  more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with pluie-yaml.  If not, see  <http://www.gnu.org/licenses/>.
+ *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *^*/
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  @software  : pluie-yaml  <https://git.pluie.org/pluie/lib-yaml>
@@ -100,6 +129,31 @@ int main (string[] args)
                     child.method_a ();
                 }
             }
+            if (o.type_gee_hmap != null) {
+                of.keyval("type_gee_hmap", "(%s<%s, %s>)" .printf(o.type_gee_hmap.get_type ().name (), o.type_gee_hmap.key_type.name (), o.type_gee_hmap.value_type.name ()));
+                foreach (var child in o.type_gee_hmap.entries) {
+                    of.echo("        == entry (%s) ==".printf(child.key));
+                    of.keyval("    toto"     , "%s (string)" .printf(child.value.toto));
+                    of.keyval("    tapa"     , "%s (string)" .printf(child.value.tata));
+                    of.keyval("    titi"     , "%d (int)"    .printf(child.value.titi));
+                    of.keyval("    tutu"     , "%s (bool)"   .printf(child.value.tutu.to_string ()));
+                }
+            }
+            if (o.type_gee_hmap2 != null) {
+                of.keyval("type_gee_hmap", "(%s<%s, %s>)" .printf(o.type_gee_hmap2.get_type ().name (), o.type_gee_hmap2.key_type.name (), o.type_gee_hmap2.value_type.name ()));
+                foreach (var child in o.type_gee_hmap2.entries) {
+                    of.echo("        == key ==");
+                    of.keyval("    obj :"    , "%s" .printf(child.key.to_string ()));
+                    of.echo("        == val (%s) ==".printf(child.value.get_type ( ).name ()));
+                    of.keyval("    toto"     , "%s (string)" .printf(child.value.toto));
+                    of.keyval("    tapa"     , "%s (string)" .printf(child.value.tata));
+                    of.keyval("    titi"     , "%d (int)"    .printf(child.value.titi));
+                    of.keyval("    tutu"     , "%s (bool)"   .printf(child.value.tutu.to_string ()));
+                }
+            }
+            else {
+                of.echo ("hmap2 null");
+            }
         }
     }
 

samples/yaml-test.vala

@@ -1,3 +1,32 @@
+/*^* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
+ *  @version     :    0.60
+ *  @type        :    library
+ *  @date        :    2018
+ *  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>
+ *  @author      :    a-Sansara        <[dev]at[pluie]dot[org]>
+ *  @copyright   :    pluie.org        <http://www.pluie.org>
+ *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  This file is part of pluie-yaml.
+ *
+ *  pluie-yaml is free software (free as in speech) : you can redistribute it
+ *  and/or modify it under the terms of the GNU General Public License as
+ *  published by the Free Software Foundation, either version 3 of the License,
+ *  or (at your option) any later version.
+ *
+ *  pluie-yaml is distributed in the hope that it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ *  more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with pluie-yaml.  If not, see  <http://www.gnu.org/licenses/>.
+ *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *^*/
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  @software  : pluie-yaml  <https://git.pluie.org/pluie/lib-yaml>

samples/yaml-tonode.vala

@@ -1,3 +1,32 @@
+/*^* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
+ *  @version     :    0.60
+ *  @type        :    library
+ *  @date        :    2018
+ *  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>
+ *  @author      :    a-Sansara        <[dev]at[pluie]dot[org]>
+ *  @copyright   :    pluie.org        <http://www.pluie.org>
+ *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  This file is part of pluie-yaml.
+ *
+ *  pluie-yaml is free software (free as in speech) : you can redistribute it
+ *  and/or modify it under the terms of the GNU General Public License as
+ *  published by the Free Software Foundation, either version 3 of the License,
+ *  or (at your option) any later version.
+ *
+ *  pluie-yaml is distributed in the hope that it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ *  more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with pluie-yaml.  If not, see  <http://www.gnu.org/licenses/>.
+ *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *^*/
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  @software  : pluie-yaml  <https://git.pluie.org/pluie/lib-yaml>
@@ -106,6 +135,7 @@ int main (string[] args)
     Pluie.Yaml.DEBUG = false;
     var config = new Yaml.Config (path, true);
     var root   = config.root_node ();
+    root.display_childs ();
     root.first ().display_childs ();
 
     of.action ("Yaml.Builder.from_node", root.first ().name);

samples/yaml-traversing.vala

@@ -1,3 +1,32 @@
+/*^* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
+ *  @version     :    0.60
+ *  @type        :    library
+ *  @date        :    2018
+ *  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>
+ *  @author      :    a-Sansara        <[dev]at[pluie]dot[org]>
+ *  @copyright   :    pluie.org        <http://www.pluie.org>
+ *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  This file is part of pluie-yaml.
+ *
+ *  pluie-yaml is free software (free as in speech) : you can redistribute it
+ *  and/or modify it under the terms of the GNU General Public License as
+ *  published by the Free Software Foundation, either version 3 of the License,
+ *  or (at your option) any later version.
+ *
+ *  pluie-yaml is distributed in the hope that it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ *  more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with pluie-yaml.  If not, see  <http://www.gnu.org/licenses/>.
+ *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *^*/
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  @software  : pluie-yaml  <https://git.pluie.org/pluie/lib-yaml>

src/c/yaml.c

@@ -1,7 +1,7 @@
 /*^* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
- *  @version     :    0.56
+ *  @version     :    0.60
  *  @type        :    library
  *  @date        :    2018
  *  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>

src/meson.build

@@ -1,7 +1,7 @@
 #^# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # 
 #
 #  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
-#  @version     :    0.56
+#  @version     :    0.60
 #  @type        :    library
 #  @date        :    2018
 #  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>
@@ -29,6 +29,7 @@
 
 src_files = [
     'src/c/yaml.c',
+    'build/install.vala',
     'src/vala/Pluie/Io.Reader.vala',
     'src/vala/Pluie/Io.InputChunkStream.vala',
     'src/vala/Pluie/Io.StreamLineMark.vala',

src/vala/Pluie/Io.InputChunkStream.vala

@@ -1,7 +1,7 @@
 /*^* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
- *  @version     :    0.56
+ *  @version     :    0.60
  *  @type        :    library
  *  @date        :    2018
  *  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>

src/vala/Pluie/Io.Reader.vala

@@ -1,7 +1,7 @@
 /*^* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
- *  @version     :    0.56
+ *  @version     :    0.60
  *  @type        :    library
  *  @date        :    2018
  *  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>

src/vala/Pluie/Io.StreamLineMark.vala

@@ -1,7 +1,7 @@
 /*^* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
- *  @version     :    0.56
+ *  @version     :    0.60
  *  @type        :    library
  *  @date        :    2018
  *  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>

src/vala/Pluie/Io.Writter.vala

@@ -1,7 +1,7 @@
 /*^* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
- *  @version     :    0.56
+ *  @version     :    0.60
  *  @type        :    library
  *  @date        :    2018
  *  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>

src/vala/Pluie/Samples.YamlChild.vala

@@ -1,7 +1,7 @@
 /*^* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
- *  @version     :    0.56
+ *  @version     :    0.60
  *  @type        :    library
  *  @date        :    2018
  *  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>

src/vala/Pluie/Samples.YamlObject.vala

@@ -1,7 +1,7 @@
 /*^* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
- *  @version     :    0.56
+ *  @version     :    0.60
  *  @type        :    library
  *  @date        :    2018
  *  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>
@@ -65,6 +65,8 @@ public class Pluie.Samples.YamlObject : Yaml.Object
     public Samples.YamlStruct                     type_struct         { get; set; }
     public Gee.ArrayList<double?>                 type_gee_al         { get; set; }
     public Gee.ArrayList<Samples.YamlChild>       type_gee_alobject   { get; set; }
+    public Gee.HashMap<string, Samples.YamlChild> type_gee_hmap       { get; set; }
+    public Gee.HashMap<YamlStruct?, Samples.YamlChild> type_gee_hmap2  { get; set; }
 
     /**
      *
@@ -75,7 +77,8 @@ public class Pluie.Samples.YamlObject : Yaml.Object
             typeof (Samples.YamlObject),
             typeof (Samples.YamlChild),
             typeof (Samples.YamlStruct),
-            typeof (Gee.ArrayList)
+            typeof (Gee.ArrayList),
+            typeof (Gee.HashMap)
         );
     }
 
@@ -86,6 +89,8 @@ public class Pluie.Samples.YamlObject : Yaml.Object
     {
         this.type_gee_al       = new Gee.ArrayList<double?> ();
         this.type_gee_alobject = new Gee.ArrayList<Samples.YamlChild> ();
+        this.type_gee_hmap     = new Gee.HashMap<string, Samples.YamlChild> ();
+        this.type_gee_hmap2    = new Gee.HashMap<Samples.YamlStruct?, Samples.YamlChild> ();
         Yaml.Register.add_namespace("Gee", "Pluie.Samples");
         Dbg.msg ("%s (%s) instantiated".printf (this.yaml_name, this.get_type().name ()), Log.LINE, Log.FILE);
     }
@@ -117,6 +122,24 @@ public class Pluie.Samples.YamlObject : Yaml.Object
                 }
             }
         }
+        else if (type == typeof (Gee.HashMap)) {
+            Yaml.Mapping? c;
+            foreach (var child in node) {
+                c = child as Yaml.Mapping;
+                switch (name) {
+                    case "type_gee_hmap":
+                        Value key = c.item ("key").val (typeof (string));
+                        var entry = (Samples.YamlChild) Yaml.Builder.from_node (c.item ("val"), typeof (Samples.YamlChild));
+                        this.type_gee_hmap.set((string) key, entry);
+                        break;
+                    case "type_gee_hmap2":
+                        var key   = Samples.YamlStruct.from_yaml_node (c.item ("key"));
+                        var entry = (Samples.YamlChild) Yaml.Builder.from_node (c.item ("val"), typeof (Samples.YamlChild));
+                        this.type_gee_hmap2.set(key, entry);
+                        break;
+                }
+            }
+        }
         else {
             var obj = Yaml.Builder.from_node(node, type);
              if (name == "type_object") {
@@ -147,9 +170,35 @@ public class Pluie.Samples.YamlObject : Yaml.Object
                 break;
             }
         }
+        else if (type == typeof (Gee.HashMap)) {
+            switch (name) {
+                case "type_gee_hmap" :
+                    Yaml.Object.objects_mapkstr_to_node (this.type_gee_hmap, name, parent);
+                break;
+                case "type_gee_hmap2" :
+                    this.hmap2_to_node (name, parent);
+                break;
+            }
+        }
         else {
             base.populate_to_node (name, type, parent);
         }
         return node;
     }
+
+    /**
+     *
+     */
+    public void hmap2_to_node (string name, Yaml.Node? parent = null)
+    {
+        of.echo (Log.METHOD);
+        var node = new Yaml.Sequence (parent, name);
+        node.tag = new Yaml.Tag (Yaml.Register.resolve_namespace_type(this.type_gee_hmap2.get_type ()), "v");
+        var i  = 0;
+        foreach (var child in this.type_gee_hmap2.entries) {
+            var entryNode = new Yaml.Mapping (node, "_%d".printf (i));
+            entryNode.add (child.key.to_yaml_node ("key"));
+            Yaml.Builder.to_node ((GLib.Object) child.value, entryNode, false, null, "val");
+        }
+    }
 }

src/vala/Pluie/Samples.YamlStruct.vala

@@ -1,7 +1,7 @@
 /*^* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
- *  @version     :    0.56
+ *  @version     :    0.60
  *  @type        :    library
  *  @date        :    2018
  *  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>

src/vala/Pluie/Yaml.AbstractChild.vala

@@ -1,7 +1,7 @@
 /*^* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
- *  @version     :    0.56
+ *  @version     :    0.60
  *  @type        :    library
  *  @date        :    2018
  *  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>

src/vala/Pluie/Yaml.AbstractNode.vala

@@ -1,7 +1,7 @@
 /*^* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
- *  @version     :    0.56
+ *  @version     :    0.60
  *  @type        :    library
  *  @date        :    2018
  *  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>

src/vala/Pluie/Yaml.Builder.vala

@@ -1,7 +1,7 @@
 /*^* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
- *  @version     :    0.56
+ *  @version     :    0.60
  *  @type        :    library
  *  @date        :    2018
  *  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>

src/vala/Pluie/Yaml.Collection.vala

@@ -1,7 +1,7 @@
 /*^* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
- *  @version     :    0.56
+ *  @version     :    0.60
  *  @type        :    library
  *  @date        :    2018
  *  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>

src/vala/Pluie/Yaml.Config.vala

@@ -1,7 +1,7 @@
 /*^* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
- *  @version     :    0.56
+ *  @version     :    0.60
  *  @type        :    library
  *  @date        :    2018
  *  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>

src/vala/Pluie/Yaml.Dumper.vala

@@ -1,7 +1,7 @@
 /*^* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
- *  @version     :    0.56
+ *  @version     :    0.60
  *  @type        :    library
  *  @date        :    2018
  *  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>

src/vala/Pluie/Yaml.Event.vala

@@ -1,7 +1,7 @@
 /*^* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
- *  @version     :    0.56
+ *  @version     :    0.60
  *  @type        :    library
  *  @date        :    2018
  *  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>

src/vala/Pluie/Yaml.Finder.vala

@@ -1,7 +1,7 @@
 /*^* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
- *  @version     :    0.56
+ *  @version     :    0.60
  *  @type        :    library
  *  @date        :    2018
  *  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>

src/vala/Pluie/Yaml.GeeBuilder.vala

@@ -1,7 +1,7 @@
 /*^* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
- *  @version     :    0.56
+ *  @version     :    0.60
  *  @type        :    library
  *  @date        :    2018
  *  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>

src/vala/Pluie/Yaml.Loader.vala

@@ -1,7 +1,7 @@
 /*^* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
- *  @version     :    0.56
+ *  @version     :    0.60
  *  @type        :    library
  *  @date        :    2018
  *  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>
@@ -36,11 +36,14 @@ using Pluie;
  */
 public class Pluie.Yaml.Loader
 {
+    /**
+     * Flag PACK_NESTED_ENTRIES
+     */
+    public static bool  PACK_NESTED_ENTRIES { public get; public set; default = false; }
     /**
      * Yaml.Scanner used to retriew yaml events
      */
     Yaml.Scanner        scanner            { public get; internal set; }
-
     /**
      * indicate if file has been sucessfully loaded
      */
@@ -84,7 +87,33 @@ public class Pluie.Yaml.Loader
      */
     public Yaml.Node? get_nodes ()
     {
-        return this.scanner.get_nodes ();
+        Yaml.Node? n = this.scanner.get_nodes ();
+        if (PACK_NESTED_ENTRIES) {
+            this.pack_entries (n);
+        }
+        return n;
+    }
+
+    /**
+     *
+     */
+    private void pack_entries (Yaml.Node? node = null)
+    {
+        bool restart = false;
+        if (node != null) {
+            if (node.ntype.is_sequence ()) {
+                foreach (var child in node) {
+                    if (child.ntype.is_mapping () && child.name[0] == '_' && child.count () == 1) {
+                        var sub = child.first ().clone_node ();
+                        node.replace_node (child, sub);
+                        restart = true;
+                        break;
+                    }
+                }
+                if (restart) pack_entries (node);
+            }
+            else foreach (var child in node) this.pack_entries (child);
+        }
     }
 
     /**

src/vala/Pluie/Yaml.Mapping.vala

@@ -1,7 +1,7 @@
 /*^* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
- *  @version     :    0.56
+ *  @version     :    0.60
  *  @type        :    library
  *  @date        :    2018
  *  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>

src/vala/Pluie/Yaml.Node.vala

@@ -1,7 +1,7 @@
 /*^* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
- *  @version     :    0.56
+ *  @version     :    0.60
  *  @type        :    library
  *  @date        :    2018
  *  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>
@@ -76,6 +76,8 @@ public class Pluie.Yaml.Node : Yaml.AbstractChild, Pluie.Yaml.Collection
         }
         catch (Yaml.AddNodeError e) {
             of.warn (e.message);
+            Yaml.dbg (this.to_string ());
+            this.display_childs ();
         }
         return done;
     }
@@ -261,6 +263,21 @@ public class Pluie.Yaml.Node : Yaml.AbstractChild, Pluie.Yaml.Collection
         return v;
     }
 
+    /**
+     *
+     */
+    public void replace_node (Yaml.Node child, Yaml.Node new_child)
+    {
+        int index = this.list.index_of (child);
+        if (index > -1) {
+            new_child.level = this.level + 1;
+            new_child.parent = this;
+            new_child.update_level ();
+            this.list.remove_at (index);
+            this.list.insert (index, new_child);
+        }
+    }
+
     /**
      * display childs
      * @param withTitle display a title before the childs node presentation
@@ -326,7 +343,7 @@ public class Pluie.Yaml.Node : Yaml.AbstractChild, Pluie.Yaml.Collection
                 )
                 : "",
             of.c (ECHO.OPTION).s ("]"),
-            withTag && this.ntype.is_root () ? (this as Yaml.Root).get_display_tag_directives () : ""
+            withTag && this.ntype.is_root () && (this as Yaml.Root) !=null ? (this as Yaml.Root).get_display_tag_directives () : ""
         );
     }
 }

src/vala/Pluie/Yaml.Object.vala

@@ -1,7 +1,7 @@
 /*^* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
- *  @version     :    0.56
+ *  @version     :    0.60
  *  @type        :    library
  *  @date        :    2018
  *  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>
@@ -127,18 +127,53 @@ public abstract class Pluie.Yaml.Object : GLib.Object
      */
     public static Yaml.Node? objects_collection_to_node (Gee.Collection list, string name, Yaml.Node? parent = null)
     {
-        of.echo (Log.METHOD);
         var node = new Yaml.Sequence (parent, name);
         node.tag = new Yaml.Tag (Yaml.Register.resolve_namespace_type(list.get_type ()), "v");
         var it = list.iterator ();
         var i  = 0;
         while (it.next ()) {
-            Yaml.Builder.to_node (
+            Yaml.Builder.to_node ((GLib.Object) it.get (), node, false, i++);
-                (GLib.Object) it.get (),
+        }
-                node, 
+        return node;
-                false,
+    }
-                i++
+
-            );
+    /**
+     * build an object Gee.HashMap<string, Yaml.Object> to a Yaml.Node
+     * @param map the gee hashmap to transform
+     * @param name name of map sequence node
+     * @param parent parent node of the map
+     * @return the resulting Yaml.Node
+     */
+    public static Yaml.Node? objects_mapkstr_to_node (Gee.HashMap map, string name, Yaml.Node? parent = null)
+    {
+        var node = new Yaml.Sequence (parent, name);
+        node.tag = new Yaml.Tag (Yaml.Register.resolve_namespace_type(map.get_type ()), "v");
+        var i  = 0;
+        foreach (var child in map.entries) {
+            var entryNode = new Yaml.Mapping (node, "_%d".printf (i++));
+            new Yaml.Mapping.with_scalar (entryNode, "key", (string) child.key);
+            Yaml.Builder.to_node ((GLib.Object) child.value, entryNode, false, null, "val");
+        }
+        return node;
+    }
+
+
+    /**
+     * build an object Gee.HashMap<string, Yaml.Object> to a Yaml.Node
+     * @param map the gee hashmap to transform
+     * @param name name of map sequence node
+     * @param parent parent node of the map
+     * @return the resulting Yaml.Node
+     */
+    public static Yaml.Node? objects_mapobjects_to_node (Gee.HashMap map, string name, Yaml.Node? parent = null)
+    {
+        var node = new Yaml.Sequence (parent, name);
+        node.tag = new Yaml.Tag (Yaml.Register.resolve_namespace_type(map.get_type ()), "v");
+        var i  = 0;
+        foreach (var child in map.entries) {
+            var entryNode = new Yaml.Mapping (node, "_%d".printf (i++));
+            Yaml.Builder.to_node ((GLib.Object) child.key, entryNode, false, null, "key");
+            Yaml.Builder.to_node ((GLib.Object) child.value, entryNode, false, null, "val");
         }
         return node;
     }

src/vala/Pluie/Yaml.Processor.vala

@@ -1,7 +1,7 @@
 /*^* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
- *  @version     :    0.56
+ *  @version     :    0.60
  *  @type        :    library
  *  @date        :    2018
  *  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>
@@ -46,6 +46,21 @@ public class Pluie.Yaml.Processor
      */
     bool                              change;
 
+    /**
+     * indicates if document start begin
+     */
+    bool                              begin;
+
+    /**
+     * indicates if new node is a sequence entry
+     */
+    bool                              isEntry;
+
+    /**
+     * indicates if new node is a sequence entry mapping
+     */
+    bool                              isEntryMapping;
+
     /**
      * indicates if begon a flow sequence
      */
@@ -174,7 +189,7 @@ public class Pluie.Yaml.Processor
         this.reset ();
         for (var has_next = this.iterator.next (); has_next; has_next = this.iterator.next ()) {
             this.event = this.iterator.get ();
-            Yaml.dbg ("    0>>>>> [EVENT event [%d] %s <<<<< %s".printf (this.indexEvt++, this.event.evtype.infos (), Log.METHOD));
+            Yaml.dbg ("    [[[ EVENT %d %s ]]]".printf (this.indexEvt++, this.event.evtype.infos ()));
             if (this.event.evtype.is_tag_directive ()) {
                 this.on_tag_directive ();
             }
@@ -182,29 +197,55 @@ public class Pluie.Yaml.Processor
                 this.on_error ();
                 break;
             }
-            if (this.event.evtype.is_mapping_end () || this.event.evtype.is_sequence_end ()) {
+            if (!this.begin) {
+                if (this.event.evtype.is_sequence_start () || this.event.evtype.is_mapping_start ()) {
+                    this.begin = true;
+                    continue;
+                }
+                else if (this.event.evtype.is_document_start ()) {
+                    this.begin = true;
+                    // to do
+                    this.event = this.next_event ();
+                    if (this.event.evtype.is_tag ()) {
+                        this.root.tag = new Yaml.Tag (this.event.data["suffix"], this.event.data["handle"].replace("!", ""));
+                        this.event = this.next_event ();
+                    }
+                    continue;
+                }
+            }
+            else {
+                if (this.event.evtype.is_anchor ()) {
+                    this.on_anchor ();
+                }
+                else if (this.event.evtype.is_alias ()) {
+                    this.on_alias ();
+                }
+                else if (this.event.evtype.is_mapping_end () || this.event.evtype.is_sequence_end ()) {
                     this.on_block_end ();
                     continue;
                 }
-            if (this.event.evtype.is_entry ()) {
+                else if (this.event.evtype.is_key () && (this.event = this.get_value_key_event ()) != null) {
-                this.on_entry ();
-            }
-            if (this.beginFlowSeq && this.event.evtype.is_scalar ()) {
-                if (!this.change) {
-                    this.on_scalar (true);
-                }
-                this.beginFlowSeq = false;
-            }
-            if (this.event.evtype.is_key () && (this.event = this.get_value_key_event ()) != null) {
                     this.on_key ();
                 }
-            if (this.event.evtype.is_value () && (this.event = this.get_value_event ()) != null) {
+                else  if (this.event.evtype.is_entry ()) {
-                this.on_value ();
+                    this.on_entry ();
-                this.add_anchor_if_needed ();
-                this.ckey = null;
                 }
+                else if (this.event.evtype.is_mapping_start ()) {
+                    this.create_mapping (this.isEntry);
+                }
+                else if (this.event.evtype.is_sequence_start ()) {
+                    this.on_sequence_start ();
+                }
+                else if (this.event.evtype.is_value ()) {
+                    continue;
+                }
+                else if (this.event.evtype.is_scalar ()) {
+                    this.on_scalar ();
+                }
+                this.add_anchor_if_needed ();
                 this.on_update ();
             }
+        }
         this.done = error_event == null && this.root != null;
         return done;
     }
@@ -227,6 +268,9 @@ public class Pluie.Yaml.Processor
         this.beginFlowSeq  = false;
         this.nextValueEvt  = null;
         this.indexEvt      = 0;
+        this.isEntry       = false;
+        this.begin         = false;
+        this.isEntryMapping = false;
     }
 
     /**
@@ -237,7 +281,20 @@ public class Pluie.Yaml.Processor
         Yaml.Event? evt = null;
         if (this.iterator.has_next () && this.iterator.next ()) {
             evt = this.iterator.get ();
-            Yaml.dbg ("    1>>>>> [EVENT event [%d] %s <<<<< %s".printf (this.indexEvt++, evt.evtype.infos (), Log.METHOD));
+            Yaml.dbg ("    >>>>> [EVENT event [%d] %s <<<<< %s".printf (this.indexEvt++, evt.evtype.infos (), Log.METHOD));
+        }
+        return evt;
+    }
+
+    /**
+     * retriew the next Yaml Event without use of iterator
+     */
+    private Yaml.Event? get_next_event ()
+    {
+        Yaml.Event? evt = null;
+        var i = this.indexEvt;
+        if (i < this.events.size) {
+            evt = this.events.get (i);
         }
         return evt;
     }
@@ -275,13 +332,15 @@ public class Pluie.Yaml.Processor
     private Yaml.Event? get_next_value_event ()
     {
         Yaml.Event? evt = null;
-        var i      = this.indexEvt+1;
+        var i      = this.indexEvt;
+        Yaml.dbg (" >>> %s from %d".printf (Log.METHOD, i));
         var search = true;
         while (search) {
             if (i < this.events.size) {
                 var e = this.events.get (i++);
                 if (e != null && e.evtype.is_value ()) {
                     evt = this.events.get (i);
+                    Yaml.dbg (" >>> %s > %d : %s".printf (Log.METHOD, i, evt.evtype.infos ()));
                     break;
                 }
             }
@@ -321,17 +380,6 @@ public class Pluie.Yaml.Processor
      */
     private void on_block_end ()
     {
-        Yaml.dbg (" ===== ON BLOCK END ===== ");
-        Yaml.dbg ("    - parent_node : %s (%s)".printf (this.parent_node.name, this.parent_node.ntype.infos ()));
-        Yaml.dbg ("    - prev_node : %s (%s - collection ? %s)".printf (this.prev_node.name, this.prev_node.ntype.infos (), this.prev_node.ntype.is_collection ().to_string ()));
-        bool suite = true;
-        if (this.prev_node.ntype.is_mapping () && this.prev_node.parent != null && this.prev_node.parent.ntype.is_sequence ()) {
-            if (!(this.prev_node.parent as Yaml.Sequence).close_block) {
-                (this.prev_node.parent as Yaml.Sequence).close_block = true;
-                suite = false;
-            }
-        }
-        if (suite) {
         if (this.prev_node.ntype.is_scalar () || (this.prev_node.ntype.is_single_pair () && this.prev_node.parent != null && this.prev_node.parent.ntype.is_mapping ())) {
             this.prev_node = this.prev_node.parent;
         }
@@ -340,22 +388,19 @@ public class Pluie.Yaml.Processor
             : this.root;
         this.prev_node = this.parent_node;
     }
-    }
 
     /**
      *
      */
     private void on_entry ()
     {
-        this.event = this.next_event();
+        this.isEntry = true;
-        Yaml.Event? e = null;
+        this.ckey = null;
-        // look up for sequence enrty nested block
+        var e = this.get_next_event ();
-        e = get_next_value_event ();
+        if (e!= null && e.evtype.is_mapping_start ()) {
-        if (this.event.evtype.is_mapping_start () && (e!= null && !e.evtype.is_mapping_start () && !e.evtype.is_scalar ())) {
+            this.isEntryMapping = true;
-            this.on_mapping_start (!e.evtype.is_scalar ());
+            this.create_mapping (true);
-        }
+            this.next_event ();
-        else if (this.event.evtype.is_scalar ()) {
-            this.on_scalar (true);
         }
     }
 
@@ -387,29 +432,9 @@ public class Pluie.Yaml.Processor
     private void on_key ()
     {
         this.on_tag (true);
-        this.ckey = this.event.data["data"];
-    }
-
-    /**
-     *
-     */
-    private void on_value ()
-    {
-        this.on_tag (false);
         if (this.event.evtype.is_scalar ()) {
-            this.on_scalar ();
+            this.ckey = this.event.data["data"];
-        }
+            Yaml.dbg (" >> node name : %s".printf (this.ckey));
-        else if (this.event.evtype.is_anchor ()) {
-            this.on_anchor ();
-        }
-        else if (this.event.evtype.is_alias ()) {
-            this.on_alias ();
-        }
-        if (this.event.evtype.is_mapping_start ()) {
-            this.on_mapping_start ();
-        }
-        else if (this.event.evtype.is_sequence_start ()) {
-            this.on_sequence_start ();
         }
     }
 
@@ -418,16 +443,13 @@ public class Pluie.Yaml.Processor
      */
     private void on_scalar (bool entry = false)
     {
-        if (!entry) {
+        if (this.ckey != null && this.parent_node.ntype.is_collection ()) {
-            if (this.ckey != null) {
             this.node = new Yaml.Mapping.with_scalar (this.parent_node, this.ckey, this.event.data["data"]);
-                this.change = true;
-            }
         }
         else {
             this.node = new Yaml.Scalar (this.parent_node, this.event.data["data"]);
-            this.change = true;
         }
+        this.change = true;
     }
 
     /**
@@ -435,8 +457,9 @@ public class Pluie.Yaml.Processor
      */
     private void on_anchor ()
     {
+        if (this.event.data != null) {
             this.idAnchor = this.event.data["id"];
-        this.event    = this.next_event ();
+        }
     }
 
     /**
@@ -444,6 +467,7 @@ public class Pluie.Yaml.Processor
      */
     private void on_alias ()
     {
+        if (this.event.data != null) {
             this.idAnchor      = this.event.data["id"];
             Yaml.Node? refnode = this.anchors.get(this.idAnchor);
             if (refnode != null) {
@@ -452,6 +476,7 @@ public class Pluie.Yaml.Processor
                 this.prev_node = this.node;
             }
         }
+    }
 
     /**
      *
@@ -460,7 +485,6 @@ public class Pluie.Yaml.Processor
     {
         this.node         = new Yaml.Sequence (this.parent_node, this.ckey);
         this.change       = true;
-        this.beginFlowSeq = true;
     }
 
     /**
@@ -468,11 +492,24 @@ public class Pluie.Yaml.Processor
      */
     private void on_mapping_start (bool entry = false)
     {
-        if (entry) {
-            this.create_mapping (entry);
         this.ckey  = null;
+        this.event = this.next_event ();
+        if (this.event.evtype.is_key ()) {
+            this.event = this.next_event ();
+            this.on_tag (true);
+            if (this.event.evtype.is_scalar ()) {
+                this.ckey = this.event.data["data"];
+            }
+            var e = this.get_next_value_event();
+            if (e!=null) {
+                if ( e.evtype.is_sequence_start ()) {
+                    this.on_sequence_start ();
+                }
+                else {
+                    this.create_mapping (this.isEntry);
+                }
+            }
         }
-        else this.create_mapping ();
     }
 
     /**
@@ -480,7 +517,7 @@ public class Pluie.Yaml.Processor
      */
     private void create_mapping (bool entry = false)
     {
-        if (entry) {
+        if (entry && this.ckey == null) {
             this.ckey = "_%d".printf(this.parent_node.count());
         }
         this.node   = new Yaml.Mapping (this.parent_node, this.ckey);
@@ -492,10 +529,8 @@ public class Pluie.Yaml.Processor
      */
     private void add_anchor_if_needed ()
     {
-        if (this.idAnchor != null) {
+        if (this.idAnchor != null && this.node != null) {
-            if (this.node != null) {
             this.anchors.set(this.idAnchor, this.node);
-            }
             this.idAnchor = null;
         }
     }
@@ -506,7 +541,10 @@ public class Pluie.Yaml.Processor
     private void on_update ()
     {
         if (this.node != null) {
+            Yaml.dbg (Log.METHOD);
             Yaml.dbg (this.node.name);
+            Yaml.dbg (this.node.ntype.infos ());
+            Yaml.dbg ("anchor ? %s".printf (this.idAnchor));
         }
         if (this.change) {
             if (this.node.parent.ntype.is_sequence ()) {
@@ -537,7 +575,10 @@ public class Pluie.Yaml.Processor
             this.keyTag    = null;
             this.valueTag  = null;
             this.node      = null;
+            this.isEntryMapping = false;
             this.change    = false;
+            this.isEntry   = false;
+            this.ckey      = null;
         }
     }
 

src/vala/Pluie/Yaml.Register.vala

@@ -1,7 +1,7 @@
 /*^* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
- *  @version     :    0.56
+ *  @version     :    0.60
  *  @type        :    library
  *  @date        :    2018
  *  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>

src/vala/Pluie/Yaml.Root.vala

@@ -1,7 +1,7 @@
 /*^* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
- *  @version     :    0.56
+ *  @version     :    0.60
  *  @type        :    library
  *  @date        :    2018
  *  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>

src/vala/Pluie/Yaml.Scalar.vala

@@ -1,7 +1,7 @@
 /*^* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
- *  @version     :    0.56
+ *  @version     :    0.60
  *  @type        :    library
  *  @date        :    2018
  *  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>

src/vala/Pluie/Yaml.Scanner.vala

@@ -1,7 +1,7 @@
 /*^* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
- *  @version     :    0.56
+ *  @version     :    0.60
  *  @type        :    library
  *  @date        :    2018
  *  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>

src/vala/Pluie/Yaml.Sequence.vala

@@ -1,7 +1,7 @@
 /*^* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
- *  @version     :    0.56
+ *  @version     :    0.60
  *  @type        :    library
  *  @date        :    2018
  *  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>

src/vala/Pluie/Yaml.Tag.vala

@@ -1,7 +1,7 @@
 /*^* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
- *  @version     :    0.56
+ *  @version     :    0.60
  *  @type        :    library
  *  @date        :    2018
  *  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>

src/vala/Pluie/Yaml.global.vala

@@ -1,7 +1,7 @@
 /*^* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
- *  @version     :    0.56
+ *  @version     :    0.60
  *  @type        :    library
  *  @date        :    2018
  *  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>
@@ -100,7 +100,9 @@ namespace Pluie.Yaml
     }
 
     /**
-     *
+     * serialize an object as a yaml compressed document data
+     * @param obj the object to serialize
+     * @param dest path destination if you want to write to a file
      */
     public static uint8[] serialize (GLib.Object? obj, string? dest = null)
     {
@@ -137,7 +139,8 @@ namespace Pluie.Yaml
     }
 
     /**
-     *
+     * deserialize yaml compressed document data to a Yaml.Object
+     * @param zdata the data to deserialized
      */
     public static Yaml.Root deserialize (uint8[] zdata)
     {
@@ -319,6 +322,22 @@ namespace Pluie.Yaml
             return this == EVT.NONE;
         }
 
+        /**
+          * @return event is document start event
+          */
+        public bool is_document_start ()
+        {
+            return this == EVT.DOCUMENT_START;
+        }
+
+        /**
+          * @return event is stream start event
+          */
+        public bool is_stream_start ()
+        {
+            return this == EVT.STREAM_START;
+        }
+
     }
 
     /**
@@ -420,7 +439,7 @@ namespace Pluie.Yaml
     }
 
     /**
-     *@return universal infos related to NODE_TYPE
+     *@return a universal unique identifier (type 4)
      */
     public string uuid ()
     {

valadoc.sh

@@ -2,7 +2,7 @@
 #^# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # 
 #
 #  @software    :    pluie-yaml       <https://git.pluie.org/pluie/lib-yaml>
-#  @version     :    0.56
+#  @version     :    0.60
 #  @type        :    library
 #  @date        :    2018
 #  @license     :    GPLv3.0          <http://www.gnu.org/licenses/>
@@ -29,13 +29,20 @@
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #^#
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-lib="pluie-yaml-0.5"
+lib="pluie-yaml-0.6"
 cd $DIR
-valadoc --package-name=$lib --verbose --force --deps -o ./doc --pkg gee-0.8 --pkg gio-2.0 --pkg gobject-2.0 --pkg gmodule-2.0 --pkg glib-2.0 --pkg pluie-echo-0.2 ./src/vala/Pluie/*.vala ./src/install.vala
+valadoc --package-name=$lib --verbose --force --deps -o ./doc --pkg gee-0.8 --pkg gio-2.0 --pkg gobject-2.0 --pkg gmodule-2.0 --pkg glib-2.0 --pkg pluie-echo-0.2 ./src/vala/Pluie/*.vala ./build/install.vala
 if [ $? -eq 0 ]; then
     rm doc/*.png
     cp resources/doc-scripts.js ./doc/scripts.js
     cp resources/doc-style.css ./doc/style.css
-    #~ rm $lib.tar.gz
+    if [ -f "./docfix" ]; then
-    #~ tar -czvf $lib.tar.gz doc/
+        ./docfix
+        if [ $? -eq 0 ]; then
+            rm $lib.tar.gz
+            tar -czvf $lib.tar.gz doc/
+            scp $lib.tar.gz pluie@pluie.org:/home/pluie/
+            ssh pluie@pluie.org "./updatedoc.sh $lib"
+        fi
+    fi
 fi