rowx 0.5.3 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2cebc3a1e2f709f929e4ce360b246f963026577a
-  data.tar.gz: a53a1527e32a11c97a724ddd2a1f00fcf2d728d0
+SHA256:
+  metadata.gz: 74037593b0b1eaf8f492f145e001f7f753742f4f424aabb0410642aab03875d5
+  data.tar.gz: d38b57838c540f38db32f247ea2ef4e48a89763f84e8b22615cedddbda3fb134
 SHA512:
-  metadata.gz: 0ba99a0d6234cf7071c8d4ffac46aff5a8ab778fbb059d16c7b706ab164c099af16470c6c5fcdb3568e028b2963804037e23377d301f1dcfb16f379387ec7f6e
-  data.tar.gz: c116ab24ed52844d89d8d46a7f90626d2bfb3c5b1644ac373ac6298baf60207554d12fef6b4b7ae77924c96475b739c6e57c5f2e28fb87b07ef3cd90cca38e00
+  metadata.gz: 551c5e87c50b589c64b695b864b728f458a88b36c176b0684f0807061a25de0397af42c8ef34f29d9f4bf8ab868589aea35bf1e90d483f195d4ebc16ad9f9958
+  data.tar.gz: beb033c4d8c7d3d37f2785890963057c57d3f6d550299d50dc62b24e9fdbc3c8410c96d60389da1c01819bd20ad8ec6fa3b59857ba8d53665e74c7aa51cba2da

data/lib/rowx.rb

@@ -5,6 +5,9 @@
 require 'line-tree'
 
 
+class RowXException < Exception
+end
+
 # for an example of ArrayCollate 
 # see http://www.jamesrobertson.eu/snippets/2014/jun/08/collating-items-in-an-array.html
 
@@ -28,10 +31,14 @@ end
 class RowX
   
   using ArrayCollate
+  using ColouredText  
 
   attr_reader :to_a, :to_xml, :to_lines
 
-  def initialize(txt, level: nil)
+  def initialize(txt, level: nil, ignore_blank_lines: false, 
+                 abort_1_row: false, debug: false, name: 'item')
+     
+    @name, @debug = name, debug
     
     # auto indent any multiline values   
     
@@ -39,17 +46,20 @@ class RowX
 
     lines = txt.gsub(/^-+$/m,'').lines.map do |line|
 
-      if not line[/^\s*\w+:|^\s+/] then
+      if not line[/^ *\w+:|^ +/] then
         indent + '  ' + line
       else
-        indent = line[/^\s+/] || ''
+        indent = line[/^ +/] || ''
         line
       end
 
     end
+    
+    puts 'lines: ' + lines.inspect if @debug
 
-    a = LineTree.new(lines.join, level: level, ignore_blank_lines: false).to_a
-
+    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
 
@@ -65,11 +75,14 @@ class RowX
 
     keyfield = a[0][0][/\w+/] if i == a.length - 1
 
-    i = 0 if a.flatten(1).grep(/^#{keyfield}/).length == 1 # only 1 record
+    if a.flatten(1).grep(/^#{keyfield}/).length == 1 then # only 1 record
+      i = 0 
+      raise RowXException, 'Expected more than 1 row' if abort_1_row
+    end
+
     records = a[i..-1].collate { |x| x.first =~ /^#{keyfield  }/ }
 
     summary = scan_a a.slice!(0,i)
-
     summary[0] = 'summary'
     
     @rexle_a = scan_records(records, level)
@@ -93,7 +106,7 @@ class RowX
 
       return if s.empty?
 
-      found = s.match(/^(\w+):\s*(.*)/m)      
+      found = s.match(/^(\w+):\s+(.*)/m)      
 
       value, name = found ? found.captures.reverse : s      
       name ||= 'description'
@@ -112,7 +125,7 @@ class RowX
       result
     end
 
-    ['item', {}, '' ]  + a
+    [@name, {}, '' ]  + a
   end
 
   def scan_records(rows, level)
@@ -121,4 +134,4 @@ class RowX
 
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rowx
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.7.1
 platform: ruby
 authors:
 - James Robertson
@@ -10,28 +10,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
-  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE3MDEwODE3MTM0MloXDTE4MDEwODE3MTM0MlowSDESMBAG
-  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
-  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAOVxinGj0hGcz+aRrzfEAWWVV94OJrhxzgqNoaqLkmdMp7O4oS/taHFNF4h3
-  m8cyuKxdXQvksf/1VcR5oyWAnNKzB6LPrSyAB9nr/b6+6iOCaJ/PlyDZnxHZioTl
-  Ea+43PE1FR28l+Z0q9YOW85xN4XnC+QwhwG/F9g47IFU5lXb0AtJekMKfyfT5ykP
-  Zs1gVSOm8hHuUpXnBQRh8mCATOzAZshqUKGDDi3CuS9kJaCbszKxvU72RWeh+3sL
-  FDFsP0fBIndSWvu/2xoiY8PjqtKWxcLZYsnhZ5S1XTPB0vXwaZdUnWQHOakQwEhC
-  yMskyxOo5eS0qwfquKnfvmHDP28CAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQU1Oj49aEhbymRP7+ikY9Z3bFYTo8wJgYDVR0RBB8w
-  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAYwmQAjDh
-  LAJ+RbcNOsr0bvlpK10isoF+cmZ3SYvEHl54x+CKh9vHz42Cku08wdSOYZE1vmhS
-  V5PEgbPDtBwjX731M67U8C2ZCu8syL9nJVKeR5HsRpm5doRh0ujx3b0zBissbwA9
-  Z8f/z5ubhWmfbYWTIJ6thw5+sCqR+fPJS18Rw+nspc4a4VM912YNDeSnsMUsj5RF
-  iNZkrPcI6MB0FZPbCKZgRZR11NYPRP3WiWCB8lf1Sgm0I1wdsucvaFPwqDMZ2n8D
-  tTW+rjyuLX3NtJ5iyGmmz/CE0gX9kWF2/5wYZ/it0UG4W9z/7Rfdke4SD00FUWVB
-  VqXQja9F+5d+OA==
+  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: 2017-03-05 00:00:00.000000000 Z
+date: 2020-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: line-tree
@@ -39,21 +43,21 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.6
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.6
-description: Generates XML from rows of labelled text, nested text, and plain text
+        version: 0.9.1
+description: Generates XML from rows of labelled text, nested text,  and plain text
 email: james@jamesrobertson.eu
 executables: []
 extensions: []
@@ -79,8 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: rowx