rexslt 0.6.12 → 0.6.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8677062cfbfef49a97de56c7fb501abf1f57c48bbea804ec13d4a6dcb93d69ed
-  data.tar.gz: dab58fa40b0365bef22573ec58c7b97cf86a5c4fdeddbd103395b2655a887e02
+  metadata.gz: b6b3abb16a3aadcc6df66d725fe37177fe617b9a9c4f2c78358a1504e0a8d3a8
+  data.tar.gz: 0e8bf4584269ba064755b1426f9f9ad1b9abb009af5398076df0f9873470c0cf
 SHA512:
-  metadata.gz: f94cb4e9621cda90f7e4e785fd7b45d53b94734bc3e3f01b8713a45faad7f9fdaaf5cefb478917abad1ff4c3533e40bfc963061b2436c401de011d6a5676841f
-  data.tar.gz: 6fbef82369e5534e05928a13b7f3ff01562767d65bded4e32bc8fbba26754271e7d5f1abd1d32c7a79df252e70705d91760a3863f91bcf76a8acf9add5a8cdf4
+  metadata.gz: 0f636b79d68d8a439515d82aa40a971e2f80e4274a3b5f82cafdabc1b949590655133a4bff5c986333a70ff1edf0767655f947021c0d2477449775b3aa403611
+  data.tar.gz: cb166cdc0bf9cd862c9a832bc6a1d282ec02b6405e7192989e8188deadb61da9bcb72569ae069e58e793d78423c5d1aed26b16a33e151a409e6f27d685dda83b

data.tar.gz.sig

@@ -1,2 +1 @@
-w���`u�E&-�?KH�+|�P&B6ǐ	�Z���6�.��xB�Te��NnX�B?����1�?�j�
-���4�e���n�ɾڅ�v3� ;H78�H�� 8q[�z8�ZخC��ȉ�a�s����&�j�t��r����2]NST$@8�3�&x�c�.�:��{d���t��^�21:ӈ��W��D
+`N�0��n�s�)y�(�u��(̗��n���3`!~
+�K2��AG4�S�'I��U��
P�/)��~�$�#� �1��aFu&��V�+�̯?>���9���!�G��<�?X�',��

data/lib/rexslt.rb

@@ -11,6 +11,7 @@ require 'logger'
 #
 # 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
@@ -89,7 +90,7 @@ class Rexslt
   def to_doc(); @doc; end
     
   def to_xml()
-    @doc.root.xml(pretty: true).sub(/<root3>\n/,'').sub(/<\/root3>$/m,'')    
+    @doc.root.xml(pretty: true).sub(/<root4>/,'').sub(/<\/root4>$/m,'')    
   end
 
   private
@@ -245,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
@@ -264,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    
@@ -352,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
   
@@ -390,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
@@ -436,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
@@ -468,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
@@ -516,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
@@ -530,7 +578,7 @@ class Rexslt
 
     doc_xml = xml.is_a?(Rexle) ? xml : Rexle.new(xml)
 
-    @doc_xsl = raw_xsl.is_a?(Rexle) ? raw_xsl : Rexle.new(raw_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
@@ -541,7 +589,7 @@ class Rexslt
 
     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
     
@@ -557,6 +605,7 @@ class Rexslt
     end
 
     h = @doc_xsl.root.element("xsl:output/attribute::*")
+    puts 'h: ' + h.inspect if @debug
     puts 'after h'.info if @debug
     
     if  h and ((h[:method] and h[:method].downcase == 'html') \

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexslt
 version: !ruby/object:Gem::Version
-  version: 0.6.12
+  version: 0.6.13
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   lsqJ2/yU8bVVS+tkDVmCLdDn+RMoPYrLqZGbWwm5913h255DeUC6/qKofxWvR+XC
   hyIDI2yf0ueF+Lirvch+gr7J
   -----END CERTIFICATE-----
-date: 2019-02-01 00:00:00.000000000 Z
+date: 2019-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rxfhelper