dynarex 1.2.12 → 1.2.13

data/lib/dynarex.rb

@@ -18,7 +18,7 @@ class Dynarex
 
   attr_accessor :format_mask, :delimiter, :xslt_schema, :schema, :order
   
-  def self.gem_url() 'http://www.jamesrobertson.eu/ruby/dynarex#1.2,12'  end
+  def self.gem_url() 'http://www.jamesrobertson.eu/ruby/dynarex#1.2.13'  end
   
 #Create a new dynarex document from 1 of the following options:
 #* a local file path
@@ -427,26 +427,13 @@ EOF
     i = @doc.root.xpath('max(records/*/attribute::id)').to_i
     
     raw_summary = schema[/\[([^\]]+)/,1]
-    rowx = buffer[/--\+.*/m]
+    #rowx = buffer[/--\+.*/m]
 
-    buffer = rowx if rowx
+    #buffer = rowx if rowx
     
     raw_lines = buffer.gsub(/^\s*#[^\n]+/,'').gsub(/\n\n/,"\n")\
         .strip.split(/\r?\n|\r(?!\n)/)
     
-    if @order == 'descending' then
-      rl = raw_lines
-      
-      if rowx then
-        raw_lines = [rl[0]] + rl[1..-1].each_slice(@fields.count).inject([])\
-            {|r,x| r += x.reverse }.reverse
-      else
-        raw_lines = rl.each_slice(@fields.count).inject([])\
-            {|r,x| r += x.reverse }.reverse
-      end
-      
-    end
-
     if raw_summary then
       a_summary = raw_summary.split(',').map(&:strip)
       
@@ -458,6 +445,19 @@ EOF
         @summary[label] = val
       end
     end
+    
+    if @order == 'descending' then
+      rl = raw_lines
+
+      if rl.first =~ /--/ then
+        raw_lines = [rl[0]] + rl[1..-1].each_slice(@fields.count).inject([])\
+            {|r,x| r += x.reverse }.reverse
+      else
+        raw_lines = rl.each_slice(@fields.count).inject([])\
+            {|r,x| r += x.reverse }.reverse
+      end
+      
+    end    
 
     @summary[:recordx_type] = 'dynarex'
     @summary[:schema] = @schema

metadata

@@ -2,7 +2,7 @@
 name: dynarex
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.12
+  version: 1.2.13
 platform: ruby
 authors: 
 - James Robertson
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-05 00:00:00 Z
+date: 2013-01-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rexle