line-tree 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72ab54108743428550e162b237c57d3f5f3ebd04
-  data.tar.gz: e24bd36af28eac887fcfe7bf2d13c7eaa8e546ff
+  metadata.gz: 34927fc0e7f9e55bab79c71bcf50b3f4c26edb0a
+  data.tar.gz: 186c4daa0b0d66c99a827b5ba148d7ab795aeb86
 SHA512:
-  metadata.gz: fb799969d60bfbebeb2e7b36e731db81334960d3e87ab3a5cf273091740c3f8d9ec2167ca6f5cb4ec0ed5498651ecac9cf2f485e3f04086d3b1dd939a19a9fe4
-  data.tar.gz: 95f8c929e6b1e53f0c98427a5d3e7e001cf567afcd810c6b02e610e90d623dc29ac7cfee6129362872e08a5e6ef819eb799d217daee13095f79260947685d882
+  metadata.gz: 7d5238c533f67ee110b235fbedbb4000ca39f7b74a1323d1e8ee49c0781deec06f0bd764991ff92802bb914829412fa80782b0b8c20f2492f5d12496658d6ecb
+  data.tar.gz: 5179885c6fc86d2bedbbb281b407892d4695cb584624b6758cf58a91ed0d20357e80118f71f357336ef07ffb0520dfc34580f39b75f9a28f582f46b92586d80d

data/lib/line-tree.rb

@@ -9,7 +9,11 @@ class LineTree
   attr_reader :to_a
 
   def initialize(lines, level: nil) @to_a = scan_shift(lines.strip, level)  end
-  def to_xml(options={}) Rexle.new(scan_a(*@to_a)).xml(options) end
+    
+  def to_xml(options={})
+    a = scan_a(*@to_a).first
+    Rexle.new(a).xml(options)
+  end
 
   private
 
@@ -53,9 +57,11 @@ class LineTree
   def scan_a(a)
     
     s = a.shift
+    non_element = s[/^\s*(\w+:)/,1]    
+    return [nil,non_element] if non_element
+    
     r = s.match(/('[^']+[']|[^\s]+)\s*(\{[^\}]+\})?\s*(.*)/m)
                                                  .captures.values_at(0,-1,1)
-
     if r.last then
       
       r[-1] = get_attributes(r.last)
@@ -68,9 +74,19 @@ class LineTree
 
     end
     
-    a.map {|x| r << scan_a(x.clone) } if a.is_a? Array  
+    if a.is_a? Array 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
+    end
     
-    r
+    [r, non_element]
   end
 
   def get_attributes(s)

metadata

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