libxml-ruby 0.9.3-x86-mswin32-60 → 0.9.4-x86-mswin32-60

data/ext/libxml/ruby_xml_sax_parser.c

@@ -1,174 +1,174 @@
-/* $Id: ruby_xml_sax_parser.c 616 2008-11-22 09:25:12Z cfis $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
-#include "ruby_libxml.h"
-#include "ruby_xml_sax_parser.h"
-
-/*
- * Document-class: LibXML::XML::SaxParser
- *
- * XML::SaxParser provides a callback based API for parsing documents,
- * in contrast to XML::Parser's tree based API and XML::Reader's stream
- * based API.  
- *
- * Note that the XML::SaxParser API is fairly complex, not well standardized, 
- * and does not directly support validation making entity, namespace and
- * base processing relatively hard.
- *
- * To use the XML::SaxParser, register a callback class via the
- * XML::SaxParser#callbacks=.  It is easiest to include the 
- * XML::SaxParser::Callbacks module in your class and override 
- * the methods as needed.
- *
- * Basic example:
- *
- *   class MyCallbacks
- *     include XML::SaxParser::Callbacks
- *     def on_start_element(element, attributes)
- *       puts #Element started: #{element}"
- *     end
- *   end
- *
- *   parser = XML::SaxParser.new
- *   parser.callbacks = MyCallbacks.new
- *   parser.parse
- */
-
-VALUE cXMLSaxParser;
-VALUE mXMLSaxParserCallbacks;
-
-static ID INPUT_ATTR;
-static ID CALLBACKS_ATTR;
-
-VALUE cbidOnInternalSubset;
-VALUE cbidOnIsStandalone;
-VALUE cbidOnHasInternalSubset;
-VALUE cbidOnHasExternalSubset;
-VALUE cbidOnStartDocument;
-VALUE cbidOnEndDocument;
-VALUE cbidOnStartElement;
-VALUE cbidOnEndElement;
-VALUE cbidOnReference;
-VALUE cbidOnCharacters;
-VALUE cbidOnProcessingInstruction;
-VALUE cbidOnComment;
-VALUE cbidOnXmlParserWarning;
-VALUE cbidOnXmlParserError;
-VALUE cbidOnXmlParserFatalError;
-VALUE cbidOnCdataBlock;
-VALUE cbidOnExternalSubset;
-
-#include "sax_parser_callbacks.inc"
-
-/*
- * call-seq:
- *    sax_parser.initialize -> sax_parser
- * 
- * Initiliazes instance of parser.
- */
-static VALUE
-rxml_sax_parser_initialize(VALUE self) {
-  VALUE input = rb_class_new_instance(0, NULL, cXMLInput);
-  rb_iv_set(self, "@input", input);
-  return self;
-}
-
-
-/* Parsing data sources */
-static int
-rxml_sax_parser_parse_file(VALUE self, VALUE input) {
-  VALUE file = rb_ivar_get(input, FILE_ATTR);
-  return xmlSAXUserParseFile(&rxml_sax_hander_struct, self, StringValuePtr(file));
-}
-
-static int
-rxml_sax_parser_parse_string(VALUE self, VALUE input) {
-  VALUE str = rb_ivar_get(input, STRING_ATTR);
-  return xmlSAXUserParseMemory(&rxml_sax_hander_struct, self, StringValuePtr(str), RSTRING_LEN(str));
-}
-
-static int
-rxml_sax_parser_parse_io(VALUE self, VALUE input) {
-  VALUE io = rb_ivar_get(input, IO_ATTR);
-  VALUE encoding = rb_ivar_get(input, ENCODING_ATTR);
-  xmlCharEncoding xmlEncoding = NUM2INT(encoding);
-  xmlParserCtxtPtr ctxt = xmlCreateIOParserCtxt(&rxml_sax_hander_struct, self,
-	 			                                        (xmlInputReadCallback) rxml_read_callback,
-				                                         NULL, io, xmlEncoding);
-  return xmlParseDocument(ctxt);
-}
-
-
-/*
- * call-seq:
- *    parser.parse -> (true|false)
- * 
- * Parse the input XML, generating callbacks to the object
- * registered via the +callbacks+ attributesibute.
- */
-static VALUE
-rxml_sax_parser_parse(VALUE self) {
-  int status;
-  VALUE input = rb_ivar_get(self, INPUT_ATTR);
-  
-  if (rb_ivar_get(input, FILE_ATTR) != Qnil)
-    status = rxml_sax_parser_parse_file(self, input);
-  else if (rb_ivar_get(input, STRING_ATTR) != Qnil)
-    status = rxml_sax_parser_parse_string(self, input);
-  else if (rb_ivar_get(input, IO_ATTR) != Qnil)
-    status = rxml_sax_parser_parse_io(self, input);
-  else
-    rb_raise(rb_eArgError, "You must specify a parser data source");
-  
-  if (status)
-  {
-    rxml_raise(&xmlLastError);
-    return Qfalse;
-  }
-  else
-  {
-    return(Qtrue);
-  }
-}
-
-// Rdoc needs to know 
-#ifdef RDOC_NEVER_DEFINED
-  mLibXML = rb_define_module("LibXML");
-  mXML = rb_define_module_under(mLibXML, "XML");
-#endif
-
-void
-ruby_init_xml_sax_parser(void) {
-  /* SaxParser */
-  cXMLSaxParser = rb_define_class_under(mXML, "SaxParser", rb_cObject);
-
-  /* Atributes */
-  CALLBACKS_ATTR = rb_intern("@callbacks");
-  INPUT_ATTR = rb_intern("@input");
-  rb_define_attr(cXMLSaxParser, "callbacks", 1, 1);
-  rb_define_attr(cXMLSaxParser, "input", 1, 0);
-
-  /* Instance Methods */
-  rb_define_method(cXMLSaxParser, "initialize", rxml_sax_parser_initialize, 0);
-  rb_define_method(cXMLSaxParser, "parse", rxml_sax_parser_parse, 0);
-
-  /* SaxCallbacks */
-  cbidOnInternalSubset = rb_intern("on_internal_subset");
-  cbidOnIsStandalone = rb_intern("on_is_standalone");
-  cbidOnHasInternalSubset = rb_intern("on_has_internal_subset");
-  cbidOnHasExternalSubset = rb_intern("on_has_external_subset");
-  cbidOnStartDocument = rb_intern("on_start_document");
-  cbidOnEndDocument = rb_intern("on_end_document");
-  cbidOnStartElement = rb_intern("on_start_element");
-  cbidOnEndElement = rb_intern("on_end_element");
-  cbidOnReference = rb_intern("on_reference");
-  cbidOnCharacters = rb_intern("on_characters");
-  cbidOnProcessingInstruction = rb_intern("on_processing_instruction");
-  cbidOnComment = rb_intern("on_comment");
-  cbidOnXmlParserWarning = rb_intern("on_parser_warning");
-  cbidOnXmlParserError = rb_intern("on_parser_error");
-  cbidOnXmlParserFatalError = rb_intern("on_parser_fatal_error");
-  cbidOnCdataBlock = rb_intern("on_cdata_block");
-  cbidOnExternalSubset = rb_intern("on_external_subset");
-}
+/* $Id: ruby_xml_sax_parser.c 630 2008-11-24 06:53:01Z cfis $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+#include "ruby_libxml.h"
+#include "ruby_xml_sax_parser.h"
+
+/*
+ * Document-class: LibXML::XML::SaxParser
+ *
+ * XML::SaxParser provides a callback based API for parsing documents,
+ * in contrast to XML::Parser's tree based API and XML::Reader's stream
+ * based API.  
+ *
+ * Note that the XML::SaxParser API is fairly complex, not well standardized, 
+ * and does not directly support validation making entity, namespace and
+ * base processing relatively hard.
+ *
+ * To use the XML::SaxParser, register a callback class via the
+ * XML::SaxParser#callbacks=.  It is easiest to include the 
+ * XML::SaxParser::Callbacks module in your class and override 
+ * the methods as needed.
+ *
+ * Basic example:
+ *
+ *   class MyCallbacks
+ *     include XML::SaxParser::Callbacks
+ *     def on_start_element(element, attributes)
+ *       puts #Element started: #{element}"
+ *     end
+ *   end
+ *
+ *   parser = XML::SaxParser.new
+ *   parser.callbacks = MyCallbacks.new
+ *   parser.parse
+ */
+
+VALUE cXMLSaxParser;
+VALUE mXMLSaxParserCallbacks;
+
+static ID INPUT_ATTR;
+static ID CALLBACKS_ATTR;
+
+VALUE cbidOnInternalSubset;
+VALUE cbidOnIsStandalone;
+VALUE cbidOnHasInternalSubset;
+VALUE cbidOnHasExternalSubset;
+VALUE cbidOnStartDocument;
+VALUE cbidOnEndDocument;
+VALUE cbidOnStartElement;
+VALUE cbidOnEndElement;
+VALUE cbidOnReference;
+VALUE cbidOnCharacters;
+VALUE cbidOnProcessingInstruction;
+VALUE cbidOnComment;
+VALUE cbidOnXmlParserWarning;
+VALUE cbidOnXmlParserError;
+VALUE cbidOnXmlParserFatalError;
+VALUE cbidOnCdataBlock;
+VALUE cbidOnExternalSubset;
+
+#include "sax_parser_callbacks.inc"
+
+/*
+ * call-seq:
+ *    sax_parser.initialize -> sax_parser
+ * 
+ * Initiliazes instance of parser.
+ */
+static VALUE
+rxml_sax_parser_initialize(VALUE self) {
+  VALUE input = rb_class_new_instance(0, NULL, cXMLInput);
+  rb_iv_set(self, "@input", input);
+  return self;
+}
+
+
+/* Parsing data sources */
+static int
+rxml_sax_parser_parse_file(VALUE self, VALUE input) {
+  VALUE file = rb_ivar_get(input, FILE_ATTR);
+  return xmlSAXUserParseFile((xmlSAXHandlerPtr)&rxml_sax_hander_struct, (void *)self, StringValuePtr(file));
+}
+
+static int
+rxml_sax_parser_parse_string(VALUE self, VALUE input) {
+  VALUE str = rb_ivar_get(input, STRING_ATTR);
+  return xmlSAXUserParseMemory((xmlSAXHandlerPtr)&rxml_sax_hander_struct, (void *)self, StringValuePtr(str), RSTRING_LEN(str));
+}
+
+static int
+rxml_sax_parser_parse_io(VALUE self, VALUE input) {
+  VALUE io = rb_ivar_get(input, IO_ATTR);
+  VALUE encoding = rb_ivar_get(input, ENCODING_ATTR);
+  xmlCharEncoding xmlEncoding = NUM2INT(encoding);
+  xmlParserCtxtPtr ctxt = xmlCreateIOParserCtxt((xmlSAXHandlerPtr)&rxml_sax_hander_struct, (void *)self,
+	 			                                        (xmlInputReadCallback) rxml_read_callback,
+				                                         NULL, (void *)io, xmlEncoding);
+  return xmlParseDocument(ctxt);
+}
+
+
+/*
+ * call-seq:
+ *    parser.parse -> (true|false)
+ * 
+ * Parse the input XML, generating callbacks to the object
+ * registered via the +callbacks+ attributesibute.
+ */
+static VALUE
+rxml_sax_parser_parse(VALUE self) {
+  int status;
+  VALUE input = rb_ivar_get(self, INPUT_ATTR);
+  
+  if (rb_ivar_get(input, FILE_ATTR) != Qnil)
+    status = rxml_sax_parser_parse_file(self, input);
+  else if (rb_ivar_get(input, STRING_ATTR) != Qnil)
+    status = rxml_sax_parser_parse_string(self, input);
+  else if (rb_ivar_get(input, IO_ATTR) != Qnil)
+    status = rxml_sax_parser_parse_io(self, input);
+  else
+    rb_raise(rb_eArgError, "You must specify a parser data source");
+  
+  if (status)
+  {
+    rxml_raise(&xmlLastError);
+    return Qfalse;
+  }
+  else
+  {
+    return(Qtrue);
+  }
+}
+
+// Rdoc needs to know 
+#ifdef RDOC_NEVER_DEFINED
+  mLibXML = rb_define_module("LibXML");
+  mXML = rb_define_module_under(mLibXML, "XML");
+#endif
+
+void
+ruby_init_xml_sax_parser(void) {
+  /* SaxParser */
+  cXMLSaxParser = rb_define_class_under(mXML, "SaxParser", rb_cObject);
+
+  /* Atributes */
+  CALLBACKS_ATTR = rb_intern("@callbacks");
+  INPUT_ATTR = rb_intern("@input");
+  rb_define_attr(cXMLSaxParser, "callbacks", 1, 1);
+  rb_define_attr(cXMLSaxParser, "input", 1, 0);
+
+  /* Instance Methods */
+  rb_define_method(cXMLSaxParser, "initialize", rxml_sax_parser_initialize, 0);
+  rb_define_method(cXMLSaxParser, "parse", rxml_sax_parser_parse, 0);
+
+  /* SaxCallbacks */
+  cbidOnInternalSubset = rb_intern("on_internal_subset");
+  cbidOnIsStandalone = rb_intern("on_is_standalone");
+  cbidOnHasInternalSubset = rb_intern("on_has_internal_subset");
+  cbidOnHasExternalSubset = rb_intern("on_has_external_subset");
+  cbidOnStartDocument = rb_intern("on_start_document");
+  cbidOnEndDocument = rb_intern("on_end_document");
+  cbidOnStartElement = rb_intern("on_start_element");
+  cbidOnEndElement = rb_intern("on_end_element");
+  cbidOnReference = rb_intern("on_reference");
+  cbidOnCharacters = rb_intern("on_characters");
+  cbidOnProcessingInstruction = rb_intern("on_processing_instruction");
+  cbidOnComment = rb_intern("on_comment");
+  cbidOnXmlParserWarning = rb_intern("on_parser_warning");
+  cbidOnXmlParserError = rb_intern("on_parser_error");
+  cbidOnXmlParserFatalError = rb_intern("on_parser_fatal_error");
+  cbidOnCdataBlock = rb_intern("on_cdata_block");
+  cbidOnExternalSubset = rb_intern("on_external_subset");
+}

data/ext/libxml/ruby_xml_sax_parser.h

@@ -1,12 +1,12 @@
-/* $Id: ruby_xml_sax_parser.h 616 2008-11-22 09:25:12Z cfis $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __rxml_SAX_PARSER__
-#define __rxml_SAX_PARSER__
-
-extern VALUE cXMLSaxParser;
-
-void ruby_init_xml_sax_parser(void);
-
-#endif
+/* $Id: ruby_xml_sax_parser.h 616 2008-11-22 09:25:12Z cfis $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __rxml_SAX_PARSER__
+#define __rxml_SAX_PARSER__
+
+extern VALUE cXMLSaxParser;
+
+void ruby_init_xml_sax_parser(void);
+
+#endif

data/ext/libxml/ruby_xml_xpointer.h

@@ -1,25 +1,13 @@
-/* $Id: ruby_xml_xpointer.h 614 2008-11-22 08:04:39Z cfis $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __rxml_XPOINTER__
-#define __rxml_XPOINTER__
-
-extern VALUE cXMLXPointer;
-extern VALUE eXMLXPointerInvalidExpression;
-
-typedef struct rxml_xpointer {
-  VALUE xd;
-  VALUE ctxt;
-  /*
-   * This needs to go into a xpointer data struct:
-   *
-   * xmlLocationSetPtr xptr;
-   *
-   * I also need an xpointer data struct type.
-  */
-} rxml_xpointer;
-
-void ruby_init_xml_xpointer(void);
-
-#endif
+/* $Id: ruby_xml_xpointer.h 630 2008-11-24 06:53:01Z cfis $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __rxml_XPOINTER__
+#define __rxml_XPOINTER__
+
+extern VALUE cXMLXPointer;
+
+void ruby_init_xml_xpointer(void);
+VALUE rxml_xpointer_point2(VALUE node, VALUE xptr_str);
+
+#endif

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.9.3"
+#define RUBY_LIBXML_VERSION  "0.9.4"
 #define RUBY_LIBXML_VERNUM   0
 #define RUBY_LIBXML_VER_MAJ   0
 #define RUBY_LIBXML_VER_MIN   9
-#define RUBY_LIBXML_VER_MIC   3
+#define RUBY_LIBXML_VER_MIC   4
 #define RUBY_LIBXML_VER_PATCH 0

data/ext/vc/libxml_ruby.vcproj

@@ -63,7 +63,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="msvcrt-ruby18.lib libxml2.lib"
-				OutputFile="C:\Development\ruby\lib\ruby\gems\1.8\gems\libxml-ruby-0.9.3-x86-mswin32-60\lib\$(ProjectName).so"
+				OutputFile="C:\Development\ruby\lib\ruby\gems\1.8\gems\libxml-ruby-0.9.4-x86-mswin32-60\lib\$(ProjectName).so"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="C:\Development\ruby\lib;C:\Development\msys\local\lib"
 				GenerateDebugInformation="true"