line-tree 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 925f930bf9cebe001d51faea47e660fd6307846e
-  data.tar.gz: f30c55cb1529c3b22f90a2fb57673560f662f06c
+  metadata.gz: e19c4df01c5cc1e49c1a2027e4fe25b33cd7c108
+  data.tar.gz: d5c3314fb2525afc9794513494cca8202fb667e8
 SHA512:
-  metadata.gz: e586079ce4d8e7dca1519e3091de50cfd76a9584fab55970f0c79483d71d5d5ff9f84d182efb4528a1b1d58adee8772ac9298448c0dba03ce2312f6cf7707bf7
-  data.tar.gz: 96698fabae4872f66f9277cf2ae7ac73cfab3be231ece7f413bc959b6a3081a0049995640330067f97e1c50667c9ffc0ad408fe0e7fa2bc7d86cf09b3f094f91
+  metadata.gz: 4e3b8abc6f3ababc817e05d84a149a524bda2e3887504bb2df71d1a53f25e1fca64e952b0d8183968b6807e324dca87b1541176a05ae46d063082916f8d75808
+  data.tar.gz: 0d85d1a505c07939b3939b53f82bd4aa7f5ad2216569bd3d4f537699f46a2960a4b9cdf9e765b839a2ce7d12e4f5bbdee0b11961b70f4cc68d93fc8f600ea26a

data/lib/line-tree.rb

@@ -13,8 +13,10 @@ class LineTree
     
     @ignore_non_element = ignore_non_element
     @ignore_label = ignore_label
+    @ignore_blank_lines = ignore_blank_lines
     
-    lines = ignore_blank_lines ? s.gsub(/^\s*$\n/,'') : s
+    lines = ignore_blank_lines ? s.gsub(/^ *$\n/,'') : s
+
     @to_a = scan_shift(lines.strip, level)
   end
     
@@ -31,16 +33,16 @@ class LineTree
 
     a = lines.split(/(?=^\S+)/)
 
-    a.map do |x|
+    a.map do |x|      
 
-      if @ignore_label == true or not x[/.*/][/^\s*\w+:\S+/] then
+      if @ignore_label == true or not x[/.*/][/^ *\w+:\S+/] then
 
-        rlines = (x).split(/\n/,-1)
+        rlines = x.lines.map {|x| x.sub(/(.)\n$/,'\1')}
 
-        rlines = [x.gsub(/^\s{2}/,'')] if level and level < 0
+        rlines = [x.gsub(/^ {2}/,'')] if level and level < 0
         label = [rlines.shift]
-        new_lines = rlines.map{|x| x[2..-1]}
-
+        new_lines = rlines.map{|x| x.sub(/^ {2}/,'')}
+        
         if new_lines.length > 1 then
           label + scan_shift(new_lines.join("\n"),level)           
         else          
@@ -49,10 +51,9 @@ class LineTree
         end
         
       else
-        [x.lines.map{|x| x.sub(/^\s{2}/,'')}.join]
+        [x.lines.map{|x| x.sub(/^ {2}/,'')}.join]
       end
     end
-    
 
   end
 
@@ -61,18 +62,18 @@ class LineTree
     s = a.shift
     
     if @ignore_non_element then
-      non_element = s[/^\s*(\w+:)/,1]    
+      non_element = s[/^ *(\w+:)/,1]    
       return [nil,non_element] if non_element
     end
     
-    r = s.match(/('[^']+[']|[^\s]+)\s*(\{.*\})?\s*(.*)/m)
+    r = s.match(/('[^']+[']|[^ ]+) *(\{.*\})? *(.*)/m)
                                                  .captures.values_at(0,1,-1)
 
     if r[1] then
       
       r[1] = get_attributes(r[1])
       
-    elsif s[/(\w+\s*=\s*["'])/]
+    elsif s[/(\w+ *= *["'])/]
       
       raw_attributes, value = s.split(/(?=[^'"]+$)/,2)
       r[1] = get_xml_attributes raw_attributes
@@ -121,4 +122,4 @@ class LineTree
   end
   
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: line-tree
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors:
 - James Robertson
@@ -12,26 +12,26 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
   YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE1MDkyMjE5MjExNVoXDTE2MDkyMTE5MjExNVowSDESMBAG
+  8ixkARkWAmV1MB4XDTE3MDMwNTIwMTYzOFoXDTE4MDMwNTIwMTYzOFowSDESMBAG
   A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
   EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAKoCZRbLwILhPaKiwZZyjlliT5d0r3ND4EgTl41BAeru4B7+QTphTGoLMLcF
-  VdSc4KXvUeIRBN1p4V0LncItc3Z2tpY/azMhp7puW5HjENToDmpZYo1L40TowIca
-  vKLi89kB8MZ4Pbz96rNO7TWBk5+9PW49enn4trVty4h0l9JfR4HUWFrLtv66cw75
-  gC3AW2Z7844K4Vwe2iIQZg/YKk2qoVYrXrPYVY8o2wp7FbHe1cQS15oJ8oW4abwv
-  KVGh9v/HWBWJpiSGyR/xf6sj5T2sFFE2p9Epz+VsaF6XcRuxM7hqg1GmCe09gnE1
-  xtu0mwyZWoEKKQfevgNKluztTKECAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQU4mlrVQsMxMyCY7h28HvpElNidW0wJgYDVR0RBB8w
+  ggEBAMYEHO7u7PSWyWNCnDIoYaYUFbGDWeeXVH/s1j9nDszw2XuWpcha0QEvhmA/
+  rikd1NjKfPQOcmdhKIDhZsI1o5XADDNfdLeGECE4VvD+AiNaQrKLJmYDJB31iN3k
+  k9a5xmzND/25YmIwGfrUVvIg6L5jf5Bzh68SHfYLfgmEjJRgT/Ze5mlg4+JtgB5b
+  BK2UJzwyTg/zQcSgbKYqJdEOJcmOHFnuy5HRmkfKJPvFpHuoF1eGv4X7w7v259vM
+  BglXs+DGljnPZu9N9m8QPd+UmM2Aep9wffbnZpDQ8tl51OA4hDqAtRw+wiMVAp0P
+  8yz9Qa0bhPcwaAaDMeTi33/uCmECAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
+  DwQEAwIEsDAdBgNVHQ4EFgQUKbYZEpa8nAinM6KOO63oAprrSGowJgYDVR0RBB8w
   HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAFWxyuEL+
-  vVXc7+WfMaArAqzFOqnnJqaX3UdlWU5Rz9LYjQhXPusIsCX+lCojHwC+CcksH89u
-  ov73AQJ3y7MC1TUAEBs+0nRUfkiwS2FjzHAfKJWUmdUUJ9U1Z2ikC7H4Gqvxhz9v
-  aJP4UUCn38tOXay5jGn9HrZV2w/SBKYJ+nGY60CEfZRwtBxFjMBoXGzzUyqdBuhn
-  c2wLKHJNKsY54pAyj8Rp1e/fbVi5/6NPmv6rccuB/vCu5pDuueU09nUMfpwGlGrp
-  7hJQViF2A4oP1yEw5KunIhFVJbc7Su5onAEfBDhrTncllL9LW24QyUxdRYFI2ddi
-  Otqv0Jb+HJ1Sjg==
+  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAl8HIvKoO
+  lD5/4p1EUi6/TD6fE6mnwSjXfiIYMvVUKeUrZF6OEmkTSmAXn/7Kr81DZkya7GXh
+  DXPLgzbYT1dQb7USjW6wF0Md/Dl4y0KE6Px0EkdV9yq8XRReXo54b3m5u9eaMyq/
+  w/TI6EfIg061p41o9FAFxyI9pqN7QNMsyK8FTBgOYsc+L1QAQLQoQ7zjZxdlTQNs
+  4K01bd7bIVPf9ZNEWkgjSJRiioUYVzsezQzB/nD9KPcbS5lAKapavHcycXsKXDpk
+  m6UjuCKOiPqABbG2jvwjzF2RT9/yszKHPuB+qsEDC9HhonU7t7xizbYXXFCa7Ocj
+  UE2/ecWxKMEncA==
   -----END CERTIFICATE-----
-date: 2015-11-03 00:00:00.000000000 Z
+date: 2017-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexle
@@ -81,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: line-tree

metadata.gz.sig

@@ -1,3 +1 @@
-%sm�_�jȢ*H���L�L��%E�+N��
-�4�pG8���'�NlG�a���$MCS�LO�|�_��x�-��&�F���%�O�Ÿ��\�^B�-JN��3��U������d9w꧞�(�ٵ�9�d���#�^��eq�0�'A��-�ATpx�2�^�Qߖ�#"#��?��Y¹ed���
-N�壢s&�_Z���	]�dJ�UJ�i��Cf.m`
+J�0nsp�L���z�v��	�HQ�Y~����]�w���]�����ה�Xv�g�2m�q$��7�ʯͻw��P&'�x��gc���_U�){��%5:6(�Ԭ�#�b�Oʬ���I��=Xfbhֈ���ڡ2V�