dynarex 1.2.32 → 1.2.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 507bca865436dc06127d13236161cc493aba8ae8
-  data.tar.gz: 350b95e9f6bdd70e41813bbd2393b06dc67e41fe
+  metadata.gz: 007f9256cc2be2e0319e6fddeeaeaff9f3c19772
+  data.tar.gz: ae1cfe5d1ac8290fbc8f02e7cc383c5f3b4d87ac
 SHA512:
-  metadata.gz: 6d8c6eced93ca5964e271c3311402c9957a531f95001d4ef962fe4b23e6e49827b312a44f9cd8a1a3e714acf751448ec02ea8925ae5071f40ecbfed336d5a025
-  data.tar.gz: e0ebf7da9b89c6bb132a4b0a5c16cf45aff4f205020bce282c63b6285edcebdddacb8c282da0192f83dfcd750712b6e8320ad4b41c3a8b72d5119f5e5398b99f
+  metadata.gz: 3bc9f0aa674008e38bc35c9e9d517836ef3327a9ba9cc90c6e18f17c6d16749fb050a984e70468c02772d8c2882c9932c3cb0305988e3309003c849bd018aa5f
+  data.tar.gz: 4c60bb3cff65d38574ee9ff2ba93086effe4c0aee0cb3bbaba0d56888b39fea4581d2b6728cdabe020f33a79e0dac33bac8a8d1db034dd28cf6cdfd775f8bbdb

data.tar.gz.sig

@@ -1,3 +1,2 @@
-^��B�:��YN���UE6�R$����fq瘢�D
-���{�(���[�)d�~Mԁ��}W}�P�#z�'�/�W:
��D�8=�Oxx_�)$�W��z�
- ����_͒7�x
+XQC��O�C鳝��J��w��,x���Ԓ�����=֏� .H�0��퇜��_�R�R�
+�����mZ��
Sъ�ЏщTX�����_`0^̌x����L���e�qi��.�Gc��Z^(��l4�S�\�������^$�x�n`���v�ݴ�[�y�A�x/yӍ��Q{`�0�-�zD�&1L�k��˚�)"'�G�Zw9��1�n9���Bb�su$�I�
j�
4B�E�r�e}@M|�O���z��

data/lib/dynarex.rb

@@ -504,8 +504,7 @@ EOF
 
     #buffer = rowx if rowx
     
-    raw_lines = buffer.gsub(/^\s*#[^\n]+/,'').gsub(/\n\n/,"\n")\
-        .strip.split(/\r?\n|\r(?!\n)/)
+    raw_lines = buffer.gsub(/^\s*#[^\n]+/,'').lines
     
     if raw_summary then
       a_summary = raw_summary.split(',').map(&:strip)
@@ -550,8 +549,10 @@ EOF
     @summary[:recordx_type] = 'dynarex'
     @summary[:schema] = @schema
     @summary[:format_mask] = @format_mask
+       
+    raw_lines.shift
 
-    lines = case raw_lines.first
+    lines = case raw_lines.first.chomp
       
       when '---'
 
@@ -573,23 +574,12 @@ EOF
         yprocs[yaml.class.to_s.to_sym].call yaml      
         
       when '--+'
-        
+
         self.summary[:rawdoc_type] = 'rowx'
-        raw_lines.shift
-        
-        key = raw_lines.first[/^[^:]+/]
-        populated_lines = raw_lines.inject([]) do |r,x| 
-          x[/^#{key}:/] ? r << [x] : r.last << x;  r
-        end
 
-        @fields.each do |field|
-          populated_lines.each do |line|
-            line << field.to_s + ':' if line.grep(/^#{field.to_s}:/).empty?            
-          end
-        end
+        raw_lines.shift    
         
-        #a3 = txt.split(/(?:\n|^\-+$)\n/)
-        a3 = populated_lines.map{|x| x.join("\n")}
+        a3 = raw_lines.join.gsub(/^\-+$/,'').split(/\n\n/)
         # get the fields
         a4 = a3.map{|x| x.scan(/\w+(?=:)/)}.flatten(1).uniq
         a5 = a3.map do |xlines|
@@ -601,9 +591,11 @@ EOF
 
         end        
         
-        xml = RowX.new(a5.join("\n\n")).to_xml
-        a2 = Rexle.new(xml).root.xpath('item').inject([]) do |r,x|
-          r << @fields.map {|field| x.text(field.to_s) }
+        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) 
+          end
         end
 
         # if there is no field value for the first field then 

metadata

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