libxml-ruby 0.5.4 → 0.6.0

data/ext/libxml/ruby_xml_sax_parser.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_sax_parser.h 225 2007-12-07 04:58:09Z transami $ */
+/* $Id: ruby_xml_sax_parser.h 111 2006-11-20 01:39:14Z roscopeco $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/libxml/ruby_xml_schema.c

@@ -1,142 +1,146 @@
-#include "libxml.h"
-#include "ruby_xml_schema.h"
-
-VALUE cXMLSchema;
-
-static void
-ruby_xml_schema_mark(ruby_xml_schema *rxschema) {
-  return;
-}
-
-void
-ruby_xml_schema_free(ruby_xml_schema *rxschema) {
-  if (rxschema->schema != NULL) {
-    xmlSchemaFree(rxschema->schema);
-    rxschema->schema = NULL;
-  }
-
-  free(rxschema);
-}
-
-/*
- * call-seq:
- *    XML::Schema.new(schema_uri) => schema
- * 
- * Create a new schema from the specified URI.
- */
-VALUE
-ruby_xml_schema_init_from_uri(int argc, VALUE *argv, VALUE class) {
-  VALUE uri;
-  xmlSchemaParserCtxtPtr parser;
-  xmlSchemaPtr sptr;
-
-  switch (argc) {
-  case 1:
-    rb_scan_args(argc, argv, "10", &uri);
-
-    Check_Type(uri, T_STRING);
-
- 	parser = xmlSchemaNewParserCtxt(StringValuePtr(uri));
- 	sptr = xmlSchemaParse(parser);
- 	xmlSchemaFreeParserCtxt(parser);
-    break;
-  default:
-    rb_raise(rb_eArgError, "wrong number of arguments (need 1)");
-  }
-  return Qnil;
-}
-
-/*
- * call-seq:
- *    XML::Schema.from_string("schema_data") => "value"
- * 
- * Create a new schema using the specified string.
- */
-VALUE
-ruby_xml_schema_init_from_str(int argc, VALUE *argv, VALUE class) {
-  VALUE schema_str;
-
-  xmlSchemaParserCtxtPtr  parser;
-  //xmlSchemaPtr            sptr;
-  ruby_xml_schema *rxschema;
-
-  switch (argc) {
-  case 1:
-    rb_scan_args(argc, argv, "10", &schema_str);
-
-    Check_Type(schema_str, T_STRING);
-
-    parser = xmlSchemaNewMemParserCtxt(StringValuePtr(schema_str), strlen(StringValuePtr(schema_str)));
-    rxschema = ALLOC(ruby_xml_schema);
-    rxschema->schema = xmlSchemaParse(parser);
- 	xmlSchemaFreeParserCtxt(parser);
-
-    return( Data_Wrap_Struct(cXMLSchema, ruby_xml_schema_mark, ruby_xml_schema_free, rxschema) );
-  default:
-    rb_raise(rb_eArgError, "wrong number of arguments (need 1)");
-  }
-  return Qnil;
-}
-  
-/* TODO what is this patch doing here?
- 
- 	xmlSchemaParserCtxtPtr  parser;
- 	xmlSchemaPtr            sptr;
- 	xmlSchemaValidCtxtPtr   vptr;
-+	int                     is_invalid;
- 	
- 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &source) == FAILURE) {
- 		return;
-@@ -598,26 +598,24 @@
- 			convert_to_string_ex(&source);
- 			parser = xmlSchemaNewParserCtxt(Z_STRVAL_P(source));
- 			sptr = xmlSchemaParse(parser);
- 			break;
- 		case SCHEMA_BLOB:
- 			convert_to_string_ex(&source);
- 			parser = xmlSchemaNewMemParserCtxt(Z_STRVAL_P(source), Z_STRLEN_P(source));
- 			sptr = xmlSchemaParse(parser);
- 			break;
- 	}
- 
- 	vptr = xmlSchemaNewValidCtxt(sptr);
-+	is_invalid = xmlSchemaValidateDoc(vptr, (xmlDocPtr) sxe->document->ptr);
- 	xmlSchemaFree(sptr);
- 	xmlSchemaFreeValidCtxt(vptr);
- 	xmlSchemaFreeParserCtxt(parser);
- 
--	if (is_valid) {
--		RETURN_TRUE;
--	} else {
-+	if (is_invalid) {
- 		RETURN_FALSE;
-+	} else {
-+		RETURN_TRUE;
- 	}
- }
-  }}} 
-@@ -695,7 +693,7 @@
- {
- 	if (!strcmp(method, "xsearch")) {
- 		simplexml_ce_xpath_search(INTERNAL_FUNCTION_PARAM_PASSTHRU);
--#ifdef xmlSchemaParserCtxtPtr
-+#ifdef LIBXML_SCHEMAS_ENABLED
- 	} else if (!strcmp(method, "validate_schema_file")) {
- 		simplexml_ce_schema_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, SCHEMA_FILE);	
- 	} else if (!strcmp(method, "validate_schema_buffer")) {
-*/
-
-void  ruby_schema_free(ruby_xml_schema *rxs) {
-}
-
-// Rdoc needs to know 
-#ifdef RDOC_NEVER_DEFINED
-  mXML = rb_define_module("XML");
-#endif
-
-void  ruby_init_xml_schema(void) {
-  cXMLSchema = rb_define_class_under(mXML, "Schema", rb_cObject);
-  rb_define_singleton_method(cXMLSchema, "new",         ruby_xml_schema_init_from_uri, -1);
-  rb_define_singleton_method(cXMLSchema, "from_string", ruby_xml_schema_init_from_str, -1);
-}
-
+#include "ruby_libxml.h"
+#include "ruby_xml_schema.h"
+
+VALUE cXMLSchema;
+
+static void
+ruby_xml_schema_mark(ruby_xml_schema *rxschema) {
+  return;
+}
+
+void
+ruby_xml_schema_free(ruby_xml_schema *rxschema) {
+  if (rxschema->schema != NULL) {
+    xmlSchemaFree(rxschema->schema);
+    rxschema->schema = NULL;
+  }
+
+  ruby_xfree(rxschema);
+}
+
+/*
+ * call-seq:
+ *    XML::Schema.new(schema_uri) => schema
+ * 
+ * Create a new schema from the specified URI.
+ */
+VALUE
+ruby_xml_schema_init_from_uri(int argc, VALUE *argv, VALUE class) {
+  xmlSchemaParserCtxtPtr parser;
+  ruby_xml_schema *schema;
+  
+  VALUE uri;
+  VALUE result = Qnil;
+
+  switch (argc) {
+  case 1:
+    rb_scan_args(argc, argv, "10", &uri);
+    Check_Type(uri, T_STRING);
+
+    parser = xmlSchemaNewParserCtxt(StringValuePtr(uri));
+    schema = ALLOC(ruby_xml_schema);
+    schema->schema = xmlSchemaParse(parser);
+    xmlSchemaFreeParserCtxt(parser);
+ 	
+    result = Data_Wrap_Struct(cXMLSchema, ruby_xml_schema_mark, ruby_xml_schema_free, schema);
+    break;
+  default:
+    rb_raise(rb_eArgError, "wrong number of arguments (need 1)");
+  }
+  return(result);
+}
+
+/*
+ * call-seq:
+ *    XML::Schema.from_string("schema_data") => "value"
+ * 
+ * Create a new schema using the specified string.
+ */
+VALUE
+ruby_xml_schema_init_from_str(int argc, VALUE *argv, VALUE class) {
+  VALUE schema_str;
+
+  xmlSchemaParserCtxtPtr  parser;
+  //xmlSchemaPtr            sptr;
+  ruby_xml_schema *rxschema;
+
+  switch (argc) {
+  case 1:
+    rb_scan_args(argc, argv, "10", &schema_str);
+
+    Check_Type(schema_str, T_STRING);
+
+    parser = xmlSchemaNewMemParserCtxt(StringValuePtr(schema_str), strlen(StringValuePtr(schema_str)));
+    rxschema = ALLOC(ruby_xml_schema);
+    rxschema->schema = xmlSchemaParse(parser);
+ 	xmlSchemaFreeParserCtxt(parser);
+
+    return( Data_Wrap_Struct(cXMLSchema, ruby_xml_schema_mark, ruby_xml_schema_free, rxschema) );
+  default:
+    rb_raise(rb_eArgError, "wrong number of arguments (need 1)");
+  }
+  return Qnil;
+}
+  
+/* TODO what is this patch doing here?
+ 
+ 	xmlSchemaParserCtxtPtr  parser;
+ 	xmlSchemaPtr            sptr;
+ 	xmlSchemaValidCtxtPtr   vptr;
++	int                     is_invalid;
+ 	
+ 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &source) == FAILURE) {
+ 		return;
+@@ -598,26 +598,24 @@
+ 			convert_to_string_ex(&source);
+ 			parser = xmlSchemaNewParserCtxt(Z_STRVAL_P(source));
+ 			sptr = xmlSchemaParse(parser);
+ 			break;
+ 		case SCHEMA_BLOB:
+ 			convert_to_string_ex(&source);
+ 			parser = xmlSchemaNewMemParserCtxt(Z_STRVAL_P(source), Z_STRLEN_P(source));
+ 			sptr = xmlSchemaParse(parser);
+ 			break;
+ 	}
+ 
+ 	vptr = xmlSchemaNewValidCtxt(sptr);
++	is_invalid = xmlSchemaValidateDoc(vptr, (xmlDocPtr) sxe->document->ptr);
+ 	xmlSchemaFree(sptr);
+ 	xmlSchemaFreeValidCtxt(vptr);
+ 	xmlSchemaFreeParserCtxt(parser);
+ 
+-	if (is_valid) {
+-		RETURN_TRUE;
+-	} else {
++	if (is_invalid) {
+ 		RETURN_FALSE;
++	} else {
++		RETURN_TRUE;
+ 	}
+ }
+  }}} 
+@@ -695,7 +693,7 @@
+ {
+ 	if (!strcmp(method, "xsearch")) {
+ 		simplexml_ce_xpath_search(INTERNAL_FUNCTION_PARAM_PASSTHRU);
+-#ifdef xmlSchemaParserCtxtPtr
++#ifdef LIBXML_SCHEMAS_ENABLED
+ 	} else if (!strcmp(method, "validate_schema_file")) {
+ 		simplexml_ce_schema_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, SCHEMA_FILE);	
+ 	} else if (!strcmp(method, "validate_schema_buffer")) {
+*/
+
+void  ruby_schema_free(ruby_xml_schema *rxs) {
+}
+
+// Rdoc needs to know 
+#ifdef RDOC_NEVER_DEFINED
+  mXML = rb_define_module("XML");
+#endif
+
+void  ruby_init_xml_schema(void) {
+  cXMLSchema = rb_define_class_under(mXML, "Schema", rb_cObject);
+  rb_define_singleton_method(cXMLSchema, "new",         ruby_xml_schema_init_from_uri, -1);
+  rb_define_singleton_method(cXMLSchema, "from_string", ruby_xml_schema_init_from_str, -1);
+}
+

data/ext/libxml/ruby_xml_state.c

@@ -1,6 +1,6 @@
 /* $Id$ */
 
-#include "libxml.h"
+#include "ruby_libxml.h"
 
 VALUE cXMLState;
 static VALUE weak_holder;
@@ -14,7 +14,7 @@ void
 ruby_xml_state_free(int * dummy) {
   if ( dummy==NULL ) return;
   xmlCleanupParser();
-  free(dummy);
+  ruby_xfree(dummy);
   dummy=NULL;
   weak_holder=Qnil;
   rb_ivar_set(cXMLState,id_state,Qnil);
@@ -57,10 +57,9 @@ ruby_xml_state_object() {
 
 VALUE
 ruby_xml_state_object_find_aux(VALUE id) {
-  rb_funcall(rb_const_get(rb_cModule,rb_intern("ObjectSpace")),
-	     rb_intern("_id2ref"),
-	     1,
-	     id);
+  return rb_funcall(rb_const_get(rb_cModule,rb_intern("ObjectSpace")),
+	            rb_intern("_id2ref"),
+	            1, id);
 }
 
 

data/ext/libxml/ruby_xml_state.h

@@ -5,6 +5,7 @@
 
 extern VALUE cXMLState;
 
+void ruby_init_state(void);
 void ruby_xml_state_marker(void);
 VALUE ruby_xml_state_object_find(VALUE id);
 

data/ext/libxml/ruby_xml_tree.c

@@ -1,43 +1,43 @@
-/* $Id: ruby_xml_tree.c 225 2007-12-07 04:58:09Z transami $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
-#include "libxml.h"
-#include "ruby_xml_tree.h"
-
-VALUE cXMLTree;
-
-// Rdoc needs to know 
-#ifdef RDOC_NEVER_DEFINED
-  mXML = rb_define_module("XML");
-#endif
-
-void
-ruby_init_xml_tree(void) {
-  cXMLTree = rb_define_class_under(mXML, "Tree", rb_cObject);
-
-  rb_define_const(cXMLTree, "ELEMENT_NODE", INT2FIX(XML_ELEMENT_NODE));
-  rb_define_const(cXMLTree, "ATTRIBUTE_NODE", INT2FIX(XML_ATTRIBUTE_NODE));
-  rb_define_const(cXMLTree, "TEXT_NODE", INT2FIX(XML_TEXT_NODE));
-  rb_define_const(cXMLTree, "CDATA_SECTION_NODE", INT2FIX(XML_CDATA_SECTION_NODE));
-  rb_define_const(cXMLTree, "ENTITY_REF_NODE", INT2FIX(XML_ENTITY_REF_NODE));
-  rb_define_const(cXMLTree, "ENTITY_NODE", INT2FIX(XML_ENTITY_NODE));
-  rb_define_const(cXMLTree, "PI_NODE", INT2FIX(XML_PI_NODE));
-  rb_define_const(cXMLTree, "COMMENT_NODE", INT2FIX(XML_COMMENT_NODE));
-  rb_define_const(cXMLTree, "DOCUMENT_NODE", INT2FIX(XML_DOCUMENT_NODE));
-  rb_define_const(cXMLTree, "DOCUMENT_TYPE_NODE", INT2FIX(XML_DOCUMENT_TYPE_NODE));
-  rb_define_const(cXMLTree, "DOCUMENT_FRAG_NODE", INT2FIX(XML_DOCUMENT_FRAG_NODE));
-  rb_define_const(cXMLTree, "NOTATION_NODE", INT2FIX(XML_NOTATION_NODE));
-  rb_define_const(cXMLTree, "HTML_DOCUMENT_NODE", INT2FIX(XML_HTML_DOCUMENT_NODE));
-  rb_define_const(cXMLTree, "DTD_NODE", INT2FIX(XML_DTD_NODE));
-  rb_define_const(cXMLTree, "ELEMENT_DECL", INT2FIX(XML_ELEMENT_DECL));
-  rb_define_const(cXMLTree, "ATTRIBUTE_DECL", INT2FIX(XML_ATTRIBUTE_DECL));
-  rb_define_const(cXMLTree, "ENTITY_DECL", INT2FIX(XML_ENTITY_DECL));
-  rb_define_const(cXMLTree, "NAMESPACE_DECL", INT2FIX(XML_NAMESPACE_DECL));
-  rb_define_const(cXMLTree, "XINCLUDE_START", INT2FIX(XML_XINCLUDE_START));
-  rb_define_const(cXMLTree, "XINCLUDE_END", INT2FIX(XML_XINCLUDE_END));
-
-#ifdef LIBXML_DOCB_ENABLED
-  rb_define_const(cXMLTree, "DOCB_DOCUMENT_NODE", INT2FIX(XML_DOCB_DOCUMENT_NODE));
-#endif
-}
+/* $Id: ruby_xml_tree.c 300 2008-07-01 19:14:15Z cfis $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+#include "ruby_libxml.h"
+#include "ruby_xml_tree.h"
+
+VALUE cXMLTree;
+
+// Rdoc needs to know 
+#ifdef RDOC_NEVER_DEFINED
+  mXML = rb_define_module("XML");
+#endif
+
+void
+ruby_init_xml_tree(void) {
+  cXMLTree = rb_define_class_under(mXML, "Tree", rb_cObject);
+
+  rb_define_const(cXMLTree, "ELEMENT_NODE", INT2FIX(XML_ELEMENT_NODE));
+  rb_define_const(cXMLTree, "ATTRIBUTE_NODE", INT2FIX(XML_ATTRIBUTE_NODE));
+  rb_define_const(cXMLTree, "TEXT_NODE", INT2FIX(XML_TEXT_NODE));
+  rb_define_const(cXMLTree, "CDATA_SECTION_NODE", INT2FIX(XML_CDATA_SECTION_NODE));
+  rb_define_const(cXMLTree, "ENTITY_REF_NODE", INT2FIX(XML_ENTITY_REF_NODE));
+  rb_define_const(cXMLTree, "ENTITY_NODE", INT2FIX(XML_ENTITY_NODE));
+  rb_define_const(cXMLTree, "PI_NODE", INT2FIX(XML_PI_NODE));
+  rb_define_const(cXMLTree, "COMMENT_NODE", INT2FIX(XML_COMMENT_NODE));
+  rb_define_const(cXMLTree, "DOCUMENT_NODE", INT2FIX(XML_DOCUMENT_NODE));
+  rb_define_const(cXMLTree, "DOCUMENT_TYPE_NODE", INT2FIX(XML_DOCUMENT_TYPE_NODE));
+  rb_define_const(cXMLTree, "DOCUMENT_FRAG_NODE", INT2FIX(XML_DOCUMENT_FRAG_NODE));
+  rb_define_const(cXMLTree, "NOTATION_NODE", INT2FIX(XML_NOTATION_NODE));
+  rb_define_const(cXMLTree, "HTML_DOCUMENT_NODE", INT2FIX(XML_HTML_DOCUMENT_NODE));
+  rb_define_const(cXMLTree, "DTD_NODE", INT2FIX(XML_DTD_NODE));
+  rb_define_const(cXMLTree, "ELEMENT_DECL", INT2FIX(XML_ELEMENT_DECL));
+  rb_define_const(cXMLTree, "ATTRIBUTE_DECL", INT2FIX(XML_ATTRIBUTE_DECL));
+  rb_define_const(cXMLTree, "ENTITY_DECL", INT2FIX(XML_ENTITY_DECL));
+  rb_define_const(cXMLTree, "NAMESPACE_DECL", INT2FIX(XML_NAMESPACE_DECL));
+  rb_define_const(cXMLTree, "XINCLUDE_START", INT2FIX(XML_XINCLUDE_START));
+  rb_define_const(cXMLTree, "XINCLUDE_END", INT2FIX(XML_XINCLUDE_END));
+
+#ifdef LIBXML_DOCB_ENABLED
+  rb_define_const(cXMLTree, "DOCB_DOCUMENT_NODE", INT2FIX(XML_DOCB_DOCUMENT_NODE));
+#endif
+}

data/ext/libxml/ruby_xml_tree.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_tree.h 225 2007-12-07 04:58:09Z transami $ */
+/* $Id: ruby_xml_tree.h 39 2006-02-21 20:40:16Z roscopeco $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/libxml/ruby_xml_xinclude.c

@@ -1,20 +1,20 @@
-/* $Id: ruby_xml_xinclude.c 225 2007-12-07 04:58:09Z transami $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
-#include "libxml.h"
-#include "ruby_xml_xinclude.h"
-
-VALUE cXMLXInclude;
-VALUE eXMLXIncludeError;
-
-// Rdoc needs to know 
-#ifdef RDOC_NEVER_DEFINED
-  mXML = rb_define_module("XML");
-#endif
-
-void
-ruby_init_xml_xinclude(void) {
-  cXMLXInclude = rb_define_class_under(mXML, "XInclude", rb_cObject);
-  eXMLXIncludeError = rb_define_class_under(cXMLXInclude, "Error", rb_eRuntimeError);
-}
+/* $Id: ruby_xml_xinclude.c 300 2008-07-01 19:14:15Z cfis $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+#include "ruby_libxml.h"
+#include "ruby_xml_xinclude.h"
+
+VALUE cXMLXInclude;
+VALUE eXMLXIncludeError;
+
+// Rdoc needs to know 
+#ifdef RDOC_NEVER_DEFINED
+  mXML = rb_define_module("XML");
+#endif
+
+void
+ruby_init_xml_xinclude(void) {
+  cXMLXInclude = rb_define_class_under(mXML, "XInclude", rb_cObject);
+  eXMLXIncludeError = rb_define_class_under(cXMLXInclude, "Error", rb_eRuntimeError);
+}

data/ext/libxml/ruby_xml_xinclude.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_xinclude.h 225 2007-12-07 04:58:09Z transami $ */
+/* $Id: ruby_xml_xinclude.h 39 2006-02-21 20:40:16Z roscopeco $ */
 
 /* Please see the LICENSE file for copyright and distribution information */