rowx 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10d0489ab6c4aab281eec01a23b84e1e46460cef
-  data.tar.gz: 164afbc00effb8ea28fc0a31d5c46f4c6f926574
+  metadata.gz: 2cebc3a1e2f709f929e4ce360b246f963026577a
+  data.tar.gz: a53a1527e32a11c97a724ddd2a1f00fcf2d728d0
 SHA512:
-  metadata.gz: ce9ac34e3c09afe80905514ec7518ae9d6cd2b953eb19bb36bd4f4d32f82ea676ddf7bef85a5b23a7dc15618f66fe414e7fca5b0e601b376bb6a1520c66166d9
-  data.tar.gz: 1d17ac9f1a3c463b41b4a8808c880ddee97c0b0cff0835d71b536b10528332c2a5c4029f8459801609da9af59cac898950c464c1b2ded5c090e37815d8178678
+  metadata.gz: 0ba99a0d6234cf7071c8d4ffac46aff5a8ab778fbb059d16c7b706ab164c099af16470c6c5fcdb3568e028b2963804037e23377d301f1dcfb16f379387ec7f6e
+  data.tar.gz: c116ab24ed52844d89d8d46a7f90626d2bfb3c5b1644ac373ac6298baf60207554d12fef6b4b7ae77924c96475b739c6e57c5f2e28fb87b07ef3cd90cca38e00

data/lib/rowx.rb

@@ -37,19 +37,20 @@ class RowX
     
     indent = ''
 
-    lines = txt.gsub(/^-*$/m,'').lines.map do |line|
+    lines = txt.gsub(/^-+$/m,'').lines.map do |line|
 
-      if not line[/\s*\w+:/] then
+      if not line[/^\s*\w+:|^\s+/] then
         indent + '  ' + line
       else
         indent = line[/^\s+/] || ''
         line
       end
 
-    end    
-    
+    end
+
     a = LineTree.new(lines.join, level: level, ignore_blank_lines: false).to_a
-    
+
+
     keyfield = a[0][0][/\w+:/]; i = 0
 
     # find the keyfield. if there's only 1 keyfield in all of the rows it's 
@@ -66,6 +67,7 @@ class RowX
 
     i = 0 if a.flatten(1).grep(/^#{keyfield}/).length == 1 # only 1 record
     records = a[i..-1].collate { |x| x.first =~ /^#{keyfield  }/ }
+
     summary = scan_a a.slice!(0,i)
 
     summary[0] = 'summary'
@@ -90,8 +92,10 @@ class RowX
       s = field.is_a?(Array) ? field[0] : field
 
       return if s.empty?
-      
-      value, name = s.split(':',2).reverse
+
+      found = s.match(/^(\w+):\s*(.*)/m)      
+
+      value, name = found ? found.captures.reverse : s      
       name ||= 'description'
       
       children = scan_a(field[1..-1]) if field[-1] .is_a?(Array) 
@@ -111,10 +115,10 @@ class RowX
     ['item', {}, '' ]  + a
   end
 
-  def scan_records(row, level)
+  def scan_records(rows, level)
     
-    row.map {|x| scan_a x }
+    rows.map {|x| scan_a x }
 
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rowx
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   tTW+rjyuLX3NtJ5iyGmmz/CE0gX9kWF2/5wYZ/it0UG4W9z/7Rfdke4SD00FUWVB
   VqXQja9F+5d+OA==
   -----END CERTIFICATE-----
-date: 2017-03-04 00:00:00.000000000 Z
+date: 2017-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: line-tree