polyrex 0.8.34 → 0.8.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f22bfea02d697da5897d487fe3174e92b1505f9f
-  data.tar.gz: e2381385c4388dc4c40e612d219aa15b38a9a97d
+  metadata.gz: 57ff9750c2b16ed4928b43bf543af269d642448e
+  data.tar.gz: 7a344815c39c0cf52e2d15ec6f8c4a2126eff871
 SHA512:
-  metadata.gz: 37f84775b83c3fc0c4d9e0a6056b9764adb3525f888eaaa8199cc74e7e9f15435dd4a7fdf9b1131938d0d703ab58259d6b5b899075b79bde81e319ce5fc93dbf
-  data.tar.gz: e62a494eff2b7e6a6a12544d3974e5a4176e7f2458e0a5521449c227b8792569a62ce83b37bc2a7cf15e7bb521f862fc1a3900c6f149fa0aafd9cee4b628b9e1
+  metadata.gz: 596141d1b84122f171e7c3bba8be8f2633501025757494cde9b86af04d6dc61e9f86982788b41f31cdf44df6351c3a35119e52d93918d48bc3b358d0ca81cd81
+  data.tar.gz: 37f2e9f7380beffd4e2b7a04e41f3cf3ed8d02bf35b674ebf9c39603f31fdad93cab7295fe21b3031057fee0fbe73297aac6a65cd3a1fdedb7257d295ec245a8

data/lib/polyrex.rb

@@ -326,8 +326,10 @@ EOF
     end
     
     @summary.format_mask = @format_masks
-
-    format_line!(@parent_node.element('summary'), @parent_node.root, LineTree.new(raw_lines.join("\n").strip).to_a)
+    records = @parent_node.root
+    @parent_node = records.parent
+    records.delete
+    @parent_node.root.add format_line!( LineTree.new(raw_lines.join("\n").strip).to_a)
 
   end  
 
@@ -342,7 +344,9 @@ EOF
     attach_edit_handlers(@objects)    
   end
   
-  def format_line!(summary, records, a, i=0)
+  def format_line!(a, i=0)
+
+    records = Rexle::Element.new('records')
 
     a.each do |x|          
 
@@ -376,13 +380,14 @@ EOF
         summary.add ynode
         next
       end
-      
+
       unless @format_masks[i][/^\(.*\)$/] then
-        
-        @field_names, field_values = RXRawLineParser.new(format_masks[i]).parse(line)
+
+        @field_names, field_values = RXRawLineParser.new(format_masks[i])\
+                                                            .parse(line)
         
       else
-        
+
         format_masks = @format_masks[i][1..-2].split('|')
         patterns = format_masks.map do |x|
           regexify_fmask(x) #.sub(/\[/,'\[').sub(/\]/,'\]')
@@ -391,7 +396,8 @@ EOF
         pattern = patterns.detect {|x| line.match(/#{x}/)}
         i = patterns.index(pattern)
         
-        @field_names =  format_masks[i].to_s.scan(/\[!(\w+)\]/).flatten.map(&:to_sym)        
+        @field_names =  format_masks[i].to_s.scan(/\[!(\w+)\]/)\
+                                              .flatten.map(&:to_sym)
 
         field_values = line.match(/#{pattern}/).captures        
         
@@ -415,19 +421,21 @@ EOF
       end
 
       format_mask = @format_masks[i]
+
       if @type == 'checklist' then
         format_mask = format_mask.sub(/999999999/,' ')
       end
+
       summary.add Rexle::Element.new('format_mask').add_text(format_mask)
       
-      new_records = Rexle::Element.new('records')
-
       record.add summary
-      record.add new_records
+      child_records = format_line!(x, i+1) unless x.empty?
+
+      record.add child_records
       records.add record
-      
-      format_line!(summary, new_records, x, i+1) unless x.empty?
     end
+
+    records
   end
   
   # -- end of full text edit methods

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polyrex
 version: !ruby/object:Gem::Version
-  version: 0.8.34
+  version: 0.8.35
 platform: ruby
 authors:
 - James Robertson
@@ -29,7 +29,7 @@ cert_chain:
   7hfiCsNv+0o/OwBNlpn8pTTpd3jV6o1Qq0Y7QiFomKd6XWlaHT4ZNtZdb/XTpC7W
   ZUZv+oXV5L4FrLlOrnTUhA+cZRntSyHs
   -----END CERTIFICATE-----
-date: 2013-09-24 00:00:00.000000000 Z
+date: 2013-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyrex-schema