rexslt 0.6.7 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b9f9d1e95abd8795d63744c0613a83fefb69538
-  data.tar.gz: b6894d0c8ba12bc0dd496317a0dba27867068d46
+  metadata.gz: f3b4e51d09e5a32477d0cbd84750233fb11efd6c
+  data.tar.gz: 15664915741e3124b9350d4ed21532d83939b0f1
 SHA512:
-  metadata.gz: f500a58273e176530b31f57eafc970e35f0a804ce150ebd50ce1165b39af263b57fabb1c3f996a902f2f8df94bbf4d54ea1cd23139f28510537d249f5433eee2
-  data.tar.gz: a5eceb8b10c79f6607fe721869e6221b35e7bf75ea5b24fa94fc8c72441a93398faf9f9ccb5dbfb2b1b0f8b29e679654ce61d3c411215c7efd7552c3a22265b4
+  metadata.gz: 0e0911d84d2694bbc7f3d6552a8cc8e9ac4620eefd6325166ada84c7aa16a2ecf52a466e0b23359ddc9230b666fb70c403f32f55362f310fa84e63d68431eff0
+  data.tar.gz: '0738ec497ce3ac97486c89affe40716a10b790cdfa3265aee6614dc0d8e5d3c4d9e4fea8ba86cb7f7ab23fd94956364d686d42a04aa118cec0674a9ebab7082e'

data.tar.gz.sig

@@ -1 +1,4 @@
-a$�i�*�ԭ�r&�nJw����C��)7" ��e�\*��ɴ�M13�ZuNR��c��lٛ�
+Ÿ����(�
+�	�O�p�(��{9x(M�'C�@���ўE�L����xW�kJ�yh/�O%d)�ʷM�Hg�&^��N3�N�+�;s���
+N�5���Jd
+ n�n��]�n�-~�3/�)���)�/ն��ANU�Suj��m�}���c ����~��u#3'�W3|����UY��۠?��� �-"qgn
€1{'[�L@I/6�I�*4�/�@�dNS�Ԁ�.�'6|_=3

data/lib/rexslt.rb

@@ -8,6 +8,7 @@ require 'rxfhelper'
 
 # modifications:
 
+# 15-Sep-2017: feature: Implemented xsl_call_template
 # 21-May-2016: bug fix: An update to the Rexle gem regarding the new 
 #              Rexle::Element::Attribute datatype caused the sort_by code 
 #              to break. This has now been rectified.
@@ -59,12 +60,16 @@ class Rexslt
     
     ## debugging variables
     
+    @log = Logger.new 'rxsl.log','daily'
     @rn = 0
     @rre = 0
 
     super()
+    @log.debug 'before options'
     @options = {}
     custom_params = params.inject({}){|r,x| r.merge(Hash[x[0].to_s,x[1]])}    
+    @log.debug 'before xsl_transform'
+
     xslt_transform(*[xsl, xml].map{|x| RXFHelper.read(x).first}, custom_params)
   end
   
@@ -117,7 +122,7 @@ class Rexslt
     end
 
     raw_template = @templates.to_a.find do |raw_item, template|
-
+      next unless raw_item
       item = raw_item.split('/')
 
       if match? keypath, item then
@@ -197,16 +202,26 @@ class Rexslt
 
     doc_element.add_attribute(name, value)
   end
+  
+  def xsl_call_template(element, x, doc_element, indent, i)
+    
+    name = x.attributes[:name]
+    template = @doc_xsl.root.element("xsl:template[@name='#{name}']")
+    
+    read_node template, element, doc_element, indent, i
+  end
 
   def xsl_choose(element, x, doc_element, indent, i)
     
+
     r = x.xpath("xsl:when").map do |xsl_node|
 
       condition = xsl_node.attributes[:test]
+
       node = element.element condition
-      
+
       if node  
-        read_node(xsl_node, element, doc_element, indent, i)      
+        read_raw_element(element, xsl_node.elements.first,  doc_element, indent, i)      
         true
       else
         false
@@ -234,7 +249,7 @@ class Rexslt
   end
   
   def xsl_element(element, x, doc_element, indent, i)
-
+    
     indent_before(element, x, doc_element, indent + 1, i) if @indent == true
 
     name = x.attributes[:name]
@@ -355,7 +370,7 @@ class Rexslt
   # doc_element: target document element
   #
   def read_node(template_node, element, doc_element, indent, i=0)
-
+    
     template_node.children.each_with_index do |x,j|
 
       name = if x.kind_of? Rexle::Element then :read_raw_element
@@ -392,9 +407,9 @@ class Rexslt
   def read_raw_element(element, x, doc_element, indent, j)
     
     method_name = x.name.gsub(/[:-]/,'_').to_sym    
-
+    
     if @xsl_methods.include? method_name then
-
+        
       if method_name == :'xsl_apply_templates' then
         #doc_element = doc_element.elements.last
       end
@@ -502,19 +517,22 @@ class Rexslt
 
   def xslt_transform(raw_xsl, xml, custom_params={})
 
+    @log.debug 'inside xslt_transform'
+
     doc_xml = xml.is_a?(Rexle) ? xml : Rexle.new(xml)
- 
+
     @doc_xsl = raw_xsl.is_a?(Rexle) ? raw_xsl : Rexle.new(raw_xsl)
-    
+    @log.debug 'after @doc_xsl'
     
     #jr2040516 filter_out_spaces @doc_xsl.root
 
     @doc = Rexle.new '<root></root>'
+
     indent = 0
 
     previous_indent = 0
     @xsl_methods = %i(apply_templates value_of element if choose when copy_of
-                      attribute for_each text output).map do |x| 
+                      attribute for_each text output call_template).map do |x| 
                         ('xsl_' + x.to_s).to_sym
                       end
     
@@ -530,6 +548,7 @@ class Rexslt
     end
 
     h = @doc_xsl.root.element("xsl:output/attribute::*")
+    @log.debug 'after h'
     
     if  h and ((h[:method] and h[:method].downcase == 'html') \
                                    or h[:'omit-xml-declaration'] == 'yes') then
@@ -586,10 +605,7 @@ class Rexslt
 
       end
     end    
-    
-    
-
-
+        
     out
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexslt
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors:
 - James Robertson
@@ -12,26 +12,26 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
   YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE2MDMwNDIzNTg1NloXDTE3MDMwNDIzNTg1NlowSDESMBAG
+  8ixkARkWAmV1MB4XDTE3MDkxNTIwMjQwM1oXDTE4MDkxNTIwMjQwM1owSDESMBAG
   A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
   EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAKzE015vYQSwDJ3b9+oMbtv9xKd3bx9aTF0MuF00hKmbPjFHd3L6dyJoEWCy
-  ZYxqiJZykN/TH8RD6wCvqPqtRwCM4j4zubSLfx9pLrWfA9KyHZ76sHNFvMwKJowV
-  /LvaQVWFsyvisyUGE5700jKE0pzt42g2MTIBsci6Lj6RTWzP5o1GgKVHEGW8JDv/
-  AEWspA+gCGoScP4lBKrwnfhjx8e0giWenEMxZFQLllLJcd95bxBsPudVXA9fSsZJ
-  LTSRPrEzX2w/T+BxTMwA3avOWPij/EqmfalHjBvruV9VHX7SIQb3wp8njvgFwI80
-  ctKDJ9kHhU0ImdBFsrEV91m3occCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUDSdtw1Awl7Da9uo7Dk/jGadtV8swJgYDVR0RBB8w
+  ggEBAMlR9HT3XszqknU82ijbs8uTs91F9jkc+2oXFCmTDwx7K6RIsUYs4J5p2hnw
+  Rg3JMpgbCnlz2/bOenXHYq2+MYw5jql68lorwqAvPOSqgnmgolid5EuNNyGqlDHB
+  Mkp79B2ZhNO8Gz77ruYgCKVkGCrwO2Njc8iGGnEiRUAntRna1YcFNYKOU1hllqDI
+  oKn0efB/YTgzqhhpYxK9sEpWfjFoO9trfj+r9BU/BAHWVDR5vxdSiqFIkbnKW65a
+  nC28KtMVI7KkUPbN8tgsm8B9Id6POHUUGjiBHr1P/zktOcyrOAnzAi9lLlS9hnkt
+  6Ktj0NDtQrAcaJOpS63qJmBuYPkCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
+  DwQEAwIEsDAdBgNVHQ4EFgQUFDszzDA8NNNCoYI2FKOrIiIp87YwJgYDVR0RBB8w
   HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAPMbAn90u
-  s7nXLA0sr2fcImZAoeklGL7xVxAjKPgy9T56LFU6KVe0p9u4uxXzs3Gi4HKIF/5P
-  P5uGfjvfnzhl0vNKbFMyrvAcgAYRR+4/T2KJHetMUBEOll3hvOgCEL96P2A3rvBs
-  Ey6GvidwOJWsH1l2PuYXh/XHX9OAUoYuzZf0oK0LSMpdqwmdyGBaIaGS/JIfusfZ
-  qti4dC2jX2jBO+yVrjhxjUa2mhJ4FMvFakkFu6ygoV2E2xff/njkAaoQHh6LW1R4
-  38j2+6ULVWalsVein3whb7qB6IOvxoSqjz6n7jAKFGHovoXPUqpv5y5Yor23rTrn
-  0YwisIc3UkL30g==
+  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAhp3O3yYu
+  +96s1H5S297WguKDGrNKJoa44o+6IU4JefUxkmfidtaSwcPnnCaAsoLXzBLpnwlY
+  m6LH1jPWHqnJlUHjtkjr/wp620cWGKcwFw8VlfqdNALV9tALCHje5J+NITR2U9P6
+  Q6tcZFPZmUCr8SvlQlqGJY1BY/e9iajntzL0j6QvBZLzaQbej1DY5Dbv3e2ipOZq
+  gQdsDg5v3CppCdi6o+CG+Q+K2P6w4EBdWKHn9FhYUMp4oDiBznW7D+dpEraoyER7
+  f4Fi5ORmK9ccbijkIGmH2JdFYi07Fax/6a8TgcpbSrICHncFAvvPo8hxuUR+aHvg
+  wux0hu0gdmk8nA==
   -----END CERTIFICATE-----
-date: 2016-05-21 00:00:00.000000000 Z
+date: 2017-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rxfhelper
@@ -39,42 +39,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.2
   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.0
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: rexle
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.30
+        version: 1.4.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.30
+        version: 1.4.9
 description: 
-email: james@r0bertson.co.uk
+email: james@jamesrobertson.eu
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -100,7 +100,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: Rexslt is an XSLT processor written purely in Ruby