libxml-ruby 0.9.6 → 0.9.7

data/test/model/atom.xml

@@ -1,4 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
+<?xml-stylesheet type="text/xsl" href="my_stylesheet.xsl"?>
 <feed xmlns="http://www.w3.org/2005/Atom">
-  <title type="text">Phil Bogle's Contacts</title>
+  <!-- Not a valid atom entry -->
+  <entry>
+    <title type="html"><![CDATA[<<strong>>]]></title>
+    <content type="xhtml">
+      <xhtml:div xmlns:xhtml="http://www.w3.org/1999/xhtml">
+        <xhtml:p>hi there</xhtml:p>
+      </xhtml:div>
+    </content>
+  </entry>
 </feed>

data/test/tc_node_text.rb

@@ -14,4 +14,4 @@ class TestTextNode < Test::Unit::TestCase
     end
     assert_equal('wrong argument type nil (expected String)', error.to_s)
   end
-end
+end

data/test/tc_reader.rb

@@ -34,75 +34,75 @@ class TestReader < Test::Unit::TestCase
        XML::Reader::TYPE_END_ELEMENT])
   end
 
-#  def test_file
-#    reader = XML::Reader.file(SIMPLE_XML)
-#    verify_simple(reader)
-#  end
-#
-#  def test_invalid_file
-#    assert_raises(RuntimeError) do
-#      XML::Reader.file('/does/not/exist')
-#    end
-#  end
-#
-#  def test_string
-#    reader = XML::Reader.string(File.read(SIMPLE_XML))
-#    verify_simple(reader)
-#  end
-#
-#  def test_io
-#    File.open(SIMPLE_XML, 'rb') do |io|
-#      reader = XML::Reader.io(io)
-#      verify_simple(reader)
-#    end
-#  end
-#
-#  def test_string_io
-#    data = File.read(SIMPLE_XML)
-#    string_io = StringIO.new(data)
-#    reader = XML::Reader.io(string_io)
-#    verify_simple(reader)
-#  end
-#
-#  def test_new_walker
-#    reader = XML::Reader.walker(XML::Document.file(SIMPLE_XML))
-#    verify_simple(reader)
-#  end
-#
-#  def test_deprecated_error_handler
-#    called = false
-#    reader = XML::Reader.new('<foo blah')
-#    reader.set_error_handler do |error|
-#      called = true
-#    end
-#
-#    reader.read
-#    assert(called)
-#  end
-#
-#  def test_deprecated_reset_error_handler
-#    called = false
-#    reader = XML::Reader.new('<foo blah')
-#    reader.set_error_handler do |error|
-#      called = true
-#    end
-#    reader.reset_error_handler
-#
-#    reader.read
-#    assert(!called)
-#  end
-#
-#  def test_attr
-#    parser = XML::Reader.new("<foo x='1' y='2'/>")
-#    assert_equal(1, parser.read)
-#    assert_equal('foo', parser.name)
-#    assert_equal('1', parser['x'])
-#    assert_equal('1', parser[0])
-#    assert_equal('2', parser['y'])
-#    assert_equal('2', parser[1])
-#    assert_equal(nil, parser['z'])
-#    assert_equal(nil, parser[2])
-#  end
+  def test_file
+    reader = XML::Reader.file(SIMPLE_XML)
+    verify_simple(reader)
+  end
+
+  def test_invalid_file
+    assert_raises(XML::Error) do
+      XML::Reader.file('/does/not/exist')
+    end
+  end
+
+  def test_string
+    reader = XML::Reader.string(File.read(SIMPLE_XML))
+    verify_simple(reader)
+  end
+
+  def test_io
+    File.open(SIMPLE_XML, 'rb') do |io|
+      reader = XML::Reader.io(io)
+      verify_simple(reader)
+    end
+  end
+
+  def test_string_io
+    data = File.read(SIMPLE_XML)
+    string_io = StringIO.new(data)
+    reader = XML::Reader.io(string_io)
+    verify_simple(reader)
+  end
+
+  def test_new_walker
+    reader = XML::Reader.walker(XML::Document.file(SIMPLE_XML))
+    verify_simple(reader)
+  end
+
+  def test_deprecated_error_handler
+    called = false
+    reader = XML::Reader.new('<foo blah')
+    reader.set_error_handler do |error|
+      called = true
+    end
+
+    reader.read
+    assert(called)
+  end
+
+  def test_deprecated_reset_error_handler
+    called = false
+    reader = XML::Reader.new('<foo blah')
+    reader.set_error_handler do |error|
+      called = true
+    end
+    reader.reset_error_handler
+
+    reader.read
+    assert(!called)
+  end
+
+  def test_attr
+    parser = XML::Reader.new("<foo x='1' y='2'/>")
+    assert_equal(1, parser.read)
+    assert_equal('foo', parser.name)
+    assert_equal('1', parser['x'])
+    assert_equal('1', parser[0])
+    assert_equal('2', parser['y'])
+    assert_equal('2', parser[1])
+    assert_equal(nil, parser['z'])
+    assert_equal(nil, parser[2])
+  end
 
   def test_value
     parser = XML::Reader.new("<foo><bar>1</bar><bar>2</bar><bar>3</bar></foo>")
@@ -121,21 +121,21 @@ class TestReader < Test::Unit::TestCase
     end
   end
 
-#  def test_expand
-#    reader = XML::Reader.file(SIMPLE_XML)
-#    reader.read
-#    node = reader.expand
-#    doc = node.doc
-#    reader.close
-#    GC.start
-#
-#    doc.standalone?
-#  end
-#
-#  def test_mode
-#    reader = XML::Reader.string('<xml/>')
-#    assert_equal(XML::Reader::MODE_INITIAL, reader.read_state)
-#    reader.read
-#    assert_equal(XML::Reader::MODE_EOF, reader.read_state)
-#  end
+  def test_expand
+    reader = XML::Reader.file(SIMPLE_XML)
+    reader.read
+    node = reader.expand
+    doc = node.doc
+    reader.close
+    GC.start
+
+    doc.standalone?
+  end
+
+  def test_mode
+    reader = XML::Reader.string('<xml/>')
+    assert_equal(XML::Reader::MODE_INITIAL, reader.read_state)
+    reader.read
+    assert_equal(XML::Reader::MODE_EOF, reader.read_state)
+  end
 end

data/test/tc_sax_parser.rb

@@ -1,5 +1,6 @@
 require 'xml'
 require 'test/unit'
+require 'pp'
 
 class DocTypeCallback
   include XML::SaxParser::Callbacks
@@ -10,72 +11,122 @@ end
 class TestCaseCallbacks
   include XML::SaxParser::Callbacks
 
-  attr_accessor :test
+  attr_accessor :result
 
   def initialize
-    @test = Hash.new { |h,k| h[k] = [] }
-    @i = 0
+    @result = Array.new
   end
 
-  def on_start_document
-    @test[:startdoc] << @i+=1
+  def on_cdata_block(cdata)
+    @result << "cdata: #{cdata}"
   end
 
-  def on_start_element(name, attr_hash)
-    @test[:startel] << [@i+=1,name,attr_hash]
+  def on_characters(chars)
+    @result << "characters: #{chars}"
   end
 
-  def on_characters(chars)
-    @test[:chars] << [@i+=1,chars]
+  def on_comment(text)
+    @result << "comment: #{text}"
   end
 
-  def on_comment(msg)
-    @test[:comment] << [@i+=1,msg]
+  def on_end_document
+    @result << "end_document"
+  end
+
+  def on_end_element(name)
+    @result << "end_element: #{name}"
+  end
+
+  def on_end_element_ns(name, prefix, uri)
+    @result << "end_element_ns #{name}, prefix: #{prefix}, uri: #{uri}"
+  end
+
+  # Called for parser errors.
+  def on_error(error)
+    @result << "error: #{error}"
   end
 
   def on_processing_instruction(target, data)
-    @test[:pinstr] << [@i+=1, target, data]
+    @result << "pi: #{target} #{data}"
   end
 
-  def on_cdata_block(cdata)
-    @test[:cdata] << [@i+=1,cdata]
+  def on_start_document
+    @result << "startdoc"
   end
 
-  def on_end_element(name)
-    @test[:endel] << [@i+=1,name]
+  def on_start_element(name, attributes)
+    attributes ||= Hash.new
+    @result << "start_element: #{name}, attr: #{attributes.inspect}"
   end
 
-  def on_end_document
-    @test[:enddoc] << @i+=1
+  def on_start_element_ns(name, attributes, prefix, uri, namespaces)
+    attributes ||= Hash.new
+    namespaces ||= Hash.new
+    @result << "start_element_ns: #{name}, attr: #{attributes.inspect}, prefix: #{prefix}, uri: #{uri}, ns: #{namespaces.inspect}"
   end
 end
 
 class TestSaxParser < Test::Unit::TestCase
   def setup
+    XML.default_keep_blanks = true
     @xp = XML::SaxParser.new
   end
 
   def teardown
     @xp = nil
+    XML.default_keep_blanks = true
   end
 
   def saxtest_file
-    File.join(File.dirname(__FILE__), 'model/saxtest.xml')
+    File.join(File.dirname(__FILE__), 'model/atom.xml')
   end
 
   def verify
-    assert_equal [1], @xp.callbacks.test[:startdoc]
-    assert_equal [[2,'test',{'uga'=>'booga','foo'=>'bar'}],[3,'fixnum',{}],[6,'fixnum',{}]],
-                 @xp.callbacks.test[:startel]
-    assert_equal [[4,'one'],[7,'two'],[9,"\n  "],[11,"\n  "],[13,"\n  "],[15,"\n"]],
-                 @xp.callbacks.test[:chars]
-    assert_equal [[10, ' msg ']], @xp.callbacks.test[:comment]
-    assert_equal [[12, 'custom', 'foo="bar"']], @xp.callbacks.test[:pinstr]
-    assert_equal [[14, 'here it goes']], @xp.callbacks.test[:cdata]
-    assert_equal [[5,'fixnum'],[8,'fixnum'],[16,'test']], @xp.callbacks.test[:endel]
-    assert_equal [17], @xp.callbacks.test[:enddoc]
-  end
-  
+    result = @xp.callbacks.result
+
+    i = -1
+    assert_equal("startdoc", result[i+=1])
+    assert_equal("pi: xml-stylesheet type=\"text/xsl\" href=\"my_stylesheet.xsl\"", result[i+=1])
+    assert_equal("start_element: feed, attr: {nil=>\"http://www.w3.org/2005/Atom\"}", result[i+=1])
+    assert_equal("start_element_ns: feed, attr: {nil=>\"http://www.w3.org/2005/Atom\"}, prefix: , uri: http://www.w3.org/2005/Atom, ns: {}", result[i+=1])
+    assert_equal("characters: \n  ", result[i+=1])
+    assert_equal("comment:  Not a valid atom entry ", result[i+=1])
+    assert_equal("characters: \n  ", result[i+=1])
+    assert_equal("start_element: entry, attr: {}", result[i+=1])
+    assert_equal("start_element_ns: entry, attr: {}, prefix: , uri: http://www.w3.org/2005/Atom, ns: {}", result[i+=1])
+    assert_equal("characters: \n    ", result[i+=1])
+    assert_equal("start_element: title, attr: {\"type\"=>\"html\"}", result[i+=1])
+    assert_equal("start_element_ns: title, attr: {\"type\"=>\"html\"}, prefix: , uri: http://www.w3.org/2005/Atom, ns: {}", result[i+=1])
+    assert_equal("cdata: <<strong>>", result[i+=1])
+    assert_equal("end_element: title", result[i+=1])
+    assert_equal("end_element_ns title, prefix: , uri: http://www.w3.org/2005/Atom", result[i+=1])
+    assert_equal("characters: \n    ", result[i+=1])
+    assert_equal("start_element: content, attr: {\"type\"=>\"xhtml\"}", result[i+=1])
+    assert_equal("start_element_ns: content, attr: {\"type\"=>\"xhtml\"}, prefix: , uri: http://www.w3.org/2005/Atom, ns: {}", result[i+=1])
+    assert_equal("characters: \n      ", result[i+=1])
+    assert_equal("start_element: xhtml:div, attr: {\"xhtml\"=>\"http://www.w3.org/1999/xhtml\"}", result[i+=1])
+    assert_equal("start_element_ns: div, attr: {\"xhtml\"=>\"http://www.w3.org/1999/xhtml\"}, prefix: xhtml, uri: http://www.w3.org/1999/xhtml, ns: {}", result[i+=1])
+    assert_equal("characters: \n        ", result[i+=1])
+    assert_equal("start_element: xhtml:p, attr: {}", result[i+=1])
+    assert_equal("start_element_ns: p, attr: {}, prefix: xhtml, uri: http://www.w3.org/1999/xhtml, ns: {}", result[i+=1])
+    assert_equal("characters: hi there", result[i+=1])
+    assert_equal("end_element: xhtml:p", result[i+=1])
+    assert_equal("end_element_ns p, prefix: xhtml, uri: http://www.w3.org/1999/xhtml", result[i+=1])
+    assert_equal("characters: \n      ", result[i+=1])
+    assert_equal("end_element: xhtml:div", result[i+=1])
+    assert_equal("end_element_ns div, prefix: xhtml, uri: http://www.w3.org/1999/xhtml", result[i+=1])
+    assert_equal("characters: \n    ", result[i+=1])
+    assert_equal("end_element: content", result[i+=1])
+    assert_equal("end_element_ns content, prefix: , uri: http://www.w3.org/2005/Atom", result[i+=1])
+    assert_equal("characters: \n  ", result[i+=1])
+    assert_equal("end_element: entry", result[i+=1])
+    assert_equal("end_element_ns entry, prefix: , uri: http://www.w3.org/2005/Atom", result[i+=1])
+    assert_equal("characters: \n", result[i+=1])
+    assert_equal("end_element: feed", result[i+=1])
+    assert_equal("end_element_ns feed, prefix: , uri: http://www.w3.org/2005/Atom", result[i+=1])
+    assert_equal("end_document", result[i+=1])
+  end
+
   def test_string_no_callbacks
     @xp.string = File.read(saxtest_file)
     assert_equal true, @xp.parse
@@ -131,26 +182,60 @@ EOS
     assert_not_nil(doc)
   end
 
+
+  def test_parse_warning
+    @xp.callbacks = TestCaseCallbacks.new
+    # Two xml PIs is a warning
+    @xp.string = <<-EOS
+<?xml version="1.0" encoding="utf-8"?>
+<?xml-invalid?>
+<Test/>
+EOS
+
+    @xp.parse
+
+    # Check callbacks
+    result = @xp.callbacks.result
+    i = -1
+    assert_equal("startdoc", result[i+=1])
+    assert_equal("error: Warning: xmlParsePITarget: invalid name prefix 'xml' at :2.", result[i+=1])
+    assert_equal("pi: xml-invalid ", result[i+=1])
+    assert_equal("start_element: Test, attr: {}", result[i+=1])
+    assert_equal("start_element_ns: Test, attr: {}, prefix: , uri: , ns: {}", result[i+=1])
+    assert_equal("end_element: Test", result[i+=1])
+    assert_equal("end_element_ns Test, prefix: , uri: ", result[i+=1])
+    assert_equal("end_document", result[i+=1])
+  end
+
   def test_parse_error
     @xp.callbacks = TestCaseCallbacks.new
     @xp.string = <<-EOS
       <Results>
-        <a>a1
-      </Results>
     EOS
 
     error = assert_raise(XML::Error) do
       doc = @xp.parse
     end
 
+    # Check callbacks
+    result = @xp.callbacks.result
+
+    i = -1
+    assert_equal("startdoc", result[i+=1])
+    assert_equal("start_element: Results, attr: {}", result[i+=1])
+    assert_equal("start_element_ns: Results, attr: {}, prefix: , uri: , ns: {}", result[i+=1])
+    assert_equal("characters: \n", result[i+=1])
+    assert_equal("error: Fatal error: Premature end of data in tag Results line 1 at :2.", result[i+=1])
+    assert_equal("end_document", result[i+=1])
+
     assert_not_nil(error)
     assert_kind_of(XML::Error, error)
-    assert_equal("Fatal error: Premature end of data in tag Results line 1 at :4.", error.message)
+    assert_equal("Fatal error: Premature end of data in tag Results line 1 at :2.", error.message)
     assert_equal(XML::Error::PARSER, error.domain)
     assert_equal(XML::Error::TAG_NOT_FINISHED, error.code)
     assert_equal(XML::Error::FATAL, error.level)
     assert_nil(error.file)
-    assert_equal(4, error.line)
+    assert_equal(2, error.line)
     assert_equal('Results', error.str1)
     assert_nil(error.str2)
     assert_nil(error.str3)

data/test/tc_well_formed.rb

@@ -8,5 +8,4 @@ class TestWellFormed < Test::Unit::TestCase
     parser.parse
     assert(parser.context.well_formed?)
   end
-end
-
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: libxml-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors: 
 - Charlie Savage
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-07 00:00:00 -07:00
+date: 2008-12-12 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -23,9 +23,9 @@ extra_rdoc_files: []
 
 files: 
 - Rakefile
-- README
-- LICENSE
 - CHANGES
+- LICENSE
+- README
 - setup.rb
 - doc/css
 - doc/css/normal.css
@@ -44,7 +44,6 @@ files:
 - ext/libxml/cbg.c
 - ext/libxml/extconf.rb
 - ext/libxml/libxml.c
-- ext/libxml/libxml.c.rej
 - ext/libxml/ruby_libxml.h
 - ext/libxml/ruby_xml_attr.c
 - ext/libxml/ruby_xml_attr.h
@@ -76,6 +75,8 @@ files:
 - ext/libxml/ruby_xml_reader.h
 - ext/libxml/ruby_xml_relaxng.c
 - ext/libxml/ruby_xml_relaxng.h
+- ext/libxml/ruby_xml_sax2_handler.c
+- ext/libxml/ruby_xml_sax2_handler.h
 - ext/libxml/ruby_xml_sax_parser.c
 - ext/libxml/ruby_xml_sax_parser.h
 - ext/libxml/ruby_xml_schema.c
@@ -94,7 +95,6 @@ files:
 - ext/libxml/ruby_xml_xpath_object.h
 - ext/libxml/ruby_xml_xpointer.c
 - ext/libxml/ruby_xml_xpointer.h
-- ext/libxml/sax_parser_callbacks.inc
 - ext/libxml/version.h
 - ext/mingw/Rakefile
 - ext/mingw/build.rake
@@ -139,7 +139,6 @@ files:
 - test/model/ruby-lang.html
 - test/model/rubynet.xml
 - test/model/rubynet_project
-- test/model/saxtest.xml
 - test/model/shiporder.rnc
 - test/model/shiporder.rng
 - test/model/shiporder.xml