roxml 2.5.0 → 2.5.1

data/History.txt

@@ -1,3 +1,14 @@
+== 2.5.1 (March 2, 2009)
+
+* minor enhancements
+
+   * Add Document#save to REXML support, complete with XMLDecl output
+
+* bug fixes
+
+   * rexml support has been fixed
+   * the first example in the readme was broken and has been fixed
+
 == 2.5.0 (February 24, 2009)
 
 * major enhancements

data/Manifest.txt

@@ -9,6 +9,7 @@ examples/active_record.rb
 examples/amazon.rb
 examples/current_weather.rb
 examples/dashed_elements.rb
+examples/library.rb
 examples/posts.rb
 examples/twitter.rb
 examples/xml/active_record.xml
@@ -38,6 +39,7 @@ spec/examples/active_record_spec.rb
 spec/examples/amazon_spec.rb
 spec/examples/current_weather_spec.rb
 spec/examples/dashed_elements_spec.rb
+spec/examples/library_spec.rb
 spec/examples/post_spec.rb
 spec/examples/twitter_spec.rb
 spec/roxml_spec.rb

data/README.rdoc

@@ -14,36 +14,36 @@ ROXML, you can annotate the Ruby classes as follows:
   class Book
     include ROXML
 
-    xml_reader :isbn, :from => "@ISBN" # attribute with name 'ISBN'
-    xml_reader :title
-    xml_reader :description, :cdata => true  # text node with cdata protection
-    xml_reader :author
+    xml_accessor :isbn, :from => "@ISBN" # attribute with name 'ISBN'
+    xml_accessor :title
+    xml_accessor :description, :cdata => true  # text node with cdata protection
+    xml_accessor :author
   end
 
   class Library
     include ROXML
 
     xml_accessor :name, :from => "NAME", :cdata => true
-    xml_accessor :books, :as => [Book]
+    xml_accessor :books, :as => [Book] # by default roxml searches for books for in <book> child nodes, then, if none are present, in ./books/book children
   end
 
 To create a library and put a number of books in it we could run the following code:
 
-  book = Book.new()
+  book = Book.new
   book.isbn = "0201710897"
   book.title = "The PickAxe"
   book.description = "Best Ruby book out there!"
   book.author = "David Thomas, Andrew Hunt, Dave Thomas"
 
-  lib = Library.new()
+  lib = Library.new
   lib.name = "Favorite Books"
-  lib << book
+  lib.books = [book]
 
 To save this information to an XML file:
 
-  File.open("library.xml", "w") do |f|
-    lib.to_xml.write(f, 0)
-  end
+  doc = ROXML::XML::Document.new
+  doc.root = lib.to_xml
+  doc.save("library.xml")
 
 To later populate the library object from the XML file:
 
@@ -62,11 +62,22 @@ you would add a reference to another ROXML class. For example:
 
 can be mapped using the following code:
 
+  class Publisher
+    include ROXML
+
+    xml_accessor :name
+
+    # other important functionality
+  end
+
   class BookWithPublisher
     include ROXML
 
-    xml_name :book
+    xml_name 'book'
     xml_reader :publisher, :as => Publisher
+
+    #  or, alternatively, if no class is needed to hang functionality on:
+    # xml_reader :publisher, :from => 'name', :in => 'publisher'
   end
 
 Note: In the above example, _xml_name_ annotation tells ROXML to set the element
@@ -88,10 +99,14 @@ The result of the block above is stored, rather than the actual value parsed fro
 
 == Construction
 
-Object lifecycle is as follows: .from_xml is called with option initialization_args.  .new,
-and thus #initialize, is called with those same args.  Then the object is populated
-with the attribute values from xml.  Then the #after_parse callback is called, with no arguments.
-In it you can ensure that your object initialization is complete, including initialization which
+Object life-cycle is as follows: .from_xml is called with a first argument representing the xml
+in file, string, or path form, and with optional initialization_args following.
+
+Firt .new and thus #initialize, is called with those same initialization_args, or no args if none
+are present.  Then the object is populated with the attribute values from xml.  Then the
+#after_parse callback is called, with no arguments.
+
+In #after_parse you can ensure that your object initialization is complete, including initialization which
 requires more than one variable in concert.
 
 E.g.:

data/Rakefile

@@ -20,7 +20,9 @@ $hoe = Hoe.new('roxml', ROXML::VERSION) do |p|
    ['libxml-ruby', '>= 0.8.6']
   ]
   p.extra_dev_deps = [
-    ['newgem', ">= #{::Newgem::VERSION}"]
+    ['newgem', ">= #{::Newgem::VERSION}"],
+    ['sqlite3-ruby', '>= 1.2.4' ],
+    ['activerecord', '>= 2.2.2' ]
   ]
 
   p.summary = "Ruby Object to XML mapping library"

data/examples/active_record.rb

@@ -3,9 +3,10 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec/spec_helper')
 require 'sqlite3'
 require 'activerecord'
 
+DB_PATH = File.join(File.dirname(__FILE__), 'active_record.sqlite3')
 ActiveRecord::Base.establish_connection(
   :adapter  => 'sqlite3',
-  :database => "examples/active_record/active_record.sqlite3"
+  :database => DB_PATH
 )
 
 class Waypoint < ActiveRecord::Base

data/examples/library.rb

@@ -0,0 +1,40 @@
+class Publisher
+  include ROXML
+
+  xml_accessor :name
+  
+  def initialize(name = nil)
+    @name = name
+  end
+  
+  def ==(other)
+    name == other.name
+  end
+  
+  # other important functionality
+end
+
+class Novel
+  include ROXML
+
+  xml_accessor :isbn, :from => "@ISBN" # attribute with name 'ISBN'
+  xml_accessor :title
+  xml_accessor :description, :cdata => true  # text node with cdata protection
+  xml_accessor :author
+  xml_accessor :publisher, :as => Publisher # singular object reference for illustrative purposes.
+  
+  def ==(other)
+    self.class.roxml_attrs.map(&:accessor).all? {|attr| send(attr) == other.send(attr) }
+  end
+end
+
+class Library
+  include ROXML
+
+  xml_accessor :name, :from => "NAME", :cdata => true
+  xml_accessor :novels, :as => [Novel] # by default roxml searches for books for in <novel> children, then, if none are present, in ./novels/novel children
+  
+  def ==(other)
+    name == other.name && novels == other.novels
+  end
+end

data/lib/roxml.rb

@@ -8,7 +8,7 @@ require 'uri'
 end
 
 module ROXML # :nodoc:
-  VERSION = '2.5.0'
+  VERSION = '2.5.1'
 
   def self.included(base) # :nodoc:
     base.extend ClassMethods::Accessors,
@@ -79,7 +79,7 @@ module ROXML # :nodoc:
     module Conversions
       # Returns a LibXML::XML::Node or a REXML::Element representing this object
       def to_xml(name = nil)
-        returning XML::Node.new(name || self.class.tag_name) do |root|
+        returning XML::Node.new((name || self.class.tag_name).to_s) do |root|
           self.class.roxml_attrs.each do |attr|
             ref = attr.to_ref(self)
             v = ref.to_xml

data/lib/roxml/xml/parsers/libxml.rb

@@ -53,6 +53,11 @@ module ROXML
         end
         alias_method_chain :new, :entity_escaping
       end
+
+      alias_method :set_libxml_content, :content=
+      def content=(string)
+        set_libxml_content(string.gsub('&', '&'))
+      end
     end
 
     class Parser

data/lib/roxml/xml/parsers/rexml.rb

@@ -5,16 +5,20 @@ module ROXML
     Document = REXML::Document
     Node = REXML::Element
 
+    module Error
+      def self.reset_handler
+        # noop
+      end
+    end
+    [REXML::ParseException, REXML::UndefinedNamespaceException, REXML::Validation::ValidationException].each do |exception|
+      exception.send(:include, Error)
+    end
+
     class Node
       class << self
         def new_cdata(content)
           REXML::CData.new(content)
         end
-
-        def new(name)
-          name = name.id2name if name.is_a? Symbol
-          REXML::Element.new(name)
-        end
       end
 
       alias_attribute :content, :text
@@ -68,6 +72,13 @@ module ROXML
         raise ArgumentError, "Root is already defined" if root
         add(node)
       end
+
+      def save(destination, opts = {:formatter => REXML::Formatters::Default.new})
+        self << REXML::XMLDecl.new unless xml_decl != REXML::XMLDecl.default # always output xml declaration
+        File.open(destination, "w") do |f|
+          opts[:formatter].write(self, f)
+        end
+      end
     end
   end
 end

data/lib/roxml/xml/references.rb

@@ -89,7 +89,7 @@ module ROXML
       if child = xml.children.find {|c| c.name == wrapper }
        return child
       end
-      xml.child_add(XML::Node.new(wrapper))
+      xml.child_add(XML::Node.new(wrapper.to_s))
     end
 
     def nodes_in(xml)
@@ -192,7 +192,7 @@ module ROXML
       if cdata?
         dest.child_add(XML::Node.new_cdata(value.to_s.to_utf_without_deprecation))
       else
-        dest.content = CGI.escapeHTML(value.to_s.to_utf_without_deprecation)
+        dest.content = value.to_s.to_utf_without_deprecation
       end
     end
   end

data/roxml.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{roxml}
-  s.version = "2.5.0"
+  s.version = "2.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Woosley", "Zak Mandhro", "Anders Engstrom", "Russ Olsen"]
-  s.date = %q{2009-02-24}
+  s.date = %q{2009-03-02}
   s.description = %q{ROXML is a Ruby library designed to make it easier for Ruby developers to work with XML. Using simple annotations, it enables Ruby classes to be mapped to XML. ROXML takes care of the marshalling and unmarshalling of mapped attributes so that developers can focus on building first-class Ruby classes. As a result, ROXML simplifies the development of RESTful applications, Web Services, and XML-RPC.}
   s.email = %q{ben.woosley@gmail.com}
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.rdoc"]
-  s.files = ["History.txt", "MIT-LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "TODO", "config/website.yml", "examples/active_record.rb", "examples/amazon.rb", "examples/current_weather.rb", "examples/dashed_elements.rb", "examples/posts.rb", "examples/twitter.rb", "examples/xml/active_record.xml", "examples/xml/amazon.xml", "examples/xml/current_weather.xml", "examples/xml/dashed_elements.xml", "examples/xml/posts.xml", "examples/xml/twitter.xml", "lib/roxml.rb", "lib/roxml/definition.rb", "lib/roxml/extensions.rb", "lib/roxml/extensions/active_support.rb", "lib/roxml/extensions/array.rb", "lib/roxml/extensions/array/conversions.rb", "lib/roxml/extensions/deprecation.rb", "lib/roxml/extensions/string.rb", "lib/roxml/extensions/string/conversions.rb", "lib/roxml/extensions/string/iterators.rb", "lib/roxml/hash_definition.rb", "lib/roxml/xml.rb", "lib/roxml/xml/parsers/libxml.rb", "lib/roxml/xml/parsers/rexml.rb", "lib/roxml/xml/references.rb", "roxml.gemspec", "spec/definition_spec.rb", "spec/examples/active_record_spec.rb", "spec/examples/amazon_spec.rb", "spec/examples/current_weather_spec.rb", "spec/examples/dashed_elements_spec.rb", "spec/examples/post_spec.rb", "spec/examples/twitter_spec.rb", "spec/roxml_spec.rb", "spec/shared_specs.rb", "spec/spec.opts", "spec/spec_helper.rb", "spec/string_spec.rb", "spec/xml/parser_spec.rb", "tasks/rspec.rake", "tasks/test.rake", "test/bugs/rexml_bugs.rb", "test/fixtures/book_malformed.xml", "test/fixtures/book_pair.xml", "test/fixtures/book_text_with_attribute.xml", "test/fixtures/book_valid.xml", "test/fixtures/book_with_authors.xml", "test/fixtures/book_with_contributions.xml", "test/fixtures/book_with_contributors.xml", "test/fixtures/book_with_contributors_attrs.xml", "test/fixtures/book_with_default_namespace.xml", "test/fixtures/book_with_depth.xml", "test/fixtures/book_with_octal_pages.xml", "test/fixtures/book_with_publisher.xml", "test/fixtures/book_with_wrapped_attr.xml", "test/fixtures/dictionary_of_attr_name_clashes.xml", "test/fixtures/dictionary_of_attrs.xml", "test/fixtures/dictionary_of_guarded_names.xml", "test/fixtures/dictionary_of_mixeds.xml", "test/fixtures/dictionary_of_name_clashes.xml", "test/fixtures/dictionary_of_names.xml", "test/fixtures/dictionary_of_texts.xml", "test/fixtures/library.xml", "test/fixtures/library_uppercase.xml", "test/fixtures/muffins.xml", "test/fixtures/nameless_ageless_youth.xml", "test/fixtures/node_with_attr_name_conflicts.xml", "test/fixtures/node_with_name_conflicts.xml", "test/fixtures/numerology.xml", "test/fixtures/person.xml", "test/fixtures/person_with_guarded_mothers.xml", "test/fixtures/person_with_mothers.xml", "test/mocks/dictionaries.rb", "test/mocks/mocks.rb", "test/release/dependencies_test.rb", "test/test_helper.rb", "test/unit/definition_test.rb", "test/unit/deprecations_test.rb", "test/unit/to_xml_test.rb", "test/unit/xml_attribute_test.rb", "test/unit/xml_block_test.rb", "test/unit/xml_bool_test.rb", "test/unit/xml_construct_test.rb", "test/unit/xml_convention_test.rb", "test/unit/xml_hash_test.rb", "test/unit/xml_initialize_test.rb", "test/unit/xml_name_test.rb", "test/unit/xml_namespace_test.rb", "test/unit/xml_object_test.rb", "test/unit/xml_required_test.rb", "test/unit/xml_text_test.rb", "vendor/override_rake_task/README", "vendor/override_rake_task/init.rb", "vendor/override_rake_task/install.rb", "vendor/override_rake_task/lib/override_rake_task.rb", "website/index.html"]
+  s.files = ["History.txt", "MIT-LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "TODO", "config/website.yml", "examples/active_record.rb", "examples/amazon.rb", "examples/current_weather.rb", "examples/dashed_elements.rb", "examples/library.rb", "examples/posts.rb", "examples/twitter.rb", "examples/xml/active_record.xml", "examples/xml/amazon.xml", "examples/xml/current_weather.xml", "examples/xml/dashed_elements.xml", "examples/xml/posts.xml", "examples/xml/twitter.xml", "lib/roxml.rb", "lib/roxml/definition.rb", "lib/roxml/extensions.rb", "lib/roxml/extensions/active_support.rb", "lib/roxml/extensions/array.rb", "lib/roxml/extensions/array/conversions.rb", "lib/roxml/extensions/deprecation.rb", "lib/roxml/extensions/string.rb", "lib/roxml/extensions/string/conversions.rb", "lib/roxml/extensions/string/iterators.rb", "lib/roxml/hash_definition.rb", "lib/roxml/xml.rb", "lib/roxml/xml/parsers/libxml.rb", "lib/roxml/xml/parsers/rexml.rb", "lib/roxml/xml/references.rb", "roxml.gemspec", "spec/definition_spec.rb", "spec/examples/active_record_spec.rb", "spec/examples/amazon_spec.rb", "spec/examples/current_weather_spec.rb", "spec/examples/dashed_elements_spec.rb", "spec/examples/library_spec.rb", "spec/examples/post_spec.rb", "spec/examples/twitter_spec.rb", "spec/roxml_spec.rb", "spec/shared_specs.rb", "spec/spec.opts", "spec/spec_helper.rb", "spec/string_spec.rb", "spec/xml/parser_spec.rb", "tasks/rspec.rake", "tasks/test.rake", "test/bugs/rexml_bugs.rb", "test/fixtures/book_malformed.xml", "test/fixtures/book_pair.xml", "test/fixtures/book_text_with_attribute.xml", "test/fixtures/book_valid.xml", "test/fixtures/book_with_authors.xml", "test/fixtures/book_with_contributions.xml", "test/fixtures/book_with_contributors.xml", "test/fixtures/book_with_contributors_attrs.xml", "test/fixtures/book_with_default_namespace.xml", "test/fixtures/book_with_depth.xml", "test/fixtures/book_with_octal_pages.xml", "test/fixtures/book_with_publisher.xml", "test/fixtures/book_with_wrapped_attr.xml", "test/fixtures/dictionary_of_attr_name_clashes.xml", "test/fixtures/dictionary_of_attrs.xml", "test/fixtures/dictionary_of_guarded_names.xml", "test/fixtures/dictionary_of_mixeds.xml", "test/fixtures/dictionary_of_name_clashes.xml", "test/fixtures/dictionary_of_names.xml", "test/fixtures/dictionary_of_texts.xml", "test/fixtures/library.xml", "test/fixtures/library_uppercase.xml", "test/fixtures/muffins.xml", "test/fixtures/nameless_ageless_youth.xml", "test/fixtures/node_with_attr_name_conflicts.xml", "test/fixtures/node_with_name_conflicts.xml", "test/fixtures/numerology.xml", "test/fixtures/person.xml", "test/fixtures/person_with_guarded_mothers.xml", "test/fixtures/person_with_mothers.xml", "test/mocks/dictionaries.rb", "test/mocks/mocks.rb", "test/release/dependencies_test.rb", "test/test_helper.rb", "test/unit/definition_test.rb", "test/unit/deprecations_test.rb", "test/unit/to_xml_test.rb", "test/unit/xml_attribute_test.rb", "test/unit/xml_block_test.rb", "test/unit/xml_bool_test.rb", "test/unit/xml_construct_test.rb", "test/unit/xml_convention_test.rb", "test/unit/xml_hash_test.rb", "test/unit/xml_initialize_test.rb", "test/unit/xml_name_test.rb", "test/unit/xml_namespace_test.rb", "test/unit/xml_object_test.rb", "test/unit/xml_required_test.rb", "test/unit/xml_text_test.rb", "vendor/override_rake_task/README", "vendor/override_rake_task/init.rb", "vendor/override_rake_task/install.rb", "vendor/override_rake_task/lib/override_rake_task.rb", "website/index.html"]
   s.has_rdoc = true
   s.homepage = %q{http://roxml.rubyforge.org}
   s.rdoc_options = ["--main", "README.rdoc"]
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = %q{roxml}
   s.rubygems_version = %q{1.3.1}
   s.summary = %q{Ruby Object to XML mapping library}
-  s.test_files = ["test/unit/xml_convention_test.rb", "test/unit/xml_object_test.rb", "test/unit/xml_required_test.rb", "test/unit/xml_bool_test.rb", "test/unit/xml_name_test.rb", "test/unit/definition_test.rb", "test/unit/xml_construct_test.rb", "test/unit/xml_namespace_test.rb", "test/unit/deprecations_test.rb", "test/unit/xml_text_test.rb", "test/unit/xml_block_test.rb", "test/unit/xml_attribute_test.rb", "test/unit/xml_initialize_test.rb", "test/unit/xml_hash_test.rb", "test/unit/to_xml_test.rb"]
+  s.test_files = ["test/unit/definition_test.rb", "test/unit/deprecations_test.rb", "test/unit/to_xml_test.rb", "test/unit/xml_attribute_test.rb", "test/unit/xml_block_test.rb", "test/unit/xml_bool_test.rb", "test/unit/xml_construct_test.rb", "test/unit/xml_convention_test.rb", "test/unit/xml_hash_test.rb", "test/unit/xml_initialize_test.rb", "test/unit/xml_name_test.rb", "test/unit/xml_namespace_test.rb", "test/unit/xml_object_test.rb", "test/unit/xml_required_test.rb", "test/unit/xml_text_test.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
@@ -28,17 +28,23 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<activesupport>, [">= 2.1.0"])
       s.add_runtime_dependency(%q<libxml-ruby>, [">= 0.8.6"])
       s.add_development_dependency(%q<newgem>, [">= 1.2.3"])
+      s.add_development_dependency(%q<sqlite3-ruby>, [">= 1.2.4"])
+      s.add_development_dependency(%q<activerecord>, [">= 2.2.2"])
       s.add_development_dependency(%q<hoe>, [">= 1.8.0"])
     else
       s.add_dependency(%q<activesupport>, [">= 2.1.0"])
       s.add_dependency(%q<libxml-ruby>, [">= 0.8.6"])
       s.add_dependency(%q<newgem>, [">= 1.2.3"])
+      s.add_dependency(%q<sqlite3-ruby>, [">= 1.2.4"])
+      s.add_dependency(%q<activerecord>, [">= 2.2.2"])
       s.add_dependency(%q<hoe>, [">= 1.8.0"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 2.1.0"])
     s.add_dependency(%q<libxml-ruby>, [">= 0.8.6"])
     s.add_dependency(%q<newgem>, [">= 1.2.3"])
+    s.add_dependency(%q<sqlite3-ruby>, [">= 1.2.4"])
+    s.add_dependency(%q<activerecord>, [">= 2.2.2"])
     s.add_dependency(%q<hoe>, [">= 1.8.0"])
   end
 end

data/spec/examples/active_record_spec.rb

@@ -6,11 +6,8 @@ describe ROXML, "under ActiveRecord" do
     @route = Route.from_xml(xml_for('active_record'))
   end
 
-  after(:all) do
-    db = File.dirname(__FILE__) + "/../../examples/active_record/active_record.sqlite3"
-    if File.exists?(db)
-      FileUtils.rm(db)
-    end
+  before(:all) do
+    FileUtils.rm(DB_PATH) if File.exists?(DB_PATH)
   end
 
   it "should be parsed" do

data/spec/examples/library_spec.rb

@@ -0,0 +1,41 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require example('library')
+
+describe Library do
+  before :all do
+    book = Novel.new
+    book.isbn = "0201710897"
+    book.title = "The PickAxe"
+    book.description = "Best Ruby book out there!"
+    book.author = "David Thomas, Andrew Hunt, Dave Thomas"
+    book.publisher = Publisher.new('Addison Wesley Longman, Inc.')
+
+    @lib = Library.new
+    @lib.name = "Favorite Books"
+    @lib.novels = [book]
+  end
+
+  describe "#to_xml" do
+    it "should contain the expected information" do
+      @lib.to_xml.should == ROXML::XML::Parser.parse(%{<library><NAME><![CDATA[Favorite Books]]></NAME><novel ISBN='0201710897'><title>The PickAxe</title><description><![CDATA[Best Ruby book out there!]]></description><author>David Thomas, Andrew Hunt, Dave Thomas</author><publisher><name>Addison Wesley Longman, Inc.</name></publisher></novel></library>}).root
+    end
+
+    context "when written to a file" do
+      before :all do
+        @doc = ROXML::XML::Document.new
+        @doc.root = @lib.to_xml
+        @doc.save("spec/examples/library.xml")
+      end
+
+      it "should be contain the expected xml" do
+        ROXML::XML::Parser.parse(File.read("spec/examples/library.xml")).to_s.should == ROXML::XML::Parser.parse(%{<?xml version="1.0"?><library><NAME><![CDATA[Favorite Books]]></NAME><novel ISBN='0201710897'><title>The PickAxe</title><description><![CDATA[Best Ruby book out there!]]></description><author>David Thomas, Andrew Hunt, Dave Thomas</author><publisher><name>Addison Wesley Longman, Inc.</name></publisher></novel></library>}).to_s
+      end
+
+      it "should be re-parsable via .from_xml" do
+        File.open("spec/examples/library.xml") do |file|
+          Library.from_xml(file).should == @lib
+        end
+      end
+    end
+  end
+end

data/spec/xml/parser_spec.rb

@@ -11,12 +11,37 @@ describe ROXML::XML::Parser do
   end
 
   it "should escape invalid characters on output to text node" do
-    ROXML::XML::Node.new("entities", " < > ' \" & ").to_s.should == "<entities> &lt; &gt; ' \" &amp; </entities>"
+    node = ROXML::XML::Node.new("entities")
+    node.content = " < > ' \" & "
+    if ROXML::XML_PARSER == 'libxml'
+      node.to_s.should == "<entities> &lt; &gt; ' \" &amp; </entities>"
+    else
+      node.to_s.should == "<entities> &lt; &gt; &apos; &quot; &amp; </entities>"
+    end
   end
 
   it "should esape invalid characters for attribute name" do
     node = ROXML::XML::Node.new("attr_holder")
     node.attributes["entities"] = "\"'<>&"
-    node.to_s.should == %{<attr_holder entities="&quot;'&lt;&gt;&amp;"/>}
+    if ROXML::XML_PARSER == 'libxml'
+      node.to_s.should == %{<attr_holder entities="&quot;'&lt;&gt;&amp;"/>}
+    else
+      node.to_s.should == %{<attr_holder entities='&quot;&apos;&lt;&gt;&amp;'/>}
+    end
+  end
+end
+
+describe ROXML::XML::Document do
+  describe "#save" do
+    context "with rexml parser" do
+      it "should defer to existing XMLDecl" do
+        if ROXML::XML_PARSER == 'rexml'
+          @doc = ROXML::XML::Document.new
+          @doc << REXML::XMLDecl.new('1.1')
+          @doc.save('spec/xml/decl_test.xml')
+          ROXML::XML::Parser.parse(File.read('spec/xml/decl_test.xml')).to_s.should == ROXML::XML::Parser.parse(%{<?xml version="1.1"?>}).to_s
+        end
+      end
+    end
   end
 end

data/test/test_helper.rb

@@ -25,7 +25,7 @@ def to_xml_test(*names)
 
       dict = klass.from_xml(xml)
       xml = remove_children(xml)
-      assert_equal xml, dict.to_xml
+      assert_equal xml.to_s, dict.to_xml.to_s
     end
   end
 end

data/test/unit/xml_namespace_test.rb

@@ -34,6 +34,7 @@ class TestDefaultXMLNamespaces < Test::Unit::TestCase
     assert_equal "Yeah, content", xml.find_first('ns:node', 'ns:http://defaultnamespace.org').content
     assert_equal nil, xml.find_first('ns:node/subnode', 'ns:http://defaultnamespace.org')
     assert_equal "Another", xml.find_first('ns:node/ns:subnode', 'ns:http://defaultnamespace.org').content
+  rescue LoadError
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: roxml
 version: !ruby/object:Gem::Version 
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors: 
 - Ben Woosley
@@ -45,6 +45,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.2.3
     version: 
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.4
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.2.2
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   type: :development
@@ -77,6 +97,7 @@ files:
 - examples/amazon.rb
 - examples/current_weather.rb
 - examples/dashed_elements.rb
+- examples/library.rb
 - examples/posts.rb
 - examples/twitter.rb
 - examples/xml/active_record.xml
@@ -106,6 +127,7 @@ files:
 - spec/examples/amazon_spec.rb
 - spec/examples/current_weather_spec.rb
 - spec/examples/dashed_elements_spec.rb
+- spec/examples/library_spec.rb
 - spec/examples/post_spec.rb
 - spec/examples/twitter_spec.rb
 - spec/roxml_spec.rb