libxml-ruby 0.5.4 → 0.6.0

data/ext/libxml/sax_parser_callbacks.inc

@@ -1,213 +1,213 @@
-/* $Id: sax_parser_callbacks.inc 225 2007-12-07 04:58:09Z transami $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
-/*
- * SAX CALLBACK HANDLERS
- */ 
-static void internal_subset_func(ruby_xml_sax_parser *cbp, 
-       const char *name,
-       const char *extid,
-       const char *sysid) {
-  VALUE handler = cbp->callbackHandler;
-  
-  if (handler && handler != Qnil) {
-    rb_funcall(handler, cbidOnInternalSubset, 3, rb_str_new2(name),
-        rb_str_new2(extid), rb_str_new2(sysid));
-  }    
-}
-
-static void is_standalone_func(ruby_xml_sax_parser *cbp) {
-  VALUE handler = cbp->callbackHandler;
-  
-  if (handler && handler != Qnil) {
-    rb_funcall(handler,cbidOnIsStandalone,0);
-  }    
-}
-
-static void has_internal_subset_func(ruby_xml_sax_parser *cbp) {
-  VALUE handler = cbp->callbackHandler;
-  
-  if (handler && handler != Qnil) {
-    rb_funcall(handler,cbidOnHasInternalSubset,0);
-  }    
-}
-
-static void has_external_subset_func(ruby_xml_sax_parser *cbp) {
-  VALUE handler = cbp->callbackHandler;
-  
-  if (handler && handler != Qnil) {
-    rb_funcall(handler,cbidOnHasExternalSubset,0);
-  }    
-}
-
-static void start_document_func(ruby_xml_sax_parser *cbp) {
-  VALUE handler = cbp->callbackHandler;
-  
-  if (handler && handler != Qnil) {
-    rb_funcall(handler,cbidOnStartDocument,0);
-  }    
-}
-
-static void end_document_func(ruby_xml_sax_parser *cbp) {
-  VALUE handler = cbp->callbackHandler;
-  
-  if (handler && handler != Qnil) {
-    rb_funcall(handler,cbidOnEndDocument,0);
-  }    
-}
-
-static void start_element_func(ruby_xml_sax_parser *cbp, 
-       const char *name, const char **attrs) {  
-  VALUE handler = cbp->callbackHandler;
-  VALUE ahsh = rb_hash_new();
-  const char *attr, *value;
-  
-  if (attrs) {
-    while ((attr = *(attrs++))) {
-      value = *(attrs++);            
-      rb_hash_aset(ahsh, rb_str_new2(attr), rb_str_new2(value));
-    }
-  }    
-  
-  if (handler && handler != Qnil) {
-    rb_funcall(handler,cbidOnStartElement,2,rb_str_new2(name),ahsh);
-  }    
-}        
-
-static void end_element_func(ruby_xml_sax_parser *cbp, 
-       const char *name) {
-  VALUE handler = cbp->callbackHandler;
-  
-  if (handler && handler != Qnil) {
-    rb_funcall(handler,cbidOnEndElement,1,rb_str_new2(name));
-  }    
-}
-
-static void reference_func(ruby_xml_sax_parser *cbp, 
-       const char *name) {
-  VALUE handler = cbp->callbackHandler;
-  
-  if (handler && handler != Qnil) {
-    rb_funcall(handler,cbidOnReference,1,rb_str_new2(name));
-  }    
-}
-
-static void characters_func(ruby_xml_sax_parser *cbp, 
-       const char *chars, int len) {
-  VALUE handler = cbp->callbackHandler;
-  
-  if (handler && handler != Qnil) {
-    rb_funcall(handler,cbidOnCharacters,1,rb_str_new(chars, len));
-  }    
-}
-
-static void processing_instruction_func(ruby_xml_sax_parser *cbp, 
-       const char *target, const char *data) {
-  VALUE handler = cbp->callbackHandler;
-  
-  if (handler && handler != Qnil) {
-    rb_funcall(handler, cbidOnProcessingInstruction, 2,
-        rb_str_new2(target),rb_str_new2(data));
-  }    
-}
-
-static void comment_func(ruby_xml_sax_parser *cbp, 
-       const char *msg) {
-  VALUE handler = cbp->callbackHandler;
-  
-  if (handler && handler != Qnil) {
-    rb_funcall(handler,cbidOnComment,1,rb_str_new2(msg));
-  }    
-}
-
-#define FORMAT_AND_CALL(callsym) \
-  do { \
-    va_list args; \
-    char buf[1024]; \
-    va_start(args, msg); \
-    vsnprintf(buf, sizeof buf, msg, args); \
-    rb_funcall(handler,callsym,1,rb_str_new2(buf)); \
-    va_end(args); \
-  } \
-  while (0)
-  
-// TODO these next three should actually be formatting messages.
-static void warning_func(ruby_xml_sax_parser *cbp, 
-       const char *msg, ...) {
-  VALUE handler = cbp->callbackHandler;
-  
-  if (handler && handler != Qnil) {
-    FORMAT_AND_CALL(cbidOnXmlParserWarning);
-  }    
-}
-
-static void error_func(ruby_xml_sax_parser *cbp, 
-       const char *msg, ...) {
-  VALUE handler = cbp->callbackHandler;
-  
-  if (handler && handler != Qnil) {
-    FORMAT_AND_CALL(cbidOnXmlParserError);
-  }    
-}
-
-static void fatal_error_func(ruby_xml_sax_parser *cbp, 
-       const char *msg, ...) {
-  VALUE handler = cbp->callbackHandler;
-  
-  if (handler && handler != Qnil) {
-    FORMAT_AND_CALL(cbidOnXmlParserFatalError);
-  }    
-}
-
-static void cdata_block_func(ruby_xml_sax_parser *cbp, 
-       const char *value, int len) {
-  VALUE handler = cbp->callbackHandler;
-  
-  if (handler && handler != Qnil) {
-    rb_funcall(handler,cbidOnCdataBlock,1,rb_str_new(value, len));
-  }    
-}
-
-static void external_subset_func(ruby_xml_sax_parser *cbp, 
-       const char *name,
-       const char *extid,
-       const char *sysid) {
-  VALUE handler = cbp->callbackHandler;
-  
-  if (handler && handler != Qnil) {
-    rb_funcall(handler, cbidOnExternalSubset, 3, rb_str_new2(name),
-        rb_str_new2(extid), rb_str_new2(sysid));
-  }    
-}
-
-static xmlSAXHandler rubySAXHandlerStruct = {
-  (internalSubsetSAXFunc)internal_subset_func,
-  (isStandaloneSAXFunc)is_standalone_func,
-  (hasInternalSubsetSAXFunc)has_internal_subset_func,
-  (hasExternalSubsetSAXFunc)has_external_subset_func,
-  0, /* resolveEntity */
-  0, /* getEntity */
-  0, /* entityDecl */
-  0, /* notationDecl */
-  0, /* attributeDecl */
-  0, /* elementDecl */
-  0, /* unparsedEntityDecl */
-  0, /* setDocumentLocator */
-  (startDocumentSAXFunc)start_document_func, 
-  (endDocumentSAXFunc)end_document_func, 
-  (startElementSAXFunc)start_element_func, 
-  (endElementSAXFunc)end_element_func, 
-  (referenceSAXFunc)reference_func,
-  (charactersSAXFunc)characters_func,
-  0, /* ignorableWhitespace */
-  (processingInstructionSAXFunc)processing_instruction_func,
-  (commentSAXFunc)comment_func,
-  (warningSAXFunc)warning_func,
-  (errorSAXFunc)error_func,
-  (fatalErrorSAXFunc)fatal_error_func,
-  0, /* xmlGetParameterEntity */
-  (cdataBlockSAXFunc)cdata_block_func,
-  (externalSubsetSAXFunc)external_subset_func,
-  1
-};
+/* $Id: sax_parser_callbacks.inc 120 2006-11-26 12:57:56Z roscopeco $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+/*
+ * SAX CALLBACK HANDLERS
+ */ 
+static void internal_subset_func(ruby_xml_sax_parser *cbp, 
+       const char *name,
+       const char *extid,
+       const char *sysid) {
+  VALUE handler = cbp->callbackHandler;
+  
+  if (handler && handler != Qnil) {
+    rb_funcall(handler, cbidOnInternalSubset, 3, rb_str_new2(name),
+        rb_str_new2(extid), rb_str_new2(sysid));
+  }    
+}
+
+static void is_standalone_func(ruby_xml_sax_parser *cbp) {
+  VALUE handler = cbp->callbackHandler;
+  
+  if (handler && handler != Qnil) {
+    rb_funcall(handler,cbidOnIsStandalone,0);
+  }    
+}
+
+static void has_internal_subset_func(ruby_xml_sax_parser *cbp) {
+  VALUE handler = cbp->callbackHandler;
+  
+  if (handler && handler != Qnil) {
+    rb_funcall(handler,cbidOnHasInternalSubset,0);
+  }    
+}
+
+static void has_external_subset_func(ruby_xml_sax_parser *cbp) {
+  VALUE handler = cbp->callbackHandler;
+  
+  if (handler && handler != Qnil) {
+    rb_funcall(handler,cbidOnHasExternalSubset,0);
+  }    
+}
+
+static void start_document_func(ruby_xml_sax_parser *cbp) {
+  VALUE handler = cbp->callbackHandler;
+  
+  if (handler && handler != Qnil) {
+    rb_funcall(handler,cbidOnStartDocument,0);
+  }    
+}
+
+static void end_document_func(ruby_xml_sax_parser *cbp) {
+  VALUE handler = cbp->callbackHandler;
+  
+  if (handler && handler != Qnil) {
+    rb_funcall(handler,cbidOnEndDocument,0);
+  }    
+}
+
+static void start_element_func(ruby_xml_sax_parser *cbp, 
+       const char *name, const char **attrs) {  
+  VALUE handler = cbp->callbackHandler;
+  VALUE ahsh = rb_hash_new();
+  const char *attr, *value;
+  
+  if (attrs) {
+    while ((attr = *(attrs++))) {
+      value = *(attrs++);            
+      rb_hash_aset(ahsh, rb_str_new2(attr), rb_str_new2(value));
+    }
+  }    
+  
+  if (handler && handler != Qnil) {
+    rb_funcall(handler,cbidOnStartElement,2,rb_str_new2(name),ahsh);
+  }    
+}        
+
+static void end_element_func(ruby_xml_sax_parser *cbp, 
+       const char *name) {
+  VALUE handler = cbp->callbackHandler;
+  
+  if (handler && handler != Qnil) {
+    rb_funcall(handler,cbidOnEndElement,1,rb_str_new2(name));
+  }    
+}
+
+static void reference_func(ruby_xml_sax_parser *cbp, 
+       const char *name) {
+  VALUE handler = cbp->callbackHandler;
+  
+  if (handler && handler != Qnil) {
+    rb_funcall(handler,cbidOnReference,1,rb_str_new2(name));
+  }    
+}
+
+static void characters_func(ruby_xml_sax_parser *cbp, 
+       const char *chars, int len) {
+  VALUE handler = cbp->callbackHandler;
+  
+  if (handler && handler != Qnil) {
+    rb_funcall(handler,cbidOnCharacters,1,rb_str_new(chars, len));
+  }    
+}
+
+static void processing_instruction_func(ruby_xml_sax_parser *cbp, 
+       const char *target, const char *data) {
+  VALUE handler = cbp->callbackHandler;
+  
+  if (handler && handler != Qnil) {
+    rb_funcall(handler, cbidOnProcessingInstruction, 2,
+        rb_str_new2(target),rb_str_new2(data));
+  }    
+}
+
+static void comment_func(ruby_xml_sax_parser *cbp, 
+       const char *msg) {
+  VALUE handler = cbp->callbackHandler;
+  
+  if (handler && handler != Qnil) {
+    rb_funcall(handler,cbidOnComment,1,rb_str_new2(msg));
+  }    
+}
+
+#define FORMAT_AND_CALL(callsym) \
+  do { \
+    va_list args; \
+    char buf[1024]; \
+    va_start(args, msg); \
+    vsnprintf(buf, sizeof buf, msg, args); \
+    rb_funcall(handler,callsym,1,rb_str_new2(buf)); \
+    va_end(args); \
+  } \
+  while (0)
+  
+// TODO these next three should actually be formatting messages.
+static void warning_func(ruby_xml_sax_parser *cbp, 
+       const char *msg, ...) {
+  VALUE handler = cbp->callbackHandler;
+  
+  if (handler && handler != Qnil) {
+    FORMAT_AND_CALL(cbidOnXmlParserWarning);
+  }    
+}
+
+static void error_func(ruby_xml_sax_parser *cbp, 
+       const char *msg, ...) {
+  VALUE handler = cbp->callbackHandler;
+  
+  if (handler && handler != Qnil) {
+    FORMAT_AND_CALL(cbidOnXmlParserError);
+  }    
+}
+
+static void fatal_error_func(ruby_xml_sax_parser *cbp, 
+       const char *msg, ...) {
+  VALUE handler = cbp->callbackHandler;
+  
+  if (handler && handler != Qnil) {
+    FORMAT_AND_CALL(cbidOnXmlParserFatalError);
+  }    
+}
+
+static void cdata_block_func(ruby_xml_sax_parser *cbp, 
+       const char *value, int len) {
+  VALUE handler = cbp->callbackHandler;
+  
+  if (handler && handler != Qnil) {
+    rb_funcall(handler,cbidOnCdataBlock,1,rb_str_new(value, len));
+  }    
+}
+
+static void external_subset_func(ruby_xml_sax_parser *cbp, 
+       const char *name,
+       const char *extid,
+       const char *sysid) {
+  VALUE handler = cbp->callbackHandler;
+  
+  if (handler && handler != Qnil) {
+    rb_funcall(handler, cbidOnExternalSubset, 3, rb_str_new2(name),
+        rb_str_new2(extid), rb_str_new2(sysid));
+  }    
+}
+
+static xmlSAXHandler rubySAXHandlerStruct = {
+  (internalSubsetSAXFunc)internal_subset_func,
+  (isStandaloneSAXFunc)is_standalone_func,
+  (hasInternalSubsetSAXFunc)has_internal_subset_func,
+  (hasExternalSubsetSAXFunc)has_external_subset_func,
+  0, /* resolveEntity */
+  0, /* getEntity */
+  0, /* entityDecl */
+  0, /* notationDecl */
+  0, /* attributeDecl */
+  0, /* elementDecl */
+  0, /* unparsedEntityDecl */
+  0, /* setDocumentLocator */
+  (startDocumentSAXFunc)start_document_func, 
+  (endDocumentSAXFunc)end_document_func, 
+  (startElementSAXFunc)start_element_func, 
+  (endElementSAXFunc)end_element_func, 
+  (referenceSAXFunc)reference_func,
+  (charactersSAXFunc)characters_func,
+  0, /* ignorableWhitespace */
+  (processingInstructionSAXFunc)processing_instruction_func,
+  (commentSAXFunc)comment_func,
+  (warningSAXFunc)warning_func,
+  (errorSAXFunc)error_func,
+  (fatalErrorSAXFunc)fatal_error_func,
+  0, /* xmlGetParameterEntity */
+  (cdataBlockSAXFunc)cdata_block_func,
+  (externalSubsetSAXFunc)external_subset_func,
+  1
+};

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.5.4"
-#define RUBY_LIBXML_VERNUM   540
-#define RUBY_LIBXML_VER_MAJ   0
-#define RUBY_LIBXML_VER_MIN   5
-#define RUBY_LIBXML_VER_MIC   4
-#define RUBY_LIBXML_VER_PATCH 0
+/* 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.6.0"
+#define RUBY_LIBXML_VERNUM   0
+#define RUBY_LIBXML_VER_MAJ   0
+#define RUBY_LIBXML_VER_MIN   6
+#define RUBY_LIBXML_VER_MIC   0
+#define RUBY_LIBXML_VER_PATCH 0

data/lib/libxml.rb

@@ -1,7 +1,27 @@
-# $Id: libxml.rb 235 2007-12-11 20:28:30Z danj $ 
+# $Id: libxml.rb 291 2008-07-01 08:04:25Z cfis $ 
 # Please see the LICENSE file for copyright and distribution information 
 
-require 'libxml_so'
+require 'libxml_ruby.so'
+
+module XML::XMLParserOptions
+  XML_PARSE_RECOVER = 1 # recover on errors
+  XML_PARSE_NOENT = 2 # substitute entities
+  XML_PARSE_DTDLOAD = 4 # load the external subset
+  XML_PARSE_DTDATTR = 8 # default DTD attributes
+  XML_PARSE_DTDVALID = 16 # validate with the DTD
+  XML_PARSE_NOERROR = 32 # suppress error reports
+  XML_PARSE_NOWARNING = 64 # suppress warning reports
+  XML_PARSE_PEDANTIC = 128 # pedantic error reporting
+  XML_PARSE_NOBLANKS = 256 # remove blank nodes
+  XML_PARSE_SAX1 = 512 # use the SAX1 interface internally
+  XML_PARSE_XINCLUDE = 1024 # Implement XInclude substitition
+  XML_PARSE_NONET = 2048 # Forbid network access
+  XML_PARSE_NODICT = 4096 # Do not reuse the context dictionnary
+  XML_PARSE_NSCLEAN = 8192 # remove redundant namespaces declarations
+  XML_PARSE_NOCDATA = 16384 # merge CDATA as text nodes
+  XML_PARSE_NOXINCNODE = 32768 # do not generate XINCLUDE START/END nodes
+  XML_PARSE_COMPACT = 65536 # compact small text nodes; no modification of the tree allowed afterwards (will possibly crash if you try to modify the tree)
+end
 
 class XML::Document
   include Enumerable
@@ -91,7 +111,7 @@ class XML::Attr
   alias :each :each_sibling
   
   def to_h
-    inject({}) do |h,a| h[a.name] = a.value end
+    inject({}) do |h,a| h[a.name] = a.value; h end
   end
 
   def to_a
@@ -102,3 +122,4 @@ class XML::Attr
     "#{name} = #{value}"
   end
 end
+

data/mingw/mingw.rake

@@ -0,0 +1,36 @@
+# We can't use Ruby's standard build procedures
+# on Windows because the Ruby executable is
+# built with VC++ while here we want to build
+# with MingW.  So just roll our own...
+
+require 'rake/clean'
+require 'rbconfig'
+
+RUBY_INCLUDE_DIR = Config::CONFIG["archdir"]
+RUBY_BIN_DIR = Config::CONFIG["bindir"]
+RUBY_LIB_DIR = Config::CONFIG["libdir"]
+RUBY_SHARED_LIB = Config::CONFIG["LIBRUBY"]
+RUBY_SHARED_DLL = RUBY_SHARED_LIB.gsub(/lib$/, 'dll')
+    
+CLEAN.include('*.o')
+CLOBBER.include('libxml.so')
+
+task :default => "libxml"
+
+SRC = FileList['../ext/libxml/*.c']
+OBJ = SRC.collect do |file_name|
+  File.basename(file_name).ext('o')
+end
+
+SRC.each do |srcfile|
+  objfile = File.basename(srcfile).ext('o')
+  file objfile => srcfile do
+    command = "gcc -c -fPIC -O2 -Wall -o #{objfile} -I/usr/local/include #{srcfile} -I#{RUBY_INCLUDE_DIR}"
+    sh "sh -c '#{command}'" 
+  end
+end
+
+file "libxml" => OBJ do
+  command = "libtool --mode=link gcc -shared -o libxml_ruby.so -L/usr/local/lib -lxml2 #{OBJ} #{RUBY_BIN_DIR}/#{RUBY_SHARED_DLL}" 
+  sh "sh -c '#{command}'" 
+end

data/test/dtd-test.rb

@@ -1,24 +1,24 @@
-require "libxml"
-
-xp = XML::Parser.new
-xp.string = '<?xml version="1.0" encoding="utf-8"?>
-<root><head a="ee" id="1">ass<buzz/></head><descr>really big ass</descr></root>'
-
-doc = xp.parse
-
-dtd = XML::Dtd.new('
-<!ELEMENT root (head, descr)>
-<!ELEMENT head (#PCDATA)>
-<!ATTLIST head
-  id NMTOKEN #REQUIRED
-  a CDATA #IMPLIED
->
-<!ELEMENT descr (#PCDATA)>
-')
-
-if doc.validate(dtd) { |message, error| puts "#{error ? 'error' : 'warning'} : #{message}" }
-  puts "validation passed"
-else
-  puts "validation failed"
-end
-
+require "libxml"
+
+xp = XML::Parser.new
+xp.string = '<?xml version="1.0" encoding="utf-8"?>
+<root><head a="ee" id="1">ass<buzz/></head><descr>really big ass</descr></root>'
+
+doc = xp.parse
+
+dtd = XML::Dtd.new('
+<!ELEMENT root (head, descr)>
+<!ELEMENT head (#PCDATA)>
+<!ATTLIST head
+  id NMTOKEN #REQUIRED
+  a CDATA #IMPLIED
+>
+<!ELEMENT descr (#PCDATA)>
+')
+
+if doc.validate(dtd) { |message, error| puts "#{error ? 'error' : 'warning'} : #{message}" }
+  puts "validation passed"
+else
+  puts "validation failed"
+end
+

data/test/etc_doc_to_s.rb

@@ -1,17 +1,15 @@
 require 'libxml'
 
-1000.times do |count|
+1.times do |count|
 
   xml_doc = XML::Document.new()
   xml_doc.encoding = "UTF-8"
   xml_doc.root = XML::Node.new("Request")
 
   1000.times do |index|
-
     xml_doc.root << node = XML::Node.new("row")
     node["user_id"] = index.to_s
     node << "600445"
-
   end
 
   xml_str = xml_doc.to_s

data/test/ets_copy_bug.rb

@@ -1,21 +1,21 @@
-#!/usr/bin/ruby -w -I.
-
-def test( doc2 )
-  doc = XML::Document.new('1.0')
-  doc.root = XML::Node.new("ccc")
-  doc.root['aaa'] = 'aaa'
-  doc.root.child_add(doc2.root) # BUG!
-  doc.root << doc2.root.copy(true)
-  return doc
-end
-
-def test2
-  doc2 = XML::Document.new('1.0')
-  doc2.root = XML::Node.new("aaa")
-  test( doc2 )
-end
-
-1000.times { |i|
-  print "\r#{i}"; $stdout.flush
-  test2
-}
+require 'libxml'
+
+def test( doc2 )
+  doc = XML::Document.new('1.0')
+  doc.root = XML::Node.new("ccc")
+  doc.root['aaa'] = 'aaa'
+  doc.root.child_add(doc2.root) # BUG!
+  doc.root << doc2.root.copy(true)
+  return doc
+end
+
+def test2
+  doc2 = XML::Document.new('1.0')
+  doc2.root = XML::Node.new("aaa")
+  test( doc2 )
+end
+
+1000.times { |i|
+  print "\r#{i}"; $stdout.flush
+  test2
+}