line-tree 0.8.0 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7643a609c4195107cbf1d9f929e5f04ebadb33f4c2207faca858e62741ff7acc
-  data.tar.gz: f620f7bdd66650d12f6b12b701068378ff52d12e8727bedda5fbdb56be3cf986
+  metadata.gz: a4941d5015036d351165b5d40866904d2808511e2aff6ae5fbfbc4d05f960ac9
+  data.tar.gz: 8169bc61faade352e4e7541e8edc4acf8e06a0f7cebc9fc833390a9106596faf
 SHA512:
-  metadata.gz: ca0a85402197dfc65d2fc10af2caa01a3bba0b5b47356a824008c93e664a409f0edb010aeee61f329f23cf98729f46d45e74431bd6e7b4b9007182a68e94d52f
-  data.tar.gz: '069e9fa9f845e35f9800e2abdb08141722bca51ed101d77c09c0f52f44fd190b8041d552acb0ec8f4cc36651f524d848a7d75a7fe23fce7cc2b5529458563c4c'
+  metadata.gz: 759dce7b2018ea6e914d94b3d3478b2d02e80cb62405d6624e6a3fa5cc81fa28feb2132d9f7e7c59bf85ec0efa66461f88a69980577ef4c02dcf807ff5b67517
+  data.tar.gz: 0d405fb0a21d367f6bd01fde12543f8ed163e54565c03845ba5751647eaeb536d989caa80d0f40e291ed47d9a6ac3cab42797bb506574a2fa3010852a1da868c

checksums.yaml.gz.sig

@@ -1,5 +1,2 @@
-����T>�Z��'��t�3pL5����Z�U�s�6cD�RA��Yy�
--7���p�{h^h@6�~K�k����
-�������2U�����b'sF:б��r�Ie�HE�bEh>R� V=ǿ�[�֓�\�Z� ������3�*��0r�K|��=�[��o���{�D�-�F	��k'�Q���~N�r��’
-���)BH��z=�;��F�*�{~Ǵ����`��},S��09�R��5e��n�6�e���[XqU���<H���j�q/�
-Xf|SNgm�PR�w
+��RY�
+G���"�ΐh{��M���g��Ǫ8��+��ܠP�ˮƨ?�:�������<�uz��������O �����E��Š-�������/QN�eOi��y�L���r6Q��;�� ��?l�����f�V#�b

data/lib/line-tree.rb

@@ -5,6 +5,19 @@
 require 'rexle'
 
 
+module HashDigx
+  refine Hash do
+    
+    def digx( a)
+
+      self.dig a[0], *a[1..-1].flat_map {|x| [:body, x]}
+
+    end  
+  end
+end
+
+
+
 class LineTree
   using ColouredText
   
@@ -28,7 +41,7 @@ class LineTree
     
     lines = ignore_blank_lines ? s.gsub(/^ *$\n/,'') : s
     puts ('lines : ' + lines.inspect).debug if @debug
-    @to_a = scan_shift(lines.strip, level)
+    @to_a = scan_shift(lines.lstrip, level)
     
   end
   
@@ -53,6 +66,10 @@ class LineTree
     
   end
   
+  def to_h()
+    build_h(@to_a)
+  end
+  
   def to_html(numbered: false)
     
     @numbered = numbered
@@ -62,6 +79,27 @@ class LineTree
     Rexle.new(s).xml declaration: false
     
   end
+  
+  def to_tree()
+    
+    def make_tree_list(a)
+      
+      items = a.inject([]) do |r,x|    
+        
+        if x.is_a? Array then
+          r << make_tree_list(x)
+        else
+          r + ['item', {title: x}]
+        end
+      end
+
+    end
+
+    a = make_tree_list(@to_a)
+    doc = Rexle.new(['tree', {}, *a])
+    doc.xml    
+    
+  end
     
   def to_xml(options={})
     to_doc.xml(options)
@@ -69,6 +107,24 @@ class LineTree
 
   private
   
+  def build_h(a)
+
+    a.inject({}) do |r,x|
+
+      h2 = if x.is_a? Array and x.length > 1 then
+
+        {x[0] => {summary: {}, body: build_h(x[1..-1]) } }
+
+      else
+
+        {x[0] => {summary: {}}}
+      end
+
+      r.merge(h2)
+
+    end
+  end
+  
   def encap(a)
         
     a.each do |node|
@@ -152,7 +208,7 @@ class LineTree
 
       puts 'x: ' + x.inspect if @debug
       
-      x.sub!(/ *$/,'')
+      #jr240521 x.sub!(/ *$/,'')
       
       if @ignore_label == true or not x[/.*/][/^ *\w+:\S+/] then
 
@@ -204,17 +260,31 @@ class LineTree
   
   def scan_a(a)
     
-    puts 'a: ' + a.inspect if @debug
+    puts 'a: ' + a.inspect if @debug    
     
     a.each do |node|
-
-      scan_a node[1..-1] if node[1..-1].is_a? Array
       
-      if node.is_a? Array then
-        r = parse_node(node[0])
-        node[0] = r[0]; node.insert 1, r[1], r[2]        
-      end
+      puts 'node: ' + node.inspect if @debug
+      
+      if node.is_a? Array then      
+        if node[1].is_a?(Array) and node[1][0] =~ /^<\w+/ then
+
+          r = parse_node(node[0])
+          node[0] = r[0]
+          node[2] = node[1][0]
+          node[1] = r[1]
+
+        else
+          
+          scan_a node[1..-1] if node[1..-1].is_a?(Array)
+        
+          puts 'node2: ' + node.inspect if @debug
+
+          r = parse_node(node[0])
+          node[0] = r[0]; node.insert 1, r[1], r[2]        
 
+        end
+      end
     end
         
     if a.first.is_a? String then
@@ -226,8 +296,8 @@ class LineTree
         return [nil,non_element] if non_element
       end      
       
-        r = parse_node(s)
-        a[0] = r[0]; a.insert 1, r[1], r[2]        
+      r = parse_node(s)
+      a[0] = r[0]; a.insert 1, r[1], r[2]        
     end
     
     a
@@ -237,12 +307,9 @@ class LineTree
 
   def get_attributes(s)
     
-    a = s.scan(/\w+: ["'][^"']+["']/).map do |attr|
-
-      name, val = attr.match(/\s*([^:=]+)[:=]\s*['"]*\
-([a-zA-Z0-9\(\);\-\/:\.,\s"'_\{\}\$]*)/).captures
-      [name, val.sub(/['"]$/,'')]
-    end
+    a = s[1..-2].split(/(\w+:)/)[1..-1].each_slice(2).map do |label, val|
+      [label[0..-2], val.strip.sub(/^['"]/,'').sub(/['"]$/,'')]
+    end    
 
     Hash[*a.flatten]
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: line-tree
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.3
 platform: ruby
 authors:
 - James Robertson
@@ -11,31 +11,31 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTkwNjA5MTcxMDE4WhcN
-  MjAwNjA4MTcxMDE4WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC4AxCY
-  XGf1ySV1wgjBLFG175tA+FRxhRXXGUv+pLAlzuW+JdCAS2/7mftnxDhsSWDOdbcL
-  /NkJ6l4mpt7pPbDmRbPySbnsocyC/EXXrI6zK845Yz2iEwU55hBt6Io66KKQljMD
-  B0dMK32UAIYrpMDISLiCCsbiHt2JeGoGao2V4oFK0JEv1SP2SRhQJwOSW3XYVibW
-  alLzxQnRRurAmPvLb/OxdXEosgy9W8nJu4+saG0qkV5Jb0uffMBMTTyfoxMreQVq
-  bOAYpcDZb2z6EFg5eirPCCBUaicen86xbV83ervKySxcmAAPm4hmk/QTLKEQWQIK
-  E5jxkZpXyggQnLRow8pfs6ZrbrRuyB2jkvyccNRjU7AE+8mQcGEKI2Fh1OUvBJV1
-  ZC7Nl2lzEa6TqumzvvTVjHXJspBzpWCYq7f0J65xgAvGdmuGKDf9m3mrkGK9w6dt
-  DomRFb8uzN694FDw2IkUNKlocglN4DAUzvaTqmi5/ItQdPJfpTszWfdv+LMCAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUr160lZC9
-  tBQ2QqlAlYkgKY9whBowJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjEwNTI0MTI0ODIxWhcN
+  MjIwNTI0MTI0ODIxWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDfk8fB
+  D2jHfBedGGk+X55VovRCkVCg862U22dOcgu6MJzInLBr1DLTRj5gKT+/KVwECFuQ
+  Z+8+bosNA5n63I4s3Ofaas+4Svtk9/qYRvKbEjNhHYRdwXk8s7k+3mcrubkYACiP
+  bF8C9gYsgmZdOHd6tJiGBPTrsvny9YIBB8ZfEaRaS+p6qyan6Mp26i94GMJlrRNU
+  KYxpO4wDm8O+YfwBEjRtgGJsAJrUGrNu/xK9TllHgByaP69m/32i8rVIlcwesM5b
+  zb6D4Sp9qGfpye6JI4nH8uGT8xY8R0PDF7NjHJKvjcgeRIjNGhRakafrlYnPBtQD
+  EmcaX1MBF6U31RDtHJIAmm6x5WQzkRQ52x9XctCyLxSQcVX3diJPkhsldT56QNW8
+  NU/jzgHtG2YjsNIXRgcjggjUQLHyqF1klpjsMa27LA/yqM06xkoR1lOqgSb+Bmo9
+  SnWA5QbJD467HSu4KzBPAcxPC47y2UiJ/dHp845jtuSu8QXlVIA6+v98Em0CAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUmWnxgrmO
+  9jxkvnq/EF/zdK/f8cUwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAGCOxbBz8YJygiA7y3whKvnGsS6Xnj1yFg+ia7T0p
-  I209mQTTGRrabTDSNsVnVqvTQyejc7DaCDQCeNGKJIu/XMk3pYbYRa7oUh9fR3NI
-  UuqMuVoHIkyF+bLoRJhy8p27vRfgGOQTsYNZ7nNl1m28Pke54mMtkrSQcHInenmX
-  bnkYwFS+JXFx+XgX1vqaVjxWSRQjgUHW4AY4PsmRbuBuc38Ebh1Xqe97wfZKQ2Sn
-  M5EOyXeiSr7ZO8ZZAcUhiNDyLYS9cbGE7ytGBCLyAGcCCWD8l3uKtaXjH26bPfPO
-  cjpmOz9ykn7NBOeMLluPTZDpDg1JXKfKjyFdB+i+ZvoRj28LfoKFP5qNj1Yn107c
-  +psOzxzpA4bEf7i5TVmKuLFdQiJYOGt88Aix+7YjzrJGIlecbyaKC0gqppSQ06ZF
-  tRbkGzcgp9c2ZiHYMTUE+pFTjJmsHsHNK2V5UKCUGoiLja2dhcA5APnBhy1IGSao
-  guQOgw0RA86t3d5G4VaV1iMO
+  BgkqhkiG9w0BAQsFAAOCAYEATwYeriJAZ1zzY4clufScRlWbAB0v1n5jqnCUoE45
+  5he18IG1hbnUQbUiIMxGN336YsLceDdr9sWlOYeD/j0mhu/fWsaOXOrMQOrdLclk
+  62EcS9R419xSjf0PRz4h6hWbNnHcIHXsmZYB72YLe7RkfSf7zNc2Y6/Bl8LToyjd
+  OHZsUhAyWXauitBNWspm+aj75uUeX0YWEcFySnBw2/MavkkrQmy3sslZBjBP3pf5
+  3wcSl64k20wvtigCsFB6TYIMAI2+HBMkobSNSJajZP1TPt48HmcYDMsYfdQzzF72
+  wgaSGvXwxq3FIPeFXk2yfUq7IOTIxHBH3q6ULVtW8NKnc5DckqUtfKbgflitRTd+
+  RtFCP/+DTXiYybQMXhdI3G/0MimLvIoEa7ytR5PvX86J+3abWenqiJ9+KXEqIroz
+  PR3ZcZkDNVXMAWJRegTgs3bTj/TOBz/9wA/ltrJjqU6xHPnNoEe/W5oSQtUywvAh
+  hWGDTAfEg/j8AdkfGnhBG1OK
   -----END CERTIFICATE-----
-date: 2019-06-09 00:00:00.000000000 Z
+date: 2021-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexle
@@ -46,7 +46,7 @@ dependencies:
         version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 1.5.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -56,16 +56,16 @@ dependencies:
         version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 1.5.11
 description: Line-tree parses indented lines of text and returns an array representing
   a tree structure.
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/line-tree.rb
-homepage: https://github.com/jrobertson/line-tree
+homepage: http://github.com/jrobertson/line-tree
 licenses:
 - MIT
 metadata: {}
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: line-tree