dx_sliml 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a270ae844deeec964e0cd1640bdc4059d527cf07
-  data.tar.gz: f2868216812e5f03a561c3e09fb57d1120448013
+  metadata.gz: fa2dfef79d77d41522a15a8209df3eb6ee3fed4d
+  data.tar.gz: cfc159194cd8606d67df6dcaf6e42f74b2a709bf
 SHA512:
-  metadata.gz: 6ca9bb390f624ad36a0c1c505c0ae5535752ed4aa9d4f764f43ce28f6f392b3dd79139176607adabe427c513c755d87486ef8ea59e80b3048864e38744444998
-  data.tar.gz: 0eece75c65eee8570b7dd5035a4b923e18834d2ada3e61496db80cea62897fd249d6d0a0426db59d4d38575efb6b4f9d81eb6daee481eba8f0d71a38db07428d
+  metadata.gz: c1ba0a6ec4a1f559067c90b894b75191c1283b73bb5e8546e162ad2f4e86e360f7eaf10982cf1969b5338f45d51e90b48f283b5b8ca7d11f7836faa4baf12416
+  data.tar.gz: b761181a2c494dba2fa56c55fc3e1ba12504c40db4eb539d2648c9b215eb66f4b34d9d4e5a6848c52227916e4f0ea4bf2e9837b29b343ed8951bd4b9a0592921

data/lib/dx_sliml.rb

@@ -7,7 +7,7 @@ require 'dynarex'
 
 class DxSliml
 
-  attr_reader :to_xslt, :to_html
+  attr_reader :to_xslt, :to_html, :to_xml
 
   def initialize(sliml=nil, dynarex=nil, dx: dynarex, fields: nil)
 
@@ -32,7 +32,6 @@ class DxSliml
     
     sliml ||= create_sliml(fields)
     @sliml = sliml    
-    
        
     sliml.gsub!(/\{[^\}]+/) do |x|
       x.gsub(/["']?(\S*)\$(\w+)([^"']*)["']?/,'\'\1{\2}\3\'')
@@ -42,11 +41,13 @@ class DxSliml
     
     @recxsl = xml.gsub(/\$(\w+)/, '<xsl:value-of select="\1"/>')
     
-    @to_xslt = build_xslt
+    @to_xslt = build_html_xslt
+    xml_xslt = build_xml_xslt
 
     #jr190316 xslt  = Nokogiri::XSLT(@to_xslt)
     #jr190316 @to_html = xslt.transform(Nokogiri::XML(@dx.to_xml))
     @to_html = Rexslt.new(@to_xslt, dx.to_xml).to_s
+    @to_xml = Rexslt.new(xml_xslt, dx.to_xml).to_xml
 
   end
 
@@ -59,7 +60,7 @@ class DxSliml
 
   private
 
-  def build_xslt()
+  def build_html_xslt()
 
     schema = @dx.schema
     rootname, recname = schema.split('/').map{|x| x[/\w+/]}
@@ -117,6 +118,41 @@ class DxSliml
     xml2.sub('<rec_template/>', @recxsl)
   end
   
+  def build_xml_xslt()
+
+    schema = @dx.schema
+    rootname, recname = schema.split('/').map{|x| x[/\w+/]}
+
+    xml = RexleBuilder.new
+    raw_a = xml.xsl_stylesheet(xmlns_xsl: \
+                     "http://www.w3.org/1999/XSL/Transform", version: "1.0") do
+      xml.xsl_output(method: "xml", indent: "yes", \
+                                              :"omit-xml-declaration" => "yes")
+
+      xml.xsl_template(match: rootname) do
+
+              xml.xsl_apply_templates(select: 'records/' + recname)
+
+      end
+
+
+      xml.xsl_template(match: 'records/' + recname) do
+
+        xml.rec_template
+
+      end
+
+    end
+
+    xml2 = Rexle.new(raw_a).xml(pretty: true).gsub('xsl_apply_templates',\
+        'xsl:apply-templates').gsub('xsl_value_of','xsl:value-of').\
+        gsub('xsl_template','xsl:template').\
+        gsub('xmlns_xsl','xmlns:xsl').gsub('xsl_for_each','xsl:for-each').\
+        gsub('xsl_','xsl:')
+
+    xml2.sub('<rec_template/>', @recxsl)
+  end
+  
   def create_sliml(fields)
     
     lines = ['dl']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dx_sliml
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - James Robertson
@@ -10,28 +10,27 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
-  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE1MDkxMDE3MjMzMloXDTE2MDkwOTE3MjMzMlowSDESMBAG
-  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
-  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAMLr2aPSzSNx5j3BITddVtIlM1LZuVukOitbe4i11On3Lav/L0akubHd+BGz
-  RdHdp3MssY3hb/EP/ueUlluc9OMQoJuBVKqtcLirsSUUnh4TVoKgixMP4jpJ3/5v
-  6dIy8vdnatmE5Q6UMNqfIx1Nk2lfMOS4KwGAOuauSrheiB9L3aNtZtB49umbVon+
-  2DfuAj3w1qvm+BVb7FssXJT98BA1rBjw/blRJ1kURKRpJjgsKHGWPYMjOTvTJMLQ
-  RYcrEdYXjU2PyO4Bzb2ixgzQsxpLdCg3yT5Psh8niClYHqUw8Vml3xsVoAXZARjT
-  65ammqagW2LPg+eqHr1Fvy5bjc8CAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUZqY7Mpuhmkr7l2iLIagPN4jvSyAwJgYDVR0RBB8w
-  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEANd7gRBOQ
-  qmI3P9AycNOMlc6BbJ/92kxqnBA8tNlTiaZ1sPCzFAM5AC76ZaU7/xNKFkPUkwpH
-  hMVZN6XkujYoa+cS73DnJW2Mik2zAlu2U4DkBXlyXIsx2tgWXinF73PGtVSL651g
-  Jkt13qK3yv6mRttOdFuBIjhKTPjd830k3Gr5qkPFlFozmnnuSyUAwIA13An9Yskc
-  G+sPxo02xvtJwGTYsbzdAl/7aYbytg8YNYZoNsI6fkVKIy/OrfYvUrFA/SEL0YXD
-  riqQvKCPf2pAclvY7x0rzJmfVDI5Puxxi7MLiknObzzMYR3lV9jHqYf9GUX+gZYo
-  T+1jKCori2GnHw==
+  MIIDXjCCAkagAwIBAgIBATANBgkqhkiG9w0BAQUFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTgwMTE5MTEyODE5WhcN
+  MTkwMTE5MTEyODE5WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+envf
+  sxBbBs1OgvQftd4kHkWLFu/hXuNL7Pt62ofRaUAIi06taT7q1Olv2YurRZXaVOWK
+  MfRwAVk9O340Ai6vGPSeeURfdN0jDBLhJyohX4Bu9/VbXgrUwK8TMoOoALkZgKgl
+  gkLRtl5CyadJoJzGHesBibOPGLfJ9tLuQZEvnephlJLhMG+wqRSTTm9fzpjpN686
+  hs6/2WZkbOYBxhzyo1BW5RL0AXX5Ez/yS7yzLE2hrRceu9mekYwrkQbdvhcuxqwU
+  jObRFXwF5y3Nwiz49a2tZe/zBr3xK8VweFnV23woanLHToIZ5rhuC9mInqGZK+q4
+  sBNLmOcTQTtYQuQpAgMBAAGjgYowgYcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
+  HQYDVR0OBBYEFGZd1LL9JiYN2wNoiFaJdRDjHnldMCYGA1UdEQQfMB2BG2dlbW1h
+  c3RlckBqYW1lc3JvYmVydHNvbi5ldTAmBgNVHRIEHzAdgRtnZW1tYXN0ZXJAamFt
+  ZXNyb2JlcnRzb24uZXUwDQYJKoZIhvcNAQEFBQADggEBAGOYM7OFVB33IhjZnyja
+  UFkBxfPbE7edH3rXWM8cNu5+eWMUmXuVMB3dvId5wsVWi2bYdyiFXBYTajO5YuwQ
+  P49hT74+qlGxXQG7AvjOwbPcqLZd8rWeT/cNp7vvr46YpybkC/AWunPwGB4RGCva
+  nkdE27U1HOYHM5NngE/Ytd+WDyh6y9dcK1rGySXOPAo+wAsLCQWjMXzOD8LLfc4p
+  gYBiqH2BeKU0VXP6fkHI2W1xMtEc8iomSIVYz604Nsk3A5FF1JkabmgFKX8NMjEh
+  CkZ6qkMMl64IWv3hWbm6Ou/TqxtUMBsYooo0jjYEmD1AqJeGwV4icnKKmyh4uZ5C
+  80c=
   -----END CERTIFICATE-----
-date: 2016-03-20 00:00:00.000000000 Z
+date: 2018-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynarex
@@ -39,22 +38,22 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.34
+        version: 1.7.28
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.34
+        version: 1.7.28
 description: 
-email: james@r0bertson.co.uk
+email: james@jamesrobertson.eu
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -80,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Uses a Sliml like format to transform a Dynarex document to HTML.