xml-simple 1.0.8 → 1.0.9

data/lib/xmlsimple.rb

@@ -11,7 +11,7 @@ require 'stringio'
 class XmlSimple
   include REXML
 
-  @@VERSION = '1.0.8'
+  @@VERSION = '1.0.9'
 
   # A simple cache for XML documents that were already transformed
   # by xml_in.
@@ -267,7 +267,7 @@ class XmlSimple
       keyattr keeproot forcecontent contentkey noattr
       searchpath forcearray suppressempty anonymoustag
       cache grouptags normalisespace normalizespace
-      variables varattr
+      variables varattr keytosymbol
     ),
     'out' => %w(
       keyattr keeproot contentkey noattr rootname
@@ -284,6 +284,7 @@ class XmlSimple
   DEF_ANONYMOUS_TAG   = 'anon'
   DEF_FORCE_ARRAY     = true
   DEF_INDENTATION     = '  '
+  DEF_KEY_TO_SYMBOL   = false
   
   # Normalizes option names in a hash, i.e., turns all
   # characters to lower case and removes all underscores.
@@ -351,6 +352,8 @@ class XmlSimple
       @options['xmldeclaration'] = DEF_XML_DECLARATION
     end
 
+    @options['keytosymbol'] = DEF_KEY_TO_SYMBOL unless @options.has_key?('keytosymbol')
+
     if @options.has_key?('contentkey')
       if @options['contentkey'] =~ /^-(.*)$/
         @options['contentkey']    = $1
@@ -655,6 +658,14 @@ class XmlSimple
         end
       end
     end
+    
+    #patch for converting keys to symbols
+    if @options.has_key?('keytosymbol')
+      if @options['keytosymbol'] == true
+        key = key.to_s.downcase.to_sym
+      end
+    end
+    
     if hash.has_key?(key)
       if hash[key].instance_of?(Array)
         hash[key] << value
@@ -880,14 +891,7 @@ class XmlSimple
   # data::
   #   The string to be escaped.
   def escape_value(data)
-    return data if data.nil? || data == ''
-    result = data.dup
-    result.gsub!('&', '&amp;')
-    result.gsub!('<', '&lt;')
-    result.gsub!('>', '&gt;')
-    result.gsub!('"', '&quot;')
-    result.gsub!("'", '&apos;')
-    result
+    Text::normalize(data)
   end
   
   # Removes leading and trailing whitespace and sequences of
@@ -896,10 +900,7 @@ class XmlSimple
   # text::
   #   String to be normalised.
   def normalise_space(text)
-    text.sub!(/^\s+/, '')
-    text.sub!(/\s+$/, '')
-    text.gsub!(/\s\s+/, ' ')
-    text
+    text.strip.gsub(/\s\s+/, ' ')
   end
 
   # Checks, if an object is nil, an empty String or an empty Hash.
@@ -927,15 +928,16 @@ class XmlSimple
   # default::
   #   Value to be returned, if node could not be converted.
   def node_to_text(node, default = nil)
-    if node.instance_of?(Element) 
-      return node.texts.join('')
+    result = if node.instance_of?(Element) 
+      node.texts.join('')
     elsif node.instance_of?(Attribute)
-      return node.value.nil? ? default : node.value.strip
+      node.value.nil? ? default : node.value.strip
     elsif node.instance_of?(Text)
-      return node.to_s.strip
+      node.to_s.strip
     else
-      return default
+      default
     end
+    Text::unnormalize(result)
   end
 
   # Parses an XML string and returns the according document.

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.0
 specification_version: 1
 name: xml-simple
 version: !ruby/object:Gem::Version 
-  version: 1.0.8
-date: 2006-02-13 00:00:00 +01:00
+  version: 1.0.9
+date: 2006-07-02 00:00:00 +02:00
 summary: A very simple API for XML processing.
 require_paths: 
 - lib
@@ -25,6 +25,7 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - Maik Schmidt
 files: