polyrex 0.8.38 → 0.8.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a63bfdc58d47f5140a372bd3a94d7013f37bacc
-  data.tar.gz: 8c3ce5dc8119e1941e995d321e86f4a6e9775ce2
+  metadata.gz: 3cc6e9a93d6c43783bfccfe2576297d7b464b38b
+  data.tar.gz: fcd94f727f246b0c036b584cf2f2095faa464935
 SHA512:
-  metadata.gz: e117c8538efbf968126de63740c885b5b0ff25d299d54a2856f94e3d7672330485ee86f5686d9322aac91a466f3982e1a6c0f535c3b7ac602a744ecd63f693d4
-  data.tar.gz: 8275a04d5aa0d955bf0bc6e32191341fadb4e2b8a515cb9da3a7477f86ad99a066fa1d8610d12e49e1fe7bfd77bdee3941664b1624346aef6f8419161dde4f8a
+  metadata.gz: 1c0f445d57045c264b7163ba67073650d5619eb53dda875f48437f122b2bfa6f1f50f2d6321c53e5f4dab309b60ee2cfd69a5d689970fc57a4f9d5848116d914
+  data.tar.gz: 37cc73a4e6bee80f9aec4ed4675861ed7380dc809d5918f476f8168865d0f773ea368e3ba37bbc170102703a0ac48533a8c927e5b5c6827e2a134aec8b4aaee6

data/lib/polyrex.rb

@@ -86,6 +86,7 @@ class Polyrex
   end
   
   def delimiter=(separator)
+
     @format_masks.map! do |format_mask|
       format_mask.to_s.gsub(/\s/, separator)
     end
@@ -128,6 +129,7 @@ class Polyrex
   end 
   
   def parse(buffer='', options={})
+
     buffer = yield if block_given?          
     string_parse buffer, options
     self
@@ -146,9 +148,11 @@ class Polyrex
   end
 
   def schema=(s)
+
     open(s)
     summary_h = Hash[*@doc.root.xpath("summary/*").map {|x| [x.name, x.text]}.flatten]      
     #@summary = OpenStruct.new summary_h
+
     @summary = RecordX.new summary_h
     @summary_fields = summary_h.keys.map(&:to_sym)    
     self
@@ -240,9 +244,11 @@ EOF
   end
 
   def polyrex_new(schema)
+
     # -- required for the parsing feature
     doc = PolyrexSchema.new(schema).to_doc
-    @format_masks = doc.root.xpath('//format_mask/text()')
+    fm = doc.root.xpath('//format_mask/text()')
+    @format_masks = fm.zip(@format_masks).map{|x,y| y || x }
 
     schema_rpath = schema.gsub(/\[[^\]]+\]/,'')
 
@@ -307,7 +313,6 @@ EOF
       end
     end
 
-    
     raw_lines = buffer.strip.split(/\r?\n|\r(?!\n)/)    
 
     raw_summary = schema[/^\w+\[([^\]]+)/,1]
@@ -331,6 +336,7 @@ EOF
     end
     
     @summary.format_mask = @format_masks
+
     records = @parent_node.root
     @parent_node = records.parent
     records.delete

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polyrex
 version: !ruby/object:Gem::Version
-  version: 0.8.38
+  version: 0.8.39
 platform: ruby
 authors:
 - James Robertson
@@ -29,7 +29,7 @@ cert_chain:
   7hfiCsNv+0o/OwBNlpn8pTTpd3jV6o1Qq0Y7QiFomKd6XWlaHT4ZNtZdb/XTpC7W
   ZUZv+oXV5L4FrLlOrnTUhA+cZRntSyHs
   -----END CERTIFICATE-----
-date: 2013-12-16 00:00:00.000000000 Z
+date: 2013-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyrex-schema
@@ -156,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0.rc.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: polyrex