dynarex 1.7.17 → 1.7.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 482c5387c9c7d4a1709a562edd9f675c322d0e6c
-  data.tar.gz: a46c5ab2e37e9c310193ac3895eb817f3fd66ac0
+  metadata.gz: c29d4650bcd04c39d05b758bfc895ece4648b91f
+  data.tar.gz: 4849e8bba22acde156140023e11c9f3c367b8906
 SHA512:
-  metadata.gz: d5c0c67eeef8f1804366c779c1ccda0de6ba8e4fc066a6e6f6a305493aad887c64aad65f0d47b0fc4515cca7ef42ea73a94059aefb994050c0a6a4d73da03035
-  data.tar.gz: 973e062e8da3048ebd62a13f4f2f2e42d323f95b2f5a842df65ed0310a3facc8884761b17bb85bc0651a01c044320b35670c728e3984656bfdefc2ca2cbfc6ea
+  metadata.gz: e7c31ed98ef72f12f2872b1efac73ef46a8c30b399bd6347263afec68efd8b0bfd76ecbf10585ab4d2ac375d6afb341bae284c0df0165f9b326baecec844c737
+  data.tar.gz: 9251db275750768910974780c9604858028ec22984e6beb6e17210134855f24c882950363cd64a5af243fef8add56dc1ebaea9a530168b1f765f6514f7719bf4

data/lib/dynarex.rb

@@ -246,7 +246,7 @@ class Dynarex
   end
   
   def to_s(header: true, delimiter: @delimiter)
-    
+
 xsl_buffer =<<EOF
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 <xsl:output encoding="UTF-8"
@@ -332,8 +332,10 @@ EOF
 
       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"/>')
+
+      s1, s2 = '<xsl:text>', '</xsl:text>'
+      xslt_format = s1 + format_mask\
+          .gsub(/(?:\[!(\w+)\])/, s2 + '<xsl:value-of select="\1"/>' + s1) + s2
         
       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.7.17
+  version: 1.7.18
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   nP4bxzo6o8Qw40KPcv/n3Vcx8tV8hUOOe4XkImYbeWst9hbbHfbg8daipgkn9NEu
   YXuVi+EfN14P6g==
   -----END CERTIFICATE-----
-date: 2016-12-23 00:00:00.000000000 Z
+date: 2017-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex-import
@@ -59,20 +59,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: rexslt
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
         version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -132,7 +132,7 @@ dependencies:
         version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: rxraw-lineparser
   requirement: !ruby/object:Gem::Requirement
@@ -179,20 +179,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: kvx
   requirement: !ruby/object:Gem::Requirement
@@ -214,7 +214,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.6.1
 description: 
-email: james@r0bertson.co.uk
+email: james@jamesrobertson.eu
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -240,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: The Dynarex gem creates, reads, updates or delete rows of Dynarex flavoured