line-tree 0.7.2 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f61074cf688e2b8575f49e7b90ce4b01eaa999814427cb31814b9ce7349d790c
-  data.tar.gz: 243c42bb0f38ea3997d72060fa96da11b7bf00067d02cff35db1b44d1923de5c
+  metadata.gz: 2d6c717f1207c926dec103d34b2ac20d9ebd6c9bca38129552e70e29ac842089
+  data.tar.gz: a538960995601cbe45b227ba164930665cdadd0ca98177761066e0162f5ffa9a
 SHA512:
-  metadata.gz: b4e91fb43f1b8b94cf6c4f352f1171cbe31bd75533a02abeefcfd6f75c8fd0ab5acb3bde9c12932ee56834abcf25443417104535b26096db97d318e85c639f11
-  data.tar.gz: '0688401ae1e49f4ccb8dfc04337b31a0cacfad3ba2f00231959ad95b85ee057e78b1e9dfc653554a78d537c71b8abdf38ff83e234de91c92ae6e767adf911628'
+  metadata.gz: 3c4eec204d400c1348e3ec70b5b541830a17058c374ae7de406f5346c7d80ce79482d73f113cc47e022b4dc9df936ab3f304b310ad3dfb5ca07b90a1654f07b5
+  data.tar.gz: f9433a19dc0ba57cf40bc3db12d39fa5337e4ce8d603226a7d5065c3ee88ff3d4a318aa28629656a5cb06e153a419db46b8dedf34e14fa9029c5ba7e83934f30

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
   
@@ -14,8 +27,11 @@ class LineTree
                  ignore_blank_lines: true, ignore_label: false, 
                  ignore_newline: true, root: nil, debug: false)
     
+    
     puts 'inside linetree'.info if @debug
-    s = root ? root + "\n" + raw_s.lines.map {|x| '  ' + x}.join : raw_s
+    
+    @root = root
+    s =  raw_s
     
     @ignore_non_element = ignore_non_element
     @ignore_label = ignore_label
@@ -39,14 +55,21 @@ class LineTree
       puts 'before scan_a' if @debug
       scan_a(*a)
     end
+
     
-    a2.unshift('root', {})
-    puts 'a2: ' + a2.inspect if @debug
     
-    Rexle.new(a2)
+    a3 = @root ? a2.unshift(@root, {}) : a2.flatten(1)
+      
+    puts 'a3: ' + a3.inspect if @debug  
+
+    Rexle.new(a3)
     
   end
   
+  def to_h()
+    build_h(@to_a)
+  end
+  
   def to_html(numbered: false)
     
     @numbered = numbered
@@ -56,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)
@@ -63,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|
@@ -198,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
@@ -220,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
@@ -231,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.7.2
+  version: 0.9.2
 platform: ruby
 authors:
 - James Robertson
@@ -10,27 +10,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDXjCCAkagAwIBAgIBATANBgkqhkiG9w0BAQUFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTgwMzE1MjIwMTUyWhcN
-  MTkwMzE1MjIwMTUyWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDwIZho
-  j0m/X3SfsXMs+3Tw2LkqdNVDegCd22MEe9vTWYsQg5lnMrePYiDjWQQnM82Udvr9
-  K2oCsPkJC6QLQRTUO+zr0Bh0nJ7gNi8SxZyGzG2lgzjVAVG3bLWCPwoCWUimoyNO
-  e6tRe5xnSC5kJnnT9PJQ7zC/ojbJrbzoQOmEEu7qrG7VHJ0XELWDg89B+khJS8cl
-  2nsjOimG3enalb6bATOwCrmaJk0jOJRSr6tyIMvy9imnKgo2Rz2dtXJoAaT0pl7W
-  RfpuVfqp2xCzrJK2tF5lSHlzyH49IpD6a9Gpyj90Fg8YnIuZXovedBhd9zyUn1rV
-  OlrRnOwDqK/Gw9K7AgMBAAGjgYowgYcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
-  HQYDVR0OBBYEFHv+A4lqesPYu1Art+YRueCuknKuMCYGA1UdEQQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTAmBgNVHRIEHzAdgRtnZW1tYXN0ZXJAamFt
-  ZXNyb2JlcnRzb24uZXUwDQYJKoZIhvcNAQEFBQADggEBAJDE/cZXxbtNL3kdBI/s
-  1mfpSyBdiq0T8FLvRFvoQ9TBrahG6awJv6qqYEd2DE6MuH2cEv1pQjUaF3OMtBow
-  BF5w4qoEYnntuO+cNCPqz8/5Q2+r+UaJSBHAcC/Q4XJHmqZP+eYLncyJsZNjR3gg
-  jWox9KwQxNYAjZsEoWGNEVrKy4RQemwjFqqLi1vzaru0FswbXlUwBw8fN2BtEZbA
-  K/OeBpT0safUWMP7zzLzq0BnYAPwfE6771wbpYxzTMqMcrFjSUgWJP/5/URIsqXN
-  wN+2fv6EC2h0XIvfmiFpfz1F3AiA5cWUW8HuIO87gQy/9YbBrh4VK9WSnVaVEv0u
-  6gM=
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjAwNTAyMDEyNTIzWhcN
+  MjEwNTAyMDEyNTIzWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDeefOB
+  XvRYlF86o1HH1xFCsA3T3Zw9YRZB2XnefFtfUJzhac7MXgioL88mMWijdsZ+jkbU
+  cChj3JA71hR84u8qMhIU8fBFGZsTdGiK2AR+FbuQGlATdpagyFH6H9qrGneICIjm
+  JEKoJsukwsce+QJBroPzahHjI+RtU9sZ3Fv66FO4+gYvKC+VyqJZMR+VioaZ1UDd
+  GDJ0ryGuJUiRLS377299caPyhRHESz1knlXxTFqgPatOP63henIg9Vcfscdw1sRG
+  umj7CGTB6mRgnBTUrkGQBbh/X1KvVFxy8REfwXHd7XSqxZ5xX+N/hGB2KijeDyGa
+  J8OARoeZIr9ZCWlj+vTbMtediJqghiX3XLh7Z7zDYIFZlCVWCzubLifMi0T46TOM
+  6bKk+DqUiXok8yzpTw/6ejI7wtcCuaR4BM2eAkzgm0qQsjsqndaKEbV6vN+jJn4/
+  wkLvkwKyRyXuASg8RinC6soJ84o/MYoDAdchEnfXIagwNLg35WSxbOJGsmkCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUOB2r9N+h
+  gG6rn2ttGp3RVDUu+8cwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEA1caJWb6DWlELBPufoEWz5MD5c/4YRrPXFbaxcR9F
+  6FVeM0/U+RxfL21LSiEM1d/LSp59szaQLNu5//kzU7BnRiloKJZnTxG42imdLdDf
+  eOvJ8bpHzHv14YaxG/odQ3m6lXgsoAyh4EQyhc0B838xE9LxFiRjV4DNaLIdL9xB
+  xx3ahpqugp3KziLAiSbh5ljRrVS3ShPsZ1b+vIpCJOCsPiIkcMNWso8+uXLEfi0i
+  TLrLGtJycaUfRUpn+9jKGj3yBIb2pxb2BiCFG9/yJM0zTtcRw8UueOXIahZPPUMV
+  p+bGmxywlIxSYxGMVc2nrC4Vq+n3VH3Zu9N7vi7PwVuL7KI+Y0eGaBwxC/k5cgUq
+  nGvja9yjtlc3kAD5ttXyrCj4eg9wObSc/Jiy3C0m46c6QYu+C5bLynmEXBJT00Zy
+  4ILlu3I+eftJ4QWM2f5lx0ZsEAgVLvw36qPDrdyX8EZf7jWgEBa1DGyDULuKoXbg
+  mL1f4imWp1K3Hh2L8I7XFMbY
   -----END CERTIFICATE-----
-date: 2018-12-18 00:00:00.000000000 Z
+date: 2021-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexle
@@ -41,7 +46,7 @@ dependencies:
         version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.5.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -51,16 +56,16 @@ dependencies:
         version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.5.11
 description: Line-tree parses indented lines of text and returns an array representing
   a tree structure.
-email: james@r0bertson.co.uk
+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: {}
@@ -80,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: line-tree