dynarex 1.2.27 → 1.2.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af8958c780bbbef841f04e8965372dc34d0c29af
-  data.tar.gz: bc48951dadb1b96090a60bb2655f6d1ebc7f57df
+  metadata.gz: 926aa9c0961f2dc726d0daf369783f900a5ec88a
+  data.tar.gz: ecd3a9f1a1f6d21e5495b64138fe996f175abeb8
 SHA512:
-  metadata.gz: 3e7389b1af0c11bcde4e55b526caa3b95e0d95ac0ad3b80a14a73d18a1c1361527286fa8d8d666b63291d8d1e657fbd9a16e6c0c38c09ca506f459c44dd95c5d
-  data.tar.gz: 3a7bb836d926972d3b909276f90166a8b7183fbc29391e9a6bdbb3ded42627b165001cadb866b27767c0283a4e48fbb7fdd01397ec1dcf2f6afa4ce3ec9a38ee
+  metadata.gz: 8a2e24c7507d1bff6709eca13051caef06e49333983677a0594781f71b20e184fc2753a3bd1a5b4f17643b16d6c3143e0c99b4b15881f1c1e42c76e9b2fb3fa5
+  data.tar.gz: ff8d38e94fa24e71e966ff545f535a966b165c8f7267ddfbd24e56e00e0e308a19a382ed27e6b356226bf0424e2ae622d7327d7e73e2776a633fd6afbfadf6cf

checksums.yaml.gz.sig

@@ -1,3 +1 @@
-k�pG�-���`Y�S䛯h;��w�ٟGJ����;
*����j0F�O��/��oR47�03�
��:��
-�k
>`��p�?ig'�*��]Q�)������?�N�h%
-��s��
+���%���{f�cL#�}�S��zEK����>�$V�Zl��8��I+�1*�~RЌTa3��2<3.�*'�Nu�YP�Ms�vuKF�䶇���XŤ!��������1n)T�ua�J`��>�SGW�]�<���/�sH�����[yC�1Ck�9�|Ts�n������=e�^����m��

data/lib/dynarex.rb

@@ -144,18 +144,45 @@ EOF
 
     #format_mask = XPath.first(@doc.root, 'summary/format_mask/text()').to_s
     #format_mask = @doc.root.element('summary/format_mask/text()')
-    format_mask = self.format_mask
-    format_mask.gsub!(/\[[^!\]]+\]/) {|x| x[1] }
-    xslt_format = format_mask.gsub(/\s(?=\[!\w+\])/,'<xsl:text> </xsl:text>')
-      .gsub(/\[!(\w+)\]/, '<xsl:value-of select="\1"/>')
-    
-    xsl_buffer.sub!(/\[!regex_values\]/, xslt_format)
 
-    xslt  = Nokogiri::XSLT(xsl_buffer)
-    out = xslt.transform(Nokogiri::XML(@doc.to_s))
+    if self.summary[:rawdoc_type] == 'rowx' then
+      a = self.fields.map do |field|
+  "<xsl:if test=\"%s != ''\">
+<xsl:text>\n</xsl:text>%s: <xsl:value-of select='%s'/>
+  </xsl:if>" % ([field]*3)
+      end
+
+      xslt_format = a.join      
+
+      xsl_buffer.sub!(/\[!regex_values\]/, xslt_format)
+      xslt  = Nokogiri::XSLT(xsl_buffer)
+      out = xslt.transform(Nokogiri::XML(@doc.to_s))
+      
+      declaration = %Q(<?dynarex schema="%s"?>\n--+) % self.schema
+      declaration + out.text
+      
+    else
+      
+      format_mask = self.format_mask
+      format_mask.gsub!(/\[[^!\]]+\]/) {|x| x[1] }
+      xslt_format = format_mask.gsub(/\s(?=\[!\w+\])/,'<xsl:text> </xsl:text>')
+        .gsub(/\[!(\w+)\]/, '<xsl:value-of select="\1"/>')
+        
+      xsl_buffer.sub!(/\[!regex_values\]/, xslt_format)
+      xslt  = Nokogiri::XSLT(xsl_buffer)
+      
+      out = xslt.transform(Nokogiri::XML(@doc.to_s))
+      declaration = %Q(<?dynarex schema="%s" format_mask="%s"?>\n) % 
+        [self.schema, self.format_mask]
+      out.text
+    end
+                             
+    #xsl_buffer.sub!(/\[!regex_values\]/, xslt_format)
+    #xslt  = Nokogiri::XSLT(xsl_buffer)
+    #out = xslt.transform(Nokogiri::XML(@doc.to_s))
     #jr250811 puts 'xsl_buffer: ' + xsl_buffer
     #jr250811 puts 'doc_to_s: ' + @doc.to_s
-    out.text
+    #out.text
     #jr231211 Rexslt.new(xsl_buffer, @doc.to_s).to_s
 
   end
@@ -525,6 +552,7 @@ EOF
         
       when '--+'
         
+        self.summary[:rawdoc_type] = 'rowx'
         raw_lines.shift
         
         key = raw_lines.first[/^[^:]+/]

metadata

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