dynarex 1.6.2 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 324076e6701c0e10ed0af9b60a7d53722323f520
-  data.tar.gz: 318429b788da222089c5c3bcb1295e27d83dd718
+  metadata.gz: 7e57d6d55278a9ec34c7762852f939dcb5db7ec4
+  data.tar.gz: 81572f47df924245fbd2c62b7a6ead52a8a0774d
 SHA512:
-  metadata.gz: 59a1e8b93a605e82396c6f6283fceed0cacfb440369f47aff93c7b5af72fcf0ec24970a4c4abe8e95d24818e3f1f537752649d336b3d5c02f0c20cf6481aa198
-  data.tar.gz: 9d291dc5469ad7901e1559e06ec35a409fd21f5b90aa6b89d4e6468e45f4b448a2aa5718fcfb3ae58c88b52a0bb3dab4e147528db247b725207dfdfb6c661347
+  metadata.gz: 30b7a7ededf10686c163b3b04a61458fd9d6878e95675ad68a4a965ff69f5d23dc290fcd8c69aea672ce5e7481e79f88989e9a07440ff90be325e368e0c50249
+  data.tar.gz: af56ec100a0e3eff0d2d1d337a4598c6ba873f6035814359a73627989ba3d2be37ab32b8b219a025f8be0d4c124c39fb0f0c25e91820c13eb985024d09558713

data/lib/dynarex.rb

@@ -13,7 +13,6 @@ require 'recordx'
 require 'rxraw-lineparser'
 require 'yaml'
 require 'rowx'
-require 'nokogiri'
 require 'ostruct'
 require 'table-formatter'
 #require 'rxfhelper'
@@ -205,8 +204,9 @@ class Dynarex
 
   def to_html(domain: '')
     xsl_buffer = RXFHelper.read(domain + @xslt).first
-    xslt  = Nokogiri::XSLT(xsl_buffer)
-    xslt.transform(Nokogiri::XML(@doc.to_s)).to_s 
+    #jr100316 xslt  = Nokogiri::XSLT(xsl_buffer)
+    #jr100316 xslt.transform(Nokogiri::XML(@doc.to_s)).to_s 
+    Rexslt.new(xsl_buffer, @doc).to_s
   end      
   
   def to_s
@@ -266,10 +266,12 @@ EOF
       xslt_format = a.join      
 
       xsl_buffer.sub!(/\[!regex_values\]/, xslt_format)
-      xslt  = Nokogiri::XSLT(xsl_buffer)
-      out = xslt.transform(Nokogiri::XML(@doc.to_s))
+      #jr100316 xslt  = Nokogiri::XSLT(xsl_buffer)
+      #jr100316 out = xslt.transform(Nokogiri::XML(@doc.to_s))
+      out = Rexslt.new(xsl_buffer, @doc).to_s
       
-      header + "\n--+\n" + out.text
+      #jr100316 header + "\n--+\n" + out.text
+      header + "\n--+\n" + out
     elsif self.summary[:rawdoc_type] == 'sectionx' then  
       
       a = (self.fields - [:uid, 'uid']).map do |field|
@@ -282,10 +284,13 @@ EOF
 
       xsl_buffer.sub!(/\[!regex_values\]/, xslt_format)
       
-      xslt  = Nokogiri::XSLT(xsl_buffer)
-      out = xslt.transform(Nokogiri::XML(@doc.to_s))
+      #jr100316 xslt  = Nokogiri::XSLT(xsl_buffer)
+      #jr100316 out = xslt.transform(Nokogiri::XML(@doc.to_s))
+      out = Rexslt.new(xsl_buffer, @doc).to_s
+      
+      #jr100316 header + "--#\n" + out.text
+      header + "--#\n" + out
       
-      header + "--#\n" + out.text
     elsif self.delimiter.length > 0 then
 
       tfo = TableFormatter.new border: false, wrap: false, \
@@ -301,10 +306,12 @@ EOF
         .gsub(/\[!(\w+)\]/, '<xsl:value-of select="\1"/>')
         
       xsl_buffer.sub!(/\[!regex_values\]/, xslt_format)
-      xslt  = Nokogiri::XSLT(xsl_buffer)
+      #jr100316 xslt  = Nokogiri::XSLT(xsl_buffer)
       
-      out = xslt.transform(Nokogiri::XML(self.to_xml))
-      header + "\n" + out.text
+      #jr100316 out = xslt.transform(Nokogiri::XML(self.to_xml))
+      out = Rexslt.new(xsl_buffer, @doc).to_s
+      #jr100316 header + "\n" + out.text
+      header + "\n" + out
     end
                              
     #xsl_buffer.sub!(/\[!regex_values\]/, xslt_format)
@@ -532,9 +539,11 @@ EOF
     #File.open('dynarex.xml','w'){|f| f.write doc.xml}
     #xml = Rexslt.new(xslt, doc.xml).to_s
 #=begin
-    xslt  = Nokogiri::XSLT(xslt)
-    out = xslt.transform(Nokogiri::XML(doc.root.xml)).to_xml \
-                 :save_with => Nokogiri::XML::Node::SaveOptions::NO_DECLARATION
+    #jr100316 xslt  = Nokogiri::XSLT(xslt)
+    #jr100316 out = xslt.transform(Nokogiri::XML(doc.root.xml)).to_xml \
+    #jr100316              :save_with => Nokogiri::XML::Node::SaveOptions::NO_DECLARATION
+    out = Rexslt.new(xsl_buffer, @doc).to_s(declaration: false)
+    
 #=end
 
     #Rexle.new("<rss version='2.0'>%s</rss>" % xml).xml(pretty: true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynarex
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.7.0
 platform: ruby
 authors:
 - James Robertson
@@ -12,26 +12,26 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
   YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE1MDMwNTE0NTMzOVoXDTE2MDMwNDE0NTMzOVowSDESMBAG
+  8ixkARkWAmV1MB4XDTE2MDMxMDE0NDkyNFoXDTE3MDMxMDE0NDkyNFowSDESMBAG
   A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
   EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAMoGRaqVTEhnYLOeobX9k3wBUrD5t3iomr7yvv7IJ92pjkTsLHxIAt51K+yB
-  XHMuvSFoxjd/kh7G6P89DphWqJw+c6XRQRsTh27NE2SpHrqaTTSNLLCMs34nkdqK
-  sWp1Ixn6g9jOx4sj3mj+b1yNbg0zOpfsE05urczE1PY2qwYcT/K917hDgLr8VriZ
-  6AU6RVd5vO/b7GetV3NEA864eQ/D+lfnjADTDDBNmtBBd25EbVAle22WRhuC6PDr
-  FnXTIKrhmsFdooVaL1HPorjFrIDp/HoftmQJ0DgNvr7TNpIGM84DBvdvLI4LlcrK
-  547QRu+OrvBiaJS3pBdskGTH3J0CAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUwiMO3M7vHaf0BDqHsDqL8thD0UgwJgYDVR0RBB8w
+  ggEBALpQLLoxq53QaY02lhfBCDTLFBb7f0OBLcHPm+xT1qtwh56JB3RBWJZk0bOE
+  OomH/NUx8ADrc0U4gyb238Utnol2aa4qkpexfCXEN4X7hZ67Kj1+tU6SWWQuTORu
+  fGQ23AspsIJynl2RIRvkf8dmFknEbhEaGpbgivOr2qS+0Wgl/ST8VTbVuX6m/sIQ
+  LajmjflwZyuhBWo0QU+SawfO4j+onotHzOMI318S0cBnnUMLaKrbzD+QW5HuhlMV
+  lhqUfp/+Uf6JHZcLvkX/KdsTGUxYboqvCvjR5h71zx4nShZaj0KxMQcG9WX8Ja9u
+  eBj48bndJwliV+HV4nvaVp9jne8CAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
+  DwQEAwIEsDAdBgNVHQ4EFgQUSVOKw2AB/Da3qHWISyt1Bi/bK5cwJgYDVR0RBB8w
   HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAA762tqY9
-  DQuf+Lp/PTnaRpWGckpS2c89o3MCzpBdj8CeTiZTesf3j/8481LwAIALAUnMQTZ9
-  cOdLECRKyiZ2wtvDUpDdOyfJ7uOAQ0owRzLzK/wC+fGwPNR6OKf1kObn/95ZavmP
-  VSLB69Ea910qZG1sLhdmdBtVfTVMausd25Yig065Kl7qTwc86Gu6Xja1PSsCVzoa
-  mf6ofYWjfavicrL3n3nJeYCeQF8W96P3VPKEq/OZNN/nrtrcOJOF/JKMimWKtdDC
-  zafTuKRozNy5wCw7Z32VaDGcJ+yTPq73CrcPrNyaoxqGfU0qNsh6oGvwrq4Q1k4j
-  Pz2GWE7KigXTBg==
+  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAB8K0hdD5
+  3jlVqQr6jbgKyHKCGrq5jGvfU5n5MUOSNYL+PtydyZav7qgfLiZwAgT6Trt7LAQu
+  N/moTF+eqMiAvmTHyCIFNpvvHL5uD7GmcdHQtH/qCXBiTdvlu1xsw48k0LfqWqcJ
+  f6zs4TAdZ+T4lwAUauxknc38HnmhwqLT7hYLl1h8KE0rXo+7Bh1afdds/HqAcflZ
+  Eh8/sws6czmm/iSBrjoVkhZ/uHCdttqFwPdke0RlrRt3CDwhwcDSQVQiTH8BQ1XE
+  nP4bxzo6o8Qw40KPcv/n3Vcx8tV8hUOOe4XkImYbeWst9hbbHfbg8daipgkn9NEu
+  YXuVi+EfN14P6g==
   -----END CERTIFICATE-----
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex-import
@@ -79,20 +79,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: dynarex-xslt
   requirement: !ruby/object:Gem::Requirement
@@ -119,20 +119,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.3.1
   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.4
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: rxraw-lineparser
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +162,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -172,27 +172,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.2
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.7
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: table-formatter
   requirement: !ruby/object:Gem::Requirement
@@ -264,5 +244,5 @@ rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: The Dynarex gem can create, read, update or delete rows of Dynarex flavoured
-  XMLrecords.
+  XML records.
 test_files: []