xml-simple 1.0.14 → 1.0.15

data/lib/xmlsimple.rb

@@ -1,7 +1,7 @@
 # = XmlSimple
 #
 # Author::    Maik Schmidt <contact@maik-schmidt.de>
-# Copyright:: Copyright (c) 2003-2009 Maik Schmidt
+# Copyright:: Copyright (c) 2003-2011 Maik Schmidt
 # License::   Distributes under the same terms as Ruby.
 #
 require 'rexml/document'
@@ -11,7 +11,7 @@ require 'stringio'
 class XmlSimple
   include REXML
 
-  @@VERSION = '1.0.13'
+  @@VERSION = '1.0.15'
 
   # A simple cache for XML documents that were already transformed
   # by xml_in.
@@ -800,9 +800,12 @@ class XmlSimple
           end
 
           # Check for the '@' attribute prefix to allow separation of attributes and elements
-          if @options['noattr'] ||
-             (@options['attrprefix'] && !(key =~ /^@(.*)/)) ||
-             !scalar(value)
+             
+          if (@options['noattr'] ||
+              (@options['attrprefix'] && !(key =~ /^@(.*)/)) ||
+              !scalar(value)
+             ) &&
+             key != @options['contentkey']
             nested << value_to_xml(value, key, indent + @options['indent'])
           else
             value = value.to_s

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 14
-  version: 1.0.14
+  - 15
+  version: 1.0.15
 platform: ruby
 authors: 
 - Maik Schmidt
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-27 00:00:00 +01:00
+date: 2011-03-24 00:00:00 +01:00
 default_executable: 
 dependencies: []