rowx 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74037593b0b1eaf8f492f145e001f7f753742f4f424aabb0410642aab03875d5
-  data.tar.gz: d38b57838c540f38db32f247ea2ef4e48a89763f84e8b22615cedddbda3fb134
+  metadata.gz: d5b5fb10f2dfdaa035102203287878692974d8e49d7eb58b3e2ca23ef3c48771
+  data.tar.gz: b01ecf96d3d126ac886af1bf9f66ec41244654740039ed8060aaa59c43f989bf
 SHA512:
-  metadata.gz: 551c5e87c50b589c64b695b864b728f458a88b36c176b0684f0807061a25de0397af42c8ef34f29d9f4bf8ab868589aea35bf1e90d483f195d4ebc16ad9f9958
-  data.tar.gz: beb033c4d8c7d3d37f2785890963057c57d3f6d550299d50dc62b24e9fdbc3c8410c96d60389da1c01819bd20ad8ec6fa3b59857ba8d53665e74c7aa51cba2da
+  metadata.gz: e1dd96cc15cf5efb1c43cb15f976f553fa6f1f5bd28fcc3e17d215c805be54a629abe99632735158f05521071fa12aeb1c5dfb49c095dbc4c38ad6c78c1990db
+  data.tar.gz: a28b1a65c3188502e5ee8395aabcc18de2f342d3558ff126a5ac2d2814b9b089e0f6498da914ee1989147d392cc4f65c39ec57df06fd865fba33ae25329e2c94

data/lib/rowx.rb

@@ -8,15 +8,15 @@ require 'line-tree'
 class RowXException < Exception
 end
 
-# for an example of ArrayCollate 
+# for an example of ArrayCollate
 # see http://www.jamesrobertson.eu/snippets/2014/jun/08/collating-items-in-an-array.html
 
 module ArrayCollate
   refine Array do
     def collate(pattern=nil)
       a = self.inject([[]]) do |r,x|
-        if block_given? then  
-          yield(x) ? r << [x] : r[-1] << x        
+        if block_given? then
+          yield(x) ? r << [x] : r[-1] << x
         else
           x =~ pattern ? r << [x] : r[-1] << x
         end # block
@@ -24,24 +24,25 @@ module ArrayCollate
       end
       a.shift if a.first.empty?
       a
-    end 
+    end
   end
 end
 
 class RowX
-  
+
   using ArrayCollate
-  using ColouredText  
+  using ColouredText
 
   attr_reader :to_a, :to_xml, :to_lines
 
-  def initialize(txt, level: nil, ignore_blank_lines: false, 
-                 abort_1_row: false, debug: false, name: 'item')
-     
+  def initialize(txt, level: nil, ignore_blank_lines: false,
+                 abort_1_row: false, debug: false, name: 'item',
+                 allow_lonely_keyfield: false)
+
     @name, @debug = name, debug
-    
-    # auto indent any multiline values   
-    
+
+    # auto indent any multiline values
+
     indent = ''
 
     lines = txt.gsub(/^-+$/m,'').lines.map do |line|
@@ -54,29 +55,34 @@ class RowX
       end
 
     end
-    
+
     puts 'lines: ' + lines.inspect if @debug
 
-    a = LineTree.new(lines.join, level: level, 
+    a = LineTree.new(lines.join, level: level,
                      ignore_blank_lines: ignore_blank_lines, debug: debug).to_a
     puts ('a: ' + a.inspect).debug if @debug
 
     keyfield = a[0][0][/\w+:/]; i = 0
+    puts ('keyfield: ' + keyfield.inspect).debug if @debug
+
+    if not allow_lonely_keyfield then
 
-    # find the keyfield. if there's only 1 keyfield in all of the rows it's 
-    # not a keyfield. Keep searching until all rows have been searched
-    while a.select {|x| x[0][/^#{keyfield}/]}.length <= 1 and \
-                                                      i < a.length and a[i+1]
-      
-      i += 1
-      keyfield = a[i][0][/\w+/]
+      # find the keyfield. if there's only 1 keyfield in all of the rows it's
+      # not a keyfield. Keep searching until all rows have been searched
+      while a.select {|x| x[0][/^#{keyfield}/]}.length <= 1 and \
+                                                        i < a.length and a[i+1]
+
+        i += 1
+        keyfield = a[i][0][/\w+/]
+
+      end
 
     end
 
     keyfield = a[0][0][/\w+/] if i == a.length - 1
 
     if a.flatten(1).grep(/^#{keyfield}/).length == 1 then # only 1 record
-      i = 0 
+      i = 0
       raise RowXException, 'Expected more than 1 row' if abort_1_row
     end
 
@@ -84,42 +90,43 @@ class RowX
 
     summary = scan_a a.slice!(0,i)
     summary[0] = 'summary'
-    
+
     @rexle_a = scan_records(records, level)
     @to_a = ['root', {}] + [summary] + @rexle_a
     @to_xml = Rexle.new(@to_a).xml pretty: true
 
   end
-  
+
   def to_lines(delimiter: ' # ')
     @rexle_a.map {|x| x[3..-1].map {|y| y[2]}.join(delimiter)}.join("\n").lines
   end
 
   private
-  
+
 
   def scan_a(row)
 
     a = row.map do |field|
 
+      puts 'field: ' + field.inspect if @debug
       s = field.is_a?(Array) ? field[0] : field
 
       return if s.empty?
+      puts 's: ' + s.inspect if @debug
+      found = s.match(/^(\w+)(?:\:$|\:\s*)(.*)/m)
 
-      found = s.match(/^(\w+):\s+(.*)/m)      
-
-      value, name = found ? found.captures.reverse : s      
+      value, name = found ? found.captures.reverse : s
       name ||= 'description'
-      
-      children = scan_a(field[1..-1]) if field[-1] .is_a?(Array) 
-      value = value.to_s.strip.gsub('<','&lt;').gsub('>','&gt;')      
+
+      children = scan_a(field[1..-1]) if field[-1] .is_a?(Array)
+      value = value.to_s.strip.gsub('<','&lt;').gsub('>','&gt;')
 
       # it's a line which has been commented out?
       if name[0] == '#' then
         value = name[1..-1] + ': ' + value
-        name = '!-' 
+        name = '!-'
       end
-        
+
       result = [name, {}, value]
       result << children if children
       result
@@ -129,7 +136,7 @@ class RowX
   end
 
   def scan_records(rows, level)
-    
+
     rows.map {|x| scan_a x }
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rowx
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - James Robertson
@@ -11,31 +11,31 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjAxMDAyMTcwMzA2WhcN
-  MjExMDAyMTcwMzA2WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCxdWYo
-  ZJh+h0r6SSXVW4Bn5epCBXzD5ponWVz4Z1njTRsB0b2gSge1JK3Z4XXMhaFqm5jR
-  8/5PUQNiZUNqklf6qY1vz9yF3UdktAZW2yFbFlh1TypMyx733Vr2v8c9RDYBraXb
-  WQEl2Ux2JhM9w0AOm6a0uTCiXhxj9KOJfa9b5FyvWkL9UXgUSb6oz+vOqFUKjv1M
-  FpKSUgaN2jfbggB7VeceH2xZ10MYLG6WwFp3rIEjMltwbBUsZqaZiHMFMujf8TKq
-  76eDWsSBJ+AmWccrfiwAlSTsJqPuz9HimBSQUAJJlqA3z44T5f+1EtZx+fzvD9m4
-  k/uSlOFK1U3U080yb4S7o5AhOErZWY/D0DupIv/IasgYtPSCQ92JihIjx4WSn3ID
-  iW4GIUjEyOL0PJBYA3yn4NjcVw2sBrduX1kdS/aewIjsBMRpifdSE448tX1bnAWb
-  vcb/8eW2FCuuTBTXCVegl5JbpXcqT1ekEIEQ/y9f5vo3ZQ7QZFq0cICL8jMCAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU769EL4hV
-  j15lovTy15PCT9yowcAwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjIwMjAxMjA1NTM4WhcN
+  MjMwMjAxMjA1NTM4WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDtNLN7
+  pZb3HdPluo1jqeNsq8eaVRqeRoLQLWjFVrVGq1h+jZlcyPs7SzcUw5dOtYq2cQkH
+  NbzuRkobm+ls5nlN2kKT8l0tLcR/fDbp3+Eb72DdV1KlXlI3lYGPtcXAv2UUTi4D
+  X0pEwM1Wg7pvQle8TbthXpvWRSUJ1sZz2369licKS+SV9PX2+7HctV2gny+D+XRi
+  0NflrTRqYKSkF45GzGnJq/Csm8mB0JY9S11Df/PzR+FvRiZCgSi1Whxzuq/dJfBg
+  EZxsgy2DW2uPBpbDctVZrYxc3pVcXOWiXLxhLBdF3+2Z/oyWeV2B3LBrZIerwQYL
+  wUZQGtj6DRUztX9PcAnwQVtF4MtXcB24BXQsdg9psMMyTfMV1nXXom8/WVGgFxdv
+  8PJaOhvH9mG26f42mG79tcxGkKF7S1QFM96btx74Rok5JEsADMMqXW3Dm+ea96KD
+  OJrHTmW6QakT4NMA/QQIBWNM9dChqBBv4PULphtgNdIHk+1KkmSplDqRUcsCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUx/xcU0TK
+  9bnACymtt/UEgTnEU8EwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAamu6TUzgQljUfB2b/5AQ4uSX9hLSuABIaaOCp7dC
-  6+50s7KPGO8OnFMg4dNh9owERjwy05ad5UditqQssYn4v3i7rAgGFMpajgV85fIu
-  Yk4HeZpwGT0Rh0puJX+lVcY4H+/0v/ilv6PQN1mnB+wdHp/wh4DcAbKoVntrVMKY
-  uSD00z/OGvu8Wt8cDoKKsvRx/M8+BA8Jh0d9rAbbD1wJxdO3dhr+xPe69rpzVQ0k
-  hHrQ2eQ6j5QceP2EbQAME42Sd+CIP8xT4HeAsUJWTqHGs0kiJvomHUTGe+JzBfke
-  CiKEYV1eq9T4rPX7hh9g+fvj66W5e/gJ6O+3fskNhzvP/lrnXPVs8ourOYI7Uoml
-  rP6fc4AahiTW5g9Yd93IIwivGQ1oRMfU15qn8AbxqV8hfbg8l8TqvJlh2vzyXZNb
-  800/1OqpheFJ2kxsgvkGfxh/3RV+ObACeZ/HSFCxStB23EvqS8umVWDkXA3qr3RB
-  yuZ4lODk6vzJbiDVh0MAHLnZ
+  BgkqhkiG9w0BAQsFAAOCAYEAK1wuYV0sR94i1wOFUaqfyPSvUf11WKHyhUTHtfQY
+  9FXtSJLAFFYo0m30ChHoJE8XMkNtS1Vc4dBm/z8njoAR0FSuE77Br4N5m9VZqiE1
+  8M0Mhd19q3vhnRs/5Jw1sR1Ct+F1FHPTZAF1SJfPepUnlbnR+sClQENs7R7GXEuu
+  KEdbSo9fKidw/ZSPpqb7RZ2ptfEAVsJkuF0Lf/bhpuLvxwdNvC2YpbQwLiEeOAbL
+  pKRxInKqWnabRZHVg59Oxvw6WRBzfS4lF793ut6w05JX7f+9X/4g5/NwKlHh7vbx
+  wusUvr5gPBCocxOnqPbKdOLOWGuHoVe6pKaUFFxVBj2R1dC/ErqNMdj0AxQoSgTi
+  aDvs3bDHPgW1IHO4PWdeXr8KBfTIr1n0qrZ1IF4rNeTiTf4Pqo7x8VrpvNN3sG6/
+  kfXR2KNu3kHN0g9PsBdrL79ctMBurBHn/ATYdhoOG4ebjY2ubJz5nR9sOONJUroJ
+  AB0aDh+E6dzxvdb+vmfSBHJb
   -----END CERTIFICATE-----
-date: 2020-10-02 00:00:00.000000000 Z
+date: 2022-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: line-tree
@@ -46,7 +46,7 @@ dependencies:
         version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.9.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -56,9 +56,9 @@ dependencies:
         version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.9.3
 description: Generates XML from rows of labelled text, nested text,  and plain text
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -83,7 +83,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: rowx