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

data/ext/libxml/libxml.c.rej

@@ -1,16 +0,0 @@
-***************
-*** 46,51 ****
-    ruby_init_xml_xinclude();
-    ruby_init_xml_xpath();
-    ruby_init_xml_xpath_context();
-    ruby_init_xml_xpointer();
-    ruby_init_xml_xpointer_context();
-    ruby_init_html_parser();
---- 46,52 ----
-    ruby_init_xml_xinclude();
-    ruby_init_xml_xpath();
-    ruby_init_xml_xpath_context();
-+   ruby_init_xml_xpath_expression();
-    ruby_init_xml_xpointer();
-    ruby_init_xml_xpointer_context();
-    ruby_init_html_parser();

data/ext/libxml/sax_parser_callbacks.inc

@@ -1,235 +0,0 @@
-/* $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(void *ctxt, 
-       const char *name,
-       const char *extid,
-       const char *sysid) {
-  VALUE self = (VALUE) ctxt;
-  VALUE handler = rb_ivar_get(self, CALLBACKS_ATTR);
-  
-  if (handler != Qnil) {
-    VALUE rname = name ? rb_str_new2(name) : Qnil;
-    VALUE rextid = extid ? rb_str_new2(extid) : Qnil;
-    VALUE rsysid  = sysid ? rb_str_new2(sysid) : Qnil;
-  rb_funcall(handler, cbidOnInternalSubset, 3, rname, rextid, rsysid);
-  }    
-}
-
-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(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(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(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(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(void *ctxt, 
-       const char *name, const char **attrs) {  
-  VALUE self = (VALUE) ctxt;
-  VALUE handler = rb_ivar_get(self, CALLBACKS_ATTR);
-  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 != Qnil) {
-    rb_funcall(handler, cbidOnStartElement, 2, rb_str_new2(name), ahsh);
-  }    
-}        
-
-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(void *ctxt, 
-       const char *name) {
-  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(void *ctxt, 
-       const char *chars, int len) {
-  VALUE self = (VALUE) ctxt;
-  VALUE handler = rb_ivar_get(self, CALLBACKS_ATTR);
-  
-  if (handler != Qnil) {
-    VALUE rchars = rb_str_new(chars, len);
-    rb_funcall(handler, cbidOnCharacters, 1, rchars);
-  }    
-}
-
-static void processing_instruction_func(void *ctxt, 
-       const char *target, const char *data) {
-  VALUE self = (VALUE) ctxt;
-  VALUE handler = rb_ivar_get(self, CALLBACKS_ATTR);
-  
-  if (handler != Qnil) {
-    VALUE rtarget = target ? rb_str_new2(target) : Qnil;
-    VALUE rdata = data ? rb_str_new2(data) : Qnil;
-    rb_funcall(handler, cbidOnProcessingInstruction, 2, rtarget, rdata);
-  }    
-}
-
-static void comment_func(void *ctxt, 
-       const char *msg) {
-  VALUE self = (VALUE) ctxt;
-  VALUE handler = rb_ivar_get(self, CALLBACKS_ATTR);
-  
-  if (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(void *ctxt, 
-       const char *msg, ...) {
-  VALUE self = (VALUE) ctxt;
-  VALUE handler = rb_ivar_get(self, CALLBACKS_ATTR);
-  
-  if (handler != Qnil) {
-    FORMAT_AND_CALL(cbidOnXmlParserWarning);
-  }    
-}
-
-static void error_func(void *ctxt, 
-       const char *msg, ...) {
-  VALUE self = (VALUE) ctxt;
-  VALUE handler = rb_ivar_get(self, CALLBACKS_ATTR);
-  
-  if (handler != Qnil) {
-    FORMAT_AND_CALL(cbidOnXmlParserError);
-  }    
-}
-
-static void fatal_error_func(void *ctxt, 
-       const char *msg, ...) {
-  VALUE self = (VALUE) ctxt;
-  VALUE handler = rb_ivar_get(self, CALLBACKS_ATTR);
-  
-  if (handler != Qnil) {
-    FORMAT_AND_CALL(cbidOnXmlParserFatalError);
-  }    
-}
-
-static void cdata_block_func(void *ctxt, 
-       const char *value, int len) {
-  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(void *ctxt, 
-       const char *name,
-       const char *extid,
-       const char *sysid) {
-  VALUE self = (VALUE) ctxt;
-  VALUE handler = rb_ivar_get(self, CALLBACKS_ATTR);
-  
-  if (handler != Qnil) {
-    VALUE rname = name ? rb_str_new2(name) : Qnil;
-    VALUE rextid = extid ? rb_str_new2(extid) : Qnil;
-    VALUE rsysid  = sysid ? rb_str_new2(sysid) : Qnil;
-    rb_funcall(handler, cbidOnExternalSubset, 3, rname, rextid, rsysid);
-  }    
-}
-
-static xmlSAXHandler rxml_sax_hander_struct = {
-  (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/test/model/saxtest.xml

@@ -1,5 +0,0 @@
-<test uga="booga" foo="bar"><fixnum>one</fixnum><fixnum>two</fixnum>
-  <!-- msg -->
-  <?custom foo="bar"?>
-  <![CDATA[here it goes]]>
-</test>