dynarex 1.2.40 → 1.2.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77fcce15dd115120b200511802c9120151ba05f1
-  data.tar.gz: d6af745ecd930d7dfd65a6df69c1a53c18b4ad7a
+  metadata.gz: 5b6f790c1b8481bff75a00d91e88910510985eb1
+  data.tar.gz: 86c2f462448f1b3371c4e16085f1b589320659aa
 SHA512:
-  metadata.gz: c9c5b06973720ae3b787fc1a9b036bb2ad52a00af2a7e61cfe2cb9cc8b8c62ed3395276f5781d30ae0edf0cf70311d1e6a8a4f1c61d685d4c70ef6c28c0c4135
-  data.tar.gz: 4073fde1dc5e56cdcffb3e4f82ffd155c92d51ced0cd761e0bd791209bfb9a58901486d14bb10aaa288552f3f3d260119399101a0317a7b60264c7fda7e29b9d
+  metadata.gz: 01dd32b9eebf4385c67e1193239242b50a055b5f324b2e50ceb8f62b70e228bb72fc9441724029912bcc8b08b8ce7193555387974f90f623114556261eed84c1
+  data.tar.gz: b826a66dbf4c0aa507161393828df44785ed4c04b6aed4e07b18d50317a22d61f875a98ec288cff9eb478f52067d976149b3c60f938a4bcfb5e2117fc62413fb

data/lib/dynarex.rb

@@ -506,8 +506,9 @@ EOF
     #buffer = rowx if rowx
     
     raw_lines = buffer.gsub(/^\s*#[^\n]+/,'').lines.to_a
-    
+
     if raw_summary then
+
       a_summary = raw_summary.split(',').map(&:strip)
       
       @summary = {}
@@ -515,8 +516,9 @@ EOF
 
       # fetch any summary lines
       while not raw_lines.empty? and \
-          raw_lines.first[/#{a_summary.join('|')}:\s+[\w\*\-\+]+/] do
-        label, val = raw_lines.shift.match(/(\w+):\s+([^$]+)$/).captures
+          raw_lines.first[/#{a_summary.join('|')}:\s+\S+/] do
+
+        label, val = raw_lines.shift.chomp.match(/(\w+):\s+([^$]+)$/).captures
         @summary[label] = val
       end
     end
@@ -552,7 +554,7 @@ EOF
     @summary[:schema] = @schema
     @summary[:format_mask] = @format_mask
        
-    raw_lines.shift
+    raw_lines.shift while raw_lines.first.strip.empty?
 
     lines = case raw_lines.first.chomp
       
@@ -578,10 +580,9 @@ EOF
       when '--+'
 
         self.summary[:rawdoc_type] = 'rowx'
+        raw_lines.shift
 
-        raw_lines.shift    
-        
-        a3 = raw_lines.join.gsub(/^\-+$/,'').split(/\n\n/)
+        a3 = raw_lines.join.strip.gsub(/^\-+$/,'').split(/\n\n/)
         # get the fields
         a4 = a3.map{|x| x.scan(/\w+(?=:)/)}.flatten(1).uniq
         a5 = a3.map do |xlines|
@@ -592,8 +593,9 @@ EOF
           r.sort.join("\n")
 
         end        
-        
+
         xml = RowX.new(a5.join("\n")).to_xml
+
         a2 = Rexle.new(xml).root.xpath('item').inject([]) do |r,x|          
           r << @fields.map do |field| 
             x.text(a4.all? {|x| x.length > 1} ? field.to_s : field.to_s.chr) 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynarex
 version: !ruby/object:Gem::Version
-  version: 1.2.40
+  version: 1.2.41
 platform: ruby
 authors:
 - James Robertson
@@ -29,7 +29,7 @@ cert_chain:
   kUea9jZD+xTq1Js9t2BHCz3Ev/sgS7CaijrbQetbNwzasFGHRd30xBEwd4zANQOp
   i0OBH0e4iIMkv+Q+PYlNRnlpQogsAdTs
   -----END CERTIFICATE-----
-date: 2013-08-09 00:00:00.000000000 Z
+date: 2013-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexle