roxml 2.5.2 → 2.5.3

data/History.txt

@@ -1,3 +1,9 @@
+== 2.5.3 (March 22, 2009)
+
+* minor enhancement
+
+  * Work around apparently unintentional breaking change in libxml-ruby 1.1.3
+
 == 2.5.2 (March 12, 2009)
 
 * minor enhancements

data/Rakefile

@@ -17,7 +17,7 @@ $hoe = Hoe.new('roxml', ROXML::VERSION) do |p|
   p.rubyforge_name       = p.name
   p.extra_deps         = [
    ['activesupport','>= 2.1.0'],
-   ['libxml-ruby', '>= 0.8.6']
+   ['libxml-ruby', '>= 1.0.0']
   ]
   p.extra_dev_deps = [
     ['newgem', ">= #{::Newgem::VERSION}"],

data/lib/roxml.rb

@@ -8,7 +8,7 @@ require 'uri'
 end
 
 module ROXML # :nodoc:
-  VERSION = '2.5.2'
+  VERSION = '2.5.3'
 
   def self.included(base) # :nodoc:
     base.extend ClassMethods::Accessors,

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

@@ -1,4 +1,5 @@
 require 'libxml'
+require 'cgi'
 
 module ROXML
   module XML # :nodoc:all
@@ -54,6 +55,12 @@ module ROXML
         alias_method_chain :new, :entity_escaping
       end
 
+      def add_child(child)
+        # libxml 1.1.3 changed child_add from returning child to returning self
+        self << child
+        child
+      end
+
       alias_method :set_libxml_content, :content=
       def content=(string)
         set_libxml_content(string.gsub('&', '&amp;'))

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

@@ -31,7 +31,7 @@ module ROXML
         end
       end
 
-      def child_add(element)
+      def add_child(element)
         if element.is_a?(REXML::CData)
           REXML::CData.new(element, true, self)
         else

data/lib/roxml/xml/references.rb

@@ -90,7 +90,7 @@ module ROXML
       if child = xml.children.find {|c| c.name == wrapper }
        return child
       end
-      xml.child_add(XML::Node.new(wrapper.to_s))
+      xml.add_child(XML::Node.new(wrapper.to_s))
     end
 
     def nodes_in(xml)
@@ -154,10 +154,10 @@ module ROXML
         xml.name = value
       elsif array?
         value.each do |v|
-          add(xml.child_add(XML::Node.new(name)), v)
+          add(xml.add_child(XML::Node.new(name)), v)
         end
       else
-        add(xml.child_add(XML::Node.new(name)), value)
+        add(xml.add_child(XML::Node.new(name)), value)
       end
     end
 

data/roxml.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{roxml}
-  s.version = "2.5.2"
+  s.version = "2.5.3"
 
   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-03-12}
+  s.date = %q{2009-03-22}
   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"]
@@ -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
@@ -26,23 +26,23 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       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_runtime_dependency(%q<libxml-ruby>, [">= 1.0.0"])
+      s.add_development_dependency(%q<newgem>, [">= 1.3.0"])
       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<libxml-ruby>, [">= 1.0.0"])
+      s.add_dependency(%q<newgem>, [">= 1.3.0"])
       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<libxml-ruby>, [">= 1.0.0"])
+    s.add_dependency(%q<newgem>, [">= 1.3.0"])
     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"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: roxml
 version: !ruby/object:Gem::Version 
-  version: 2.5.2
+  version: 2.5.3
 platform: ruby
 authors: 
 - Ben Woosley
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-12 00:00:00 -04:00
+date: 2009-04-17 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +33,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.8.6
+        version: 1.0.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: newgem
@@ -43,7 +43,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.3
+        version: 1.3.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby