rexslt 0.6.9 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 69797514b98a7984bc4175670b6ffc7d7863557e
-  data.tar.gz: d62aa717f191ad2bc16998f7c388f668e6853e96
+SHA256:
+  metadata.gz: aa90a309932376c100cce5be8f22d80a557b991f5fed84916eb7835c30bfd0a7
+  data.tar.gz: 41ad2d628a4c98d16a2d088b00dacb865c0935e1d57d0fde72f92a14860c45cf
 SHA512:
-  metadata.gz: 7efcdd6aad9ff17aac7e7aa98273161cd5c5df715e7ac0ca5c7e49b7e63149d9c449f1849329de7c2d39173429b90762adacc2e548f721f726430ce016de353a
-  data.tar.gz: 94d967daded356dedf56eeb4b59b8c8a424eaf293de2d96f8fce0395b64d65cce2415b59be4f1c67694dcc87c59fcefc40b153f6607814ad8a5c2e92cf037490
+  metadata.gz: 3b74db7015db32fd1f917974f499fe5542590ab7063fe0611e60969b085aa4a7710f0afcd892044958afe66f70a172d0fbcb8e1c25ba3b64330f948583b2dcc6
+  data.tar.gz: 14265ce7768530af39b2a6576d16c220008a12550cac838aa38ba4d3f16a4a044b5765719ae1657c12c1c004b1b0b06b6aa9e01ee95f602f83736595041f90fa

data/lib/rexslt.rb

@@ -4,10 +4,15 @@
 
 require 'rexle'
 require 'rxfhelper'
+require 'logger'
 
 
 # modifications:
-
+#
+# 01-Feb-2019: bug fix: new line characters are no longer stripped 
+#                       between XSL elements
+#              bug fix: An attribute variable value is now returned correctly
+# 19-Jan-2018: feature: Implemented Rexslt#to_xml which returns pretty XML
 # 16-Sep-2017: improvement: all predicates in an xsl:choose 
 #                           condition now must be true
 # 15-Sep-2017: feature: Implemented xsl_call_template
@@ -57,31 +62,36 @@ end
 
 class Rexslt
   using RexPath
+  using ColouredText
   
-  def initialize(xsl, xml, params={})    
+  def initialize(xsl, xml, raw_params={}, debug: false)    
     
     ## debugging variables
     
-    @log = Logger.new 'rxsl.log','daily'
     @rn = 0
     @rre = 0
 
     super()
-    @log.debug 'before options'
+    puts 'before options'.info if @debug
     @options = {}
+    
+    params = raw_params.merge({debug: false})
+    @debug = debug
     custom_params = params.inject({}){|r,x| r.merge(Hash[x[0].to_s,x[1]])}    
-    @log.debug 'before xsl_transform'
+    puts 'before xsl_transform'.info if @debug
 
     xslt_transform(*[xsl, xml].map{|x| RXFHelper.read(x).first}, custom_params)
   end
   
   def to_s(options={})
-    @doc.to_s(@options.merge(options)).sub('<root>','').sub(/<\/root>$/m,'')
+    @doc.to_s(@options.merge(options)).sub(/<root4>/,'').sub(/<\/root4>$/m,'').lstrip
   end
              
   def to_doc(); @doc; end
     
-  alias to_xml to_s
+  def to_xml()
+    @doc.root.xml(pretty: true).sub(/<root4>/,'').sub(/<\/root4>$/m,'')    
+  end
 
   private
   
@@ -236,6 +246,24 @@ class Rexslt
     end       
 
   end
+
+  def xsl_cdata(element, x, doc_element, indent, i)
+    puts ('cdata x: ' + element.inspect) if @debug    
+    
+    new_element = Rexle::CData.new(x.value.to_s)
+
+    read_node(x, element, new_element, indent, i)
+    doc_element.add new_element     
+  end
+  
+  def xsl_comment(element, x, doc_element, indent, i)
+    #puts ('comment x: ' + element.inspect) if @debug    
+    
+    new_element = Rexle::Comment.new(x.value.to_s)
+
+    read_node(x, element, new_element, indent, i)
+    doc_element.add new_element     
+  end
   
   def xsl_copy_of(element, x, doc_element, indent, i)
     #jr251012 indent = 1 unless indent
@@ -255,12 +283,15 @@ class Rexslt
     name = x.attributes[:name]
     variable = name[/^\{(.*)\}$/,1]
 
+    puts 'variable: ' + variable.inspect if @debug
+    
     if variable then
       name = element.element(variable)
     end
 
     new_element = Rexle::Element.new(name) # .add_text(x.value.strip)
-    new_element.text = element.text if element.text
+    puts 'element.text: ' + element.to_s.inspect
+    new_element.text = element.text.to_s.strip
 
     read_node(x, element, new_element, indent, i)
     doc_element.add new_element    
@@ -343,9 +374,11 @@ class Rexslt
   end
 
   def indent_after(element, x, doc_element, prev_indent)
+    
+    puts 'indent? : ' + @indent.inspect if @debug
 
     if @indent == true then          
-      doc_element.add_text "\n" + '  ' * (prev_indent > 0 ? prev_indent - 1 : prev_indent)
+      doc_element.add_text  '  ' * (prev_indent > 0 ? prev_indent - 1 : prev_indent)
     end            
   end
   
@@ -373,6 +406,7 @@ class Rexslt
     
     template_node.children.each_with_index do |x,j|
 
+      puts ('x: '  + x.inspect).debug if @debug
       name = if x.kind_of? Rexle::Element then :read_raw_element
       elsif x.is_a? String then :read_raw_text
       elsif x.class.to_s =~  /Rexle::Comment$/ then :ignore
@@ -380,7 +414,10 @@ class Rexslt
         :ignore
       end
 
-      method(name).call(element, x, doc_element, indent, i)
+      r2 = method(name).call(element, x, doc_element, indent, i)
+      puts 'r2: ' + r2.inspect if @debug
+      r2
+
     end
 
   end
@@ -393,11 +430,10 @@ class Rexslt
     if x.to_s.strip.length > 0 then
 
       val = x.to_s.strip #
-      doc_element.add_element val
+      puts ('val: ' + val.inspect).debug if @debug
+      doc_element.add_element x.to_s
     end
 
-    #doc_element.add_text x if x.is_a? String
-
   end
   
   # element: xml element
@@ -427,20 +463,28 @@ class Rexslt
       new_element.attributes.each do |k,raw_v|        
         
         v = raw_v.is_a?(Array) ? raw_v.join(' ') : raw_v
-                  
+        
+        puts 'v: ' + v.inspect if @debug          
+        
         if v[/{/] then
 
           v.gsub!(/(\{[^\}]+\})/) do |x2|
 
             xpath = x2[/\{([^\}]+)\}/,1]
-            text = element.text(xpath)
+            puts 'element.text(xpath): ' + element.text(xpath).inspect if @debug
+            text = element.text(xpath).to_s.strip
+            puts 'text: ' + text.inspect if @debug
             text ? text.clone : ''
             
           end
+          
+          puts '2. v: ' + v.inspect if @debug
 
         end  
       end      
-            
+
+      puts 'x.children.length: ' + x.children.length.inspect if @debug
+      
       if x.children.length > 0 then           
 
         indent_before(element, x, doc_element, new_indent, j) if @indent == true
@@ -459,31 +503,43 @@ class Rexslt
 
       else
 
-        indent_before(element, x, doc_element, new_indent, j) if @indent == true
+        indent_before(element, x, new_element, new_indent, j) if @indent == true
         
         val = @indent == true ? x.to_s : x.to_s        
-        doc_element.add val
+        #jr020219 doc_element.add val
+        doc_element.add new_element
 
       end
-            
+      
     end
+    #new_element
+    #puts 'attributes: ' + new_element.attributes.inspect if @debug
     
   end
   
-  def value_of(x, element, i)
+  def value_of(x, elementx, i)
+    
+    puts 'value_of: ' + elementx.to_s.inspect if @debug
     
     field = x.attributes[:select]
 
     o = case field
       when '.'
-        element.value
+        elementx.value
       when /^\$/
         @param[field[/^\$(.*)/,1]]
       when 'position()'
         i.to_s
     else
-      ee = element.text(field) 
-      ee
+      r = elementx.element(field)
+      if r.is_a? Rexle::Element::Attribute
+        r.value.to_s
+      elsif r.is_a? Rexle::Element
+        r.texts.join
+      else
+        ''
+      end
+
     end
     
   end
@@ -507,7 +563,8 @@ class Rexslt
   end
   
   def xsl_value_of(element, x, doc_element, indent, i)
-    
+  
+    #puts 'xsl_value_of: ' + x.inspect if @debug
     s = value_of(x, element,i)
     doc_element.add_text  s
     doc_element
@@ -517,22 +574,22 @@ class Rexslt
 
   def xslt_transform(raw_xsl, xml, custom_params={})
 
-    @log.debug 'inside xslt_transform'
+    puts 'inside xslt_transform'.info if @debug
 
     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'
+    @doc_xsl = raw_xsl.is_a?(Rexle) ? raw_xsl : Rexle.new(raw_xsl.gsub(/(?<=\<\/xsl:text>)[^<]+/,''))
+    puts 'after @doc_xsl'.info if @debug
     
     #jr2040516 filter_out_spaces @doc_xsl.root
 
-    @doc = Rexle.new '<root></root>'
+    @doc = Rexle.new '<root4></root4>', debug: @debug
 
     indent = 0
 
     previous_indent = 0
     @xsl_methods = %i(apply_templates value_of element if choose when copy_of
-                      attribute for_each text output call_template).map do |x| 
+                      attribute for_each text output call_template comment cdata).map do |x| 
                         ('xsl_' + x.to_s).to_sym
                       end
     
@@ -548,7 +605,8 @@ class Rexslt
     end
 
     h = @doc_xsl.root.element("xsl:output/attribute::*")
-    @log.debug 'after h'
+    puts 'h: ' + h.inspect if @debug
+    puts 'after h'.info if @debug
     
     if  h and ((h[:method] and h[:method].downcase == 'html') \
                                    or h[:'omit-xml-declaration'] == 'yes') then
@@ -572,6 +630,8 @@ class Rexslt
     # using the 1st template    
     xpath = String.new @templates.to_a[0][0]
     out = read_node(@templates.to_a[0][-1], doc_xml.element(xpath), @doc.root, indent)
+
+    puts ('out: ' + out.inspect).debug if @debug
     
     html = @doc.root.element('html')
     
@@ -610,4 +670,4 @@ class Rexslt
 
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexslt
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.7.0
 platform: ruby
 authors:
 - James Robertson
@@ -10,49 +10,53 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
-  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE3MDkxNTIwMjQwM1oXDTE4MDkxNTIwMjQwM1owSDESMBAG
-  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
-  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAMlR9HT3XszqknU82ijbs8uTs91F9jkc+2oXFCmTDwx7K6RIsUYs4J5p2hnw
-  Rg3JMpgbCnlz2/bOenXHYq2+MYw5jql68lorwqAvPOSqgnmgolid5EuNNyGqlDHB
-  Mkp79B2ZhNO8Gz77ruYgCKVkGCrwO2Njc8iGGnEiRUAntRna1YcFNYKOU1hllqDI
-  oKn0efB/YTgzqhhpYxK9sEpWfjFoO9trfj+r9BU/BAHWVDR5vxdSiqFIkbnKW65a
-  nC28KtMVI7KkUPbN8tgsm8B9Id6POHUUGjiBHr1P/zktOcyrOAnzAi9lLlS9hnkt
-  6Ktj0NDtQrAcaJOpS63qJmBuYPkCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUFDszzDA8NNNCoYI2FKOrIiIp87YwJgYDVR0RBB8w
-  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAhp3O3yYu
-  +96s1H5S297WguKDGrNKJoa44o+6IU4JefUxkmfidtaSwcPnnCaAsoLXzBLpnwlY
-  m6LH1jPWHqnJlUHjtkjr/wp620cWGKcwFw8VlfqdNALV9tALCHje5J+NITR2U9P6
-  Q6tcZFPZmUCr8SvlQlqGJY1BY/e9iajntzL0j6QvBZLzaQbej1DY5Dbv3e2ipOZq
-  gQdsDg5v3CppCdi6o+CG+Q+K2P6w4EBdWKHn9FhYUMp4oDiBznW7D+dpEraoyER7
-  f4Fi5ORmK9ccbijkIGmH2JdFYi07Fax/6a8TgcpbSrICHncFAvvPo8hxuUR+aHvg
-  wux0hu0gdmk8nA==
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjAwNjExMDg0NzI2WhcN
+  MjEwNjExMDg0NzI2WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDPC1jP
+  UnBsDwh6SFog0UD7FfPwnsAyWkevkFcg/xnKOL9XvLlvfKl5bPZARVOmPh0CJU/e
+  YTPvmJ4LsLObJUNKvxuYkk2YVIAUFeMKrGrIbFkZ+Whs9qgDW8TOOsDoytNUcDau
+  92s+9eRmH9HyemjM8OavlfNunE+eQV7biidbdzBDXi0WZPzrofp28T/MsNkWv8mn
+  1qCIJQT10VrG/fz6P8gbnK/4Km4Dm42818TGg+hjyu6rZwaI8jseh6pDMCzBnXZg
+  NGI3EWs+InBv3EorhHhFXP11ZOj3NwJ6/LZMN6p22rTy9J6+3M1q6EKak3SkwQvp
+  ZupuK2wvrBQtb/YmYhqwpfrgtDCqB+mx4Fr6uE5xMqKYJz/SKr0UX4O4gnrVHAJt
+  okbBpJRnystbaLqokUkG1Y8wKN7N51HjN3I63js6uMwPNsxhE/06CfuqCAAsbuBw
+  ZNIuyS9VyBQZgg0RIof3vfYq9/aapYZKTRETBuO23gNnYJWZNGFld0cuwGkCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUmAFTYnIa
+  oQk0m1KXgr0YS/KmfUgwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAC4Ug/dDQy6LlTghpYiXr7cx9xt9fSn54mEMpq3Sv
+  FDD+UmCvttADlo2vSk60EC6TUlW3sdlzP1w8FEeFyBp+y7biXK7DZHGUKxHCx9jy
+  hvbOS9okcb6k/7mAX1LYym+wmFN3+7gm2n1s94NIdJPpNhhnbbaDBaelKaWCg+TI
+  oIl3jIO7zoBIPnpIjYoH4Bl1gLesuvsmf31llGbHCQwuNMkYNmRxGO0zvvJ9I2VH
+  F9CN9sPeTRj9t1S0Qwkgw53+1Z9HCOSSTmhftpPRCYqXB3rWxQjjEhPPk+a39WWZ
+  ESidVaVw58zW50BejA4CitkgPe40gAYUbWLbl/JmaPEY7BusUghRxP0yE0SCTUPZ
+  Kd+1svoJytUIfwSCQoVgapdhxx6Z1sz9IeGswNCHPaP/jebMXJIL+PYU/7AHTRXu
+  /16J2OUcKrvQrokVNgm0rF4M9Hu4NBscxtnDWItY6latWceUQ8Er0p4Sgd2l5AGY
+  CeLdjbFCkrm/RzoszCPvxQcQ
   -----END CERTIFICATE-----
-date: 2017-09-16 00:00:00.000000000 Z
+date: 2020-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rxfhelper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 1.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 1.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rexle
   requirement: !ruby/object:Gem::Requirement
@@ -62,7 +66,7 @@ dependencies:
         version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.9
+        version: 1.4.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -72,7 +76,7 @@ dependencies:
         version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.9
+        version: 1.4.12
 description: 
 email: james@jamesrobertson.eu
 executables: []
@@ -99,8 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Rexslt is an XSLT processor written purely in Ruby