rexslt 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e5cb3fb23bdbadadbc09927caf8290a487024ba
-  data.tar.gz: c106d6397abf4421c4585edeb08731672024bc22
+  metadata.gz: 68e513b8fdd750c72fabe07c753e59d5b565088f
+  data.tar.gz: 6ce67421162e952525e8925434792484fbd1053b
 SHA512:
-  metadata.gz: 2413e53b29a3dad2412d64fb7fb2a83780b9ae462a29ead1802fec907580d7db83618e03d99ff361192d4de28f35e7799207196945352aa28a0790afe8e725aa
-  data.tar.gz: 61c384317e59acdcedabd667fd806cd380b229b5b73b85468b8abfc90550fe0236241da8a6c8881cb3ad1875a403a77f6f072a862b6f2547ba456b91cc15c729
+  metadata.gz: 3ad5ba37e143554029cece967288848fcc124d13e040c2c31015fda1b5aaa3eac8d87e8a56c17af861db37a6f52ece229bd417ec1bc46ed3fbe80689f6d370a1
+  data.tar.gz: d642630d259f89419e6939982ef03eb46bbfcc67864a9438c0afcf9eada9e47e67c3125fff4396650741bacc7101925049a018de5312048920b4eccc622e0e81

checksums.yaml.gz.sig

@@ -1,4 +1,2 @@
-~3s��X�����9<
-.��<�����A��w+($���F�U��v�BNDV���]¨2���S־������{fw��)�C�h�+�6{�x�eu��iƮ��(�@̜&���դ�����ڿ\��>�}�(A��$�
-������zC�ܣ�
- �/�}���M8L�@��N8�"�_�����5cw\�O������������Ϥ�T�gb
�+u���5:텟�����Һ9���'0�x�^����7Yն�#8
+5)���!���0�ұ����}Q1N�bF�ZA�T��x���Fze�x��?.�)h�,
+|k����ꔝA�.�tlZ�
΋�������}"VZ���B��n��?��J^Ϝ0��P���M5˱�3� ���=Yu�>��`�X�{��U�C�Z^z�|9�v����\LB

data/lib/rexslt.rb

@@ -97,6 +97,7 @@ class Rexslt
 
       if match? keypath, item then
         matched_node = element.xpath field
+
         true
       else
         child = item.pop
@@ -217,7 +218,7 @@ class Rexslt
     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, i) if @indent == true
+    indent_after(element, x, doc_element, indent) if @indent == true
   end
   
   def xsl_for_each(element, x, doc_element, indent, i)
@@ -259,10 +260,34 @@ class Rexslt
   end
     
   def xsl_if(element, x, doc_element, indent, i=0)
+
+    condition = x.attributes[:test].clone
+    
+    cond = condition.slice!(/position\(\) < \d+/)
     
-    condition = x.attributes[:test].gsub('position()',i.to_s).gsub('&lt;','<').gsub('&gt;','>')
+    result = if cond then
+      
+      cond.sub!(/position\(\)/, i.to_s)
+      cond.sub!(/&lt;/,'<')
+      cond.sub!(/&gt;/,'>')
+
+      b = eval(cond)
+
+      if b then
 
-    result = element.element condition    
+        if condition.length > 0 then
+          element.element condition   
+        else
+          true
+        end
+      else
+        false
+      end
+            
+    else
+
+      element.element condition
+    end
 
     if result then
       read_node x, element,  doc_element, indent, i
@@ -305,7 +330,7 @@ class Rexslt
   end
   
   def read_node(template_node, element, doc_element, indent, i=0)
-
+    
     procs = {"Rexle::Element" => :read_raw_element, "String" => :read_raw_text}        
 
     template_node.children.each_with_index do |x,j|
@@ -341,8 +366,8 @@ class Rexslt
       if method_name == :'xsl_apply_templates' then
         #doc_element = doc_element.elements.last
       end
-      
-      method(method_name).call(element, x, doc_element, indent, i=0)
+
+      method(method_name).call(element, x, doc_element, indent, j)
 
     else
 
@@ -370,7 +395,7 @@ class Rexslt
 
         indent_before(element, x, doc_element, new_indent, j) if @indent == true
              
-        read_node(x, element, new_element, new_indent, i)        
+        read_node(x, element, new_element, new_indent, j)        
         doc_element.add new_element   
 
         if @indent == true then
@@ -384,7 +409,7 @@ class Rexslt
 
       else
 
-        indent_before(element, x, doc_element, new_indent, i) if @indent == true
+        indent_before(element, x, doc_element, new_indent, j) if @indent == true
         
         val = @indent == true ? x.to_s : x.to_s        
         doc_element.add val
@@ -394,6 +419,10 @@ class Rexslt
     
   end
   
+  def xsl_output()
+
+  end
+  
   def xsl_text(element, x, doc_element, indent, i)
 
     val = @indent == true ? padding(doc_element, indent, x) : ''    
@@ -425,7 +454,7 @@ class Rexslt
   
 
   def xslt_transform(raw_xsl, xml, custom_params={})
-   
+        
     doc_xml = xml.is_a?(Rexle) ? xml : Rexle.new(xml)
  
     @doc_xsl = raw_xsl.is_a?(Rexle) ? raw_xsl : Rexle.new(raw_xsl)
@@ -436,8 +465,10 @@ class Rexslt
     indent = 0
 
     previous_indent = 0
-    @xsl_methods = [:'xsl_apply_templates', :'xsl_value_of', :'xsl_element', :'xsl_if', :'xsl_choose', 
-                    :'xsl_when', :'xsl_copy_of', :'xsl_attribute', :'xsl_for_each', :'xsl_text']
+    @xsl_methods = %i(apply_templates value_of element if choose when copy_of
+                      attribute for_each text output).map do |x| 
+                        ('xsl_' + x.to_s).to_sym
+                      end
     
     strip_space = @doc_xsl.root.element "xsl:strip-space/attribute::elements"
 
@@ -469,7 +500,7 @@ class Rexslt
     # using the 1st template    
     xpath = String.new @templates.to_a[0][0]
 
-    read_node(@templates.to_a[0][-1], doc_xml.element(xpath), @doc.root, indent) 
+    read_node(@templates.to_a[0][-1], doc_xml.element(xpath), @doc.root, indent)
 
   end
 

metadata

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