Permalink
Browse files

Properly set up libxml includes. Don't include LibXML in toplevel.

[#2084 state:resolved]
  • Loading branch information...
1 parent e609d83 commit d4091d3bc79731f55491cfb51c604a66502c944f @jeremy jeremy committed Mar 10, 2009
Showing with 9 additions and 7 deletions.
  1. +9 −7 activesupport/lib/active_support/xml_mini/libxml.rb
@@ -1,4 +1,6 @@
-# = XML Mini Libxml implementation
+require 'libxml'
+
+# = XmlMini LibXML implementation
module ActiveSupport
module XmlMini_LibXML #:nodoc:
extend self
@@ -7,19 +9,19 @@ module XmlMini_LibXML #:nodoc:
# string::
# XML Document string to parse
def parse(string)
- XML.default_keep_blanks = false
+ LibXML::XML.default_keep_blanks = false
if string.blank?
{}
else
- XML::Parser.string(string.strip).parse.to_hash
+ LibXML::XML::Parser.string(string.strip).parse.to_hash
end
end
end
end
-module XML
+module LibXML
module Conversions
module Document
def to_hash
@@ -37,7 +39,7 @@ module Node
# Hash to merge the converted element into.
def to_hash(hash={})
if text?
- raise RuntimeError if content.length >= LIB_XML_LIMIT
+ raise LibXML::XML::Error if content.length >= LIB_XML_LIMIT
hash[CONTENT_ROOT] = content
else
sub_hash = insert_name_into_hash(hash, name)
@@ -127,5 +129,5 @@ def yaml?
end
end
-XML::Document.send(:include, XML::Conversions::Document)
-XML::Node.send(:include, XML::Conversions::Node)
+LibXML::XML::Document.send(:include, LibXML::Conversions::Document)
+LibXML::XML::Node.send(:include, LibXML::Conversions::Node)

0 comments on commit d4091d3

Please sign in to comment.