kvx 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cadaf1215b2da0fd1ad43738ace4067eaaa34854163d46d2813cdbaed2c12b81
-  data.tar.gz: c12db9591acdec03bef9453eb28c02a476c732f2bf19e7dfe0c6f37f392ddd78
+  metadata.gz: 9ddaef947e49b210dbee31fcf56ec84e3644681c6a790c9ec80cb9fe314cd9d8
+  data.tar.gz: 56fae3981651c158701eb34023477125fbe7dd0ee8421d49d0e15174f550aae4
 SHA512:
-  metadata.gz: 0b9d0408cd7218d7191ea7b709df8806b29c8ca3a4d7fd5858111089b57154eb3b030cc3eab3ccd145aedd50493bf1349be1fb10ace2a0986761e976929334a7
-  data.tar.gz: 3d203c56ac70d4f8c50fd51fd115922782fa50f64a6be2d11453f74aa8818c373e36ecbfa84662b8831969537b7bc1fe99e161b9339e071132f99327108b29a7
+  metadata.gz: fd452778a00be2a43d078b61ffdbb2616c1b631a0a1806c6027453c739b755ac90c7cd7e804ee6fe0839dae01d083d02abbffb7900e54fa6b7ba6159abee3248
+  data.tar.gz: 27c99e9368bc2dfd7cd49527eed157a31a9e2a2bd3d8caaf357fb12c1c5ccf898dc8913a963fdb2594eacf660054403302bc9425b54dfc46e06b588565ed9dd7

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,9 +326,27 @@ 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 ('inside scan_to_h').info if @debug
-    raw_a = LineTree.new(txt.gsub(/(^-*$)|(^ *#.*)/,'').strip, 
+    raw_a = LineTree.new(lines.join.gsub(/(^-*$)|(^ *#.*)/,'').strip, 
                          ignore_blank_lines: @ignore_blank_lines).to_a
     puts ('raw_a: ' + raw_a.inspect).debug if @debug
     
@@ -333,12 +354,17 @@ class Kvx
     #   label, they will be fixed using the following statement
     
     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
         r << y.last[-1]
       end
+      
       r
+      
     end
 
     @body = a.inject({}) do |r, line|
@@ -348,7 +374,7 @@ class Kvx
       
       if line.join.length > 0 then 
 
-        r2 = if line[0][0][/^[^:]+: /] then
+        r2 = if line[0][0][/^[^:]+:/] then
 
           padding = line[0].length < 2 ? "\n" : "\n  "
           
@@ -378,7 +404,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.6
 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-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: line-tree
@@ -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.0.3
 signing_key: 
 specification_version: 4
 summary: Kvx (Keys, Values, and XML) makes it convenient to store and retrieve the