rexslt 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9448fe886690e81555907e4b213e39db47d450c0
-  data.tar.gz: 8a45f7ce5b6546392aeacb5a09d2390ede1481b4
+  metadata.gz: 9b8dd32d843b131cc31484f5e948bc279539912f
+  data.tar.gz: 83d808af7960652ef1e94907eb950f95522cd3ab
 SHA512:
-  metadata.gz: 8f99899f6a01154decb23672d303d30752aa663e6f7193fcc32a3896e64dc1c8801f264879a03291a4366f20f8d828d643ec239d6b1d650d2406242ac40fd44a
-  data.tar.gz: 8cded864fb2bf25b30e4dd1171e8616185278fce303abc8a0c94ce57dac8a4aeccb8193c29cdb132bd22a87bcb238a2be4ead2b22e9c3dc331c919c9fe8f4e8b
+  metadata.gz: 80734e550e8a66f18fa6f4867044e1998f3eed693c458827e6ea6f952af591aed20a407950b67d6496f3074e0045bf4010ca47113621689e9c3e80e91f748954
+  data.tar.gz: a26995174afc0b233201ff2dc9dc3058a39d88d3b9fc16e797182b5a596b93889a79f030a779fee071e7f0f461772338f2e4477e5b81cefbe4df96999655c1e2

data/lib/rexslt.rb

@@ -6,6 +6,11 @@ require 'rexle'
 require 'rxfhelper'
 
 
+# modifications:
+
+# 24-Apr-2016: An xsl:attribute value can now be rendered using 
+#              an xsl:text element
+
 module RexPath
   
   refine Rexle::Element do
@@ -172,6 +177,12 @@ class Rexslt
 
     e = x.element('xsl:value-of')
     value = value_of(e, element) if e
+
+    av = x.element('xsl:text')
+    if av then
+      value = av.text
+    end
+
     doc_element.add_attribute(name, value)
   end
 
@@ -182,7 +193,7 @@ class Rexslt
       condition = xsl_node.attributes[:test]
       node = element.element condition
       
-      if node and node == true      
+      if node  
         read_node(xsl_node, element, doc_element, indent, i)      
         true
       else
@@ -265,39 +276,20 @@ class Rexslt
       nodes.reverse! if order.downcase == 'descending'
     end
      
-    nodes.each {|node| read_node(x, node, doc_element, indent, i)}
+    nodes.each.with_index {|node, j| read_node(x, node, doc_element, indent, j+1)}
     
   end
     
   def xsl_if(element, x, doc_element, indent, i=0)
 
-    condition = x.attributes[:test].clone
-    
-    cond = condition.slice!(/position\(\) < \d+/)
-    
-    result = if cond then
-      
-      cond.sub!(/position\(\)/, i.to_s)
-      cond.sub!(/&lt;/,'<')
-      cond.sub!(/&gt;/,'>')
-
-      b = eval(cond)
-
-      if b then
-
-        if condition.length > 0 then
-          element.element condition   
-        else
-          true
-        end
-      else
-        false
-      end
-            
-    else
+    cond = x.attributes[:test].clone
+          
+    cond.sub!(/position\(\)/, i.to_s)
+    cond.sub!(/&lt;/,'<')
+    cond.sub!(/&gt;/,'>')
+    cond.sub!(/\bmod\b/,'%')
 
-      element.element condition
-    end
+    result = element.element cond    
 
     if result then
       read_node x, element,  doc_element, indent, i

metadata

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