rexslt 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00908e1bba1b4cbe1f95bcd22a345f1b3dec8cdb
-  data.tar.gz: 90e44414f744cc9bf137e9d6b43611305691b316
+  metadata.gz: cd815219f497f3d3f80343f8aae45da3cc9fc9d7
+  data.tar.gz: 2334c3b2c6278f2d07030c8ccd15201f2ccf0c75
 SHA512:
-  metadata.gz: becea7c6938a04b1162ec4de54070a0641455ec30a1cb638b1a26e6649ac4e8e5e49ef0bf6c5ddf1a85302324c6b77eb2f8d892458ecf8201498f232d546a177
-  data.tar.gz: 79a71dfcc9fdb568ddf6b4cd385afb83ef7c91b9e2ca3fde353af7da078418b668a95394561f1997bdf890e573d3bc621fd249253cf10278c553d373e671caf6
+  metadata.gz: bcb7449c9021bca9389e1992c82d7cc95fb188c92b3eb583fe72fd0949789409cfc1a7f5b9eb219b93b84accfcb59c3414ca9d0be7cab0c0472c0dc623cf9b9a
+  data.tar.gz: 46be2a500aa184f343c275bc69f4148cb25d5b9627014a0779e8f4241738d3b9b7fd795f41047a5db3dcc1a5a63920e5223af804b72fb4c383c0910b0489c35c

data/lib/rexslt.rb

@@ -38,8 +38,11 @@ class Rexslt
   using RexPath
   
   def initialize(xsl, xml, params={})    
+    
+
     super()
     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
   
@@ -208,10 +211,12 @@ class Rexslt
   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]
-    variable = name[/^\{(.*)\}$/,1] 
+    variable = name[/^\{(.*)\}$/,1]
+
     if variable then
-      name = element.element("name()")
+      name = element.element(variable)
     end
 
     new_element = Rexle::Element.new(name) # .add_text(x.value.strip)
@@ -381,15 +386,12 @@ class Rexslt
 
         new_element = x.clone
 
-        #jr030316 new_element.text = ''
-        #new_element.text = x.text
-
         new_element.attributes.each do |k,v|
           
           if v[/{/] then
 
             v.gsub!(/(\{[^\}]+\})/) do |x2|
-              element.text(x2[/\{([^\}]+)\}/,1]).clone
+              element.element(x2[/\{([^\}]+)\}/,1]).clone
             end
 
           end  
@@ -456,7 +458,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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexslt
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   38j2+6ULVWalsVein3whb7qB6IOvxoSqjz6n7jAKFGHovoXPUqpv5y5Yor23rTrn
   0YwisIc3UkL30g==
   -----END CERTIFICATE-----
-date: 2016-03-19 00:00:00.000000000 Z
+date: 2016-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rxfhelper
@@ -62,7 +62,7 @@ dependencies:
         version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.11
+        version: 1.3.15
   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.11
+        version: 1.3.15
 description: 
 email: james@r0bertson.co.uk
 executables: []