rexslt 0.5.11 → 0.5.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b5a178a90b731f56d261d03532b4871580ea9ec
-  data.tar.gz: 1d880d68ab9dfaa3289ef679e9998309eb96b6c0
+  metadata.gz: 692af4dea356de7239c406eb323d954dca996218
+  data.tar.gz: b549f3092fbfa174b2e25041afe3cb7d05210b3d
 SHA512:
-  metadata.gz: 8d7605ab12d04e030c3de3e7f4e1deb93107e1da38e6fe3dbce8eae03f7e7e478d31230f134b0c34fcb809f9f8449b1d7acebc0a0cde23c4e5fb4787736c1c76
-  data.tar.gz: 4406078c37739114adcad6b7072fb6a5bc6f3a2c1e2c4f3299b377b75b562a5a6036e134022794b12c83d08bad5aa2902d82206e77ed30cdcd108c96c5debdc3
+  metadata.gz: a47773c8f5ebe185148a60f40cb10d359a13aa7c40fb3a9d9015e80a0fd8ddcc548e721cbfec97ca7d156373dd13f88bc72c05294dcb95f918a9e95d5ff86e76
+  data.tar.gz: 7d2ca768f79b923bc80788984225086e80ff3b7442a3706ea0608001cfb84ea41dc412a5d269b81551349ccd2110f0d32fc1f0b220d0d59a710ffda248bdd83b

data/lib/rexslt.rb

@@ -162,10 +162,12 @@ class Rexslt
   end
 
   def xsl_attribute(element, x, doc_element, indent, i)
-    
+
     name = x.attributes[:name]
     value = x.value
-    doc_element.add_attribute name, value
+
+    value = value_of(x.element('xsl:value-of'), element) unless value
+    doc_element.add_attribute(name, value)
   end
 
   def xsl_choose(element, x, doc_element, indent, i)
@@ -437,6 +439,22 @@ class Rexslt
     
   end
   
+  def value_of(x, element)
+    
+    field = x.attributes[:select]
+
+    o = case field
+      when '.'
+        element.value
+      when /^\$/
+        @param[field[/^\$(.*)/,1]]
+    else
+      ee = element.text(field) 
+      ee
+    end
+    
+  end
+  
   def xsl_output()
 
   end
@@ -457,21 +475,11 @@ class Rexslt
   
   def xsl_value_of(element, x, doc_element, indent, i)
     
-    field = x.attributes[:select]
-
-    o = case field
-      when '.'
-        element.value
-      when /^\$/
-        @param[field[/^\$(.*)/,1]]
-    else
-      ee = element.text(field) 
-      ee
-    end
+    s = value_of(x, element)
 
     #jr030316 doc_element.add_element o.to_s #unless o.to_s.empty?
 
-    doc_element.add_text  o
+    doc_element.add_text  s
     
     doc_element
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexslt
 version: !ruby/object:Gem::Version
-  version: 0.5.11
+  version: 0.5.12
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   38j2+6ULVWalsVein3whb7qB6IOvxoSqjz6n7jAKFGHovoXPUqpv5y5Yor23rTrn
   0YwisIc3UkL30g==
   -----END CERTIFICATE-----
-date: 2016-04-02 00:00:00.000000000 Z
+date: 2016-04-03 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.15
+        version: 1.3.16
   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.15
+        version: 1.3.16
 description: 
 email: james@r0bertson.co.uk
 executables: []