xjson 0.0.2 → 0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d30069a7d02308be08e5f01c71698903baed37be4c3de6467974e7687f059717
-  data.tar.gz: afecc610ac0b4d48be974fc860f43a52f79b9c899f39ce434e4929661ac60b3e
+  metadata.gz: d9be96a65a6e811b28601eceade054a524d5c1e65f0d5afbe65186e29e3915aa
+  data.tar.gz: da2e88f23ded6359547730eb704855bd388c6bbd46d0cc4b6c6426de436ba68b
 SHA512:
-  metadata.gz: c28e41c8e1d538576b93488fd79e9e9458a61a07b0846fcd6e9bf2cee00b5bbc3fcb2a2455c392979c70c21bf929513344509b487da14be2e01bcec2d7fa699b
-  data.tar.gz: 145d79b07ca81a97aa7cbead7383691f4297f23df66224b3fdce10fec7cca41f1e0491567128c9a498c1b9e81f4ce1c5ac5141275d78ec02d44d1d48f71cbba2
+  metadata.gz: 5bdf536a5789d49d10c0647781e7bd4479c49d348fcbc0b456f16a6484706d8a7e21495c7083aa68af10b03d039675783d9d39f75530cd5c4fe25f2f1322f624
+  data.tar.gz: 2d20c7ce94ce6b301d6f10a3fce1b055f7ded592ba40efd0f4ea5c84fc5bab857002a66e93acd1ec2564e190542ce7fbd85718ff54b6b8ec4216fd41b002043b

data/CHANGELOG.rdoc

@@ -1,6 +1,3 @@
 = Version history
 
-[0.0.2] Documentation update.
-        Improved test coverage.
-
 [0.0.1] Initial version.

data/doc/Xjson/XjsonIncludeError.html

@@ -114,9 +114,9 @@
 </div>
 
       <div id="footer">
-  Generated on Sat Jul 10 11:09:29 2021 by
+  Generated on Thu Jul  8 19:56:40 2021 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.25 (ruby-2.7.3).
+  0.9.25 (ruby-2.7.2).
 </div>
 
     </div>

data/doc/Xjson/XjsonReferenceError.html

@@ -114,9 +114,9 @@
 </div>
 
       <div id="footer">
-  Generated on Sat Jul 10 11:09:29 2021 by
+  Generated on Thu Jul  8 19:56:40 2021 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.25 (ruby-2.7.3).
+  0.9.25 (ruby-2.7.2).
 </div>
 
     </div>

data/doc/Xjson.html

@@ -134,7 +134,7 @@
         <dt id="VERSION-constant" class="">VERSION =
           
         </dt>
-        <dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>0.0.2</span><span class='tstring_end'>&quot;</span></span></pre></dd>
+        <dd><pre class="code"><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>0.0.1</span><span class='tstring_end'>&quot;</span></span></pre></dd>
       
     </dl>
   
@@ -315,9 +315,7 @@
   
 
   
-    <span class="summary_desc"><div class='inline'>
-<p>Dump JSON data as marshal.</p>
-</div></span>
+    <span class="summary_desc"><div class='inline'></div></span>
   
 </li>
 
@@ -501,9 +499,7 @@
   
 
   
-    <span class="summary_desc"><div class='inline'>
-<p>Read xjson file.</p>
-</div></span>
+    <span class="summary_desc"><div class='inline'></div></span>
   
 </li>
 
@@ -569,33 +565,7 @@
   
 
   
-    <span class="summary_desc"><div class='inline'>
-<p>Return JSON data as string.</p>
-</div></span>
-  
-</li>
-
-      
-        <li class="public ">
-  <span class="summary_signature">
-    
-      <a href="#write_json_file-instance_method" title="#write_json_file (instance method)">#<strong>write_json_file</strong>(json_file)  &#x21d2; Object </a>
-    
-
-    
-  </span>
-  
-  
-  
-  
-  
-  
-  
-
-  
-    <span class="summary_desc"><div class='inline'>
-<p>Write expanded json file.</p>
-</div></span>
+    <span class="summary_desc"><div class='inline'></div></span>
   
 </li>
 
@@ -871,29 +841,18 @@
   
 
   
-</h3><div class="docstring">
-  <div class="discussion">
-    
-<p>Dump JSON data as marshal.</p>
-
-
-  </div>
-</div>
-<div class="tags">
-  
-
-</div><table class="source_code">
+</h3><table class="source_code">
   <tr>
     <td>
       <pre class="lines">
 
 
-266
-267
-268</pre>
+264
+265
+266</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/xjson.rb', line 266</span>
+      <pre class="code"><span class="info file"># File 'lib/xjson.rb', line 264</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_dump'>dump</span><span class='lparen'>(</span> <span class='id identifier rubyid_filename'>filename</span> <span class='rparen'>)</span>
     <span class='const'>File</span><span class='period'>.</span><span class='id identifier rubyid_write'>write</span><span class='lparen'>(</span> <span class='id identifier rubyid_filename'>filename</span><span class='comma'>,</span> <span class='const'>Marshal</span><span class='period'>.</span><span class='id identifier rubyid_dump'>dump</span><span class='lparen'>(</span> <span class='ivar'>@data</span> <span class='rparen'>)</span> <span class='rparen'>)</span>
@@ -1165,19 +1124,19 @@
       <pre class="lines">
 
 
+57
+58
+59
+60
+61
+62
 63
 64
 65
-66
-67
-68
-69
-70
-71
-72</pre>
+66</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/xjson.rb', line 63</span>
+      <pre class="code"><span class="info file"># File 'lib/xjson.rb', line 57</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_find_in_array_of_hash'>find_in_array_of_hash</span><span class='lparen'>(</span> <span class='id identifier rubyid_scope'>scope</span><span class='comma'>,</span> <span class='id identifier rubyid_key'>key</span><span class='comma'>,</span> <span class='id identifier rubyid_value'>value</span> <span class='rparen'>)</span>
     <span class='id identifier rubyid_index'>index</span> <span class='op'>=</span> <span class='int'>0</span>
@@ -1220,6 +1179,12 @@
       <pre class="lines">
 
 
+40
+41
+42
+43
+44
+45
 46
 47
 48
@@ -1229,16 +1194,10 @@
 52
 53
 54
-55
-56
-57
-58
-59
-60
-61</pre>
+55</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/xjson.rb', line 46</span>
+      <pre class="code"><span class="info file"># File 'lib/xjson.rb', line 40</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_flatten'>flatten</span><span class='lparen'>(</span> <span class='id identifier rubyid_data'>data</span> <span class='rparen'>)</span>
     <span class='kw'>case</span> <span class='id identifier rubyid_data'>data</span>
@@ -1384,34 +1343,23 @@
   
 
   
-</h3><div class="docstring">
-  <div class="discussion">
-    
-<p>Read xjson file.</p>
-
-
-  </div>
-</div>
-<div class="tags">
-  
-
-</div><table class="source_code">
+</h3><table class="source_code">
   <tr>
     <td>
       <pre class="lines">
 
 
+30
 31
 32
 33
 34
 35
 36
-37
-38</pre>
+37</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/xjson.rb', line 31</span>
+      <pre class="code"><span class="info file"># File 'lib/xjson.rb', line 30</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_read_json_file'>read_json_file</span><span class='lparen'>(</span> <span class='id identifier rubyid_xjson_file'>xjson_file</span> <span class='rparen'>)</span>
     <span class='ivar'>@cur_file</span><span class='period'>.</span><span class='id identifier rubyid_unshift'>unshift</span> <span class='id identifier rubyid_xjson_file'>xjson_file</span>
@@ -1441,6 +1389,11 @@
       <pre class="lines">
 
 
+108
+109
+110
+111
+112
 113
 114
 115
@@ -1454,7 +1407,7 @@
 123</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/xjson.rb', line 113</span>
+      <pre class="code"><span class="info file"># File 'lib/xjson.rb', line 108</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_reference'>reference</span><span class='lparen'>(</span> <span class='id identifier rubyid_data'>data</span><span class='comma'>,</span> <span class='id identifier rubyid_ref_desc'>ref_desc</span> <span class='rparen'>)</span>
     <span class='id identifier rubyid_path'>path</span><span class='comma'>,</span> <span class='id identifier rubyid_label'>label</span> <span class='op'>=</span> <span class='id identifier rubyid_reference_handle'>reference_handle</span><span class='lparen'>(</span> <span class='id identifier rubyid_data'>data</span><span class='comma'>,</span> <span class='id identifier rubyid_ref_desc'>ref_desc</span> <span class='rparen'>)</span>
@@ -1465,8 +1418,13 @@
         <span class='comment'># scope = scope[ path[0] ]
 </span>        <span class='id identifier rubyid_scope'>scope</span> <span class='op'>=</span> <span class='id identifier rubyid_path'>path</span><span class='lbracket'>[</span> <span class='id identifier rubyid_label'>label</span> <span class='rbracket'>]</span>
     <span class='kw'>end</span>
-    <span class='id identifier rubyid_scope'>scope</span>
-<span class='kw'>end</span></pre>
+    <span class='comment'># scope = path[ label ]
+</span>    <span class='comment'># if scope.class == String
+</span>        <span class='id identifier rubyid_scope'>scope</span>
+    <span class='comment'># else
+</span>    <span class='comment'>#     scope.to_s
+</span>    <span class='comment'># end
+</span><span class='kw'>end</span></pre>
     </td>
   </tr>
 </table>
@@ -1487,6 +1445,12 @@
       <pre class="lines">
 
 
+68
+69
+70
+71
+72
+73
 74
 75
 76
@@ -1519,19 +1483,15 @@
 103
 104
 105
-106
-107
-108
-109
-110
-111</pre>
+106</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/xjson.rb', line 74</span>
+      <pre class="code"><span class="info file"># File 'lib/xjson.rb', line 68</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_reference_handle'>reference_handle</span><span class='lparen'>(</span> <span class='id identifier rubyid_data'>data</span><span class='comma'>,</span> <span class='id identifier rubyid_ref_desc'>ref_desc</span> <span class='rparen'>)</span>
     <span class='kw'>if</span> <span class='id identifier rubyid_ref_desc'>ref_desc</span><span class='lbracket'>[</span><span class='int'>0</span><span class='rbracket'>]</span> <span class='op'>!=</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>:</span><span class='tstring_end'>&quot;</span></span>
-        <span class='id identifier rubyid_reference_handle'>reference_handle</span><span class='lparen'>(</span> <span class='id identifier rubyid_data'>data</span><span class='comma'>,</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>:</span><span class='embexpr_beg'>#{</span><span class='id identifier rubyid_ref_desc'>ref_desc</span><span class='embexpr_end'>}</span><span class='tstring_end'>&quot;</span></span> <span class='rparen'>)</span>
+        <span class='comment'># [ data, ref_desc ]
+</span>        <span class='id identifier rubyid_reference_handle'>reference_handle</span><span class='lparen'>(</span> <span class='id identifier rubyid_data'>data</span><span class='comma'>,</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>:</span><span class='embexpr_beg'>#{</span><span class='id identifier rubyid_ref_desc'>ref_desc</span><span class='embexpr_end'>}</span><span class='tstring_end'>&quot;</span></span> <span class='rparen'>)</span>
     <span class='kw'>else</span>
         <span class='comment'># Relative reference from root.
 </span>        <span class='id identifier rubyid_path'>path</span> <span class='op'>=</span> <span class='id identifier rubyid_ref_desc'>ref_desc</span><span class='period'>.</span><span class='id identifier rubyid_split'>split</span><span class='lparen'>(</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>:</span><span class='tstring_end'>&quot;</span></span> <span class='rparen'>)</span><span class='lbracket'>[</span><span class='int'>1</span><span class='op'>..</span><span class='op'>-</span><span class='int'>1</span><span class='rbracket'>]</span>
@@ -1581,29 +1541,18 @@
   
 
   
-</h3><div class="docstring">
-  <div class="discussion">
-    
-<p>Return JSON data as string.</p>
-
-
-  </div>
-</div>
-<div class="tags">
-  
-
-</div><table class="source_code">
+</h3><table class="source_code">
   <tr>
     <td>
       <pre class="lines">
 
 
+260
 261
-262
-263</pre>
+262</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/xjson.rb', line 261</span>
+      <pre class="code"><span class="info file"># File 'lib/xjson.rb', line 260</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_to_s'>to_s</span>
     <span class='const'>JSON</span><span class='period'>.</span><span class='id identifier rubyid_pretty_generate'>pretty_generate</span><span class='lparen'>(</span> <span class='ivar'>@data</span> <span class='rparen'>)</span>
@@ -1611,47 +1560,6 @@
     </td>
   </tr>
 </table>
-</div>
-    
-      <div class="method_details ">
-  <h3 class="signature " id="write_json_file-instance_method">
-  
-    #<strong>write_json_file</strong>(json_file)  &#x21d2; <tt>Object</tt> 
-  
-
-  
-
-  
-</h3><div class="docstring">
-  <div class="discussion">
-    
-<p>Write expanded json file.</p>
-
-
-  </div>
-</div>
-<div class="tags">
-  
-
-</div><table class="source_code">
-  <tr>
-    <td>
-      <pre class="lines">
-
-
-41
-42
-43</pre>
-    </td>
-    <td>
-      <pre class="code"><span class="info file"># File 'lib/xjson.rb', line 41</span>
-
-<span class='kw'>def</span> <span class='id identifier rubyid_write_json_file'>write_json_file</span><span class='lparen'>(</span> <span class='id identifier rubyid_json_file'>json_file</span> <span class='rparen'>)</span>
-    <span class='const'>File</span><span class='period'>.</span><span class='id identifier rubyid_write'>write</span><span class='lparen'>(</span> <span class='id identifier rubyid_json_file'>json_file</span><span class='comma'>,</span> <span class='const'>JSON</span><span class='period'>.</span><span class='id identifier rubyid_pretty_generate'>pretty_generate</span><span class='lparen'>(</span> <span class='ivar'>@data</span> <span class='rparen'>)</span> <span class='op'>+</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>\n</span><span class='tstring_end'>&quot;</span></span> <span class='rparen'>)</span>
-<span class='kw'>end</span></pre>
-    </td>
-  </tr>
-</table>
 </div>
     
   </div>
@@ -1659,9 +1567,9 @@
 </div>
 
       <div id="footer">
-  Generated on Sat Jul 10 11:09:29 2021 by
+  Generated on Thu Jul  8 19:56:40 2021 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.25 (ruby-2.7.3).
+  0.9.25 (ruby-2.7.2).
 </div>
 
     </div>

data/doc/_index.html

@@ -114,9 +114,9 @@
 </div>
 
       <div id="footer">
-  Generated on Sat Jul 10 11:09:29 2021 by
+  Generated on Thu Jul  8 19:56:40 2021 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.25 (ruby-2.7.3).
+  0.9.25 (ruby-2.7.2).
 </div>
 
     </div>

data/doc/file.CHANGELOG.html

@@ -59,19 +59,16 @@
 
       <div id="content"><div id='filecontents'>
 <h1 id="label-Version+history">Version history</h1>
-<dl class="rdoc-list label-list"><dt>0.0.2
-<dd>
-<p>Documentation update. Improved test coverage.</p>
-</dd><dt>0.0.1
+<dl class="rdoc-list label-list"><dt>0.0.1
 <dd>
 <p>Initial version.</p>
 </dd></dl>
 </div></div>
 
       <div id="footer">
-  Generated on Sat Jul 10 11:09:29 2021 by
+  Generated on Thu Jul  8 19:56:40 2021 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.25 (ruby-2.7.3).
+  0.9.25 (ruby-2.7.2).
 </div>
 
     </div>

data/doc/file.README.html

@@ -64,9 +64,9 @@
 </div></div>
 
       <div id="footer">
-  Generated on Sat Jul 10 11:09:29 2021 by
+  Generated on Thu Jul  8 19:56:40 2021 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.25 (ruby-2.7.3).
+  0.9.25 (ruby-2.7.2).
 </div>
 
     </div>

data/doc/index.html

@@ -64,9 +64,9 @@
 </div></div>
 
       <div id="footer">
-  Generated on Sat Jul 10 11:09:29 2021 by
+  Generated on Thu Jul  8 19:56:40 2021 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.25 (ruby-2.7.3).
+  0.9.25 (ruby-2.7.2).
 </div>
 
     </div>

data/doc/method_list.html

@@ -180,14 +180,6 @@
   </li>
   
 
-  <li class="even ">
-    <div class="item">
-      <span class='object_link'><a href="Xjson.html#write_json_file-instance_method" title="Xjson#write_json_file (method)">#write_json_file</a></span>
-      <small>Xjson</small>
-    </div>
-  </li>
-  
-
 
       </ul>
     </div>

data/doc/top-level-namespace.html

@@ -100,9 +100,9 @@
 </div>
 
       <div id="footer">
-  Generated on Sat Jul 10 11:09:29 2021 by
+  Generated on Thu Jul  8 19:56:40 2021 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.25 (ruby-2.7.3).
+  0.9.25 (ruby-2.7.2).
 </div>
 
     </div>

data/lib/xjson.rb

@@ -6,7 +6,7 @@ class Xjson
     class XjsonIncludeError < RuntimeError; end
     class XjsonReferenceError < RuntimeError; end
 
-    VERSION = "0.0.2"
+    VERSION = "0.0.1"
     def Xjson.version
         Xjson::VERSION
     end
@@ -27,7 +27,6 @@ class Xjson
         @data = expand( @ext_data )
     end
 
-    # Read xjson file.
     def read_json_file( xjson_file )
         @cur_file.unshift xjson_file
         if xjson_file[0] != "<"
@@ -37,11 +36,6 @@ class Xjson
         end
     end
 
-    # Write expanded json file.
-    def write_json_file( json_file )
-        File.write( json_file, JSON.pretty_generate( @data ) + "\n" )
-    end
-
     # Flatten by one level within array.
     def flatten( data )
         case data
@@ -73,6 +67,7 @@ class Xjson
 
     def reference_handle( data, ref_desc )
         if ref_desc[0] != ":"
+            # [ data, ref_desc ]
             reference_handle( data, ":#{ref_desc}" )
         else
             # Relative reference from root.
@@ -119,7 +114,12 @@ class Xjson
             # scope = scope[ path[0] ]
             scope = path[ label ]
         end
-        scope
+        # scope = path[ label ]
+        # if scope.class == String
+            scope
+        # else
+        #     scope.to_s
+        # end
     end
 
     def override_desc( data, exp )
@@ -257,12 +257,10 @@ class Xjson
         end
     end
 
-    # Return JSON data as string.
     def to_s
         JSON.pretty_generate( @data )
     end
 
-    # Dump JSON data as marshal.
     def dump( filename )
         File.write( filename, Marshal.dump( @data ) )
     end

data/test/golden/test.json

@@ -3,37 +3,53 @@
   "regressions": {
     "all": {
       "test": [
+        [
+          "t_run_1_2",
+          [
+            1234
+          ]
+        ],
+        [
+          "t_run_1_4",
+          [
+            1234
+          ]
+        ],
+        [
+          "t_run_2_1",
+          [
+            1234
+          ]
+        ],
+        [
+          "t_run_2_2",
+          [
+            1234
+          ]
+        ],
+        [
+          "t_run_7_1",
+          [
+            1234
+          ]
+        ],
         {
-          "name": "t_run_1_1",
-          "dir": "test_dir"
+          "foobar1": "test1"
         },
         {
-          "name": "t_run_1_2",
-          "dir": "test_dir-1_2"
-        },
-        {
-          "name": "t_run_1_3",
-          "dir": "test_dir"
-        },
-        {
-          "foobar1": "test1",
-          "dir": "test_dir"
-        },
-        {
-          "foobar2": "test2",
-          "dir": "test_dir"
+          "foobar2": "test2"
         }
       ]
     }
   },
   "foobar1": "test1",
   "foobar2": "test2",
-  "release": "210701",
+  "release": "201104",
   "minor": "3",
   "runroot": "prog-",
   "home": "FOOBAR",
   "dut_files": [
-    "/release/210701/src/main.c",
+    "/release/201104/src/main.c",
     [
       "YES: 3"
     ],
@@ -47,4 +63,4 @@
     }
   ],
   "eof": true
-}
+}

data/test/input/test.ext.json

@@ -5,10 +5,12 @@
 
         "all": {
             "test": [
-                { "name": "t_run_1_1" },
+                [ "t_run_1_2", [ 1234 ] ],
                 { "@null": false },
-                { "name": "t_run_1_2" },
-                { "name": "t_run_1_3" },
+                [ "t_run_1_4", [ 1234 ] ],
+                [ "t_run_2_1", [ 1234 ] ],
+                [ "t_run_2_2", [ 1234 ] ],
+                [ "t_run_7_1", [ 1234 ] ],
                 { "@include": "test/input/inc-arr.ext.json" }
             ]
         }
@@ -16,12 +18,11 @@
 
     "included-file": { "@include": "test/input/inc-hash.ext.json" },
 
-    "release"      : "210701",
-    "minor"        : "3",
-    "runroot"      : { "@join": [ "-", "prog", {"@self":":regressions:all:test:1:0"} ] },
-    "home"         : { "@env": "XJSON_FOOBAR" },
-    "test-dir"     : { "@base": [ ":regressions:all:test:*", [ "dir", "test_dir" ] ] },
-    "test-dir-1_2" : { "@over": [ ":regressions:all:test:*:name:t_run_1_2:dir", "test_dir-1_2" ] },
+    "release"     : "201104",
+    "minor"       : "3",
+    "runroot"     : { "@join": [ "-", "prog", {"@self":":regressions:all:test:1:0"} ] },
+    "home"        : { "@env": "XJSON_FOOBAR" },
+
 
     "dut_files": [
         { "@join": [ "/", "/release", {"@self":"release"}, "src/main.c" ] },

data/test/test_xjson.rb

@@ -15,7 +15,7 @@ class XjsonTest < Test::Unit::TestCase
         # Open file.
         json = Xjson.new( ifile )
         ofile = "test/result/test.json"
-        json.write_json_file( ofile )
+        File.write( ofile, JSON.pretty_generate( json.data ) )
 
         golden_data = File.read( "test/golden/test.json" )
         design_data = File.read( ofile )
@@ -28,3 +28,17 @@ class XjsonTest < Test::Unit::TestCase
     end
 
 end
+
+#require_relative '../lib/xjson.rb'
+#require 'fileutils'
+#FileUtils.mkdir_p( "test/result" )
+#
+#ifile = 'test/input/test.ext.json'
+#
+## Open file.
+#json = Xjson.new( ifile )
+#ofile = "test/result/test.json"
+#File.write( ofile, JSON.pretty_generate( json.data ) )
+#
+#golden_data = File.read( "test/golden/test.json" )
+#design_data = File.read( ofile )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xjson
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: '0.1'
 platform: ruby
 authors:
 - Tero Isannainen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-10 00:00:00.000000000 Z
+date: 2021-07-08 00:00:00.000000000 Z
 dependencies: []
 description: Xjson is extension to JSON format.
 email: tero.isannainen@gmail.com
@@ -40,7 +40,6 @@ files:
 - doc/method_list.html
 - doc/top-level-namespace.html
 - lib/xjson.rb
-- markdown/README.md
 - test/golden/test.json
 - test/input/inc-arr.ext.json
 - test/input/inc-hash.ext.json

data/markdown/README.md

@@ -1,130 +0,0 @@
-# Overview
-
-Xjson is an extension to JSON format. The Xjson library processes the
-extensions and outputs standard JSON.
-
-Xjson (as JSON format) is compatible with standard JSON, i.e. the
-syntax is the same and Xjson can be processed with JSON tools. The
-extensions are special Xjson keywords that have semantics which the
-Xjson processor manages.
-
-Xjson renders JSON databases more dynamic and easy to maintain. The
-same could be achieved with a separate pre-processor, but Xjson
-provides tighter integration to JSON. This means that JSON aware text
-editors can be utilized and the JSON file (with extensions) looks and
-feels like a "normal" JSON file.
-
-
-# Extensions
-
-The extensions provide dynamic behaviour and modularity support.
-
-* `@eval`: Evaluate "system"/"shell" command.
-
-* `@env`:  Reference an environment variable.
-
-* `@join`: Join pieces of strings with given separator.
-
-* `@flat`: Flatten the list by one level.
-
-* `@self`: Refer to existing key/value pair, i.e. support for variables.
-
-* `@over`: Overwrite existing value or create if not existing.
-
-* `@base`: Set base (default) value, if not existing.
-
-* `@null`: No operation.
-
-* `@include`: Expand another Xjson/JSON file inplace.
-
-
-Example:
-
-```
-    {
-        "opts": [
-            { "@eval": "/prj/sbin/list_opts" },
-            { "@join": [ " ",
-                         "-conf_file",
-                         { "@join": [ "/",
-                                      { "@self": "workdir" },
-                                      "unit/data.txt" ] }
-                       ]
-            }
-        ],
-        "sub-defs": { "@include": "submodule.json" }
-    }
-
-```
-
-Extensions are captured within a Hash with one key/value pair. The
-pair will be recursively processed, and hence the extensions can be
-nested.
-
-Value of "opts" is an array, and the extensions can be directly stored
-as array members.
-
-"sub-defs" gives a unique label (key) for the extension, and each key
-must be unique in JSON, or it will be silently overwritten and
-disappear.
-
-Hence depending on the context of the extension, it should be written
-either with or without the extension label.
-
-Extension arguments and results:
-
-```
-    @eval: <string>                           => <string>
-    @env:  <string>                           => <string>
-    @join: <separator>, <list-of-strings>     => <string>
-    @flat: <array-of-atoms-or-arrays>         => <array>
-    @self: <key-reference>                    => <value>
-    @over: <key-reference>, <value>           => -
-    @base: <key-reference>, <value>           => -
-    @null: false                              => -
-    @include: <filename-string>               => <hash>
-
-```
-
-# Key Reference
-
-Key Reference (KR) is used to refer the items in the database
-itself. It can be used with `@self`, `@over`, and `@base` extensions.
-
-Key Reference is a String, where ":" is used as hierarchy
-separator. The string should start with ":" to designate the root, but
-when if a pure top-entry reference is performed, then a plain key name
-is accepted (e.g. just "opts", and not ":opts").
-
-Key Reference is split into path selectors with the ":" character. The
-path selectors are used one by one. Typically the path selector is a
-key and the corresponding value is selected to be used for the next
-path selector.
-
-However, for arrays, the path selector can be an index. The index
-selects the Nth item in the array.
-
-In addition to selecting keys and indexed items, there is a wildcard
-selector. The "*" character is used as wildcard. Wildcard behaves
-differently depending on its location in the Key Reference string.
-
-If wildcard is the last part of the KR, then it must correspond to an
-array in the hierarchy. The wildcard thus means all the members in the
-array. Then array members must be Hash entries, if KR is used with
-`@over` or `@base`. The value in this case is array of two, where
-first entry is key for the Hash members and second entry is the
-assigned value.
-
-If wildcard is used in the middle of the KR, then the next two path
-selectors are used as key and value matching path, and finally the
-third path selector is key to a value. Wildcard must correspond to an
-array of Hash members, and the array member that matches the key and
-value, will be selected. In allows travelling through the array
-without knowing the array index of the desired member.
-
-Example:
-
-```
-    "base-name": { "@base": [ ":modules:*", [ "start", "starter" ] ] },
-    "over-name": { "@over": [ ":modules:*:name:main:stop", "stopper" ] },
-```