libxml-ruby 0.6.0 → 0.7.0

data/ext/libxml/ruby_xml_reader.h

@@ -1,14 +1,14 @@
-/* Copyright (c) 2006 Apple Computer Inc.
- * Please see the LICENSE file for copyright and distribution information. */
-
-#ifndef __RUBY_XML_READER__
-#define __RUBY_XML_READER__
-
-extern VALUE cXMLReader;
-
-void ruby_init_xml_reader(void);
-
-/* Exported to be used by XML::Document#reader */
-VALUE ruby_xml_reader_new_walker(VALUE self, VALUE doc);
-
-#endif /* __RUBY_XML_READER__ */
+/* Copyright (c) 2006 Apple Computer Inc.
+ * Please see the LICENSE file for copyright and distribution information. */
+
+#ifndef __RUBY_XML_READER__
+#define __RUBY_XML_READER__
+
+extern VALUE cXMLReader;
+
+void ruby_init_xml_reader(void);
+
+/* Exported to be used by XML::Document#reader */
+VALUE ruby_xml_reader_new_walker(VALUE self, VALUE doc);
+
+#endif /* __RUBY_XML_READER__ */

data/ext/libxml/ruby_xml_sax_parser.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_sax_parser.c 300 2008-07-01 19:14:15Z cfis $ */
+/* $Id: ruby_xml_sax_parser.c 339 2008-07-09 08:36:26Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -29,61 +29,61 @@ VALUE cbidOnExternalSubset;
 #include "sax_parser_callbacks.inc"
 
 void
-ruby_xml_sax_parser_free(ruby_xml_sax_parser *rxsp) {
+ruby_xml_sax_parser_free(ruby_xml_sax_parser *nodesp) {
   /* Apparently this isn't needed: time will tell */
-  /* if (rxsp->xsh != NULL) */
-  /* xmlFreeSax_Parser(rxsp->sax_parser); */
+  /* if (nodesp->xsh != NULL) */
+  /* xmlFreeSax_Parser(nodesp->sax_parser); */
 }
 
 void
-ruby_xml_sax_parser_mark(ruby_xml_sax_parser *rxsp) {
-  if (rxsp->callbackHandler && (rxsp->callbackHandler != Qnil)) {
-    rb_gc_mark(rxsp->callbackHandler);
+ruby_xml_sax_parser_mark(ruby_xml_sax_parser *nodesp) {
+  if (nodesp->callbackHandler && (nodesp->callbackHandler != Qnil)) {
+    rb_gc_mark(nodesp->callbackHandler);
   }
   
-  if (rxsp->filename && (rxsp->filename != Qnil)) {
-    rb_gc_mark(rxsp->filename);
+  if (nodesp->filename && (nodesp->filename != Qnil)) {
+    rb_gc_mark(nodesp->filename);
   }
 
-  if (rxsp->str && (rxsp->str != Qnil)) {
-    rb_gc_mark(rxsp->str);
+  if (nodesp->str && (nodesp->str != Qnil)) {
+    rb_gc_mark(nodesp->str);
   }
 }
 
 /*
  * call-seq:
- *    XML::SaxParser.new => sax_parser
+ *    XML::SaxParser.new -> sax_parser
  * 
  * Create a new XML::SaxParser instance.
  */
 VALUE
 ruby_xml_sax_parser_new(VALUE class) {
-  ruby_xml_sax_parser *rxsp;
+  ruby_xml_sax_parser *nodesp;
   
-  rxsp = ALLOC(ruby_xml_sax_parser);
-  rxsp->xsh = &rubySAXHandlerStruct;
+  nodesp = ALLOC(ruby_xml_sax_parser);
+  nodesp->xsh = &rubySAXHandlerStruct;
 
-  rxsp->callbackHandler = Qnil;  
-  rxsp->xpc = NULL;
-  rxsp->filename = Qnil;
-  rxsp->str = Qnil;
+  nodesp->callbackHandler = Qnil;  
+  nodesp->xpc = NULL;
+  nodesp->filename = Qnil;
+  nodesp->str = Qnil;
 
   return(Data_Wrap_Struct(class, ruby_xml_sax_parser_mark, 
-                              ruby_xml_sax_parser_free, rxsp));
+                              ruby_xml_sax_parser_free, nodesp));
 }
 
 
 /*
  * call-seq:
- *    sax_parser.callbacks => #<XML::SaxParser::Callbacks subclass>
+ *    sax_parser.callbacks -> #<XML::SaxParser::Callbacks subclass>
  * 
  * Obtain the callbacks used by this parser.
  */
 VALUE
 ruby_xml_sax_parser_callbacks_get(VALUE self) {
-  ruby_xml_sax_parser *rxsp;
-  Data_Get_Struct(self, ruby_xml_sax_parser, rxsp);
-  return(rxsp->callbackHandler);
+  ruby_xml_sax_parser *nodesp;
+  Data_Get_Struct(self, ruby_xml_sax_parser, nodesp);
+  return(nodesp->callbackHandler);
 }
 
 
@@ -92,30 +92,30 @@ ruby_xml_sax_parser_callbacks_get(VALUE self) {
  *    sax_parser.callbacks = #<XML::SaxParser::Callbacks subclass>
  * 
  * Set the callbacks used by this parser. The value assigned to
- * this attribute will usually be an object that extends the the 
+ * this attributesibute will usually be an object that extends the the 
  * XML::SaxParser::Callbacks module, overriding the callbacks it
  * wishes to process.
  */
 VALUE
 ruby_xml_sax_parser_callbacks_set(VALUE self, VALUE callbacks) {
-  ruby_xml_sax_parser *rxsp;
-  Data_Get_Struct(self, ruby_xml_sax_parser, rxsp);
-  rxsp->callbackHandler = callbacks;
-  return(rxsp->callbackHandler);
+  ruby_xml_sax_parser *nodesp;
+  Data_Get_Struct(self, ruby_xml_sax_parser, nodesp);
+  nodesp->callbackHandler = callbacks;
+  return(nodesp->callbackHandler);
 }
 
 
 /*
  * call-seq:
- *    sax_parser.filename => "filename"
+ *    sax_parser.filename -> "filename"
  * 
  * Obtain the filename this parser reads from.
  */
 VALUE
 ruby_xml_sax_parser_filename_get(VALUE self) {
-  ruby_xml_sax_parser *rxsp;
-  Data_Get_Struct(self, ruby_xml_sax_parser, rxsp);
-  return(rxsp->filename);
+  ruby_xml_sax_parser *nodesp;
+  Data_Get_Struct(self, ruby_xml_sax_parser, nodesp);
+  return(nodesp->filename);
 }
 
 
@@ -127,35 +127,35 @@ ruby_xml_sax_parser_filename_get(VALUE self) {
  */
 VALUE
 ruby_xml_sax_parser_filename_set(VALUE self, VALUE filename) {
-  ruby_xml_sax_parser *rxsp;
+  ruby_xml_sax_parser *nodesp;
   Check_Type(filename, T_STRING);
-  Data_Get_Struct(self, ruby_xml_sax_parser, rxsp);
-  rxsp->filename = filename;
-  return(rxsp->filename);
+  Data_Get_Struct(self, ruby_xml_sax_parser, nodesp);
+  nodesp->filename = filename;
+  return(nodesp->filename);
 }
 
  
 /*
  * call-seq:
- *    parser.parse => (true|false)
+ *    parser.parse -> (true|false)
  * 
  * Parse the input XML, generating callbacks to the object
- * registered via the +callbacks+ attribute.
+ * registered via the +callbacks+ attributesibute.
  */
 VALUE
 ruby_xml_sax_parser_parse(VALUE self) {
   char *str;
   int status = 1;
-  ruby_xml_sax_parser *rxsp;
+  ruby_xml_sax_parser *nodesp;
 
-  Data_Get_Struct(self, ruby_xml_sax_parser, rxsp);
+  Data_Get_Struct(self, ruby_xml_sax_parser, nodesp);
 
-  if (rxsp->filename != Qnil) {
-    status = xmlSAXUserParseFile(rxsp->xsh, rxsp, StringValuePtr(rxsp->filename));
-  } else if (rxsp->str != Qnil) {
-    str = StringValuePtr(rxsp->str);
+  if (nodesp->filename != Qnil) {
+    status = xmlSAXUserParseFile(nodesp->xsh, nodesp, StringValuePtr(nodesp->filename));
+  } else if (nodesp->str != Qnil) {
+    str = StringValuePtr(nodesp->str);
     status = //ruby_xml_document_new(cXMLDocument,
-				   xmlSAXUserParseMemory(rxsp->xsh, rxsp,
+				   xmlSAXUserParseMemory(nodesp->xsh, nodesp,
                  str, strlen(str)); //);
   }
   
@@ -171,15 +171,15 @@ ruby_xml_sax_parser_parse(VALUE self) {
 
 /*
  * call-seq:
- *    parser.string => "xml"
+ *    parser.string -> "xml"
  * 
  * Obtain the parser's input string.
  */
 VALUE
 ruby_xml_sax_parser_str_get(VALUE self) {
-  ruby_xml_sax_parser *rxsp;
-  Data_Get_Struct(self, ruby_xml_sax_parser, rxsp);
-  return(rxsp->str);
+  ruby_xml_sax_parser *nodesp;
+  Data_Get_Struct(self, ruby_xml_sax_parser, nodesp);
+  return(nodesp->str);
 }
 
 
@@ -191,11 +191,11 @@ ruby_xml_sax_parser_str_get(VALUE self) {
  */
 VALUE
 ruby_xml_sax_parser_str_set(VALUE self, VALUE str) {
-  ruby_xml_sax_parser *rxsp;
+  ruby_xml_sax_parser *nodesp;
   Check_Type(str, T_STRING);
-  Data_Get_Struct(self, ruby_xml_sax_parser, rxsp);
-  rxsp->str = str;
-  return(rxsp->str);
+  Data_Get_Struct(self, ruby_xml_sax_parser, nodesp);
+  nodesp->str = str;
+  return(nodesp->str);
 }
 
 
@@ -276,7 +276,7 @@ ruby_xml_sax_callbacks_on_end_document(int argc, VALUE *argv, VALUE self) {
  
 /*
  * call-seq:
- *    callbacks.on_start_element(name, attr_hash)
+ *    callbacks.on_start_element(name, attributes_hash)
  * 
  * Called for an element start event.
  */

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

data/ext/libxml/ruby_xml_schema.c

@@ -20,66 +20,66 @@ ruby_xml_schema_free(ruby_xml_schema *rxschema) {
 
 /*
  * call-seq:
- *    XML::Schema.new(schema_uri) => schema
+ *    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) {
+ruby_xml_schema_init_from_uri(VALUE class, VALUE uri) {
   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);
+
+  Check_Type(uri, T_STRING);
+
+  parser = xmlSchemaNewParserCtxt(StringValuePtr(uri));
+  schema = ALLOC(ruby_xml_schema);
+  schema->schema = xmlSchemaParse(parser);
+  xmlSchemaFreeParserCtxt(parser);
+
+  return Data_Wrap_Struct(cXMLSchema, ruby_xml_schema_mark, ruby_xml_schema_free, schema);
 }
 
 /*
  * call-seq:
- *    XML::Schema.from_string("schema_data") => "value"
+ *    XML::Schema.document(document) -> schema
  * 
- * Create a new schema using the specified string.
+ * Create a new schema from the specified URI.
  */
 VALUE
-ruby_xml_schema_init_from_str(int argc, VALUE *argv, VALUE class) {
-  VALUE schema_str;
+ruby_xml_schema_init_from_document(VALUE class, VALUE document) {
+  ruby_xml_document_t *rdoc;
+  ruby_xml_schema *schema;
+  xmlSchemaParserCtxtPtr parser;
+
+  Data_Get_Struct(document, ruby_xml_document_t, rdoc);
+
+  parser = xmlSchemaNewDocParserCtxt(rdoc->doc);
+  schema = ALLOC(ruby_xml_schema);
+  schema->schema = xmlSchemaParse(parser);
+  xmlSchemaFreeParserCtxt(parser);
+
+  return Data_Wrap_Struct(cXMLSchema, ruby_xml_schema_mark, ruby_xml_schema_free, schema);
+}
 
+/*
+ * call-seq:
+ *    XML::Schema.string("schema_data") -> "value"
+ * 
+ * Create a new schema using the specified string.
+ */
+VALUE
+ruby_xml_schema_init_from_string(VALUE self, 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);
 
-    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);
 
-    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;
+  return Data_Wrap_Struct(cXMLSchema, ruby_xml_schema_mark, ruby_xml_schema_free, rxschema);
 }
   
 /* TODO what is this patch doing here?
@@ -130,17 +130,10 @@ ruby_xml_schema_init_from_str(int argc, VALUE *argv, VALUE class) {
  	} 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);
+  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_string, 1);
+  rb_define_singleton_method(cXMLSchema, "document",    ruby_xml_schema_init_from_document, 1);
 }