RubyGems - libxml-ruby - Versions diffs - 0.9.7-x86-mswin32-60 → 0.9.8-x86-mswin32-60 - Mend

libxml-ruby 0.9.7-x86-mswin32-60 → 0.9.8-x86-mswin32-60

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (99) hide show

data/CHANGES +53 -0
data/Rakefile +1 -0
data/ext/libxml/build.log +4 -0
data/ext/libxml/cbg.c +86 -86
data/ext/libxml/libxml.c +878 -876
data/ext/libxml/ruby_libxml.h +8 -4
data/ext/libxml/ruby_xml_attr.c +36 -168
data/ext/libxml/ruby_xml_attr.h +2 -4
data/ext/libxml/ruby_xml_attr_decl.c +177 -0
data/ext/libxml/ruby_xml_attr_decl.h +13 -0
data/ext/libxml/ruby_xml_attributes.c +29 -20
data/ext/libxml/ruby_xml_document.c +895 -898
data/ext/libxml/ruby_xml_dtd.c +18 -1
data/ext/libxml/ruby_xml_dtd.h +1 -0
data/ext/libxml/ruby_xml_encoding.c +116 -0
data/ext/libxml/ruby_xml_encoding.h +12 -0
data/ext/libxml/ruby_xml_error.c +8 -2
data/ext/libxml/ruby_xml_html_parser.c +53 -74
data/ext/libxml/ruby_xml_html_parser.h +2 -3
data/ext/libxml/ruby_xml_html_parser_context.c +145 -0
data/ext/libxml/ruby_xml_html_parser_context.h +12 -0
data/ext/libxml/ruby_xml_html_parser_options.c +48 -0
data/ext/libxml/ruby_xml_html_parser_options.h +12 -0
data/ext/libxml/ruby_xml_input_cbg.c +1 -1
data/ext/libxml/ruby_xml_io.c +30 -0
data/ext/libxml/ruby_xml_io.h +9 -0
data/ext/libxml/ruby_xml_namespace.c +34 -16
data/ext/libxml/ruby_xml_namespace.h +2 -2
data/ext/libxml/ruby_xml_namespaces.c +6 -6
data/ext/libxml/ruby_xml_node.c +1367 -1324
data/ext/libxml/ruby_xml_node.h +2 -2
data/ext/libxml/ruby_xml_parser.c +26 -78
data/ext/libxml/ruby_xml_parser.h +1 -1
data/ext/libxml/ruby_xml_parser_context.c +284 -13
data/ext/libxml/ruby_xml_parser_context.h +1 -2
data/ext/libxml/ruby_xml_parser_options.c +75 -0
data/ext/libxml/ruby_xml_parser_options.h +14 -0
data/ext/libxml/ruby_xml_reader.c +277 -183
data/ext/libxml/ruby_xml_sax_parser.c +60 -57
data/ext/libxml/ruby_xml_xpath_context.c +43 -8
data/ext/libxml/ruby_xml_xpath_expression.c +6 -0
data/ext/libxml/ruby_xml_xpath_object.c +107 -95
data/ext/libxml/ruby_xml_xpath_object.h +9 -1
data/ext/libxml/ruby_xml_xpointer.c +107 -107
data/ext/libxml/version.h +2 -2
data/ext/mingw/libxml_ruby.dll.a +0 -0
data/ext/mingw/libxml_ruby.so +0 -0
data/ext/vc/libxml_ruby.vcproj +43 -3
data/lib/libxml.rb +2 -3
data/lib/libxml/attr.rb +71 -2
data/lib/libxml/attr_decl.rb +81 -0
data/lib/libxml/document.rb +78 -14
data/lib/libxml/html_parser.rb +75 -42
data/lib/libxml/node.rb +11 -0
data/lib/libxml/parser.rb +106 -62
data/lib/libxml/reader.rb +12 -0
data/lib/libxml/sax_parser.rb +42 -52
data/lib/libxml/xpath_object.rb +15 -0
data/test/model/atom.xml +12 -12
data/test/model/bands.xml +4 -4
data/test/model/books.xml +146 -147
data/test/model/merge_bug_data.xml +1 -1
data/test/model/rubynet.xml +1 -0
data/test/model/shiporder.rng +1 -1
data/test/model/shiporder.xml +22 -22
data/test/model/shiporder.xsd +30 -30
data/test/model/xinclude.xml +1 -1
data/test/{tc_node_attr.rb → tc_attr.rb} +1 -1
data/test/tc_attr_decl.rb +131 -0
data/test/tc_deprecated_require.rb +1 -3
data/test/tc_document.rb +13 -3
data/test/tc_document_write.rb +5 -5
data/test/tc_dtd.rb +13 -5
data/test/tc_html_parser.rb +14 -26
data/test/tc_node_cdata.rb +1 -3
data/test/tc_node_comment.rb +2 -4
data/test/tc_node_edit.rb +2 -3
data/test/tc_node_text.rb +35 -1
data/test/tc_node_write.rb +3 -3
data/test/tc_node_xlink.rb +2 -4
data/test/tc_parser.rb +163 -70
data/test/tc_parser_context.rb +103 -42
data/test/tc_reader.rb +173 -45
data/test/tc_relaxng.rb +2 -2
data/test/tc_sax_parser.rb +48 -52
data/test/tc_schema.rb +2 -2
data/test/tc_xpath.rb +37 -6
data/test/tc_xpath_context.rb +7 -1
data/test/tc_xpath_expression.rb +1 -3
data/test/tc_xpointer.rb +1 -3
data/test/test_suite.rb +2 -3
metadata +20 -13
data/ext/libxml/ruby_xml_input.c +0 -329
data/ext/libxml/ruby_xml_input.h +0 -20
data/lib/libxml/parser_context.rb +0 -17
data/lib/libxml/parser_options.rb +0 -25
data/test/model/simple.xml +0 -7
data/test/tc_input.rb +0 -13
data/test/tc_well_formed.rb +0 -11

data/test/model/merge_bug_data.xml CHANGED

@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <template>
   <body>
     <section>

data/test/model/rubynet.xml CHANGED

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <rubynet xmlns:xlink="http://www.w3.org/1999/xlink">
   <pkg version="1.0">
     <meta>

data/test/model/shiporder.rng CHANGED

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   relax ng schema in compact syntax; this cannot be used within libxml but

data/test/model/shiporder.xml CHANGED

@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shiporder orderid="889923"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:noNamespaceSchemaLocation="shiporder.xsd">
-  <orderperson>John Smith</orderperson>
-  <shipto>
-    <name>Ola Nordmann</name>
-    <address>Langgt 23</address>
-    <city>4000 Stavanger</city>
-    <country>Norway</country>
-  </shipto>
-  <item>
-    <title>Empire Burlesque</title>
-    <note>Special Edition</note>
-    <quantity>1</quantity>
-    <price>10.90</price>
-  </item>
-  <item>
-    <title>Hide your heart</title>
-    <quantity>1</quantity>
-    <price>9.90</price>
-  </item>
+<?xml version="1.0" encoding="utf-8"?>
+<shiporder orderid="889923"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:noNamespaceSchemaLocation="shiporder.xsd">
+  <orderperson>John Smith</orderperson>
+  <shipto>
+    <name>Ola Nordmann</name>
+    <address>Langgt 23</address>
+    <city>4000 Stavanger</city>
+    <country>Norway</country>
+  </shipto>
+  <item>
+    <title>Empire Burlesque</title>
+    <note>Special Edition</note>
+    <quantity>1</quantity>
+    <price>10.90</price>
+  </item>
+  <item>
+    <title>Hide your heart</title>
+    <quantity>1</quantity>
+    <price>9.90</price>
+  </item>
 </shiporder>

data/test/model/shiporder.xsd CHANGED

@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="iso-8859-1" ?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <xs:element name="shiporder">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="orderperson" type="xs:string"/>
-        <xs:element name="shipto">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element name="name" type="xs:string"/>
-              <xs:element name="address" type="xs:string"/>
-              <xs:element name="city" type="xs:string"/>
-              <xs:element name="country" type="xs:string"/>
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
-        <xs:element name="item" maxOccurs="unbounded">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element name="title" type="xs:string"/>
-              <xs:element name="note" type="xs:string" minOccurs="0"/>
-              <xs:element name="quantity" type="xs:positiveInteger"/>
-              <xs:element name="price" type="xs:decimal"/>
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
-      </xs:sequence>
-      <xs:attribute name="orderid" type="xs:string" use="required"/>
-    </xs:complexType>
-  </xs:element>
+<?xml version="1.0" encoding="iso-8859-1" ?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <xs:element name="shiporder">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="orderperson" type="xs:string"/>
+        <xs:element name="shipto">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="name" type="xs:string"/>
+              <xs:element name="address" type="xs:string"/>
+              <xs:element name="city" type="xs:string"/>
+              <xs:element name="country" type="xs:string"/>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="item" maxOccurs="unbounded">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="title" type="xs:string"/>
+              <xs:element name="note" type="xs:string" minOccurs="0"/>
+              <xs:element name="quantity" type="xs:positiveInteger"/>
+              <xs:element name="price" type="xs:decimal"/>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+      </xs:sequence>
+      <xs:attribute name="orderid" type="xs:string" use="required"/>
+    </xs:complexType>
+  </xs:element>
 </xs:schema>

data/test/model/xinclude.xml CHANGED

@@ -2,4 +2,4 @@
 <document xmlns:xi="http://www.w3.org/2001/XInclude">
   <p>This libxml2 binding has the following project information:
    <code><xi:include href="rubynet_project" parse="text"/></code></p>
-</document>
+</document>

data/test/{tc_node_attr.rb → tc_attr.rb} RENAMED

@@ -1,4 +1,4 @@
-require "xml"
+require 'xml'
 require 'test/unit'
 class AttrNodeTest < Test::Unit::TestCase

data/test/tc_attr_decl.rb ADDED

@@ -0,0 +1,131 @@
+require 'xml'
+require 'test/unit'
+class AttrDeclTest < Test::Unit::TestCase
+  def setup
+    xp = XML::Parser.string(<<-EOS)
+	<!DOCTYPE test [
+	  <!ELEMENT root (property*)>
+	  <!ELEMENT property EMPTY>
+	  <!ATTLIST property name       NMTOKEN          #REQUIRED>
+	  <!ATTLIST property access     (r | w | rw)    "rw">
+	]>
+	<root>
+	  <property name="readonly" access="r" />
+	  <property name="readwrite" />
+	</root>
+    EOS
+    @doc = xp.parse
+  end
+  def teardown
+    @doc = nil
+  end
+  def test_attributes
+    # Get a element with an access attribute
+    elem = @doc.find_first('/root/property[@name="readonly"]')
+    assert_equal(2, elem.attributes.length)
+    assert_not_nil(elem['access'])
+    # Get a element node without a access attribute
+    elem = @doc.find_first('/root/property[@name="readwrite"]')
+    assert_equal(1, elem.attributes.length)
+    assert_nil(elem['access'])
+  end
+  def test_attr
+    # Get a property node without a access attribute
+    elem = @doc.find_first('/root/property[@name="readonly"]')
+    # Get the attr_decl
+    attr = elem.attributes.get_attribute('access')
+    assert_not_nil(attr)
+    assert_equal(XML::Node::ATTRIBUTE_NODE, attr.node_type)
+    assert_equal('attribute', attr.node_type_name)
+    # Get its value
+    assert_equal('r', attr.value)
+  end
+  def test_attr_decl
+    # Get a property node without a access attribute
+    elem = @doc.find_first('/root/property[@name="readwrite"]')
+    # Get the attr_decl
+    attr_decl = elem.attributes.get_attribute('access')
+    assert_not_nil(attr_decl)
+    assert_equal(XML::Node::ATTRIBUTE_DECL, attr_decl.node_type)
+    assert_equal('attribute declaration', attr_decl.node_type_name)
+    # Get its value
+    assert_equal('rw', attr_decl.value)
+  end
+  def test_type
+    # Get a property node without a access attribute
+    elem = @doc.find_first('/root/property[@name="readwrite"]')
+    attr_decl = elem.attributes.get_attribute('access')
+    assert_not_nil(attr_decl)
+    assert_equal(XML::Node::ATTRIBUTE_DECL, attr_decl.node_type)
+    assert_equal('attribute declaration', attr_decl.node_type_name)
+  end
+  def test_name
+    elem = @doc.find_first('/root/property[@name="readwrite"]')
+    attr_decl = elem.attributes.get_attribute('access')
+    assert_equal('access', attr_decl.name)
+  end
+  def test_value
+    elem = @doc.find_first('/root/property[@name="readwrite"]')
+    attr_decl = elem.attributes.get_attribute('access')
+    assert_equal('rw', attr_decl.value)
+  end
+  def test_to_s
+    elem = @doc.find_first('/root/property[@name="readwrite"]')
+    attr_decl = elem.attributes.get_attribute('access')
+    assert_equal('access = rw', attr_decl.to_s)
+  end
+  def test_prev
+    elem = @doc.find_first('/root/property[@name="readwrite"]')
+    attr_decl = elem.attributes.get_attribute('access')
+    first_decl = attr_decl.prev
+    assert_equal(XML::Node::ATTRIBUTE_DECL, first_decl.node_type)
+    assert_equal('name', first_decl.name)
+    assert_nil(first_decl.value)
+    elem_decl = first_decl.prev
+    assert_equal(XML::Node::ELEMENT_DECL, elem_decl.node_type)
+  end
+  def test_next
+    elem = @doc.find_first('/root/property[@name="readwrite"]')
+    attr_decl = elem.attributes.get_attribute('access')
+    next_decl = attr_decl.next
+    assert_nil(next_decl)
+  end
+  def test_doc
+    elem = @doc.find_first('/root/property[@name="readwrite"]')
+    attr_decl = elem.attributes.get_attribute('access')
+    assert_same(@doc, attr_decl.doc)
+  end
+  def test_parent
+    elem = @doc.find_first('/root/property[@name="readwrite"]')
+    attr_decl = elem.attributes.get_attribute('access')
+    parent = attr_decl.parent
+    assert_instance_of(XML::Dtd, parent)
+  end
+end

data/test/tc_deprecated_require.rb CHANGED

@@ -3,10 +3,8 @@ require 'test/unit'
 class TestDeprecatedRequire < Test::Unit::TestCase
   def test_basic
-    xp = XML::Parser.new
+    xp = XML::Parser.string('<ruby_array uga="booga" foo="bar"><fixnum>one</fixnum><fixnum>two</fixnum></ruby_array>')
     assert_instance_of(XML::Parser, xp)
-    str = '<ruby_array uga="booga" foo="bar"><fixnum>one</fixnum><fixnum>two</fixnum></ruby_array>'
-    assert_equal(str, xp.string = str)
     @doc = xp.parse
     assert_instance_of(XML::Document, @doc)
   end

data/test/tc_document.rb CHANGED

@@ -4,10 +4,8 @@ require 'test/unit'
 class TestDocument < Test::Unit::TestCase
   def setup
-    xp = XML::Parser.new
+    xp = XML::Parser.string('<ruby_array uga="booga" foo="bar"><fixnum>one</fixnum><fixnum>two</fixnum></ruby_array>')
     assert_instance_of(XML::Parser, xp)
-    str = '<ruby_array uga="booga" foo="bar"><fixnum>one</fixnum><fixnum>two</fixnum></ruby_array>'
-    assert_equal(str, xp.string = str)
     @doc = xp.parse
     assert_instance_of(XML::Document, @doc)
   end
@@ -73,4 +71,16 @@ class TestDocument < Test::Unit::TestCase
     assert_equal("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<rubynet/>\n",
                  @doc.to_s(:indent => false))
   end
+  def test_encoding
+    doc = XML::Document.new
+    assert_equal(XML::Encoding::NONE, doc.encoding)
+    file = File.expand_path(File.join(File.dirname(__FILE__), 'model/bands.xml'))
+    doc = XML::Document.file(file)
+    assert_equal(XML::Encoding::UTF_8, doc.encoding)
+    doc.encoding = XML::Encoding::ISO_8859_1
+    assert_equal(XML::Encoding::ISO_8859_1, doc.encoding)
+  end
 end

data/test/tc_document_write.rb CHANGED

@@ -44,20 +44,20 @@ class TestDocumentWrite < Test::Unit::TestCase
     # ö - c3 b6 in hex, \303\266 in octal
     # ü - c3 bc in hex, \303\274 in octal
     assert_equal("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<bands genre=\"metal\">\n  <m\303\266tley_cr\303\274e country=\"us\">An American heavy metal band formed in Los Angeles, California in 1981.</m\303\266tley_cr\303\274e>\n  <iron_maiden country=\"uk\">British heavy metal band formed in 1975.</iron_maiden>\n</bands>\n",
-                 @doc.to_s(:encoding => XML::Input::UTF_8))
+                 @doc.to_s(:encoding => XML::Encoding::UTF_8))
     # ISO_8859_1:
     # ö - f6 in hex, \366 in octal
     # ü - fc in hex, \374 in octal
     assert_equal("<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n<bands genre=\"metal\">\n  <m\366tley_cr\374e country=\"us\">An American heavy metal band formed in Los Angeles, California in 1981.</m\366tley_cr\374e>\n  <iron_maiden country=\"uk\">British heavy metal band formed in 1975.</iron_maiden>\n</bands>\n",
-                 @doc.to_s(:encoding => XML::Input::ISO_8859_1))
+                 @doc.to_s(:encoding => XML::Encoding::ISO_8859_1))
     # Invalid encoding
     error = assert_raise(ArgumentError) do
       @doc.to_s(:encoding => -9999)
     end
-    assert_equal('Unknown encoding.', error.to_s)
+    assert_equal('Unknown encoding value: -9999', error.to_s)
   end
   # --- save tests -----
@@ -89,7 +89,7 @@ class TestDocumentWrite < Test::Unit::TestCase
   def test_save_iso_8859_1
     temp_filename = File.join(Dir.tmpdir, "tc_document_write_test_save_iso_8859_1.xml")
-    bytes = @doc.save(temp_filename, :encoding => XML::Input::ISO_8859_1)
+    bytes = @doc.save(temp_filename, :encoding => XML::Encoding::ISO_8859_1)
     assert_equal(272, bytes)
     contents = File.read(temp_filename)
@@ -101,7 +101,7 @@ class TestDocumentWrite < Test::Unit::TestCase
   def test_save_iso_8859_1_no_indent
     temp_filename = File.join(Dir.tmpdir, "tc_document_write_test_save_iso_8859_1_no_indent.xml")
-    bytes = @doc.save(temp_filename, :indent => false, :encoding => XML::Input::ISO_8859_1)
+    bytes = @doc.save(temp_filename, :indent => false, :encoding => XML::Encoding::ISO_8859_1)
     assert_equal(265, bytes)
     contents = File.read(temp_filename)

data/test/tc_dtd.rb CHANGED

@@ -58,7 +58,7 @@ class TestDtd < Test::Unit::TestCase
     assert_not_nil(error.node)
     assert_equal('invalid', error.node.name)
   end
   def test_external_dtd
     xml = <<-EOS
       <!DOCTYPE test PUBLIC "-//TEST" "test.dtd" []>
@@ -74,13 +74,21 @@ class TestDtd < Test::Unit::TestCase
     XML.default_load_external_dtd = false
     doc = XML::Parser.string(xml).parse
-    assert_equal(Array.new, errors)
+    assert_equal(0, errors.length)
+    errors = Array.new
     XML.default_load_external_dtd = true
     doc = XML::Parser.string(xml).parse
+    assert_equal(1, errors.length)
+    assert_equal("Warning: failed to load external entity \"test.dtd\" at :1.",
+                 errors[0].to_s)
+    errors = Array.new
+    doc = XML::Parser.string(xml, :options => XML::Parser::Options::DTDLOAD).parse
+    assert_equal(1, errors.length)
     assert_equal("Warning: failed to load external entity \"test.dtd\" at :1.",
-                  errors.map do |error|
-                    error.to_s
-                  end.join(' '))
+                 errors[0].to_s)
+  ensure
+    XML::Error.reset_handler
   end
 end

data/test/tc_html_parser.rb CHANGED

@@ -1,19 +1,7 @@
 require "xml"
 require 'test/unit'
-class HtmlParserTest < Test::Unit::TestCase
-  def setup
-    @xp = XML::HTMLParser.new()
-    assert_not_nil(@xp)
-    str = '<html><head><meta name=keywords content=nasty></head><body>Hello<br>World</html>'
-    @xp.string = str
-    assert_equal(str, @xp.string)
-  end
-  def teardown()
-    @xp = nil
-  end
+class HTMLParserTest < Test::Unit::TestCase
   def html_file
     File.expand_path(File.join(File.dirname(__FILE__), 'model/ruby-lang.html'))
   end
@@ -22,8 +10,6 @@ class HtmlParserTest < Test::Unit::TestCase
   def test_file
     xp = XML::HTMLParser.file(html_file)
     assert_instance_of(XML::HTMLParser, xp)
-    assert_equal(html_file, xp.file)
-    assert_equal(html_file, xp.input.file)
   end
   def test_string
@@ -32,8 +18,6 @@ class HtmlParserTest < Test::Unit::TestCase
     assert_instance_of(XML::HTMLParser, xp)
     assert_instance_of(XML::HTMLParser, xp)
-    assert_equal(str, xp.string)
-    assert_equal(str, xp.input.string)
     doc = xp.parse
     assert_instance_of(XML::Document, doc)
@@ -43,9 +27,7 @@ class HtmlParserTest < Test::Unit::TestCase
     File.open(html_file) do |io|
       xp = XML::HTMLParser.io(io)
       assert_instance_of(XML::HTMLParser, xp)
-      assert_equal(io, xp.io)
-      assert_equal(io, xp.input.io)
       doc = xp.parse
       assert_instance_of(XML::Document, doc)
     end
@@ -56,16 +38,22 @@ class HtmlParserTest < Test::Unit::TestCase
     io = StringIO.new(data)
     xp = XML::HTMLParser.io(io)
     assert_instance_of(XML::HTMLParser, xp)
-    assert_equal(io, xp.io)
-    assert_equal(io, xp.input.io)
     doc = xp.parse
     assert_instance_of(XML::Document, doc)
   end
-  def test_libxml_html_parser_parse
-    doc = @xp.parse
+  def test_parse
+    html = <<-EOS
+      <html>
+        <head>
+          <meta name=keywords content=nasty>
+        </head>
+        <body>Hello<br>World</html>
+   EOS
+    parser = XML::HTMLParser.string(html)
+    doc = parser.parse
     assert_instance_of XML::Document, doc
     root = doc.root
@@ -102,4 +90,4 @@ class HtmlParserTest < Test::Unit::TestCase
     assert_instance_of XML::Node, world
     assert_equal 'World', world.content
   end
-end
+end