dynarex 1.2.56 → 1.2.57

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16bba2f2ab993f7eb53a568efb0a9f17c7a252be
-  data.tar.gz: 4ff34ef303155d85f401c995c8a386c056ef2b24
+  metadata.gz: d42eb9a5d0717deaab404e5de5a46aba88618505
+  data.tar.gz: 43258f7e46ec208c9987ad051855b030c34846e0
 SHA512:
-  metadata.gz: 3be10e56019dfcbc80eecf7e37d8220505027783c8f0e7c2d7acc21921adaf1d3b636039bc78765995bdb0b2e48bdc931b5990b2a0fa1d5e46684e417799da47
-  data.tar.gz: a522619b8693cc939b00413031d440f0134b88aa2354c2941cf0da4e12da5f218d3adef9f91691f7fabdf3ce34a665aaf70aeccf19afa93940706e17e4dc285a
+  metadata.gz: 9c758ffd422a1b382e945b458d74785db9b1daf173eb2f75bcb02044d47dd8d9b02783ccd85cbab8e18061682383f658583daac295819c43bd55d95d2015efa7
+  data.tar.gz: ff5a7cfe62dd3244cd1cd91c30bae062a8e548a54b4eb4d1a61ff817ef9f1d7ec51666aaf349e33335dabdd74e5d6f64383c3d637676bd4132f94c53a797ad09

data/lib/dynarex.rb

@@ -34,7 +34,7 @@ class Dynarex
 
   def initialize(location=nil)
     #puts Rexle.version
-    @delimiter = ' '   
+    @delimiter = ''   
     open(location) if location
     if @order == 'descending' then
       @records = records_to_h(:descending) 
@@ -50,7 +50,15 @@ class Dynarex
   end
 
   def delimiter=(separator)
+
     @delimiter = separator
+
+    if separator.length > 0 then 
+      @summary[:delimiter]
+    else
+      @summary.delete :delimiter
+    end
+
     @format_mask = @format_mask.to_s.gsub(/\s/, separator)
     @summary[:format_mask] = @format_mask
   end
@@ -182,6 +190,19 @@ EOF
                                          self.summary[x]}.join("\n")
     end
 
+    if @raw_header then
+      declaration = @raw_header
+    else
+      smry_fields = %i(schema)              
+      smry_fields << :delimiter if self.delimiter.length > 0
+      s = smry_fields.map {|x| "%s=\"%s\"" % [x, self.send(x)]}.join ' '
+      #declaration = "<?dynarex %s ?>" % s
+      declaration = %Q(<?dynarex %s format_mask="%s"?>\n) % 
+        [s, self.format_mask.gsub('"', '\"')]
+    end
+
+    header = declaration + sumry
+
     if self.summary[:rawdoc_type] == 'rowx' then
       a = self.fields.map do |field|
   "<xsl:if test=\"%s != ''\">
@@ -195,17 +216,14 @@ EOF
       xslt  = Nokogiri::XSLT(xsl_buffer)
       out = xslt.transform(Nokogiri::XML(@doc.to_s))
       
-      if @raw_header then
-        declaration = @raw_header
-      else        
-        declaration = %Q(<?dynarex schema="%s"?>\n) % self.schema.gsub('"', '\"')
-      end
-      declaration + sumry + "\n--+\n" + out.text
+      header + "\n--+\n" + out.text
       
     elsif self.delimiter.length > 0 then
+
       tfo = TableFormatter.new border: false, nowrap: true, divider: self.delimiter
-      tfo.source = self.to_h.map{|x| x.values}
-      tfo.display
+      tfo.source = self.to_h.map{|x| x.values}      
+      header + tfo.display
+
     else
       
       format_mask = self.format_mask
@@ -217,13 +235,7 @@ EOF
       xslt  = Nokogiri::XSLT(xsl_buffer)
       
       out = xslt.transform(Nokogiri::XML(@doc.to_s))
-      if @raw_header then
-        declaration = @raw_header
-      else              
-        declaration = %Q(<?dynarex schema="%s" format_mask="%s"?>\n) % 
-          [self.schema, self.format_mask.gsub('"', '\"')]
-      end
-      declaration + sumry + "\n" + out.text
+      header + "\n" + out.text
     end
                              
     #xsl_buffer.sub!(/\[!regex_values\]/, xslt_format)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynarex
 version: !ruby/object:Gem::Version
-  version: 1.2.56
+  version: 1.2.57
 platform: ruby
 authors:
 - James Robertson