dynarex 1.7.9 → 1.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bad4d77e4c5097175bfbac1ddd248ee8ee75dd3e
-  data.tar.gz: 4414e3da7931a09acc4fa96d1977eeef4e384f45
+  metadata.gz: 2a20140da7001e92b57d4200633b330a92e7740a
+  data.tar.gz: cfea860892b162711caba5d3e1eeeef301ca9b74
 SHA512:
-  metadata.gz: 81f801e58c22a9aaddf055e42bcaa83862297723faee98ed084c373f4126cc260d15cb3397d694024949ce40e0bbbeedb8c840a42f9eb0cbc1581a92b5558190
-  data.tar.gz: 153328a5a875ce9b538940a3b65885cb603a40307d6af4877ca10ba3f596eb76af9c54ec74c6de1dfedfa9e631a51ed30bb5c0fd2fb744c4e2ad9e2a00d0b055
+  metadata.gz: 81e3c54a84c5b007e16ee60c048d0a60f7a1bea77747160ae4d54d3e6820ec89cf1881b5cc89d592846469d061f044f2a0462d5c899fc5e9827f9db50373af99
+  data.tar.gz: b8f041de3156ae34eb16aa167c3a1e69d2228add0ba2e91b51b188e96783cf08971f530169b750b5e0a6c4e62392e50e586ade27bd984117e8cc0d7ce917cd50

data.tar.gz.sig

@@ -1,2 +1,3 @@
-]Vv����e��CP*?
���3�Fp1�m�8�Uf���^���e��
-����R��flI>��}S����5E��D���Z/Mh��y�o�ۧ��d	ZY�g�4�aHy��.�/��"�����O[�dm/P�p�iL�*��q��Nfw�3Y^��c��n�T�� �B�X|��M�
+.boΘM/�;j!
+��Ó�M�x��p̻;�����8�N��L�ȿn����13�������R���9�+$��+���[5M4��.��J�`y@',7�3��;��*b
+������+�	n�3��N�0�+:����C	�"����HDݢgk/��J`oQ&fqsVJ������j/�uU�g����L��J�J�5����M��

data/lib/dynarex.rb

@@ -221,7 +221,7 @@ class Dynarex
     pretty ? JSON.pretty_generate(h) : h.to_json
   end
   
-  def to_s
+  def to_s(header: false, delimiter: @delimiter)
     
 xsl_buffer =<<EOF
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
@@ -255,7 +255,7 @@ EOF
       smry_fields = %i(schema)              
       smry_fields << :order if self.summary[:order] == 'descending'
       
-      if self.delimiter.length > 0 then
+      if delimiter.length > 0 then
         smry_fields << :delimiter 
       else
         smry_fields << :format_mask unless self.summary[:rawdoc_type] == 'rowx'
@@ -266,7 +266,7 @@ EOF
       declaration = %Q(<?dynarex %s?>\n) % s
     end
 
-    header = declaration + sumry
+    docheader = declaration + sumry
 
     if self.summary[:rawdoc_type] == 'rowx' then
       a = self.fields.map do |field|
@@ -280,7 +280,7 @@ EOF
       xsl_buffer.sub!(/\[!regex_values\]/, xslt_format)
       out = Rexslt.new(xsl_buffer, @doc).to_s
       
-      header + "\n--+\n" + out
+      docheader + "\n--+\n" + out
     elsif self.summary[:rawdoc_type] == 'sectionx' then  
       
       a = (self.fields - [:uid, 'uid']).map do |field|
@@ -295,14 +295,14 @@ EOF
 
       out = Rexslt.new(xsl_buffer, @doc).to_s
       
-      header + "--#\n" + out
+      docheader + "--#\n" + out
       
     elsif self.delimiter.length > 0 then
 
       tfo = TableFormatter.new border: false, wrap: false, \
                                                   divider: self.delimiter
       tfo.source = self.to_h.map{|x| x.values}      
-      header + tfo.display
+      docheader + tfo.display
 
     else
 
@@ -315,7 +315,7 @@ EOF
 
       out = Rexslt.new(xsl_buffer, @doc).to_s
 
-      header + "\n" + out
+      header ? docheader + "\n" + out : out
     end
 
   end
@@ -393,7 +393,7 @@ EOF
 #  dynarex.create name: Bob, age: 52
 
   def create(obj, id: nil, custom_attributes: {})
-    
+
     raise 'Dynarex#create(): input error: no arg provided' unless obj
     
     case obj.class.to_s.downcase.to_sym    
@@ -1294,4 +1294,4 @@ XSL
     end
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynarex
 version: !ruby/object:Gem::Version
-  version: 1.7.9
+  version: 1.7.10
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   nP4bxzo6o8Qw40KPcv/n3Vcx8tV8hUOOe4XkImYbeWst9hbbHfbg8daipgkn9NEu
   YXuVi+EfN14P6g==
   -----END CERTIFICATE-----
-date: 2016-07-13 00:00:00.000000000 Z
+date: 2016-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex-import