polyrex 0.5.2 → 0.5.3

data/lib/polyrex.rb

@@ -105,7 +105,13 @@ class Polyrex
       
       @field_names = @format_masks[i].to_s.scan(/\[!(\w+)\]/).flatten.map(&:to_sym)
       t = @format_masks[i].to_s.gsub(/\[!(\w+)\]/, '(.*)').sub(/\[/,'\[').sub(/\]/,'\]')
-      field_values = line.match(/#{t}/).captures      
+      a = t.reverse.split(/(?=\)\*\.\()/).reverse.map &:reverse
+
+      patterns = tail_map(a)
+      pattern = patterns.detect {|x| line.match(/#{x}/)}.join
+      field_values = line.match(/#{pattern}/).captures      
+      field_values += [''] * (@field_names.length - field_values.length)
+      #field_values = line.match(/#{t}/).captures      
 
       @id = (@id.to_i + 1).to_s      
       record = Element.new(tag_name)
@@ -176,6 +182,10 @@ class Polyrex
     load_handlers(schema)
     @parent_node = XPath.first(@doc.root,'records')    
 
-  end    
+  end
+  
+  def tail_map(a)
+    [a] + (a.length > 1 ? tail(a[0..-2]) : [])
+  end  
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: polyrex
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors: []
 
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-02 00:00:00 +01:00
+date: 2010-06-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency