dynarex 1.2.96 → 1.2.97

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 730234b66ee9ea5b3f22b5431febfa27c5010d77
-  data.tar.gz: 2e86bb48de519525d50367f83240d8bcb1ff6b5c
+  metadata.gz: ba9cee7b9e693f188f46af066d7c6fd9eb39cc7d
+  data.tar.gz: 7032bcc79105fbb554201512466a04330846787e
 SHA512:
-  metadata.gz: 7de9de3b42ae7d97eb1f86bb5a078dc641957f3f15ac9556ae0e49a717032e9b4f9f678a341b7e42c3712ad4f7213e6f9764daad718bf2524b1bfddc6cfb9c3c
-  data.tar.gz: f5202d133e27b665a8895917f76532c5a6d453fa1849e8f400c07efde9416cd403b253a1aa02b7ea6dd72564dcf3652fbddbf40a3de15d9db2edee32456ad75c
+  metadata.gz: c513aea9c1c9232135e3dc03733cf271f0f6bfeaa8990f37d14faf849d55fde313a375122b5d5fcafad77e5b3dd22adcfc20b0f34729c1d1a340920dc6a8ccfb
+  data.tar.gz: 1d6c8040b0a24fc118fa61847551a40d670d480318a968797973289a59d6f65a1e49294f10a5fba58ec87bafb57546d67ce940f769e1fe8fb37dfadb65d7a124

checksums.yaml.gz.sig

@@ -1 +1 @@
-?�����\��+JRR�V��%��@L(!<`�PY���|�s��&TK�����w���uB����muo�*�yh�WCo4�l�=�����h���/;��qX��j���Ag�U����,Ey���8�Y�RYw�&(�M��/8k'�i]���M�b��)�<^��1����~7�0���x�x�XhN�@TnP�#���f�&~;����/��I� �n{�>�
m�	U���S!"�?S��<E�)&v$�)}���,��e���l��$
+I��}����q�,qz�1�L�`�HҎ��O�Z o&Gq	�zr�����՛���G���i��U

data/lib/dynarex.rb

@@ -726,23 +726,36 @@ EOF
         a3 = raw_lines.join.strip.split(/\n\n(?=\w+:)/)
 
         # get the fields
-        a4 = a3.map{|x| x.scan(/\w+(?=:)/)}.flatten(1).uniq
-        a5 = a3.map do |xlines|
-
-          missing_fields = a4 - xlines.scan(/^\w+(?=:)/)
-          #r061013 r = xlines.lines.map(&:strip)
-          r = xlines.split(/\n(\w+:.*)/)
-          r += missing_fields.map{|x| x + ":"}
-          r.sort.join("\n")
+        a4 = a3.map{|x| x.scan(/^\w+(?=:)/)}.flatten(1).uniq
+        
+        abbrv_fields = a4.all? {|x| x.length == 1}
+        
+        a5 = a3.map do |xlines|
+        
+          missing_fields = a4 - xlines.scan(/^\w+(?=:)/)
 
-        end        
+          r = xlines.split(/\n(\w+:.*)/m)
+          missing_fields.map!{|x| x + ":"}
+          key = (abbrv_fields ? @fields[0].to_s[0] : @fields.first.to_s) + ':'
+          
+          if missing_fields.include? key
+            r.unshift key
+            missing_fields.delete key
+          end
+          
+          r += missing_fields
+          r.join("\n")
+        
+        end
 
-        xml = RowX.new(a5.join("\n").strip).to_xml
+        xml = RowX.new(a5.join("\n").strip, level: 0).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) 
+
+          r << @fields.map do |field|
+            x.text(abbrv_fields ? field.to_s.chr : field.to_s )
           end
+          
         end
 
         a2.compact!        

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynarex
 version: !ruby/object:Gem::Version
-  version: 1.2.96
+  version: 1.2.97
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   SLshUY2PSjSnVYx3Gln9vzST8CSTQPZbVpDfzbTqqAZnzqhIe2UaLbzGCMoz8kbw
   jQ7NXbu03ZrsvQ==
   -----END CERTIFICATE-----
-date: 2014-12-20 00:00:00.000000000 Z
+date: 2014-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexle