libxml-ruby 0.9.6-x86-mswin32-60 → 0.9.7-x86-mswin32-60

data/ext/libxml/ruby_xml_xpointer.c

@@ -1,107 +1,107 @@
-/* $Id: ruby_xml_xpointer.c 650 2008-11-30 03:40:22Z cfis $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
-#include "ruby_libxml.h"
-#include "ruby_xml_xpointer.h"
-
-VALUE cXMLXPointer;
-
-/*
- * Document-class: LibXML::XML::XPointer
- *
- * The XML::Pointer class provides a standards based API for searching an xml document.
- * XPointer is based on the XML Path Language (XML::XPath) and is documented
- * at http://www.w3.org/TR/WD-xptr.
- */
-
-static VALUE rxml_xpointer_point(VALUE class, VALUE rnode, VALUE xptr_str)
-{
-#ifdef LIBXML_XPTR_ENABLED
-  xmlNodePtr xnode;
-  xmlXPathContextPtr xctxt;
-  xmlXPathObjectPtr xpop;
-
-  VALUE context;
-  VALUE result;
-  VALUE argv[1];
-
-  Check_Type(xptr_str, T_STRING);
-  if (rb_obj_is_kind_of(rnode, cXMLNode) == Qfalse)
-  rb_raise(rb_eTypeError, "require an XML::Node object");
-
-  Data_Get_Struct(rnode, xmlNode, xnode);
-
-  argv[0] = rb_funcall(rnode, rb_intern("doc"), 0);
-  context = rb_class_new_instance(1, argv, cXMLXPathContext);
-  Data_Get_Struct(context, xmlXPathContext, xctxt);
-
-  xpop = xmlXPtrEval((xmlChar*)StringValuePtr(xptr_str), xctxt);
-  if (!xpop)
-  rxml_raise(&xmlLastError);
-
-  result = rxml_xpath_object_wrap(xpop);
-  rb_iv_set(result, "@context", context);
-
-  return(result);
-#else
-  rb_warn("libxml was compiled without XPointer support");
-  return (Qfalse);
-#endif
-}
-
-VALUE rxml_xpointer_point2(VALUE node, VALUE xptr_str)
-{
-  return (rxml_xpointer_point(cXMLXPointer, node, xptr_str));
-}
-
-/*
- * call-seq:
- *    XML::XPointer.range(start_node, end_node) -> xpath
- *
- * Create an xpath representing the range between the supplied
- * start and end node.
- */
-static VALUE rxml_xpointer_range(VALUE class, VALUE rstart, VALUE rend)
-{
-#ifdef LIBXML_XPTR_ENABLED
-  xmlNodePtr start, end;
-  VALUE rxxp;
-  xmlXPathObjectPtr xpath;
-
-  if (rb_obj_is_kind_of(rstart, cXMLNode) == Qfalse)
-  rb_raise(rb_eTypeError, "require an XML::Node object as a starting point");
-  if (rb_obj_is_kind_of(rend, cXMLNode) == Qfalse)
-  rb_raise(rb_eTypeError, "require an XML::Node object as an ending point");
-
-  Data_Get_Struct(rstart, xmlNode, start);
-  if (start == NULL)
-  return(Qnil);
-
-  Data_Get_Struct(rend, xmlNode, end);
-  if (end == NULL)
-  return(Qnil);
-
-  xpath = xmlXPtrNewRangeNodes(start, end);
-  if (xpath == NULL)
-  rb_fatal("You shouldn't be able to have this happen");
-
-  rxxp = rxml_xpath_object_wrap(xpath);
-  return(rxxp);
-#else
-  rb_warn("libxml was compiled without XPointer support");
-  return (Qfalse);
-#endif
-}
-
-// 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_xpointer(void)
-{
-  cXMLXPointer = rb_define_class_under(mXML, "XPointer", rb_cObject);
-  rb_define_singleton_method(cXMLXPointer, "range", rxml_xpointer_range, 2);
-}
+/* $Id: ruby_xml_xpointer.c 650 2008-11-30 03:40:22Z cfis $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+#include "ruby_libxml.h"
+#include "ruby_xml_xpointer.h"
+
+VALUE cXMLXPointer;
+
+/*
+ * Document-class: LibXML::XML::XPointer
+ *
+ * The XML::Pointer class provides a standards based API for searching an xml document.
+ * XPointer is based on the XML Path Language (XML::XPath) and is documented
+ * at http://www.w3.org/TR/WD-xptr.
+ */
+
+static VALUE rxml_xpointer_point(VALUE class, VALUE rnode, VALUE xptr_str)
+{
+#ifdef LIBXML_XPTR_ENABLED
+  xmlNodePtr xnode;
+  xmlXPathContextPtr xctxt;
+  xmlXPathObjectPtr xpop;
+
+  VALUE context;
+  VALUE result;
+  VALUE argv[1];
+
+  Check_Type(xptr_str, T_STRING);
+  if (rb_obj_is_kind_of(rnode, cXMLNode) == Qfalse)
+  rb_raise(rb_eTypeError, "require an XML::Node object");
+
+  Data_Get_Struct(rnode, xmlNode, xnode);
+
+  argv[0] = rb_funcall(rnode, rb_intern("doc"), 0);
+  context = rb_class_new_instance(1, argv, cXMLXPathContext);
+  Data_Get_Struct(context, xmlXPathContext, xctxt);
+
+  xpop = xmlXPtrEval((xmlChar*)StringValuePtr(xptr_str), xctxt);
+  if (!xpop)
+  rxml_raise(&xmlLastError);
+
+  result = rxml_xpath_object_wrap(xpop);
+  rb_iv_set(result, "@context", context);
+
+  return(result);
+#else
+  rb_warn("libxml was compiled without XPointer support");
+  return (Qfalse);
+#endif
+}
+
+VALUE rxml_xpointer_point2(VALUE node, VALUE xptr_str)
+{
+  return (rxml_xpointer_point(cXMLXPointer, node, xptr_str));
+}
+
+/*
+ * call-seq:
+ *    XML::XPointer.range(start_node, end_node) -> xpath
+ *
+ * Create an xpath representing the range between the supplied
+ * start and end node.
+ */
+static VALUE rxml_xpointer_range(VALUE class, VALUE rstart, VALUE rend)
+{
+#ifdef LIBXML_XPTR_ENABLED
+  xmlNodePtr start, end;
+  VALUE rxxp;
+  xmlXPathObjectPtr xpath;
+
+  if (rb_obj_is_kind_of(rstart, cXMLNode) == Qfalse)
+  rb_raise(rb_eTypeError, "require an XML::Node object as a starting point");
+  if (rb_obj_is_kind_of(rend, cXMLNode) == Qfalse)
+  rb_raise(rb_eTypeError, "require an XML::Node object as an ending point");
+
+  Data_Get_Struct(rstart, xmlNode, start);
+  if (start == NULL)
+  return(Qnil);
+
+  Data_Get_Struct(rend, xmlNode, end);
+  if (end == NULL)
+  return(Qnil);
+
+  xpath = xmlXPtrNewRangeNodes(start, end);
+  if (xpath == NULL)
+  rb_fatal("You shouldn't be able to have this happen");
+
+  rxxp = rxml_xpath_object_wrap(xpath);
+  return(rxxp);
+#else
+  rb_warn("libxml was compiled without XPointer support");
+  return (Qfalse);
+#endif
+}
+
+// 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_xpointer(void)
+{
+  cXMLXPointer = rb_define_class_under(mXML, "XPointer", rb_cObject);
+  rb_define_singleton_method(cXMLXPointer, "range", rxml_xpointer_range, 2);
+}

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.6"
+#define RUBY_LIBXML_VERSION  "0.9.7"
 #define RUBY_LIBXML_VERNUM   0
 #define RUBY_LIBXML_VER_MAJ   0
 #define RUBY_LIBXML_VER_MIN   9
-#define RUBY_LIBXML_VER_MIC   6
+#define RUBY_LIBXML_VER_MIC   7
 #define RUBY_LIBXML_VER_PATCH 0

data/ext/vc/libxml_ruby.vcproj

@@ -249,6 +249,10 @@
 				RelativePath="..\libxml\ruby_xml_relaxng.c"
 				>
 			</File>
+			<File
+				RelativePath="..\libxml\ruby_xml_sax2_handler.c"
+				>
+			</File>
 			<File
 				RelativePath="..\libxml\ruby_xml_sax_parser.c"
 				>
@@ -355,6 +359,10 @@
 				RelativePath="..\libxml\ruby_xml_relaxng.h"
 				>
 			</File>
+			<File
+				RelativePath="..\libxml\ruby_xml_sax2_handler.h"
+				>
+			</File>
 			<File
 				RelativePath="..\libxml\ruby_xml_sax_parser.h"
 				>

data/lib/libxml/node.rb

@@ -295,8 +295,8 @@ module LibXML
 
       # --- Deprecated Namespaces ---
       def namespace
-        warn('Node#namespace is deprecated.  Use Node#namespaces.namespace instead.')
-        self.namespaces.namespace
+        warn('Node#namespace is deprecated.  Use Node#namespaces instead.')
+        self.namespaces.entries
       end
 
       def namespace=(value)
@@ -304,6 +304,11 @@ module LibXML
         self.namespaces.namespace = value
       end
 
+      def namespace_node
+        warn('Node#namespace_node is deprecated.  Use Node#namespaces.namespace instead.')
+        self.namespaces.namespace
+      end
+
       def ns
         warn('Node#ns is deprecated.  Use Node#namespaces.namespace instead.')
         self.namespaces.namespace

data/lib/libxml/sax_callbacks.rb

@@ -2,103 +2,83 @@ module LibXML
   module XML
     class SaxParser
       module Callbacks
-        # Called for an internal subset event.
-        def on_internal_subset(name, external_id, system_id)
-        end
-
-        # Called for 'is standalone' event.
-        def on_is_standalone
-        end
-
-        # Called for an internal subset notification event.
-        def on_has_internal_subset
+        # Called for a CDATA block event.
+        def on_cdata_block(cdata)
         end
 
-        # Called for an external subset notification event.
-        def on_has_external_subset
+        # Called for a characters event.
+        def on_characters(chars)
         end
 
-        # Called for a start document event.
-        def on_start_document
+        # Called for a comment event.
+        def on_comment(msg)
         end
 
         # Called for a end document event.
         def on_end_document
         end
 
-        # Called for a start element event.
-        def on_start_element(name, attributes_hash)
+        # Called for a end element event.
+        def on_end_element_ns(name, prefix, uri)
         end
 
-        # Called for a end element event.
-        def on_end_element(name)
+        # Called for parser errors.
+        def on_error(msg)
         end
 
-        # Called for a reference event.
-        def on_reference(name)
+        # Called for an external subset event.
+        def on_external_subset(name, external_id, system_id)
         end
 
-        # Called for a characters event.
-        def on_characters(chars)
+        # Called for an external subset notification event.
+        def on_has_external_subset
         end
 
-        # Called for an processing instruction event.
-        def on_processing_instruction(target, data)
+        # Called for an internal subset notification event.
+        def on_has_internal_subset
         end
 
-        # Called for a comment event.
-        def on_comment(msg)
+        # Called for an internal subset event.
+        def on_internal_subset(name, external_id, system_id)
         end
 
-        # Called for parser warnings.
-        def on_parser_warning(msg)
+        # Called for 'is standalone' event.
+        def on_is_standalone
         end
 
-        # Called for parser errors.
-        def on_parser_error(msg)
+        # Called for an processing instruction event.
+        def on_processing_instruction(target, data)
         end
 
-        # Called for fatal parser errors.
-        def on_parser_fatal_error(msg)
+        # Called for a reference event.
+        def on_reference(name)
         end
 
-        # Called for a CDATA block event.
-        def on_cdata_block(cdata)
+        # Called for a start document event.
+        def on_start_document
         end
 
-        # Called for an external subset event.
-        def on_external_subset(name, external_id, system_id)
+        # Called for a start element event.
+        def on_start_element_ns(name, attributes, prefix, uri, namespaces)
         end
       end
 
       module VerboseCallbacks
-        # Called for an internal subset event.
-        def on_internal_subset(name, external_id, system_id)
-          STDOUT << "on_internal_subset(" << name << ", " << external_id << ", " << system_id << ")\n"
-          STDOUT.flush
-        end
-
-        # Called for 'is standalone' event.
-        def on_is_standalone
-          STDOUT << "on_is_standalone\n"
-          STDOUT.flush
-        end
-
-        # Called for an internal subset notification event.
-        def on_has_internal_subset
-          STDOUT << "on_has_internal_subset\n"
+        # Called for a CDATA block event.
+        def on_cdata_block(cdata)
+          STDOUT << "on_cdata_block(" << cdata << ")\n"
           STDOUT.flush
         end
 
-        # Called for an external subset notification event.
-        def on_has_external_subset
-          STDOUT << "on_has_internal_subset\n"
+        # Called for a characters event.
+        def on_characters(chars)
+          STDOUT << "on_characters(" << chars << ")\n"
           STDOUT.flush
         end
 
-        # Called for a start document event.
-        def on_start_document
-          STDOUT << "on_start_document\n"
+        # Called for a comment event.
+        def on_comment(msg)
+          STDOUT << "on_comment(" << msg << ")\n"
           STDOUT.flush
         end
 
@@ -108,69 +88,77 @@ module LibXML
           STDOUT.flush
         end
 
-        # Called for a start element event.
-        def on_start_element(name, attributes_hash)
-          STDOUT << "on_start_element(" << name << ", " << attributes_hash << ")\n"
+        # Called for a end element event.
+        def on_end_element_ns(name, prefix, uri)
+          STDOUT << "on_end_element(" << name <<
+                                      ", prefix: " << prefix << 
+                                      ", uri: " << uri <<
+                                      ")\n"
           STDOUT.flush
         end
 
-        # Called for a end element event.
-        def on_end_element(name)
-          STDOUT << "on_end_element(" << name << ")\n"
+        # Called for parser errors.
+        def on_error(error)
+          STDOUT << "on_error(" << error << ")\n"
           STDOUT.flush
         end
 
-        # Called for a reference event.
-        def on_reference(name)
-          STDOUT << "on_reference(" << name << ")\n"
+        # Called for an external subset event.
+        def on_external_subset(name, external_id, system_id)
+          STDOUT << "on_external_subset(" << name << ", " << external_id << ", " << system_id << ")\n"
           STDOUT.flush
         end
 
-        # Called for a characters event.
-        def on_characters(chars)
-          STDOUT << "on_characters(" << chars << ")\n"
+        # Called for an external subset notification event.
+        def on_has_external_subset
+          STDOUT << "on_has_internal_subset\n"
           STDOUT.flush
         end
 
-        # Called for an processing instruction event.
-        def on_processing_instruction(target, data)
-          STDOUT << "on_characters(" << target << ", " << data << ")\n"
+        # Called for an internal subset notification event.
+        def on_has_internal_subset
+          STDOUT << "on_has_internal_subset\n"
           STDOUT.flush
         end
 
-        # Called for a comment event.
-        def on_comment(msg)
-          STDOUT << "on_comment(" << msg << ")\n"
+        # Called for an internal subset event.
+        def on_internal_subset(name, external_id, system_id)
+          STDOUT << "on_internal_subset(" << name << ", " << external_id << ", " << system_id << ")\n"
           STDOUT.flush
         end
 
-        # Called for parser warnings.
-        def on_parser_warning(msg)
-          STDOUT << "on_parser_warning(" << msg << ")\n"
+        # Called for 'is standalone' event.
+        def on_is_standalone
+          STDOUT << "on_is_standalone\n"
           STDOUT.flush
         end
 
-        # Called for parser errors.
-        def on_parser_error(msg)
-          STDOUT << "on_parser_error(" << msg << ")\n"
+        # Called for an processing instruction event.
+        def on_processing_instruction(target, data)
+          STDOUT << "on_characters(" << target << ", " << data << ")\n"
           STDOUT.flush
         end
 
-        # Called for fatal parser errors.
-        def on_parser_fatal_error(msg)
-          STDOUT << "on_parser_fatal_error(" << msg << ")\n"
+        # Called for a reference event.
+        def on_reference(name)
+          STDOUT << "on_reference(" << name << ")\n"
           STDOUT.flush
         end
 
-        # Called for a CDATA block event.
-        def on_cdata_block(cdata)
-          STDOUT << "on_cdata_block(" << cdata << ")\n"
+        # Called for a start document event.
+        def on_start_document
+          STDOUT << "on_start_document\n"
           STDOUT.flush
         end
 
-        # Called for an external subset event.
-        def on_external_subset(name, external_id, system_id)
-          STDOUT << "on_external_subset(" << name << ", " << external_id << ", " << system_id << ")\n"
+        # Called for a start element event.
+        def on_start_element_ns(name, attributes, prefix, uri, namespaces)
+          STDOUT << "on_start_element_ns(" << name <<
+                                      ", attr " << (attributes || Hash.new).inspect <<
+                                      ", prefix: " << prefix <<
+                                      ", uri: " << uri << ")\n" <<
+                                      ", ns " << (namespaces || Hash.new).inspect <<
+                                      ")\n"
           STDOUT.flush
         end
       end