kvx 0.9.5 → 0.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cadaf1215b2da0fd1ad43738ace4067eaaa34854163d46d2813cdbaed2c12b81
-  data.tar.gz: c12db9591acdec03bef9453eb28c02a476c732f2bf19e7dfe0c6f37f392ddd78
+  metadata.gz: 109d12cb0e82c682e94c369c81726331070e2a7e57d6d88fea4c1701701c7c1e
+  data.tar.gz: f84bdb9a378f13abb834f6e7be36924812ad1028b7c6846c002c44f3e4b69ead
 SHA512:
-  metadata.gz: 0b9d0408cd7218d7191ea7b709df8806b29c8ca3a4d7fd5858111089b57154eb3b030cc3eab3ccd145aedd50493bf1349be1fb10ace2a0986761e976929334a7
-  data.tar.gz: 3d203c56ac70d4f8c50fd51fd115922782fa50f64a6be2d11453f74aa8818c373e36ecbfa84662b8831969537b7bc1fe99e161b9339e071132f99327108b29a7
+  metadata.gz: 5769d109589a3c4d5d65131ef45cc78a27d3e63c82029a86d60cb12adcd2be2ec5da7b0c5fde77646fee357072fad8c58934ac1d413d97e2c313905c3cd8c709
+  data.tar.gz: 56982a372339f230ea947a8ac0f2d0e0cd5e297c86b1cd4fd38aec1a0557e6a273bbe25e0cfc5c7cb959af73a56fcf972387ec595a73eae7327d49302bfaa19b

data/lib/kvx.rb

@@ -244,7 +244,10 @@ class Kvx
   def make_xml(h)
     
     puts 'inside make_xml: ' + h.inspect if @debug
-    RexleBuilder.new(h, debug: false).to_a[3..-1]
+    h2 = h.clone
+    h2.each {|key,value| value.delete :items if value.is_a?(Hash) }
+
+    RexleBuilder.new(h2, debug: false).to_a[3..-1]
   end
   
   def parse_string(s)
@@ -323,22 +326,48 @@ class Kvx
     
   
   def scan_to_h(txt)
+    
+    txt.gsub!(/^\w+:(?=$)/,'\0 ')
+    puts 'txt:'  + txt.inspect if @debug
+    
+    # auto indent any multiline values which aren't already indented
+    
+    indent = ''
+
+    lines = txt.gsub(/^-+$/m,'').lines.map do |line|
 
+      if not line[/^ *\w+:|^ +/] then
+        indent + '  ' + line
+      else
+        indent = line[/^ +/] || ''
+        line
+      end
+
+    end    
+    puts ('lines: ' + lines.inspect).debug if @debug
+    
     puts ('inside scan_to_h').info if @debug
-    raw_a = LineTree.new(txt.gsub(/(^-*$)|(^ *#.*)/,'').strip, 
+    raw_a = LineTree.new(lines.join.gsub(/(^-*$)|(?<=\S) +#.*/,'').strip, 
                          ignore_blank_lines: @ignore_blank_lines).to_a
     puts ('raw_a: ' + raw_a.inspect).debug if @debug
     
     # if there are any orphan lines which aren't nested underneath a 
     #   label, they will be fixed using the following statement
     
-    a = raw_a.chunk {|x| x[0][/^[^:]+:|.*/]}.inject([]) do |r,y|
+    a = raw_a.chunk {|x| x[0][/^[^:]+:/]}.inject([]) do |r,y|
+
+      
+      puts 'r: ' + r.inspect if @debug
+      
       if r.last and !y.first[/[^:]+:/] then
         r.last << y.last[-1]
       else
+        puts 'y: ' + y.inspect if @debug
         r << y.last[-1]
       end
+      
       r
+      
     end
 
     @body = a.inject({}) do |r, line|
@@ -346,13 +375,16 @@ class Kvx
       s = line.shift
       puts ('s: ' + s.inspect).debug if @debug
       
-      if line.join.length > 0 then 
-
-        r2 = if line[0][0][/^[^:]+: /] then
-
-          padding = line[0].length < 2 ? "\n" : "\n  "
+      if line.join.length > 0 then
+        
+        puts 'line: ' + line.inspect if @debug
+        
+        padding = line[0].length < 2 ? "\n" : "\n  "        
+        s10 = line.map{|x| x.join(padding)}.join("\n")
+        
+        r2 = if s10[/^ *\w+:[\n ]/] then
           
-          scan_to_h(line.map{|x| x.join(padding)}.join("\n"))
+          scan_to_h(s10)
           
         else
 
@@ -366,6 +398,7 @@ class Kvx
           end
           
           r3 = {description: txt2, items: h}
+          puts 'remaining: ' + remaining.inspect if @debug
 
           if remaining then
             r3.merge!(scan_to_h remaining + "\n ")
@@ -378,7 +411,7 @@ class Kvx
         
       else
         
-        value, name = s.split(': ',2).reverse
+        value, name = s.split(/: */,2).reverse
         name ||= 'description'          
         v = value =~ /^\{\s*\}$/ ? {} : value.to_s
         

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kvx
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.10
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   m/+jxdgFjKKGxeZqunu9cp5ca9wSjjtKh/VA/3xZtPwokCa7vCMB+ZxUP0jvd++u
   OTXy8k/zqddw/VfD/It1UUK4
   -----END CERTIFICATE-----
-date: 2021-05-18 00:00:00.000000000 Z
+date: 2021-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: line-tree
@@ -61,22 +61,22 @@ dependencies:
   name: rxfhelper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 description: 
 email: james@jamesrobertson.eu
 executables: []
@@ -103,8 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.10
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Kvx (Keys, Values, and XML) makes it convenient to store and retrieve the