dynarex 1.2.30 → 1.2.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0de448fafe96222ba235d6c638c052f0515b7760
-  data.tar.gz: 3132eef76aef292878e86f2217f2f8dda6a57760
+  metadata.gz: 43ead0947536928464dc4dfce435aa84de0d3544
+  data.tar.gz: b0780ccfa393fa0ffd377b14eb602fd68b7d717e
 SHA512:
-  metadata.gz: 6a15bae8efbb93ce779f06555b23902c8190a4ee0a0ad12936ce26310201499c4ddea8f1d5f34cb19dd0aeaa3a8d157cecbc215dc972053e01bd360f6d2577f1
-  data.tar.gz: ee7540110279a67ae79fc5f558b6af410dc7e4e7b4804f569c6e8770aa7ac7dab23397aee3cf9d717a3ebf06fba6c87b0c0269c4bbc0c4315a3c43c4f4b83265
+  metadata.gz: 2554422e1cafdd9666cf384c436c724a82636866995bd77631b535b67397a58811b3d56df68c8757d1db64c2201f8844f95ff07fde2183a71cc8cac2918b236f
+  data.tar.gz: 4b80172746018dea4fd8611b19f1d868736391076fe162e3a2b7f52f0e347ec2980a0bcdb17bf6523588c2440896772d5d5538e92bbf9d5ac078980857c332f5

data/lib/dynarex.rb

@@ -403,6 +403,11 @@ EOF
 
   private
 
+  def add_id(a)
+    @default_key = :id
+    @fields << :id
+    a.each.with_index{|x,i| x << (i+1).to_s}    
+  end
 
   def create_find(fields)
 
@@ -582,16 +587,23 @@ EOF
             line << field.to_s + ':' if line.grep(/^#{field.to_s}:/).empty?            
           end
         end
-        
-        xml = RowX.new(populated_lines.join("\n")).to_xml
 
+        xml = RowX.new(populated_lines.map{|x| x.join("\n")}.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) }
         end
+
+        # if there is no field value for the first field then 
+        #   the default_key is invalid. The default_key is changed to an ID.
+        if a2.detect {|x| x.first == ''} then
+          add_id(a2)
+        end
+        
+        a2
         
     else
         
-      raw_lines.map.with_index do |x,i|
+      a2 = raw_lines.map.with_index do |x,i|
                 
         begin
           field_names, field_values = RXRawLineParser.new(@format_mask).parse(x)
@@ -601,6 +613,9 @@ EOF
         field_values
       end
       
+      a3 = a2.map(&:first)
+      add_id(a2) if a3 != a3.uniq 
+      a2
     end
 
     a = lines.map.with_index do |x,i| 

metadata

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