rexslt 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a3bf1a0e1cf9b43802dfb28fffd0c3aa04a3e08
-  data.tar.gz: 0f023aa72ce7df0b1e4d01eb74bedc6119c5df39
+  metadata.gz: 95e290c2a89c244bf699efa66861541d7dd3c8b2
+  data.tar.gz: ea41c03ab0ff57e6593c1f01fa3f4de90246ae32
 SHA512:
-  metadata.gz: 537c86472bc5971a9e99b17f6416428240b2deef586d4c6aea9e9d94f756516ec7a3ab5a7470640d10c72bacbde888db2023884102a40c47797c8a49430cece9
-  data.tar.gz: b90150549fdc860d9aa6c27f106348966317b599d7e5d75c4e281fcd73d9984d189374a7469f7a667f7fab2427f26ad0d5e8c042d9341d74eead7dcf33bd5e0a
+  metadata.gz: 189af495ea0713480685d0e656f6cf9d4ec104f65c30276f4586da9c28e63794223616bbc2fc1a70cdba624b9e20a310a6af939b3e74a32e7b2168e9bdbb77f9
+  data.tar.gz: 895a8fc44f217954077d99a0658434e89ac477cf073930c340f5a910715fc517d12728352d366a4c66b65178d8f8277dd89540a1abfbbf23e606f39c01413bbb

data/lib/rexslt.rb

@@ -47,6 +47,23 @@ class Rexslt
   alias to_xml to_s
 
   private
+  
+  def filter_out_spaces(e)
+
+    e.children.each do |x|
+
+      if x.is_a? String and e.name != 'xsl:text' then
+
+        x.gsub!(/\n/,'')
+        x.gsub!(/ +/,'')
+
+      elsif x.is_a? Rexle::Element and x.children.length > 0 then
+        filter_out_spaces x
+      end
+      
+    end
+  end
+  
 
   def xsl_apply_templates(element, x, doc_element, indent, i)
 
@@ -298,13 +315,16 @@ 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
+
       val = x.to_s #
-      #jr040316 doc_element.add_element val
+      doc_element.add_element val
     end
 
-    doc_element.add_text x if x.is_a? String
+    #doc_element.add_text x if x.is_a? String
+    #puts '300 doc_element: '  + doc_element.inspect
 
   end
   
@@ -331,7 +351,7 @@ class Rexslt
         new_element = x.clone
 
         #jr030316 new_element.text = ''
-        new_element.text = x.text
+        #new_element.text = x.text
 
         new_element.attributes.each do |k,v|
           
@@ -371,9 +391,11 @@ class Rexslt
   end
   
   def xsl_text(element, x, doc_element, indent, i)
+
     val = @indent == true ? padding(doc_element, indent, x) : ''    
-    val += x.value
+    val += x.value.to_s
     doc_element.add_element val
+    
   end
   
   def xsl_value_of(element, x, doc_element, indent, i)
@@ -401,8 +423,10 @@ class Rexslt
   def xslt_transform(raw_xsl, xml, custom_params={})
    
     doc_xml = Rexle.new xml
-    @doc_xsl = Rexle.new raw_xsl.gsub(/ +/,' ').gsub(/\n/,'')\
-                                                 .gsub(/> /,'>').gsub(/ </,'<')
+  
+    @doc_xsl = Rexle.new raw_xsl
+    
+    filter_out_spaces @doc_xsl.root
 
     @doc = Rexle.new '<root></root>'
     indent = 0

metadata

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