line-tree 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e05262cfe7c1837b9f24701a9fd1a9117862a11c
-  data.tar.gz: 4ce637c24ea955eafa11036e94fc502971de2da7
+  metadata.gz: 932ffe2082ae648bc26ccf7b0b78c1d42401b834
+  data.tar.gz: 69144908f9b36cb399c0e88ceeca6aec16ffbeb3
 SHA512:
-  metadata.gz: fe1a66fc75a5d5240eb15bdb7701a737cc8d9d2201461ca839ef1df2f7bb08c0f4421681235b370665408f86639996f758b7bd6be64fb57b02c496faa2091ae7
-  data.tar.gz: 8de02a8a98aebc58404612682b195a36f9b6464157240c45e1da24e8589ef18ee7840b490f8cfab34c6660b4400177d0da8dea71c078778514060ed7a8ed6c43
+  metadata.gz: c20912bd69c76d2078bdafaee7bb401a6a79c788220745640ca17020c2d5d604236d6be954557aaf34ed98c27bedfaf098f705871194d8fa91d2b012cd6667c7
+  data.tar.gz: 411e8bd28d98cb873da43851a8bc6e1e553bc7ee4bab5d2aff49a6c36fbaf78e86c9d0ce06abb845ee05dd45ac83ad08ec138f01c96362fd0eb12d023432541d

data/lib/line-tree.rb

@@ -13,6 +13,7 @@ class LineTree
                  ignore_blank_lines: true, ignore_label: false, 
                  ignore_newline: true, root: nil, debug: false)
     
+    puts 'inside linetree' if @debug
     s = root ? root + "\n" + raw_s.lines.map {|x| '  ' + x}.join : raw_s
     
     @ignore_non_element = ignore_non_element
@@ -34,6 +35,7 @@ class LineTree
     a2 = if a[0].is_a? Array then      
       encapsulate ? encap(a) : scan_a(a)
     else
+      puts 'before scan_a' if @debug
       scan_a(*a)
     end
     
@@ -124,46 +126,40 @@ class LineTree
     end
 
   end
-
+  
   def scan_a(a)
     
-    s = a.shift
-    
-    if @ignore_non_element then
-      non_element = s[/^ *(\w+:)/,1]    
-      return [nil,non_element] if non_element
-    end
+    puts 'a: ' + a.inspect if @debug
     
-    r = s.match(/('[^']+[']|[^ ]+) *(\{.*\})? *(.*)/m)
-                                                 .captures.values_at(0,1,-1)
+    a.each do |node|
 
-    if r[1] then
-      
-      r[1] = get_attributes(r[1])
-      
-    elsif s[/(\w+ *= *["'])/]
+      scan_a node[-1] if node[-1].is_a? Array
       
-      raw_attributes, value = s.split(/(?=[^'"]+$)/,2)
-      r[1] = get_xml_attributes raw_attributes
-      r[-1] = value.to_s.strip
+      if node.is_a? Array then
+        r = parse_node(node[0])
+        node[0] = r[0]; node.insert 1, r[1], r[2]        
+      end
 
     end
-    
-    if a.is_a? Array then
+        
+    if a.first.is_a? String then
       
-      a.map do |x|
-        result, remaining = scan_a(x.clone) 
-
-        if remaining then
-          r.last ?  r << remaining :  r[-1] += remaining  
-        end
-        r << result
-      end
+      s = a[0]
+      
+      if @ignore_non_element then
+        non_element = s[/^ *(\w+:)/,1]    
+        return [nil,non_element] if non_element
+      end      
+      
+        r = parse_node(s)
+        a[0] = r[0]; a.insert 1, r[1], r[2]        
     end
     
-    [r, non_element]
+    a
+
   end
 
+
   def get_attributes(s)
     
     a = s.scan(/\w+: ["'][^"']+["']/).map do |attr|
@@ -189,5 +185,24 @@ class LineTree
     return r
   end
   
+  def parse_node(s)
+    
+    r = s.match(/('[^']+[']|[^ ]+) *(\{.*\})? *(.*)/m)
+                                                .captures.values_at(0,1,-1)
+
+    if r[1] then
+      
+      r[1] = get_attributes(r[1])
+      
+    elsif s[/(\w+ *= *["'])/]
+      
+      raw_attributes, value = s.split(/(?=[^'"]+$)/,2)
+      r[1] = get_xml_attributes raw_attributes
+      r[-1] = value.to_s.strip
+
+    end      
+    
+    r
+  end
 
 end

data.tar.gz.sig

@@ -1,2 +1 @@
-���R���`�͍?�9�&6AfQCE��:��p��h:�{	g�]i�(J�E~T����A�7L�����*9��g 5Q�ZEb,�K
-����$ N�����̹�x@�S1�Y���3�	��K��N ]$�?C﹇:E2�Ū9��AWD��}�sH��)
+N��_t���A����kl<F7�ĝ�7��U�:�[���/��B���F�"�"iT��>8�dȱ+ҝ7r�w@"����a4����|-t�niV�rmC��u�29��z�E�1�\���B^���=�KVRH�A�f�rf���"�y���I�S�Y�_�q�᧐9��F��+�a

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: line-tree
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors:
 - James Robertson