rowx 0.6.1 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d6559de84d94fde4feb2822a5a105dec56fadb50
-  data.tar.gz: f2cb9d31779c117cd31531b87cc14155b04152cf
+SHA256:
+  metadata.gz: 117e67e111222ae3340f55869da655ee10e6e94f538cef074d70a977f58f522d
+  data.tar.gz: c89eb4d40e0df4f8aea3dbb7214979365f23fd9dfb146e8b961f391863d36c17
 SHA512:
-  metadata.gz: e5ae79e85b8563c27029fd29db84fde20eb93dda5c1afa3cd287e9a3605a4f90413beb1f64e8c19885a0dd800d3eb8d9999fc2a94b7f5a0fa190d570174a764b
-  data.tar.gz: 37203ff377d20ecfa77eab61b4e86585d2a2f1cf063f2cf258bd430400086df63a4f406d4196cdea9fc444ff0b4ea9ab35a7b718c9b9362290107c9b5a3f5832
+  metadata.gz: d4e1b9ee7c969e217846bc6d9a1e6c896659915e10ff2aaa631b3db1c28d14def8ed2e138ca1701b86fc8cd3246e9dc0b8c73647bf6f0263a9c4f176934022f5
+  data.tar.gz: f7ac382605f8662528d1e27b2936ac7530dec4e96ef852a51435e70dc48b1327fa064c4d9bd868436057d9deb3ca6edacaadfe53794ec1eac3d60310dbbfe318

data/lib/rowx.rb

@@ -31,13 +31,15 @@ end
 class RowX
   
   using ArrayCollate
+  using ColouredText  
 
   attr_reader :to_a, :to_xml, :to_lines
 
   def initialize(txt, level: nil, ignore_blank_lines: false, 
-                 abort_1_row: false, debug: true)
-    
-    @debug = debug
+                 abort_1_row: false, debug: false, name: 'item', 
+                 allow_lonely_keyfield: false)
+     
+    @name, @debug = name, debug
     
     # auto indent any multiline values   
     
@@ -58,20 +60,25 @@ class RowX
 
     a = LineTree.new(lines.join, level: level, 
                      ignore_blank_lines: ignore_blank_lines, debug: debug).to_a
-    puts 'a: ' + a.inspect if @debug
+    puts ('a: ' + a.inspect).debug if @debug
 
     keyfield = a[0][0][/\w+:/]; i = 0
+    puts ('keyfield: ' + keyfield.inspect).debug if @debug
 
-    # 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]
+    if not allow_lonely_keyfield then
       
-      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
@@ -100,12 +107,13 @@ class RowX
   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?
-
-      found = s.match(/^(\w+):\s*(.*)/m)      
+      puts 's: ' + s.inspect if @debug
+      found = s.match(/^(\w+)(?:\:$|\:\s+)(.*)/m)      
 
       value, name = found ? found.captures.reverse : s      
       name ||= 'description'
@@ -124,7 +132,7 @@ class RowX
       result
     end
 
-    ['item', {}, '' ]  + a
+    [@name, {}, '' ]  + a
   end
 
   def scan_records(rows, level)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rowx
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.4
 platform: ruby
 authors:
 - James Robertson
@@ -10,27 +10,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDXjCCAkagAwIBAgIBATANBgkqhkiG9w0BAQUFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTgwODAxMTk0NTAzWhcN
-  MTkwODAxMTk0NTAzWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDQZ1fv
-  UYGzw3Of4/QX27BNJ3jayY5CMqoR+UyYKFyfqVTmRxHFJ3g2npuJkqcLvSWGpQSB
-  dkbOuUZHb7wsxa/HRC3UoX9nNQ8V5GtoVkMLtyriBRbCQkx8n4ShbbB+Fh0sbO5r
-  +SbGABrrzQcMuiazmoAPqEp0MsUrK7OcVc3wDJCIw4Hx1TSU5AiFg5jaVcLdN5fo
-  OG/eS+c4qelHDJJ9YnHVNTtUNmRkdepoDfyaSbpdG8Lm4WIf5s7ifnA3KXRhppeg
-  Z4WTad5AFx/u2A5e8/gCuXuNItqM6K6XCAcsMDVdKWkEAIv8Ywl+hmBe5cH2vfBI
-  psJBpE9DeIlzhLxpAgMBAAGjgYowgYcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
-  HQYDVR0OBBYEFANcDiEA6+Q+A4X6HmY2LIdpcjxQMCYGA1UdEQQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTAmBgNVHRIEHzAdgRtnZW1tYXN0ZXJAamFt
-  ZXNyb2JlcnRzb24uZXUwDQYJKoZIhvcNAQEFBQADggEBAMQxDkQ6jxIqRtxwxdHH
-  /YYlw3idGHDtCYKWtHXa7rcQum878vbzLSYOX30n8XQnXWhR0z0gos09D9s5YqzH
-  hsPTHAwupPDaC9rv+M+5b2M1oqswuJtDRVF4wCi6OzJ9jvjnrUYzS9/oUD28HYrq
-  b+Qt8NAeuKThCfC0MprgdeahK2/FUBmTlGBv5i+kiFTn/iqtK+tfvWZ0ewwKDTPp
-  HJxqAvTNo5/ZGfOw9reqPsH0WWgbOJBXW5nNTgvRAGGq7qFNdUOpEzOGqp/lSquN
-  NVzuRR3ZpJv0oB5erN7dQnmpAOXibr8YefToNKbiZyALjt0Xij7mUEEG0xypyYrY
-  hR8=
+  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
+  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
   -----END CERTIFICATE-----
-date: 2018-08-01 00:00:00.000000000 Z
+date: 2020-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: line-tree
@@ -38,20 +43,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.10
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.10
+        version: 0.9.1
 description: Generates XML from rows of labelled text, nested text,  and plain text
 email: james@jamesrobertson.eu
 executables: []
@@ -78,8 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: rowx