rexslt 0.5.13 → 0.5.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acd3d03a552151896c50a5e7b4cf112fbd9a9197
-  data.tar.gz: 6e5207cba44694d48750e565588f3d55d5fcd4ed
+  metadata.gz: 74ebd52f673bd7270758857d59ec2ef4fff46c0e
+  data.tar.gz: 318604f1ffed35693c27ad3cda2f0e47a3591e3d
 SHA512:
-  metadata.gz: 595f189b00e463d2af97e72f23da9e4ee002e7edb976ac42fef8bc648aac6eef74d2d0de16f21c3a0032ed566b7d4db74e85014991777c8e67aec2469676e8e8
-  data.tar.gz: d3275272d74b3157e0aae8ea83b0639b014ae0782c5c003be3693b9ab82b77763d4e55a58f6b06bdc88b4421f7f6c7b2b3a310eb7802dbcac097a5bf3082edca
+  metadata.gz: 906c59a61bd6c02a7e5c8b5dafbd1c89bd95fd945025a052dd9513ca0adc1afd8798c6ce938c93a60ffcfe255ec1f4b2cd5171ad30c0d52a8f549229e227a6d5
+  data.tar.gz: 457de1d3f878a3b904d0660831031fc11211657bd1d9fdb34d29f80aa86eecd66d60c1c37e09d79691c725b063377c0161ba0da9f3b1186d21ae4fb96ff1853c

data/lib/rexslt.rb

@@ -39,6 +39,10 @@ class Rexslt
   
   def initialize(xsl, xml, params={})    
     
+    ## debugging variables
+    
+    @rn = 0
+    @rre = 0
 
     super()
     @options = {}
@@ -221,8 +225,9 @@ class Rexslt
     end
 
     new_element = Rexle::Element.new(name) # .add_text(x.value.strip)
+    #jr060416 doc_element.text = element.text if element.text
+    new_element.text = element.text if element.text
 
-    doc_element.text = element.text if element.text
     read_node(x, element, new_element, indent, i)
     doc_element.add new_element    
     indent_after(element, x, doc_element, indent) if @indent == true
@@ -342,6 +347,12 @@ class Rexslt
     x.to_s.strip.length > 0 ? '  ' * indent : ''        
   end
   
+  
+  # Reads an XSL node which is either an XSL element, a string or a comment
+  # template_node: XSL node
+  # element: XML node
+  # doc_element: target document element
+  #
   def read_node(template_node, element, doc_element, indent, i=0)
         
     procs = {
@@ -351,6 +362,8 @@ class Rexslt
     }
 
     template_node.children.each_with_index do |x,j|
+      
+      # x: an XSL element, or a string or a comment
       method(procs[x.class.to_s]).call(element, x, doc_element, indent, i)
     end
 
@@ -360,7 +373,6 @@ class Rexslt
   #
   def read_raw_text(element, x, doc_element, raw_indent, i)
 
-
     #val = @indent == true ? padding(doc_element, raw_indent, x) : ''
     if x.to_s.strip.length > 0 then
 
@@ -372,9 +384,13 @@ class Rexslt
 
   end
   
+  # element: xml element
+  # x: xsl element
+  # doc_element: 
+  #
   def read_raw_element(element, x, doc_element, indent, j)
-
-    method_name = x.name.gsub(/[:-]/,'_').to_sym
+    
+    method_name = x.name.gsub(/[:-]/,'_').to_sym    
 
     if @xsl_methods.include? method_name then
 
@@ -391,7 +407,6 @@ class Rexslt
       new_indent = indent + 1  if @indent == true
 
       new_element = x.clone
-      #doc_element.add new_element  
 
       new_element.attributes.each do |k,raw_v|
 
@@ -409,11 +424,9 @@ class Rexslt
 
         end  
       end      
-      
+            
       if x.children.length > 0 then           
 
-
-
         indent_before(element, x, doc_element, new_indent, j) if @indent == true
              
         read_node(x, element, new_element, new_indent, j)        
@@ -436,6 +449,7 @@ class Rexslt
         doc_element.add val
 
       end
+            
     end
     
   end
@@ -536,7 +550,6 @@ 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)
 
     out

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexslt
 version: !ruby/object:Gem::Version
-  version: 0.5.13
+  version: 0.5.14
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   38j2+6ULVWalsVein3whb7qB6IOvxoSqjz6n7jAKFGHovoXPUqpv5y5Yor23rTrn
   0YwisIc3UkL30g==
   -----END CERTIFICATE-----
-date: 2016-04-04 00:00:00.000000000 Z
+date: 2016-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rxfhelper