kvx 0.9.4 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c255b6ca87fbc7ec29656a2f7e33a4bf6770f33fbdeb17a9ec9743051055530f
-  data.tar.gz: baffbe4607834ba2ef49c78b21059b92d9e344d5c6fdd9d7a04252d2d0409d49
+  metadata.gz: 15f341e0536edd706c0b9fcaef3f72644aa71ddada69de76d4a79d223b9b5ec6
+  data.tar.gz: 7bd3ba8db13f0dfa1369d4694fc4ef5d6e7159b9494ef1cb7c792b6a2a1c9d0b
 SHA512:
-  metadata.gz: c03ade6587fa5c1475aac9badde784b5929766d60d59ea53d70ca698b9bbe973acfcf9f4173ab5c2056dba13acb102b7a5c2fba509897f504b10d299489032b5
-  data.tar.gz: c38a4f5f215403a51006cfd1004a8a7a5977e3a034c9d994445c58a48bbd8fa5c7976e60691309c0013a17781d64dfaeb12e802e9c820ad099450785da34f022
+  metadata.gz: a57d322f8186ea30dbe81b657192dee6729d6dce7026f8ca96fef38199dcff3bf7158c122aa9a8181759360b50d4813a5a62a5cdb81767e4f81566a0ae495f0f
+  data.tar.gz: 7058b1386cd2045b6871848c8ae140ebe498cc50e7c8c356a5f6d003f3e74d9334533d727ec595cfebfe769c673c4da5cd5fda555d89ae2147918b5777bbd53e

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,47 @@ 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[/^ *[^:]+:|^ +/] 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, 
-                                              ignore_blank_lines: @ignore_blank_lines).to_a
+    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 +374,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[/^[^:]+:[\n ]/] then
           
-          scan_to_h(line.map{|x| x.join(padding)}.join("\n"))
+          scan_to_h(s10)
           
         else
 
@@ -378,7 +409,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.4
+  version: 0.9.9
 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-05 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