libxml-ruby 0.9.1 → 0.9.2

data/CHANGES

@@ -1,5 +1,11 @@
 (See log/ChangeLog for more detailed changes derived directly from source control.)
 
+== 0.9.2 / 2008-11-19 Charlie Savage
+
+* Add support for compiled XPath expressions (donated by Pavel Valodzka)
+
+* Fixes for compiling on OS X 10.5.4 and 10.5.5
+
 == 0.9.1 / 2008-11-18 Charlie Savage
 
 * Expose LibXML's encoding support via a new Encoding object.

data/ext/libxml/libxml.c

@@ -1,4 +1,4 @@
-/* $Id: libxml.c 585 2008-11-18 17:40:45Z cfis $ */
+/* $Id: libxml.c 600 2008-11-19 07:39:29Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -872,6 +872,7 @@ Init_libxml_ruby(void) {
   ruby_init_xml_xinclude();
   ruby_init_xml_xpath();
   ruby_init_xml_xpath_context();
+  ruby_init_xml_xpath_expression();
   ruby_init_xml_xpointer();
   ruby_init_html_parser();
   ruby_init_input_callbacks(); 

data/ext/libxml/libxml.c.rej

@@ -0,0 +1,16 @@
+***************
+*** 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/ruby_libxml.h

@@ -1,71 +1,72 @@
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RUBY_LIBXML_H__
-#define __RUBY_LIBXML_H__
-
-#include "version.h"
-
-#include <ruby.h>
-#include <rubyio.h>
-#include <util.h>
-#include <libxml/parser.h>
-#include <libxml/parserInternals.h>
-#include <libxml/debugXML.h>
-#include <libxml/xmlversion.h>
-#include <libxml/xmlmemory.h>
-#include <libxml/xpath.h>
-#include <libxml/valid.h>
-#include <libxml/catalog.h>
-#include <libxml/HTMLparser.h>
-#include <libxml/xmlreader.h>
-
-// Maybe not yet defined in ruby
-#ifndef RSTRING_LEN
-#define RSTRING_LEN(x) RSTRING(x)->len
-#endif
-
-// not in Ruby 1.9
-#ifndef GetWriteFile
-#define GetWriteFile(fp) rb_io_stdio_file(fp)
-#define OpenFile rb_io_t
-#endif
-
-#ifdef LIBXML_DEBUG_ENABLED
-#include <libxml/xpathInternals.h>
-#endif
-#ifdef LIBXML_XINCLUDE_ENABLED
-#include <libxml/xinclude.h>
-#endif
-#ifdef LIBXML_XPTR_ENABLED
-#include <libxml/xpointer.h>
-#endif
-
-
-#include "ruby_xml_encoding.h"
-#include "ruby_xml_error.h"
-#include "ruby_xml_input.h"
-#include "ruby_xml_state.h"
-#include "ruby_xml_attributes.h"
-#include "ruby_xml_attr.h"
-#include "ruby_xml_document.h"
-#include "ruby_xml_node.h"
-#include "ruby_xml_ns.h"
-#include "ruby_xml_parser.h"
-#include "ruby_xml_parser_context.h"
-#include "ruby_xml_sax_parser.h"
-#include "ruby_xml_xinclude.h"
-#include "ruby_xml_xpath.h"
-#include "ruby_xml_xpath_context.h"
-#include "ruby_xml_xpath_object.h"
-#include "ruby_xml_xpointer.h"
-#include "ruby_xml_input_cbg.h"
-#include "ruby_xml_dtd.h"
-#include "ruby_xml_schema.h"
-#include "ruby_xml_relaxng.h"
-#include "ruby_xml_html_parser.h"
-#include "ruby_xml_reader.h"
-
-extern VALUE mLibXML;
-extern VALUE mXML;
-
-#endif
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RUBY_LIBXML_H__
+#define __RUBY_LIBXML_H__
+
+#include "version.h"
+
+#include <ruby.h>
+#include <rubyio.h>
+#include <util.h>
+#include <libxml/parser.h>
+#include <libxml/parserInternals.h>
+#include <libxml/debugXML.h>
+#include <libxml/xmlversion.h>
+#include <libxml/xmlmemory.h>
+#include <libxml/xpath.h>
+#include <libxml/valid.h>
+#include <libxml/catalog.h>
+#include <libxml/HTMLparser.h>
+#include <libxml/xmlreader.h>
+
+// Maybe not yet defined in ruby
+#ifndef RSTRING_LEN
+#define RSTRING_LEN(x) RSTRING(x)->len
+#endif
+
+// not in Ruby 1.9
+#ifndef GetWriteFile
+#define GetWriteFile(fp) rb_io_stdio_file(fp)
+#define OpenFile rb_io_t
+#endif
+
+#ifdef LIBXML_DEBUG_ENABLED
+#include <libxml/xpathInternals.h>
+#endif
+#ifdef LIBXML_XINCLUDE_ENABLED
+#include <libxml/xinclude.h>
+#endif
+#ifdef LIBXML_XPTR_ENABLED
+#include <libxml/xpointer.h>
+#endif
+
+
+#include "ruby_xml_encoding.h"
+#include "ruby_xml_error.h"
+#include "ruby_xml_input.h"
+#include "ruby_xml_state.h"
+#include "ruby_xml_attributes.h"
+#include "ruby_xml_attr.h"
+#include "ruby_xml_document.h"
+#include "ruby_xml_node.h"
+#include "ruby_xml_ns.h"
+#include "ruby_xml_parser.h"
+#include "ruby_xml_parser_context.h"
+#include "ruby_xml_sax_parser.h"
+#include "ruby_xml_xinclude.h"
+#include "ruby_xml_xpath.h"
+#include "ruby_xml_xpath_expression.h"
+#include "ruby_xml_xpath_context.h"
+#include "ruby_xml_xpath_object.h"
+#include "ruby_xml_xpointer.h"
+#include "ruby_xml_input_cbg.h"
+#include "ruby_xml_dtd.h"
+#include "ruby_xml_schema.h"
+#include "ruby_xml_relaxng.h"
+#include "ruby_xml_html_parser.h"
+#include "ruby_xml_reader.h"
+
+extern VALUE mLibXML;
+extern VALUE mXML;
+
+#endif

data/ext/libxml/ruby_xml_error.c

@@ -202,7 +202,9 @@ ruby_init_xml_error() {
   rb_define_const(eXMLError, "VALID", INT2NUM(XML_FROM_VALID));
   rb_define_const(eXMLError, "CHECK", INT2NUM(XML_FROM_CHECK));
   rb_define_const(eXMLError, "WRITER", INT2NUM(XML_FROM_WRITER));
+#if LIBXML_VERSION >= 20621
   rb_define_const(eXMLError, "MODULE", INT2NUM(XML_FROM_MODULE));
+#endif
 #if LIBXML_VERSION >= 20632
   rb_define_const(eXMLError, "I18N", INT2NUM(XML_FROM_I18N));
   rb_define_const(eXMLError, "SCHEMATRONV", INT2NUM(XML_FROM_SCHEMATRONV));
@@ -323,7 +325,12 @@ ruby_init_xml_error() {
   rb_define_const(eXMLError, "NS_ERR_UNDEFINED_NAMESPACE", INT2NUM(XML_NS_ERR_UNDEFINED_NAMESPACE));
   rb_define_const(eXMLError, "NS_ERR_QNAME", INT2NUM(XML_NS_ERR_QNAME));
   rb_define_const(eXMLError, "NS_ERR_ATTRIBUTE_REDEFINED", INT2NUM(XML_NS_ERR_ATTRIBUTE_REDEFINED));
+#if LIBXML_VERSION >= 20620
   rb_define_const(eXMLError, "NS_ERR_EMPTY", INT2NUM(XML_NS_ERR_EMPTY));
+#endif
+#if LIBXML_VERSION >= 20700
+  rb_define_const(eXMLError, "NS_ERR_COLON", INT2NUM(XML_NS_ERR_COLON));
+#endif
   rb_define_const(eXMLError, "DTD_ATTRIBUTE_DEFAULT", INT2NUM(XML_DTD_ATTRIBUTE_DEFAULT));
   rb_define_const(eXMLError, "DTD_ATTRIBUTE_REDEFINED", INT2NUM(XML_DTD_ATTRIBUTE_REDEFINED));
   rb_define_const(eXMLError, "DTD_ATTRIBUTE_VALUE", INT2NUM(XML_DTD_ATTRIBUTE_VALUE));
@@ -781,8 +788,10 @@ ruby_init_xml_error() {
   rb_define_const(eXMLError, "SCHEMAV_CVC_AU", INT2NUM(XML_SCHEMAV_CVC_AU));
   rb_define_const(eXMLError, "SCHEMAV_CVC_TYPE_1", INT2NUM(XML_SCHEMAV_CVC_TYPE_1));
   rb_define_const(eXMLError, "SCHEMAV_CVC_TYPE_2", INT2NUM(XML_SCHEMAV_CVC_TYPE_2));
+#if LIBXML_VERSION >= 20618
   rb_define_const(eXMLError, "SCHEMAV_CVC_IDC", INT2NUM(XML_SCHEMAV_CVC_IDC));
   rb_define_const(eXMLError, "SCHEMAV_CVC_WILDCARD", INT2NUM(XML_SCHEMAV_CVC_WILDCARD));
+#endif
 #if LIBXML_VERSION >= 20631
   rb_define_const(eXMLError, "SCHEMAV_MISC", INT2NUM(XML_SCHEMAV_MISC));
 #endif
@@ -909,8 +918,10 @@ ruby_init_xml_error() {
   rb_define_const(eXMLError, "SCHEMATRONV_ASSERT", INT2NUM(XML_SCHEMATRONV_ASSERT));
   rb_define_const(eXMLError, "SCHEMATRONV_REPORT", INT2NUM(XML_SCHEMATRONV_REPORT));
 #endif
+#if LIBXML_VERSION >= 20618
   rb_define_const(eXMLError, "MODULE_OPEN", INT2NUM(XML_MODULE_OPEN));
   rb_define_const(eXMLError, "MODULE_CLOSE", INT2NUM(XML_MODULE_CLOSE));
+#endif
   rb_define_const(eXMLError, "CHECK_FOUND_ELEMENT", INT2NUM(XML_CHECK_FOUND_ELEMENT));
   rb_define_const(eXMLError, "CHECK_FOUND_ATTRIBUTE", INT2NUM(XML_CHECK_FOUND_ATTRIBUTE));
   rb_define_const(eXMLError, "CHECK_FOUND_TEXT", INT2NUM(XML_CHECK_FOUND_TEXT));

data/ext/libxml/ruby_xml_html_parser.c

@@ -1,133 +1,133 @@
-/* $Id: ruby_xml_html_parser.c 580 2008-11-18 09:24:43Z cfis $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
-#include "ruby_libxml.h"
-
-VALUE cXMLHTMLParser;
-ID INPUT_ATTR;
-ID CONTEXT_ATTR;
-
-
-/*
-* Document-class: LibXML::XML::HTMLParser
-*
-* The HTML parser implements an HTML 4.0 non-verifying parser with an API 
-* compatible with the XML::Parser.  In contrast with the XML::Parser, 
-* it can parse "real world" HTML, even if it severely broken from a
-* specification point of view. */
-
-
-/*
- * call-seq:
- *    XML::HTMLParser.initialize -> parser
- * 
- * Initializes a new parser instance with no pre-determined source.
- */
-VALUE
-ruby_xml_html_parser_initialize(VALUE self) {
-  VALUE input = rb_class_new_instance(0, NULL, cXMLInput);
-  rb_iv_set(self, "@input", input);
-  rb_iv_set(self, "@context", Qnil);
-  return self;
-}
-
-htmlParserCtxtPtr
-ruby_xml_html_parser_file_ctxt(VALUE input) {
-  VALUE file = rb_ivar_get(input, FILE_ATTR);
-  VALUE encoding = rb_ivar_get(input, ENCODING_ATTR);
-  VALUE encodingStr = ruby_xml_encoding_to_s(Qnil, encoding);
-
-  return htmlCreateFileParserCtxt(StringValuePtr(file), StringValuePtr(encodingStr));
-}
-
-htmlParserCtxtPtr
-ruby_xml_html_parser_str_ctxt(VALUE input) {
-  VALUE data = rb_ivar_get(input, STRING_ATTR);
-  return htmlCreateMemoryParserCtxt(StringValuePtr(data), RSTRING_LEN(data));
-}
-
-/*
-htmlParserCtxtPtr
-ruby_xml_html_parser_io_ctxt(VALUE input) {
-  VALUE io = rb_ivar_get(input, IO_ATTR);
-  VALUE encoding = rb_ivar_get(input, ENCODING_ATTR);
-  xmlCharEncoding xmlEncoding = NUM2INT(encoding);
-
-  OpenFile *fptr;
-  FILE *f;
-
-  GetOpenFile(io, fptr);
-  rb_io_check_readable(fptr);
-  f = GetWriteFile(fptr);
-
-  return htmlCreateIOParserCtxt(NULL, NULL,
-				     (xmlInputReadCallback) ctxtRead,
-				     NULL, f, xmlEncoding);
-}
-*/
-
-/*
- * call-seq:
- *    parser.parse -> document
- * 
- * Parse the input XML and create an XML::Document with
- * it's content. If an error occurs, XML::Parser::ParseError
- * is thrown.
- */
-VALUE
-ruby_xml_html_parser_parse(VALUE self) {
-  xmlParserCtxtPtr ctxt;
-  VALUE context;
-  VALUE input = rb_ivar_get(self, INPUT_ATTR);
-
-  context = rb_ivar_get(self, CONTEXT_ATTR);
-  if (context != Qnil)
-    rb_raise(rb_eRuntimeError, "You cannot parse a data source twice");
-
-  if (rb_ivar_get(input, FILE_ATTR) != Qnil)
-    ctxt = ruby_xml_html_parser_file_ctxt(input);
-  else if (rb_ivar_get(input, STRING_ATTR) != Qnil)
-    ctxt = ruby_xml_html_parser_str_ctxt(input);
-  /*else if (rb_ivar_get(input, DOCUMENT_ATTR) != Qnil)
-    ctxt = ruby_xml_html_parser_parse_document(input);
-  else if (rb_ivar_get(input, IO_ATTR) != Qnil)
-    ctxt = ruby_xml_html_parser_io_ctxt(input);*/
-  else
-    rb_raise(rb_eArgError, "You must specify a parser data source");
-  
-  if (!ctxt)
-    ruby_xml_raise(&xmlLastError);
-
-  context = ruby_xml_parser_context_wrap(ctxt);
-  rb_ivar_set(self, CONTEXT_ATTR, context);
- 
-  if (htmlParseDocument(ctxt) == -1 || !ctxt->wellFormed) {
-    xmlFreeDoc(ctxt->myDoc);
-    ruby_xml_raise(&ctxt->lastError);
-  }
-
-  return ruby_xml_document_wrap(ctxt->myDoc);
-}
-
-// Rdoc needs to know 
-#ifdef RDOC_NEVER_DEFINED
-  mLibXML = rb_define_module("LibXML");
-  mXML = rb_define_module_under(mLibXML, "XML");
-#endif
-
-void
-ruby_init_html_parser(void) {	
-  INPUT_ATTR = rb_intern("@input");
-  CONTEXT_ATTR = rb_intern("@context");
-
-  cXMLHTMLParser = rb_define_class_under(mXML, "HTMLParser", rb_cObject);
- 
-  /* Atributes */
-  rb_define_attr(cXMLHTMLParser, "input", 1, 0);
-  rb_define_attr(cXMLHTMLParser, "context", 1, 0);
-
-  /* Instance methods */
-  rb_define_method(cXMLHTMLParser, "initialize", ruby_xml_html_parser_initialize, 0);
-  rb_define_method(cXMLHTMLParser, "parse", ruby_xml_html_parser_parse, 0);
-}
+/* $Id: ruby_xml_html_parser.c 604 2008-11-19 18:01:55Z cfis $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+#include "ruby_libxml.h"
+
+VALUE cXMLHTMLParser;
+static ID INPUT_ATTR;
+static ID CONTEXT_ATTR;
+
+
+/*
+* Document-class: LibXML::XML::HTMLParser
+*
+* The HTML parser implements an HTML 4.0 non-verifying parser with an API 
+* compatible with the XML::Parser.  In contrast with the XML::Parser, 
+* it can parse "real world" HTML, even if it severely broken from a
+* specification point of view. */
+
+
+/*
+ * call-seq:
+ *    XML::HTMLParser.initialize -> parser
+ * 
+ * Initializes a new parser instance with no pre-determined source.
+ */
+VALUE
+ruby_xml_html_parser_initialize(VALUE self) {
+  VALUE input = rb_class_new_instance(0, NULL, cXMLInput);
+  rb_iv_set(self, "@input", input);
+  rb_iv_set(self, "@context", Qnil);
+  return self;
+}
+
+htmlParserCtxtPtr
+ruby_xml_html_parser_file_ctxt(VALUE input) {
+  VALUE file = rb_ivar_get(input, FILE_ATTR);
+  VALUE encoding = rb_ivar_get(input, ENCODING_ATTR);
+  VALUE encodingStr = ruby_xml_encoding_to_s(Qnil, encoding);
+
+  return htmlCreateFileParserCtxt(StringValuePtr(file), StringValuePtr(encodingStr));
+}
+
+htmlParserCtxtPtr
+ruby_xml_html_parser_str_ctxt(VALUE input) {
+  VALUE data = rb_ivar_get(input, STRING_ATTR);
+  return htmlCreateMemoryParserCtxt(StringValuePtr(data), RSTRING_LEN(data));
+}
+
+/*
+htmlParserCtxtPtr
+ruby_xml_html_parser_io_ctxt(VALUE input) {
+  VALUE io = rb_ivar_get(input, IO_ATTR);
+  VALUE encoding = rb_ivar_get(input, ENCODING_ATTR);
+  xmlCharEncoding xmlEncoding = NUM2INT(encoding);
+
+  OpenFile *fptr;
+  FILE *f;
+
+  GetOpenFile(io, fptr);
+  rb_io_check_readable(fptr);
+  f = GetWriteFile(fptr);
+
+  return htmlCreateIOParserCtxt(NULL, NULL,
+				     (xmlInputReadCallback) ctxtRead,
+				     NULL, f, xmlEncoding);
+}
+*/
+
+/*
+ * call-seq:
+ *    parser.parse -> document
+ * 
+ * Parse the input XML and create an XML::Document with
+ * it's content. If an error occurs, XML::Parser::ParseError
+ * is thrown.
+ */
+VALUE
+ruby_xml_html_parser_parse(VALUE self) {
+  xmlParserCtxtPtr ctxt;
+  VALUE context;
+  VALUE input = rb_ivar_get(self, INPUT_ATTR);
+
+  context = rb_ivar_get(self, CONTEXT_ATTR);
+  if (context != Qnil)
+    rb_raise(rb_eRuntimeError, "You cannot parse a data source twice");
+
+  if (rb_ivar_get(input, FILE_ATTR) != Qnil)
+    ctxt = ruby_xml_html_parser_file_ctxt(input);
+  else if (rb_ivar_get(input, STRING_ATTR) != Qnil)
+    ctxt = ruby_xml_html_parser_str_ctxt(input);
+  /*else if (rb_ivar_get(input, DOCUMENT_ATTR) != Qnil)
+    ctxt = ruby_xml_html_parser_parse_document(input);
+  else if (rb_ivar_get(input, IO_ATTR) != Qnil)
+    ctxt = ruby_xml_html_parser_io_ctxt(input);*/
+  else
+    rb_raise(rb_eArgError, "You must specify a parser data source");
+  
+  if (!ctxt)
+    ruby_xml_raise(&xmlLastError);
+
+  context = ruby_xml_parser_context_wrap(ctxt);
+  rb_ivar_set(self, CONTEXT_ATTR, context);
+ 
+  if (htmlParseDocument(ctxt) == -1 || !ctxt->wellFormed) {
+    xmlFreeDoc(ctxt->myDoc);
+    ruby_xml_raise(&ctxt->lastError);
+  }
+
+  return ruby_xml_document_wrap(ctxt->myDoc);
+}
+
+// Rdoc needs to know 
+#ifdef RDOC_NEVER_DEFINED
+  mLibXML = rb_define_module("LibXML");
+  mXML = rb_define_module_under(mLibXML, "XML");
+#endif
+
+void
+ruby_init_html_parser(void) {	
+  INPUT_ATTR = rb_intern("@input");
+  CONTEXT_ATTR = rb_intern("@context");
+
+  cXMLHTMLParser = rb_define_class_under(mXML, "HTMLParser", rb_cObject);
+ 
+  /* Atributes */
+  rb_define_attr(cXMLHTMLParser, "input", 1, 0);
+  rb_define_attr(cXMLHTMLParser, "context", 1, 0);
+
+  /* Instance methods */
+  rb_define_method(cXMLHTMLParser, "initialize", ruby_xml_html_parser_initialize, 0);
+  rb_define_method(cXMLHTMLParser, "parse", ruby_xml_html_parser_parse, 0);
+}