rexslt 0.6.11 → 0.6.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f6f2fcd4f4f5add9cf17a3da33f6d23b3b4890a2
-  data.tar.gz: 2d05b609990be88dc140d2a20bd2df187fc0a89c
+SHA256:
+  metadata.gz: 8677062cfbfef49a97de56c7fb501abf1f57c48bbea804ec13d4a6dcb93d69ed
+  data.tar.gz: dab58fa40b0365bef22573ec58c7b97cf86a5c4fdeddbd103395b2655a887e02
 SHA512:
-  metadata.gz: ed60314be33b39c9eea2dcedff1b7cee5ad6fb5f1bde100b374e3c5e89506a26843f4884cdc3935a7c72344b32debcbea8fb0c769b207e95fd86584e93b6bef6
-  data.tar.gz: 3486f01f82b598aa41fc4fbffb38b19197f4e106089c40808a2898386607101edbb4b9ba226d3b9faaa3ce5bccd1aa77bcd22fb2c0a65439c3263a43bfa61f61
+  metadata.gz: f94cb4e9621cda90f7e4e785fd7b45d53b94734bc3e3f01b8713a45faad7f9fdaaf5cefb478917abad1ff4c3533e40bfc963061b2436c401de011d6a5676841f
+  data.tar.gz: 6fbef82369e5534e05928a13b7f3ff01562767d65bded4e32bc8fbba26754271e7d5f1abd1d32c7a79df252e70705d91760a3863f91bcf76a8acf9add5a8cdf4

checksums.yaml.gz.sig

@@ -1,2 +1,2 @@
-�U��J>���a�x
`��x��ݫ��?����d��d�Qޖ�RG�K���B�2�KԬ�R!��G�_�֎oҜQ�Wx���)	��5M���w^���0j�\�dߛ�O��y��)�3:��A
-��%�U�>|�p$Z,����4�R�b_�b�O�j
+-~V6x�+�:]cΈ�0㢩>�>�u���
�lժ�F5����W��8鹢�I��E�ϕ�k�2:e��P�ٺ���5����~�u�*�����M�L!]�������n���M
+b\dy.{~�뾇�%���O�2|��-`jO��=�����ִT��g�G��(x3��D�n$��P86�1B�n�0��������q��Ռ)Y�u�W�k�fs8�Z�핲.�yw@��!Ұ�En�98�m�J5RR�|�C=�东i

data/lib/rexslt.rb

@@ -8,7 +8,9 @@ require 'logger'
 
 
 # modifications:
-
+#
+# 01-Feb-2019: bug fix: new line characters are no longer stripped 
+#                       between XSL elements
 # 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
@@ -59,32 +61,35 @@ 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>\n/,'').sub(/<\/root>$/m,'')
+    @doc.to_s(@options.merge(options)).sub(/<root4>/,'').sub(/<\/root4>$/m,'').lstrip
   end
              
   def to_doc(); @doc; end
     
   def to_xml()
-    @doc.root.xml(pretty: true).sub(/<root>\n/,'').sub(/<\/root>$/m,'')    
+    @doc.root.xml(pretty: true).sub(/<root3>\n/,'').sub(/<\/root3>$/m,'')    
   end
 
   private
@@ -377,6 +382,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
@@ -397,11 +403,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
@@ -521,16 +526,16 @@ 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'
+    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
 
@@ -552,7 +557,7 @@ class Rexslt
     end
 
     h = @doc_xsl.root.element("xsl:output/attribute::*")
-    @log.debug 'after h'
+    puts 'after h'.info if @debug
     
     if  h and ((h[:method] and h[:method].downcase == 'html') \
                                    or h[:'omit-xml-declaration'] == 'yes') then
@@ -576,6 +581,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')
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexslt
 version: !ruby/object:Gem::Version
-  version: 0.6.11
+  version: 0.6.12
 platform: ruby
 authors:
 - James Robertson
@@ -10,28 +10,32 @@ 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
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTkwMjAxMTk1MjQyWhcN
+  MjAwMjAxMTk1MjQyWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCr1Aj5
+  q9c4JQkcjTisuXqjdp5xqnBYNA5ZSWRD7mjzwdKajCSFEE/Qbe5W51pdJLf7T4F+
+  nOSQVOQ7bbtUFlmaAVXmzYXM84+kp7yZJVrTPyIFgsO+2trIizZ0HsE4H2CPBhrX
+  oefgXQCumOBjwBswUzD9qqvNAX0l0LVa3QBidwA4IHcc8RIFnu/1JOk11GCHYYNR
+  T31kN5iGvSH1Cl4cXYuD5PX44bTJ+zdBWusZcCV71MM/QLEglSL9HiS/PNjExMTk
+  8UuT6uuD2n090OotL4qyotVODvetCkIMQullgGBYSQtT/R8sN35Tg64443Gmh4Ft
+  u92AmIFSzgGjZLFlc6B/McqxAFxhHCehyGo2X6vvOBz/vExmWpq8FhXHaw726cpw
+  iRaBhcCBoxyp1OAUTGnLMbqVyP47KSMEtz+wc1fGR9mUmsPc1hTM0j25scygOK26
+  6pugoVyZLVNIGKnEXQGOGEknDqxHT4jYiYUVXV2N3/0OctBZlsulD/aTX5cCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUljB/mcn+
+  iSaM5h8WLBvmN14qEaIwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAjceGpE0m2OBEXk3T4j5zgE7cO16+sjaM1vk7Cfrq
+  FlMKBOq0LHOECVjSxRC9k43K7BAxypBfne+Xm92eRnc8jl/O5MaW1yqbVIDbaPEP
+  K3I4WO76HYnwmvjOdjL5FHX3Y5GgADdIiUvxNDmlS1vU9NKk8lzHdZlIcf9R6Vek
+  dkB0yYLS2C7pmudqpiwONPrMWVz8BLnerj9N16isNtqP72a9vqBxUAtAmUjyeBRn
+  OnHbMWg5fFPG1j3jzyxLGB1YU3uGF6kL3j4etV4dPEv5snbhI5z6rGEMlT/P7mo9
+  p6XeA76363WNUzlA4hsY+b3hQvGvgFtj1u3keeTySZtCjSNq6xVOtDxzlngDsVNX
+  LPQT8NUug9u8KKvGw+MsrirU/wvQIGablJzhsnZI+snWgGbBYu28magLY+g5Uyn7
+  lsqJ2/yU8bVVS+tkDVmCLdDn+RMoPYrLqZGbWwm5913h255DeUC6/qKofxWvR+XC
+  hyIDI2yf0ueF+Lirvch+gr7J
   -----END CERTIFICATE-----
-date: 2018-02-03 00:00:00.000000000 Z
+date: 2019-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rxfhelper
@@ -99,8 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Rexslt is an XSLT processor written purely in Ruby