libxml-ruby 0.9.2-x86-mswin32-60 → 0.9.3-x86-mswin32-60

data/ext/libxml/sax_parser_callbacks.inc

@@ -1,15 +1,16 @@
-/* $Id: sax_parser_callbacks.inc 544 2008-11-16 09:50:27Z cfis $ */
+/* $Id: sax_parser_callbacks.inc 616 2008-11-22 09:25:12Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
 /*
  * SAX CALLBACK HANDLERS
  */ 
-static void internal_subset_func(ruby_xml_sax_parser *cbp, 
+static void internal_subset_func(void *ctxt, 
        const char *name,
        const char *extid,
        const char *sysid) {
-  VALUE handler = cbp->callbackHandler;
+  VALUE self = (VALUE) ctxt;
+  VALUE handler = rb_ivar_get(self, CALLBACKS_ATTR);
   
   if (handler != Qnil) {
     VALUE rname = name ? rb_str_new2(name) : Qnil;
@@ -19,49 +20,55 @@ static void internal_subset_func(ruby_xml_sax_parser *cbp,
   }    
 }
 
-static void is_standalone_func(ruby_xml_sax_parser *cbp) {
-  VALUE handler = cbp->callbackHandler;
+static void is_standalone_func(void *ctxt) {
+  VALUE self = (VALUE) ctxt;
+  VALUE handler = rb_ivar_get(self, CALLBACKS_ATTR);
   
   if (handler != Qnil) {
     rb_funcall(handler, cbidOnIsStandalone,0);
   }    
 }
 
-static void has_internal_subset_func(ruby_xml_sax_parser *cbp) {
-  VALUE handler = cbp->callbackHandler;
+static void has_internal_subset_func(void *ctxt) {
+  VALUE self = (VALUE) ctxt;
+  VALUE handler = rb_ivar_get(self, CALLBACKS_ATTR);
   
   if (handler != Qnil) {
     rb_funcall(handler, cbidOnHasInternalSubset, 0);
   }    
 }
 
-static void has_external_subset_func(ruby_xml_sax_parser *cbp) {
-  VALUE handler = cbp->callbackHandler;
+static void has_external_subset_func(void *ctxt) {
+  VALUE self = (VALUE) ctxt;
+  VALUE handler = rb_ivar_get(self, CALLBACKS_ATTR);
   
   if (handler != Qnil) {
     rb_funcall(handler, cbidOnHasExternalSubset, 0);
   }    
 }
 
-static void start_document_func(ruby_xml_sax_parser *cbp) {
-  VALUE handler = cbp->callbackHandler;
+static void start_document_func(void *ctxt) {
+  VALUE self = (VALUE) ctxt;
+  VALUE handler = rb_ivar_get(self, CALLBACKS_ATTR);
   
   if (handler != Qnil) {
     rb_funcall(handler, cbidOnStartDocument, 0);
   }    
 }
 
-static void end_document_func(ruby_xml_sax_parser *cbp) {
-  VALUE handler = cbp->callbackHandler;
+static void end_document_func(void *ctxt) {
+  VALUE self = (VALUE) ctxt;
+  VALUE handler = rb_ivar_get(self, CALLBACKS_ATTR);
   
   if (handler != Qnil) {
     rb_funcall(handler, cbidOnEndDocument, 0);
   }    
 }
 
-static void start_element_func(ruby_xml_sax_parser *cbp, 
+static void start_element_func(void *ctxt, 
        const char *name, const char **attrs) {  
-  VALUE handler = cbp->callbackHandler;
+  VALUE self = (VALUE) ctxt;
+  VALUE handler = rb_ivar_get(self, CALLBACKS_ATTR);
   VALUE ahsh = rb_hash_new();
   const char *attr, *value;
   
@@ -77,26 +84,29 @@ static void start_element_func(ruby_xml_sax_parser *cbp,
   }    
 }        
 
-static void end_element_func(ruby_xml_sax_parser *cbp, const char *name) {
-  VALUE handler = cbp->callbackHandler;
+static void end_element_func(void *ctxt, const char *name) {
+  VALUE self = (VALUE) ctxt;
+  VALUE handler = rb_ivar_get(self, CALLBACKS_ATTR);
   
   if (handler != Qnil) {
     rb_funcall(handler, cbidOnEndElement, 1, rb_str_new2(name));
   }    
 }
 
-static void reference_func(ruby_xml_sax_parser *cbp, 
+static void reference_func(void *ctxt, 
        const char *name) {
-  VALUE handler = cbp->callbackHandler;
+  VALUE self = (VALUE) ctxt;
+  VALUE handler = rb_ivar_get(self, CALLBACKS_ATTR);
   
   if (handler != Qnil) {
     rb_funcall(handler, cbidOnReference,1,rb_str_new2(name));
   }    
 }
 
-static void characters_func(ruby_xml_sax_parser *cbp, 
+static void characters_func(void *ctxt, 
        const char *chars, int len) {
-  VALUE handler = cbp->callbackHandler;
+  VALUE self = (VALUE) ctxt;
+  VALUE handler = rb_ivar_get(self, CALLBACKS_ATTR);
   
   if (handler != Qnil) {
     VALUE rchars = rb_str_new(chars, len);
@@ -104,9 +114,10 @@ static void characters_func(ruby_xml_sax_parser *cbp,
   }    
 }
 
-static void processing_instruction_func(ruby_xml_sax_parser *cbp, 
+static void processing_instruction_func(void *ctxt, 
        const char *target, const char *data) {
-  VALUE handler = cbp->callbackHandler;
+  VALUE self = (VALUE) ctxt;
+  VALUE handler = rb_ivar_get(self, CALLBACKS_ATTR);
   
   if (handler != Qnil) {
     VALUE rtarget = target ? rb_str_new2(target) : Qnil;
@@ -115,9 +126,10 @@ static void processing_instruction_func(ruby_xml_sax_parser *cbp,
   }    
 }
 
-static void comment_func(ruby_xml_sax_parser *cbp, 
+static void comment_func(void *ctxt, 
        const char *msg) {
-  VALUE handler = cbp->callbackHandler;
+  VALUE self = (VALUE) ctxt;
+  VALUE handler = rb_ivar_get(self, CALLBACKS_ATTR);
   
   if (handler != Qnil) {
     rb_funcall(handler, cbidOnComment,1,rb_str_new2(msg));
@@ -136,47 +148,52 @@ static void comment_func(ruby_xml_sax_parser *cbp,
   while (0)
   
 // TODO these next three should actually be formatting messages.
-static void warning_func(ruby_xml_sax_parser *cbp, 
+static void warning_func(void *ctxt, 
        const char *msg, ...) {
-  VALUE handler = cbp->callbackHandler;
+  VALUE self = (VALUE) ctxt;
+  VALUE handler = rb_ivar_get(self, CALLBACKS_ATTR);
   
   if (handler != Qnil) {
     FORMAT_AND_CALL(cbidOnXmlParserWarning);
   }    
 }
 
-static void error_func(ruby_xml_sax_parser *cbp, 
+static void error_func(void *ctxt, 
        const char *msg, ...) {
-  VALUE handler = cbp->callbackHandler;
+  VALUE self = (VALUE) ctxt;
+  VALUE handler = rb_ivar_get(self, CALLBACKS_ATTR);
   
   if (handler != Qnil) {
     FORMAT_AND_CALL(cbidOnXmlParserError);
   }    
 }
 
-static void fatal_error_func(ruby_xml_sax_parser *cbp, 
+static void fatal_error_func(void *ctxt, 
        const char *msg, ...) {
-  VALUE handler = cbp->callbackHandler;
+  VALUE self = (VALUE) ctxt;
+  VALUE handler = rb_ivar_get(self, CALLBACKS_ATTR);
   
   if (handler != Qnil) {
     FORMAT_AND_CALL(cbidOnXmlParserFatalError);
   }    
 }
 
-static void cdata_block_func(ruby_xml_sax_parser *cbp, 
+static void cdata_block_func(void *ctxt, 
        const char *value, int len) {
-  VALUE handler = cbp->callbackHandler;
+  VALUE self = (VALUE) ctxt;
+  VALUE handler = rb_ivar_get(self, CALLBACKS_ATTR);
   
   if (handler != Qnil) {
     rb_funcall(handler, cbidOnCdataBlock,1,rb_str_new(value, len));
   }    
 }
 
-static void external_subset_func(ruby_xml_sax_parser *cbp, 
+static void external_subset_func(void *ctxt, 
        const char *name,
        const char *extid,
        const char *sysid) {
-  VALUE handler = cbp->callbackHandler;
+  VALUE self = (VALUE) ctxt;
+  VALUE handler = rb_ivar_get(self, CALLBACKS_ATTR);
   
   if (handler != Qnil) {
     VALUE rname = name ? rb_str_new2(name) : Qnil;
@@ -186,7 +203,7 @@ static void external_subset_func(ruby_xml_sax_parser *cbp,
   }    
 }
 
-static xmlSAXHandler rubySAXHandlerStruct = {
+static xmlSAXHandler rxml_sax_hander_struct = {
   (internalSubsetSAXFunc)internal_subset_func,
   (isStandaloneSAXFunc)is_standalone_func,
   (hasInternalSubsetSAXFunc)has_internal_subset_func,

data/ext/libxml/version.h

@@ -1,9 +1,9 @@
 /* Don't nuke this block!  It is used for automatically updating the
  * versions below. VERSION = string formatting, VERNUM = numbered
  * version for inline testing: increment both or none at all.*/
-#define RUBY_LIBXML_VERSION  "0.9.2"
+#define RUBY_LIBXML_VERSION  "0.9.3"
 #define RUBY_LIBXML_VERNUM   0
 #define RUBY_LIBXML_VER_MAJ   0
 #define RUBY_LIBXML_VER_MIN   9
-#define RUBY_LIBXML_VER_MIC   2
+#define RUBY_LIBXML_VER_MIC   3
 #define RUBY_LIBXML_VER_PATCH 0

data/ext/vc/libxml_ruby.vcproj

@@ -63,7 +63,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="msvcrt-ruby18.lib libxml2.lib"
-				OutputFile="C:\Development\ruby\lib\ruby\gems\1.8\gems\libxml-ruby-0.9.2-x86-mswin32-60\lib\$(ProjectName).so"
+				OutputFile="C:\Development\ruby\lib\ruby\gems\1.8\gems\libxml-ruby-0.9.3-x86-mswin32-60\lib\$(ProjectName).so"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="C:\Development\ruby\lib;C:\Development\msys\local\lib"
 				GenerateDebugInformation="true"
@@ -205,10 +205,6 @@
 				RelativePath="..\libxml\ruby_xml_dtd.c"
 				>
 			</File>
-			<File
-				RelativePath="..\libxml\ruby_xml_encoding.c"
-				>
-			</File>
 			<File
 				RelativePath="..\libxml\ruby_xml_error.c"
 				>
@@ -311,10 +307,6 @@
 				RelativePath="..\libxml\ruby_xml_dtd.h"
 				>
 			</File>
-			<File
-				RelativePath="..\libxml\ruby_xml_encoding.h"
-				>
-			</File>
 			<File
 				RelativePath="..\libxml\ruby_xml_error.h"
 				>

data/lib/libxml/html_parser.rb

@@ -2,31 +2,31 @@ module LibXML
   module XML
     class HTMLParser
       def self.file(value)
-        parser = Parser.new
+        parser = self.new
         parser.input.file = value
         parser
       end
 
       def self.string(value)
-        parser = Parser.new
+        parser = self.new
         parser.input.string = value
         parser
       end
 
       def self.document(value)
-        parser = Parser.new
+        parser = self.new
         parser.input.document = value
         parser
       end
 
       def self.io(value)
-        parser = Parser.new
+        parser = self.new
         parser.input.io = value
         parser
       end
 
       def file
-        input.filename
+        input.file
       end
 
       def file=(value)

data/lib/libxml/parser.rb

@@ -7,25 +7,25 @@ module LibXML
       end
 
       def self.file(value)
-        parser = Parser.new
+        parser = self.new
         parser.input.file = value
         parser
       end
 
       def self.string(value)
-        parser = Parser.new
+        parser = self.new
         parser.input.string = value
         parser
       end
 
       def self.document(value)
-        parser = Parser.new
+        parser = self.new
         parser.input.document = value
         parser
       end
 
       def self.io(value)
-        parser = Parser.new
+        parser = self.new
         parser.input.io = value
         parser
       end

data/lib/libxml/sax_parser.rb

@@ -1,6 +1,30 @@
 module LibXML
   module XML
     class SaxParser
+      def self.file(value)
+        parser = self.new
+        parser.input.file = value
+        parser
+      end
+
+      def self.string(value)
+        parser = self.new
+        parser.input.string = value
+        parser
+      end
+
+      def self.document(value)
+        parser = self.new
+        parser.input.document = value
+        parser
+      end
+
+      def self.io(value)
+        parser = self.new
+        parser.input.io = value
+        parser
+      end
+
       def filename=(value)
         warn("SaxParser.filename is deprecated.  Use SaxParser#file instead.")
         self.file = value

data/test/tc_document_write.rb

@@ -132,29 +132,15 @@ class TestDocumentWrite < Test::Unit::TestCase
 
   def test_encoding_utf
     @doc.root = XML::Node.new('rubynet')
-    @doc.encoding = XML::Encoding.encoding_to_s(XML::Encoding::UTF8)
+    @doc.encoding = XML::Input.encoding_to_s(XML::Input::UTF8)
     assert_instance_of(XML::Node, @doc.root)
     assert_equal("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<rubynet/>\n", @doc.to_s)
   end
 
   def test_encoding_latin1
     @doc.root = XML::Node.new('rubynet')
-    @doc.encoding = XML::Encoding.encoding_to_s(XML::Encoding::ISO_8859_1)
+    @doc.encoding = XML::Input.encoding_to_s(XML::Input::ISO_8859_1)
     assert_instance_of(XML::Node, @doc.root)
     assert_equal("<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n<rubynet/>\n", @doc.to_s)
   end
-
-  def test_encoding_to_s
-    doc = XML::Document.new
-    doc.encoding = 'UTF-8'
-    doc.root = XML::Node.new 'node'
-    doc.root.content = '&#1;'
-
-    xml = doc.to_s(true, 'UTF-8')
-    puts xml
-
-    parser = XML::Parser.string(xml)
-    doc = parser.parse
-    p doc.root.content
-  end
 end

data/test/tc_html_parser.rb

@@ -1,8 +1,8 @@
 require "xml"
 require 'test/unit'
 
-class TC_XML_HTMLParser < Test::Unit::TestCase
-  def setup()
+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>'
@@ -14,7 +14,59 @@ class TC_XML_HTMLParser < Test::Unit::TestCase
     @xp = nil
   end
 
-  def test_libxml_html_parser_parse()
+  def html_file
+    File.expand_path(File.join(File.dirname(__FILE__), 'model/rubynet.xml'))
+  end
+
+  # -----  Sources  ------
+  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
+    str = '<html><body><p>hi</p></body></html>'
+    xp = XML::HTMLParser.string(str)
+
+    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)
+    assert_instance_of(XML::Parser::Context, xp.context)
+  end
+
+  def test_io
+    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)
+      assert_instance_of(XML::Parser::Context, xp.context)
+    end
+  end
+
+  def test_string_io
+    data = File.read(html_file)
+    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)
+    assert_instance_of(XML::Parser::Context, xp.context)
+  end
+
+  def test_libxml_html_parser_parse
     doc = @xp.parse
 
     assert_instance_of XML::Document, doc
@@ -54,10 +106,10 @@ class TC_XML_HTMLParser < Test::Unit::TestCase
     assert_equal 'World', world.content
   end
 
-  def test_libxml_html_parser_context()
+  def test_libxml_html_parser_context
     doc = @xp.parse
     assert_instance_of(XML::Document, doc)
     assert_instance_of(XML::Parser::Context, @xp.context)
   assert @xp.context.html?
   end
-end # TC_XML_HTMLParser
+end