kvx 0.9.2 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96cfc3e8b1006b34c301f6753f35be06d1488fbfc3233094269c0d6cf61560a6
-  data.tar.gz: d706f6a62e289443c0fc90a09a49ca29a2001de59e8f59420da4cd3cb345d3a0
+  metadata.gz: '03690b30a2cce31295d0d6eeffc8c142785ab25efb0bad30328a41121d0f1e28'
+  data.tar.gz: d16ee75eb0d6aec1641b9b1a544e459623195889860f579414f8b338151cdb08
 SHA512:
-  metadata.gz: da3953a0cbfbf07a8116eaa7365c8d0e0074c356d57e4f1c894f85c2eb6cbe6a218db580c1cf066ba15153eb193fe097c978e2d4f4cbe134fb7552052166831d
-  data.tar.gz: 9291206b7516b575363a4965fc1d3fa816e888f35a768c286162df1bebc5528aa0e9dd70659f436472424e73a51e30711317fd18faea435bb4c47626983afe08
+  metadata.gz: 0e5cfff4834e5f080f983608178807c0483db5073cb158cc64ccc1b95b05bd0dd2afe7d0e25dbcafb8648d08ea1b803c6f914e1907bc5f264a8c5510d05262b2
+  data.tar.gz: c8d3f742947f5dd4f10a54223ffb27b09c131d36ff443f2b2790120b16a570a9e253cf1677fd88f637158d0c3ee2f87d720530dd08655c17edb9f9854376cb05

data/lib/kvx.rb

@@ -36,7 +36,7 @@ class Kvx
 
   def initialize(x=nil, attributes: {}, debug: false)
 
-    @header = false
+    @header = attributes.any?
     @identifier = 'kvx'
     @summary = {}
     @ignore_blank_lines ||= false
@@ -76,12 +76,23 @@ class Kvx
     FileX.write filename, self.to_s
   end
   
-  def to_h()
+  # flattening is helpful when passing the Hash object to 
+  # RecordX as a new record
+  #
+  def to_h(flatten: false)
     
     if @summary.empty? then
+      
       deep_clone @body
+      
     else
-      {summary: deep_clone(@summary), body: deep_clone(@body)}
+      
+      if flatten then
+        @summary.merge @body
+      else
+        {summary: deep_clone(@summary), body: deep_clone(@body)}
+      end
+      
     end
     
   end
@@ -137,8 +148,12 @@ class Kvx
       header = '<?' + @identifier
       header += attr
       header += "?>\n"
-      header += scan_to_s @summary
-      header += "\n----------------------------------\n\n"
+      
+      if @summary and @summary.any? then
+        header += scan_to_s @summary
+        header += "\n----------------------------------\n\n"
+      end
+      
     end
 
     # -- use the nested description Hash object if there are multiple lines
@@ -146,8 +161,17 @@ class Kvx
     
     @body.each do |key, value|
             
-      h[key] = value.is_a?(String) ? value : \
+      h[key] = if value.is_a?(String) then
+      
+        if value.lines.length < 2 then
+          value 
+        else
+          "\n" + value.lines.map {|x| '  ' + x }.join          
+        end
+        
+      else
           "\n" + value[:description].lines.map {|x| '  ' + x }.join
+      end
       
     end    
     
@@ -161,6 +185,13 @@ class Kvx
     doc.xml(options)
 
   end
+  
+  # used by RecordX to update a KVX record
+  # id is unnecssary because there is only 1 record mapped to RecordX
+  #
+  def update(id=nil, hpair={})
+    @body.merge! hpair
+  end
 
   private
   
@@ -213,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)
@@ -261,7 +295,7 @@ class Kvx
       @attributes.merge! attr
       @header = true
       body, summary = a.join.strip.split(/^----*$/).reverse      
-      @summary = scan_to_h summary
+      @summary = scan_to_h summary if summary
       
       body
     else
@@ -292,22 +326,46 @@ 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, 
-                                              ignore_blank_lines: @ignore_blank_lines).to_a
+    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
     
     # 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|
@@ -315,13 +373,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
 
@@ -347,7 +408,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.2
+  version: 0.9.7
 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-02-20 00:00:00.000000000 Z
+date: 2021-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: line-tree