line-tree 0.3.18 → 0.3.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8aa4eab5f3e5548251694ed5d385fbd50eeceaac
-  data.tar.gz: 30c4324e0058ffcaa7aa42c07e8017e48006af5a
+  metadata.gz: d7c984ae8961ad00a19254cd4ec33088a29d93f5
+  data.tar.gz: 2f3ad9ac8dc9c01e73ef1114df8822ae8c6ffe77
 SHA512:
-  metadata.gz: 44f02bcb312dff828bd43ae1fe92edf28c48163b53e923e23f382f9a3ffd2dc6a350d3af6f852fbe1a0be5f44ecfe59ca6cffe9c05ab8f7aed3c5af405b80681
-  data.tar.gz: 6533206b2194059abef61198e2b64821ece22c7be2752162a9e683f75e7d34a4311e23c6b1635df52426af1030147e0b59a32d510d508dedc407e2988fc3441c
+  metadata.gz: fe21e459cfff31adb62578d27201dc5340a0ab6a14530113db26c8f20c4a0c766e7536f0eb916c6dd8ca592fa9874e98a5cc4c892b0387ad0d9e604dbadb0f08
+  data.tar.gz: 889cf085ce38d1162542c0a23d809967a2f88f735ece472be5778017b86d7dba4b0bfa9e5fc89819fd703b53e471dfd5e03264075f773c2581773c24c5fdc350

data/lib/line-tree.rb

@@ -36,12 +36,25 @@ class LineTree
   end
 
   def scan_a(a)
+    
+    s = a.shift
+    r = s.match(/('[^']+[']|[^\s]+)\s*(\{[^\}]+\})?\s*(.*)/m)
+                                                 .captures.values_at(0,-1,1)
+
+    if r.last then
+      
+      r[-1] = get_attributes(r.last)
+      
+    elsif s[/(\w+\s*=\s*["'])/]
+      
+      raw_attributes, value = s.split(/(?=[^'"]+$)/,2)
+      r[-1] = get_xml_attributes raw_attributes
+      r[1] = value.strip
 
-    r = a.shift.match(/('[^']+[']|[^\s]+)\s*(\{[^\}]+\})?\s*(.*)/m)
-          .captures.values_at(0,-1,1)
-
-    r[-1] = get_attributes(r.last) if r.last
+    end
+    
     a.map {|x| r << scan_a(x.clone) } if a.is_a? Array  
+    
     r
   end
 
@@ -54,5 +67,19 @@ class LineTree
 
     Hash[*a.flatten]
   end
+  
+  def get_xml_attributes(raw_attributes)
+    
+    r1 = /([\w\-:]+\='[^']*)'/
+    r2 = /([\w\-:]+\="[^"]*)"/
+    
+    r =  raw_attributes.scan(/#{r1}|#{r2}/).map(&:compact).flatten.inject({}) do |r, x|
+      attr_name, val = x.split(/=/,2) 
+      r.merge(attr_name.to_sym => val[1..-1])
+    end
+
+    return r
+  end
+  
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: line-tree
 version: !ruby/object:Gem::Version
-  version: 0.3.18
+  version: 0.3.19
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   ErtlSTAImlBCK8q5BS4jBBt8VAEpNdkWpWbtDtLPA639pW2QWIcPx13ObWJh7Ejk
   THoVqqsHTfeg3g==
   -----END CERTIFICATE-----
-date: 2014-06-05 00:00:00.000000000 Z
+date: 2014-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexle

metadata.gz.sig

@@ -1,5 +1,4 @@
-΋���U��1�Ҿ
�a7ⴷ�uv&�u��
-��O^���}^�^EB-x㱣�1��^S�d�G��B;��TC���+y�4�a�m��{
-�[�)!�z;6�
-.Vw�^%���
-�WX�DE���V��r�v/�"P�wd�i�sy�;ʅ�fb>tEC�(�
+�_
+M�T���3U^Om0���ʅ�#�h��CG��y-7�f
+S�׆z�ɈNLO�3�������Io���S�xC���c)��P�6M/*ijl
+3�6����C8;g!1+ZQM͡'�?��?�^V�Wܰ�%G�b�����E��+����*�!�ll��p{E�cO馠)ڷY9�a%�:I����gTt�-@nq�����%�٠yM|��~���D
�Fx\<y$Q���_�DM���ٚ]�BfzY"����