rexslt 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6b973b4823311eacb05ede80db2f1399a380714
-  data.tar.gz: 348390c05cdcbe54a19bd9b330bbd0f3cea5748b
+  metadata.gz: eaf222d869dfbe17e3186ded72bc4bcc0a0fad29
+  data.tar.gz: 81991c23f1a45ab622dbdd4d700983ec2d0ce702
 SHA512:
-  metadata.gz: 2cc571cf1a357a76c1e8a4a5a94dd78b61235a07b625d2bb21b1e778c7697a2a1806d58d333b0c60d5292056fb291ca3a4e5b03fa9318141bba4cdab9a258ca9
-  data.tar.gz: 793b84303be053d9888b909169caa82f6b1fe5839dcc047aae92e175ec4e6768da67e15e3335941e8f54daa3fb100aa6cc18ab68a435ed673991448e358174bf
+  metadata.gz: 694802525335760a469684f4c61d3601404832559ac1cd3a4fb93443e0ba112c81eafc8661e1358c101d67230c0c41b53d19a49f8ad7b9a93a39575121466a56
+  data.tar.gz: eaf9ca255cdbad0d7b54f5a4163eb6c6f56b721743f6e1593af67e79ef1eb2411ce72eafb9ad9365a900f67376ca152cabad1074c56adcbb27a510dd53b657af

data.tar.gz.sig

@@ -1,2 +1,2 @@
-nڱ�LHB�inp
��e�
-�h��eZ3�����ߤ^�����C�qa
+H#�H�׼?��T˫m�0?�):�KDF��(���?���/cf�;�
g�An;�
+!��(�ܔ��T�.��\A��l_5����[����GU_����#r�F?����a���U�Y0p�?���j��?�F���tO�,í�	d�����}�$�-`ܮ��U[G���8�� *�F�����P��l���E����~"�c?��~��+.�9�:=k1x�Q�ث��9����L;�բ{�O6n�!~;��

data/lib/rexslt.rb

@@ -7,7 +7,8 @@ require 'rxfhelper'
 
 
 # modifications:
-
+# 30-Apr-2016: bug fix: This class can now be executed within an 
+#                       eval statement which runs within another class
 # 24-Apr-2016: The position() function is now supported within an 
 #              xsl:value-of select attribute
 #              An xsl:attribute value can now be rendered using 
@@ -54,7 +55,6 @@ class Rexslt
     super()
     @options = {}
     custom_params = params.inject({}){|r,x| r.merge(Hash[x[0].to_s,x[1]])}    
-
     xslt_transform(*[xsl, xml].map{|x| RXFHelper.read(x).first}, custom_params)
   end
   
@@ -224,7 +224,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]
@@ -235,7 +235,6 @@ 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
 
     read_node(x, element, new_element, indent, i)
@@ -345,17 +344,17 @@ class Rexslt
   # doc_element: target document element
   #
   def read_node(template_node, element, doc_element, indent, i=0)
-        
-    procs = {
-      "Rexle::Element" => :read_raw_element, 
-      "String" => :read_raw_text, 
-      "Rexle::Comment" => :ignore
-    }
 
     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)
+
+      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
+      else
+        :ignore
+      end
+
+      method(name).call(element, x, doc_element, indent, i)
     end
 
   end
@@ -535,7 +534,7 @@ class Rexslt
     
     # fetch the templates
     #puts "Rexle:Version: " + Rexle.version
-    
+
     @templates = @doc_xsl.root.xpath('xsl:template').inject({}) do |r,x|
       r.merge(x.attributes[:match] || x.attributes[:select] => x)
     end
@@ -543,7 +542,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)
-    
 
     if @doc_xsl.root.element('xsl:output[@method="html"]') then
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexslt
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   38j2+6ULVWalsVein3whb7qB6IOvxoSqjz6n7jAKFGHovoXPUqpv5y5Yor23rTrn
   0YwisIc3UkL30g==
   -----END CERTIFICATE-----
-date: 2016-04-24 00:00:00.000000000 Z
+date: 2016-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rxfhelper
@@ -39,20 +39,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: rexle
   requirement: !ruby/object:Gem::Requirement
@@ -62,7 +62,7 @@ dependencies:
         version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.29
+        version: 1.3.30
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -72,7 +72,7 @@ dependencies:
         version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.29
+        version: 1.3.30
 description: 
 email: james@r0bertson.co.uk
 executables: []