xml-simple 1.0.11 → 1.0.12

data/lib/xmlsimple.rb

@@ -1,7 +1,7 @@
 # = XmlSimple
 #
 # Author::    Maik Schmidt <contact@maik-schmidt.de>
-# Copyright:: Copyright (c) 2003-2006 Maik Schmidt
+# Copyright:: Copyright (c) 2003-2009 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.11'
+  @@VERSION = '1.0.12'
 
   # A simple cache for XML documents that were already transformed
   # by xml_in.
@@ -151,7 +151,7 @@ class XmlSimple
 
     # If no XML string or filename was supplied look for scriptname.xml.
     if string.nil?
-      string = File::basename($0)
+      string = File::basename($0).dup
       string.sub!(/\.[^.]+$/, '')
       string += '.xml'
 
@@ -163,7 +163,7 @@ class XmlSimple
       if string =~ /<.*?>/m
         @doc = parse(string)
       elsif string == '-'
-        @doc = parse($stdin.readlines.to_s)
+        @doc = parse($stdin.read)
       else
         filename = find_xml_file(string, @options['searchpath'])
 
@@ -185,8 +185,8 @@ class XmlSimple
         
         @doc = load_xml_file(filename)
       end
-    elsif string.kind_of?(IO) || string.kind_of?(StringIO)
-      @doc = parse(string.readlines.to_s)
+    elsif string.kind_of?(IO) || string.kind_of?(StringIO) || string.kind_of?(Zlib::GzipReader)
+      @doc = parse(string.read)
     else
       raise ArgumentError, "Could not parse object of type: <#{string.type}>."
     end
@@ -267,12 +267,12 @@ class XmlSimple
       keyattr keeproot forcecontent contentkey noattr
       searchpath forcearray suppressempty anonymoustag
       cache grouptags normalisespace normalizespace
-      variables varattr keytosymbol
+      variables varattr keytosymbol attrprefix
     ),
     'out' => %w(
       keyattr keeproot contentkey noattr rootname
       xmldeclaration outputfile noescape suppressempty
-      anonymoustag indent grouptags noindent
+      anonymoustag indent grouptags noindent attrprefix
     )
   }
 
@@ -497,7 +497,7 @@ class XmlSimple
       }
     end
     
-    # Fold Hases containing a single anonymous Array up into just the Array.
+    # Fold Hashes containing a single anonymous Array up into just the Array.
     if count == 1 
       anonymoustag = @options['anonymoustag']
       if result.has_key?(anonymoustag) && result[anonymoustag].instance_of?(Array)
@@ -705,7 +705,11 @@ class XmlSimple
   #   Document node to extract attributes from.
   def get_attributes(node)
     attributes = {}
-    node.attributes.each { |n,v| attributes[n] = v }
+    if @options['attrprefix']
+      node.attributes.each { |n,v| attributes["@" + n] = v }
+    else
+      node.attributes.each { |n,v| attributes[n] = v }
+    end
     attributes
   end
   
@@ -796,7 +800,10 @@ class XmlSimple
             value = {}
           end
 
-          if !scalar(value) || @options['noattr']
+          # Check for the '@' attribute prefix to allow separation of attributes and elements
+          if @options['noattr'] ||
+             (@options['attrprefix'] && !(key =~ /^@(.*)/)) ||
+             !scalar(value)
             nested << value_to_xml(value, key, indent + @options['indent'])
           else
             value = value.to_s
@@ -804,7 +811,7 @@ class XmlSimple
             if key == @options['contentkey']
               text_content = value
             else
-              result << ' ' << key << '="' << value << '"'
+              result << ' ' << ($1||key) << '="' << value << '"'
             end
           end
         }
@@ -991,7 +998,7 @@ class XmlSimple
   # REXML::ParseException::
   #   If the specified file is not wellformed.
   def load_xml_file(filename)
-    parse(File.readlines(filename).to_s)
+    parse(IO::read(filename))
   end
 
   # Caches the data belonging to a certain file.

metadata

@@ -1,46 +1,53 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
-specification_version: 1
 name: xml-simple
 version: !ruby/object:Gem::Version 
-  version: 1.0.11
-date: 2007-03-12 00:00:00 +01:00
-summary: A very simple API for XML processing.
-require_paths: 
-- lib
-email: contact@maik-schmidt.de
-homepage: http://xml-simple.rubyforge.org
-rubyforge_project: xml-simple
-description: 
-autorequire: xmlsimple
-default_executable: 
-bindir: bin
-has_rdoc: false
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 1.0.12
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Maik Schmidt
-files: 
-- lib/xmlsimple.rb
-test_files: []
-
-rdoc_options: []
+autorequire: 
+bindir: bin
+cert_chain: []
 
-extra_rdoc_files: []
+date: 2009-02-27 00:00:00 +01:00
+default_executable: 
+dependencies: []
 
+description: 
+email: contact@maik-schmidt.de
 executables: []
 
 extensions: []
 
+extra_rdoc_files: []
+
+files: 
+- lib/xmlsimple.rb
+has_rdoc: false
+homepage: http://xml-simple.rubyforge.org
+post_install_message: 
+rdoc_options: []
+
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
+rubyforge_project: xml-simple
+rubygems_version: 1.3.1
+signing_key: 
+specification_version: 2
+summary: A simple API for XML processing.
+test_files: []