libxml-ruby 0.7.0-x86-mswin32-60 → 0.8.0-x86-mswin32-60

data/ext/libxml/ruby_xml_node.h

@@ -1,17 +1,17 @@
-/* $Id: ruby_xml_node.h 348 2008-07-09 18:18:19Z cfis $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RUBY_XML_NODE__
-#define __RUBY_XML_NODE__
-
-extern VALUE cXMLNode;
-extern VALUE eXMLNodeSetNamespace;
-extern VALUE eXMLNodeFailedModify;
-extern VALUE eXMLNodeUnknownType;
-
-void ruby_init_xml_node(void);
-void ruby_xml_node_mark_common(xmlNodePtr xnode);
-VALUE ruby_xml_node2_wrap(VALUE class, xmlNodePtr xnode);
-VALUE check_string_or_symbol(VALUE val);
-#endif
+/* $Id: ruby_xml_node.h 348 2008-07-09 18:18:19Z cfis $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RUBY_XML_NODE__
+#define __RUBY_XML_NODE__
+
+extern VALUE cXMLNode;
+extern VALUE eXMLNodeSetNamespace;
+extern VALUE eXMLNodeFailedModify;
+extern VALUE eXMLNodeUnknownType;
+
+void ruby_init_xml_node(void);
+void ruby_xml_node_mark_common(xmlNodePtr xnode);
+VALUE ruby_xml_node2_wrap(VALUE class, xmlNodePtr xnode);
+VALUE check_string_or_symbol(VALUE val);
+#endif

data/ext/libxml/ruby_xml_node_set.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_node_set.c 339 2008-07-09 08:36:26Z cfis $ */
+/* $Id: ruby_xml_node_set.c 461 2008-07-15 21:35:56Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -6,7 +6,7 @@
 #include "ruby_xml_node_set.h"
 
 /*
- * Document-class: XML::Node::Set
+ * Document-class: LibXML::XML::Node::Set
  * 
  * Includes Enumerable.
  */
@@ -149,14 +149,15 @@ ruby_xml_node_set_xpath_data_get(VALUE self) {
 
 // Rdoc needs to know 
 #ifdef RDOC_NEVER_DEFINED
-	mXML = rb_define_module("XML");
+  mLibXML = rb_define_module("LibXML");
+  mXML = rb_define_module_under(mLibXML, "XML");
   cXMLNode = rb_define_class_under(mXML, "Node", rb_cObject);
 #endif
 
 void
 ruby_init_xml_node_set(void) {
   cXMLNodeSet = rb_define_class_under(cXMLNode, "Set", rb_cObject);  
-  rb_include_module(cXMLNodeSet, rb_const_get(rb_cObject, rb_intern("Enumerable")));
+  rb_include_module(cXMLNodeSet, rb_mEnumerable);
 
   rb_define_method(cXMLNodeSet, "each", ruby_xml_node_set_each, 0);
   rb_define_method(cXMLNodeSet, "empty?", ruby_xml_node_set_empty_q, 0);

data/ext/libxml/ruby_xml_node_set.h

@@ -1,20 +1,20 @@
-/* $Id: ruby_xml_node_set.h 207 2007-11-14 07:51:46Z danj $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RUBY_XML_NODE_SET__
-#define __RUBY_XML_NODE_SET__
-
-extern VALUE cXMLNodeSet;
-
-typedef struct ruby_xml_node_set {
-  VALUE rxpop;
-} ruby_xml_node_set;
-
-void ruby_init_xml_node_set(void);
-VALUE ruby_xml_node_set_new(VALUE class, VALUE xpop);
-VALUE ruby_xml_node_set_new2(VALUE xpop);
-VALUE ruby_xml_node_set_each(VALUE self);
-VALUE ruby_xml_node_set_first(VALUE self);
-
-#endif
+/* $Id: ruby_xml_node_set.h 207 2007-11-14 07:51:46Z danj $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RUBY_XML_NODE_SET__
+#define __RUBY_XML_NODE_SET__
+
+extern VALUE cXMLNodeSet;
+
+typedef struct ruby_xml_node_set {
+  VALUE rxpop;
+} ruby_xml_node_set;
+
+void ruby_init_xml_node_set(void);
+VALUE ruby_xml_node_set_new(VALUE class, VALUE xpop);
+VALUE ruby_xml_node_set_new2(VALUE xpop);
+VALUE ruby_xml_node_set_each(VALUE self);
+VALUE ruby_xml_node_set_first(VALUE self);
+
+#endif

data/ext/libxml/ruby_xml_ns.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_ns.c 351 2008-07-09 19:55:21Z cfis $ */
+/* $Id: ruby_xml_ns.c 461 2008-07-15 21:35:56Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -127,7 +127,8 @@ ruby_xml_ns_prefix_q(VALUE self) {
 
 // Rdoc needs to know 
 #ifdef RDOC_NEVER_DEFINED
-  mXML = rb_define_module("XML");
+  mLibXML = rb_define_module("LibXML");
+  mXML = rb_define_module_under(mLibXML, "XML");
 #endif
 
 void

data/ext/libxml/ruby_xml_ns.h

@@ -1,12 +1,12 @@
-/* $Id: ruby_xml_ns.h 324 2008-07-08 23:00:02Z cfis $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RUBY_XML_NS__
-#define __RUBY_XML_NS__
-
-extern VALUE cXMLNS;
-
-void ruby_init_xml_ns(void);
-VALUE ruby_xml_ns_wrap(xmlNsPtr ns);
-#endif
+/* $Id: ruby_xml_ns.h 324 2008-07-08 23:00:02Z cfis $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RUBY_XML_NS__
+#define __RUBY_XML_NS__
+
+extern VALUE cXMLNS;
+
+void ruby_init_xml_ns(void);
+VALUE ruby_xml_ns_wrap(xmlNsPtr ns);
+#endif

data/ext/libxml/ruby_xml_parser.c

@@ -1,11 +1,10 @@
-/* $Id: ruby_xml_parser.c 351 2008-07-09 19:55:21Z cfis $ */
+/* $Id: ruby_xml_parser.c 461 2008-07-15 21:35:56Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
 #include <stdarg.h>
 #include "ruby_libxml.h"
 
-static VALUE libxml_xmlRubyErrorProc = Qnil;
 static int id_call;
 
 VALUE cXMLParser;
@@ -764,6 +763,7 @@ ruby_xml_parser_filename_set(VALUE self, VALUE filename) {
   ruby_xml_parser *rxp;
   ruby_xml_parser_context *rxpc;
   rx_file_data *data;
+  int retry_count = 0;
 
   Check_Type(filename, T_STRING);
   Data_Get_Struct(self, ruby_xml_parser, rxp);
@@ -784,9 +784,17 @@ ruby_xml_parser_filename_set(VALUE self, VALUE filename) {
   data->filename = filename;
 
   Data_Get_Struct(rxp->ctxt, ruby_xml_parser_context, rxpc);
+  retry:
   rxpc->ctxt = xmlCreateFileParserCtxt(StringValuePtr(filename));
-  if (rxpc->ctxt == NULL)
-    rb_raise(rb_eIOError, StringValuePtr(filename));
+  if (rxpc->ctxt == NULL) {
+    if ((errno == EMFILE || errno == ENFILE) && retry_count == 0) {
+      retry_count++;
+      rb_gc();
+      goto retry;
+    } else {
+      rb_raise(rb_eIOError, StringValuePtr(filename));
+    }
+  }
 
   return(data->filename);
 }
@@ -1224,51 +1232,19 @@ ruby_xml_parser_str_set(VALUE self, VALUE str) {
   return(data->str);
 }
 
-/*
- * call-seq:
- *    XML::Parser.register_error_handler(lambda { |msg| ... }) -> old_handler
- *    XML::Parser.register_error_handler(nil) -> old_handler
- * 
- * Register the attached block as the handler for parser errors.
- * A message describing parse errors is passed to the block.
- * Libxml passes error messages to the handler in parts, one per call.
- * A typical error results in six calls to this proc, with arguments:
- * 
- *   "Entity: line 1: ", 
- *   "parser ", 
- *   "error : ", 
- *   "Opening and ending tag mismatch: foo line 1 and foz\n",
- *   "<foo><bar/></foz>\n",
- *   "                 ^\n"
- * 
- * Note that the error handler is shared by all threads.
- */
-VALUE
-ruby_xml_parser_registerErrorHandler(VALUE self, VALUE proc) {
-  VALUE old_block = libxml_xmlRubyErrorProc;
-  libxml_xmlRubyErrorProc = proc;
-  return(old_block);
-}
-
 static void
 libxml_xmlErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx, const char *msg, ...)
 {
+  VALUE message;
   va_list ap;
   char str[1000];
-  VALUE rstr;
 
-  if (libxml_xmlRubyErrorProc == Qnil) {
-    va_start(ap, msg);
-    vfprintf(stderr, msg, ap);
-    va_end(ap);
-  } else {
-    va_start(ap, msg);
-    if (vsnprintf(str, 999, msg, ap) >= 998) str[999] = 0;
-    va_end(ap);
+  va_start(ap, msg);
+  if (vsnprintf(str, 999, msg, ap) >= 998) str[999] = 0;
+  va_end(ap);
 
-    rstr = rb_str_new2(str);
-    rb_funcall2(libxml_xmlRubyErrorProc, id_call, 1, &rstr);
-  }
+  message = rb_str_new2(str);
+  rb_funcall(cXMLParser, rb_intern("xml_error_func_handler"), 1, message);
 }
 
 /* #define RUBY_XML_PARSER_ENABLED_INIT(func, method) \
@@ -1284,7 +1260,8 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx, const char *msg, ...)
 
 // Rdoc needs to know 
 #ifdef RDOC_NEVER_DEFINED
-  mXML = rb_define_module("XML");
+  mLibXML = rb_define_module("LibXML");
+  mXML = rb_define_module_under(mLibXML, "XML");
 #endif
 
 void
@@ -1404,7 +1381,6 @@ ruby_init_parser(void) {
 			     ruby_xml_parser_memory_used, 0);
   rb_define_singleton_method(cXMLParser, "new", ruby_xml_parser_new, 0);
   rb_define_singleton_method(cXMLParser, "string", ruby_xml_parser_new_string, 1);
-  rb_define_singleton_method(cXMLParser, "register_error_handler", ruby_xml_parser_registerErrorHandler, 1);
   rb_define_method(cXMLParser, "filename", ruby_xml_parser_filename_get, 0);
   rb_define_method(cXMLParser, "filename=", ruby_xml_parser_filename_set, 1);
   rb_define_method(cXMLParser, "io", ruby_xml_parser_io_get, 0);
@@ -1418,9 +1394,5 @@ ruby_init_parser(void) {
   xmlSetGenericErrorFunc(NULL, libxml_xmlErrorFuncHandler);
   xmlThrDefSetGenericErrorFunc(NULL, libxml_xmlErrorFuncHandler);
 
-  // Ruby needs to know about this even though it's not exported, otherwise
-  // our error proc might get garbage collected.
-  rb_global_variable(&libxml_xmlRubyErrorProc);             
-
   id_call = rb_intern("call");
 }

data/ext/libxml/ruby_xml_parser.h

@@ -1,31 +1,31 @@
-/* $Id: ruby_xml_parser.h 39 2006-02-21 20:40:16Z roscopeco $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RUBY_XML_PARSER__
-#define __RUBY_XML_PARSER__
-
-#define MAX_LIBXML_FEATURES_LEN 50
-
-extern int ruby_xml_parser_count;
-extern VALUE cXMLParser;
-extern VALUE eXMLParserParseError;
-
-typedef struct ruby_xml_parser {
-  VALUE ctxt;
-  int parsed;
-  void *data;
-  int data_type;
-} ruby_xml_parser;
-
-VALUE ruby_xml_parser_default_load_external_dtd_set(VALUE class, VALUE bool);
-VALUE ruby_xml_parser_default_substitute_entities_set(VALUE class, VALUE bool);
-VALUE ruby_xml_parser_features(VALUE self);
-VALUE ruby_xml_parser_filename_get(VALUE self);
-VALUE ruby_xml_parser_filename_set(VALUE self, VALUE filename);
-VALUE ruby_xml_parser_new(VALUE class);
-VALUE ruby_xml_parser_parse(VALUE self);
-VALUE ruby_xml_parser_str_get(VALUE self);
-VALUE ruby_xml_parser_str_set(VALUE self, VALUE str);
-
-#endif
+/* $Id: ruby_xml_parser.h 39 2006-02-21 20:40:16Z roscopeco $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RUBY_XML_PARSER__
+#define __RUBY_XML_PARSER__
+
+#define MAX_LIBXML_FEATURES_LEN 50
+
+extern int ruby_xml_parser_count;
+extern VALUE cXMLParser;
+extern VALUE eXMLParserParseError;
+
+typedef struct ruby_xml_parser {
+  VALUE ctxt;
+  int parsed;
+  void *data;
+  int data_type;
+} ruby_xml_parser;
+
+VALUE ruby_xml_parser_default_load_external_dtd_set(VALUE class, VALUE bool);
+VALUE ruby_xml_parser_default_substitute_entities_set(VALUE class, VALUE bool);
+VALUE ruby_xml_parser_features(VALUE self);
+VALUE ruby_xml_parser_filename_get(VALUE self);
+VALUE ruby_xml_parser_filename_set(VALUE self, VALUE filename);
+VALUE ruby_xml_parser_new(VALUE class);
+VALUE ruby_xml_parser_parse(VALUE self);
+VALUE ruby_xml_parser_str_get(VALUE self);
+VALUE ruby_xml_parser_str_set(VALUE self, VALUE str);
+
+#endif

data/ext/libxml/ruby_xml_parser_context.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_parser_context.c 344 2008-07-09 16:15:31Z cfis $ */
+/* $Id: ruby_xml_parser_context.c 461 2008-07-15 21:35:56Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -650,7 +650,8 @@ ruby_xml_parser_context_well_formed_q(VALUE self) {
 
 // Rdoc needs to know 
 #ifdef RDOC_NEVER_DEFINED
-  mXML = rb_define_module("XML");
+  mLibXML = rb_define_module("LibXML");
+  mXML = rb_define_module_under(mLibXML, "XML");
   cXMLParser = rb_define_class_under(mXML, "Parser", rb_cObject);
 #endif
 

data/ext/libxml/ruby_xml_parser_context.h

@@ -1,20 +1,20 @@
-/* $Id: ruby_xml_parser_context.h 319 2008-07-08 07:40:27Z cfis $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RUBY_XML_PARSER_CONTEXT__
-#define __RUBY_XML_PARSER_CONTEXT__
-
-extern VALUE cXMLParserContext;
-
-typedef struct ruby_xml_parser_context {
-  xmlParserCtxtPtr ctxt;
-  int is_ptr;
-} ruby_xml_parser_context;
-
-void ruby_xml_parser_context_free(ruby_xml_parser_context *ctxt);
-void ruby_init_xml_parser_context(void);
-VALUE ruby_xml_parser_context_new();
-VALUE ruby_xml_parser_context_each(VALUE self);
-
-#endif
+/* $Id: ruby_xml_parser_context.h 319 2008-07-08 07:40:27Z cfis $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RUBY_XML_PARSER_CONTEXT__
+#define __RUBY_XML_PARSER_CONTEXT__
+
+extern VALUE cXMLParserContext;
+
+typedef struct ruby_xml_parser_context {
+  xmlParserCtxtPtr ctxt;
+  int is_ptr;
+} ruby_xml_parser_context;
+
+void ruby_xml_parser_context_free(ruby_xml_parser_context *ctxt);
+void ruby_init_xml_parser_context(void);
+VALUE ruby_xml_parser_context_new();
+VALUE ruby_xml_parser_context_each(VALUE self);
+
+#endif

data/ext/libxml/ruby_xml_reader.c

@@ -789,7 +789,8 @@ ruby_xml_reader_valid(VALUE self)
 
 /* Rdoc needs to know. */ 
 #ifdef RDOC_NEVER_DEFINED
-  mXML = rb_define_module("XML");
+  mLibXML = rb_define_module("LibXML");
+  mXML = rb_define_module_under(mLibXML, "XML");
 #endif
 
 void

data/ext/libxml/ruby_xml_sax_parser.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_sax_parser.c 339 2008-07-09 08:36:26Z cfis $ */
+/* $Id: ruby_xml_sax_parser.c 461 2008-07-15 21:35:56Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -406,7 +406,8 @@ ruby_xml_sax_callbacks_on_external_subset(int argc, VALUE *argv, VALUE self) {
 
 // Rdoc needs to know 
 #ifdef RDOC_NEVER_DEFINED
-  mXML = rb_define_module("XML");
+  mLibXML = rb_define_module("LibXML");
+  mXML = rb_define_module_under(mLibXML, "XML");
 #endif
 
 void

data/ext/libxml/ruby_xml_sax_parser.h

@@ -1,56 +1,56 @@
-/* $Id: ruby_xml_sax_parser.h 111 2006-11-20 01:39:14Z roscopeco $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RUBY_XML_SAX_PARSER__
-#define __RUBY_XML_SAX_PARSER__
-
-extern VALUE cXMLSaxParser;
-extern VALUE mXMLSaxParserCallbacks;
-
-/*
-typedef struct ruby_xml_sax_parser_callbacks {
-    VALUE internalSubset;
-    VALUE isStandalone;
-    VALUE hasInternalSubset;
-    VALUE hasExternalSubset;
-    VALUE resolveEntity;
-    VALUE getEntity;
-    VALUE entityDecl;
-    VALUE notationDecl;
-    VALUE attributeDecl;
-    VALUE elementDecl;
-    VALUE unparsedEntityDecl;
-    VALUE setDocumentLocator;
-    VALUE startDocument;
-    VALUE endDocument;
-    VALUE startElement;
-    VALUE endElement;
-    VALUE reference;
-    VALUE characters;
-    VALUE ignorableWhitespace;
-    VALUE processingInstruction;
-    VALUE comment;
-    VALUE xmlParserWarning;
-    VALUE xmlParserError;
-    VALUE xmlParserFatalError;
-    VALUE getParameterEntity;
-    VALUE cdataBlock;
-    VALUE externalSubset;  
-} ruby_xml_sax_parser_callbacks;
-*/
-
-typedef struct ruby_xml_sax_parser {
-  xmlParserCtxtPtr xpc;
-  xmlSAXHandlerPtr xsh;
-  //ruby_xml_sax_parser_callbacks *cbp;
-  VALUE callbackHandler;
-  VALUE filename;
-  VALUE str;
-} ruby_xml_sax_parser;
-
-void ruby_xml_sax_parser_free(ruby_xml_sax_parser *rxsp);
-void ruby_init_xml_sax_parser(void);
-VALUE ruby_xml_sax_parser_new(VALUE class);
-
-#endif
+/* $Id: ruby_xml_sax_parser.h 111 2006-11-20 01:39:14Z roscopeco $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RUBY_XML_SAX_PARSER__
+#define __RUBY_XML_SAX_PARSER__
+
+extern VALUE cXMLSaxParser;
+extern VALUE mXMLSaxParserCallbacks;
+
+/*
+typedef struct ruby_xml_sax_parser_callbacks {
+    VALUE internalSubset;
+    VALUE isStandalone;
+    VALUE hasInternalSubset;
+    VALUE hasExternalSubset;
+    VALUE resolveEntity;
+    VALUE getEntity;
+    VALUE entityDecl;
+    VALUE notationDecl;
+    VALUE attributeDecl;
+    VALUE elementDecl;
+    VALUE unparsedEntityDecl;
+    VALUE setDocumentLocator;
+    VALUE startDocument;
+    VALUE endDocument;
+    VALUE startElement;
+    VALUE endElement;
+    VALUE reference;
+    VALUE characters;
+    VALUE ignorableWhitespace;
+    VALUE processingInstruction;
+    VALUE comment;
+    VALUE xmlParserWarning;
+    VALUE xmlParserError;
+    VALUE xmlParserFatalError;
+    VALUE getParameterEntity;
+    VALUE cdataBlock;
+    VALUE externalSubset;  
+} ruby_xml_sax_parser_callbacks;
+*/
+
+typedef struct ruby_xml_sax_parser {
+  xmlParserCtxtPtr xpc;
+  xmlSAXHandlerPtr xsh;
+  //ruby_xml_sax_parser_callbacks *cbp;
+  VALUE callbackHandler;
+  VALUE filename;
+  VALUE str;
+} ruby_xml_sax_parser;
+
+void ruby_xml_sax_parser_free(ruby_xml_sax_parser *rxsp);
+void ruby_init_xml_sax_parser(void);
+VALUE ruby_xml_sax_parser_new(VALUE class);
+
+#endif