rexslt 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a50a74890cca7d7df1bee74c7c964bd5ae494c7
-  data.tar.gz: da1d29bb6c43e63bcc255cedc0f90e46cbf4687c
+  metadata.gz: 4dbbe98957afc6c78b725745365f82a3660f6706
+  data.tar.gz: a77613d38f753e5f78d6e4c1051c5f61f4bc66f8
 SHA512:
-  metadata.gz: b15e5f6253c8855a070a1d74f625b4d0ec9555862d401b6ba965c26f18b32a4a4ce157aa7357252706ac16660286a3e1ef1a5e1547d2ead65dd638e84a821a85
-  data.tar.gz: e75ae71a56b7273a78e02e486782a07a0b2612fa7633b6828e1aabbbaf5a1ad2c08feba427940b899e2150c86bc30e355cd96aaba2c68ece795c57b303ba7abd
+  metadata.gz: 5e38b0b15a2c5a3946c4062169c6d59cc374a27e0f59faf4927f43f01ecdabc767858395347af30b760537c44ed0871a8e0c575ec117e0eba0e6f6cfea0744da
+  data.tar.gz: d8c0cfa937bf54c2d92f106b7156ea9b1f12d12cbed65f445ca371f56d4371b9eb40c8c7659336a747e276d4fbf381be5875b7d6de4891853897ee6b9c365e33

data/lib/rexslt.rb

@@ -8,6 +8,10 @@ require 'rxfhelper'
 
 # modifications:
 
+# 04-May-2016: bug fix: disabled the method which strips out all new 
+#              line spaces, and replaced it with a statement in the 
+#              read_raw_text() method which strips out space before and 
+#              after the text
 # 03-May-2016: A returned HTML document will no longer include an 
 #              XML declaration by default
 # 30-Apr-2016: bug fix: This class can now be executed within an 
@@ -227,7 +231,7 @@ class Rexslt
   end
   
   def xsl_element(element, x, doc_element, indent, i)
-    
+
     indent_before(element, x, doc_element, indent + 1, i) if @indent == true
 
     name = x.attributes[:name]
@@ -369,7 +373,7 @@ class Rexslt
     #val = @indent == true ? padding(doc_element, raw_indent, x) : ''
     if x.to_s.strip.length > 0 then
 
-      val = x.to_s #
+      val = x.to_s.strip #
       doc_element.add_element val
     end
 
@@ -401,8 +405,8 @@ class Rexslt
 
       new_element = x.clone
 
-      new_element.attributes.each do |k,raw_v|
-
+      new_element.attributes.each do |k,raw_v|        
+        
         v = raw_v.is_a?(Array) ? raw_v.join(' ') : raw_v
                   
         if v[/{/] then
@@ -499,7 +503,7 @@ class Rexslt
     @doc_xsl = raw_xsl.is_a?(Rexle) ? raw_xsl : Rexle.new(raw_xsl)
     
     
-    filter_out_spaces @doc_xsl.root
+    #jr2040516 filter_out_spaces @doc_xsl.root
 
     @doc = Rexle.new '<root></root>'
     indent = 0
@@ -545,8 +549,19 @@ 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)
+    
+    html = @doc.root.element('html')
+    
+    if html then
+      
+        if h and h[:'omit-xml-declaration'] != 'yes'  then
+        else
+          @options[:declaration] = :none
+        end
+        
+    end    
 
-    if @doc_xsl.root.element('xsl:output[@method="html"]') then
+    if @doc_xsl.root.element('xsl:output[@method="html"]') or html then
       
       head = @doc.root.element('html/head')
 
@@ -569,14 +584,7 @@ class Rexslt
     end    
     
     
-    if @doc.root.element('html') then
-      
-        if h and h[:'omit-xml-declaration'] != 'yes'  then
-        else
-          @options[:declaration] = :none
-        end
-        
-    end
+
 
     out
 

metadata

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