libxml-ruby 0.9.7 → 0.9.8

data/ext/libxml/ruby_xml_xpath_object.h

@@ -5,7 +5,15 @@
 
 extern VALUE cXMLXPathObject;
 
+typedef struct rxml_xpath_object
+{
+  xmlDocPtr xdoc;
+  xmlXPathObjectPtr xpop;
+  VALUE nsnodes;
+} rxml_xpath_object;
+
+
 void ruby_init_xml_xpath_object(void);
-VALUE rxml_xpath_object_wrap(xmlXPathObjectPtr xpop);
+VALUE rxml_xpath_object_wrap(xmlDocPtr xdoc, xmlXPathObjectPtr xpop);
 
 #endif

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 739 2009-01-23 03:42:09Z 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(xnode->doc, 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(start->doc, 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.7"
+#define RUBY_LIBXML_VERSION  "0.9.8"
 #define RUBY_LIBXML_VERNUM   0
 #define RUBY_LIBXML_VER_MAJ   0
 #define RUBY_LIBXML_VER_MIN   9
-#define RUBY_LIBXML_VER_MIC   7
+#define RUBY_LIBXML_VER_MIC   8
 #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.6-x86-mswin32-60\lib\$(ProjectName).so"
+				OutputFile="C:\Development\ruby\lib\ruby\gems\1.8\gems\libxml-ruby-0.9.8-x86-mswin32-60\lib\$(ProjectName).so"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="C:\Development\ruby\lib;C:\Development\msys\local\lib"
 				GenerateDebugInformation="true"
@@ -193,6 +193,10 @@
 				RelativePath="..\libxml\ruby_xml_attr.c"
 				>
 			</File>
+			<File
+				RelativePath="..\libxml\ruby_xml_attr_decl.c"
+				>
+			</File>
 			<File
 				RelativePath="..\libxml\ruby_xml_attributes.c"
 				>
@@ -205,6 +209,10 @@
 				RelativePath="..\libxml\ruby_xml_dtd.c"
 				>
 			</File>
+			<File
+				RelativePath="..\libxml\ruby_xml_encoding.c"
+				>
+			</File>
 			<File
 				RelativePath="..\libxml\ruby_xml_error.c"
 				>
@@ -214,13 +222,21 @@
 				>
 			</File>
 			<File
-				RelativePath="..\libxml\ruby_xml_input.c"
+				RelativePath="..\libxml\ruby_xml_html_parser_context.c"
+				>
+			</File>
+			<File
+				RelativePath="..\libxml\ruby_xml_html_parser_options.c"
 				>
 			</File>
 			<File
 				RelativePath="..\libxml\ruby_xml_input_cbg.c"
 				>
 			</File>
+			<File
+				RelativePath="..\libxml\ruby_xml_io.c"
+				>
+			</File>
 			<File
 				RelativePath="..\libxml\ruby_xml_namespace.c"
 				>
@@ -241,6 +257,10 @@
 				RelativePath="..\libxml\ruby_xml_parser_context.c"
 				>
 			</File>
+			<File
+				RelativePath="..\libxml\ruby_xml_parser_options.c"
+				>
+			</File>
 			<File
 				RelativePath="..\libxml\ruby_xml_reader.c"
 				>
@@ -303,6 +323,10 @@
 				RelativePath="..\libxml\ruby_xml_attr.h"
 				>
 			</File>
+			<File
+				RelativePath="..\libxml\ruby_xml_attr_decl.h"
+				>
+			</File>
 			<File
 				RelativePath="..\libxml\ruby_xml_attributes.h"
 				>
@@ -315,6 +339,10 @@
 				RelativePath="..\libxml\ruby_xml_dtd.h"
 				>
 			</File>
+			<File
+				RelativePath="..\libxml\ruby_xml_encoding.h"
+				>
+			</File>
 			<File
 				RelativePath="..\libxml\ruby_xml_error.h"
 				>
@@ -324,13 +352,21 @@
 				>
 			</File>
 			<File
-				RelativePath="..\libxml\ruby_xml_input.h"
+				RelativePath="..\libxml\ruby_xml_html_parser_context.h"
+				>
+			</File>
+			<File
+				RelativePath="..\libxml\ruby_xml_html_parser_options.h"
 				>
 			</File>
 			<File
 				RelativePath="..\libxml\ruby_xml_input_cbg.h"
 				>
 			</File>
+			<File
+				RelativePath="..\libxml\ruby_xml_io.h"
+				>
+			</File>
 			<File
 				RelativePath="..\libxml\ruby_xml_namespace.h"
 				>
@@ -351,6 +387,10 @@
 				RelativePath="..\libxml\ruby_xml_parser_context.h"
 				>
 			</File>
+			<File
+				RelativePath="..\libxml\ruby_xml_parser_options.h"
+				>
+			</File>
 			<File
 				RelativePath="..\libxml\ruby_xml_reader.h"
 				>

data/lib/libxml.rb

@@ -1,4 +1,4 @@
-# $Id: libxml.rb 666 2008-12-07 00:16:50Z cfis $ 
+# $Id: libxml.rb 710 2009-01-20 05:30:51Z cfis $ 
 # Please see the LICENSE file for copyright and distribution information 
 
 # If running on Windows, then add the current directory to the PATH
@@ -14,8 +14,6 @@ require 'libxml_ruby'
 # Load Ruby supporting code.
 require 'libxml/error'
 require 'libxml/parser'
-require 'libxml/parser_options'
-require 'libxml/parser_context'
 require 'libxml/document'
 require 'libxml/namespaces'
 require 'libxml/namespace'
@@ -23,6 +21,7 @@ require 'libxml/node'
 require 'libxml/ns'
 require 'libxml/attributes'
 require 'libxml/attr'
+require 'libxml/attr_decl'
 require 'libxml/tree'
 require 'libxml/reader'
 require 'libxml/html_parser'

data/lib/libxml/attr.rb

@@ -6,6 +6,75 @@ module LibXML
     class Attr 
       include Enumerable
 
+      # call-seq:
+      #    attr.child? -> (true|false)
+      #
+      # Returns whether this attribute has child attributes.
+      #
+      def child?
+        not self.children.nil?
+      end
+
+      # call-seq:
+      #    attr.doc? -> (true|false)
+      #
+      # Determine whether this attribute is associated with an
+      # XML::Document.
+      def doc?
+        not self.doc.nil?
+      end
+
+      # call-seq:
+      #    attr.last? -> (true|false)
+      #
+      # Determine whether this is the last attribute.
+      def last?
+        self.last.nil?
+      end
+
+      # call-seq:
+      #    attr.next? -> (true|false)
+      #
+      # Determine whether there is a next attribute.
+      def next?
+        not self.next.nil?
+      end
+
+      # call-seq:
+      #    attr.ns? -> (true|false)
+      #
+      # Determine whether this attribute has an associated
+      # namespace.
+      def ns?
+        not self.ns.nil?
+      end
+
+      #
+      # call-seq:
+      #    attr.parent? -> (true|false)
+      #
+      # Determine whether this attribute has a parent.
+      def parent?
+        not self.parent.nil?
+      end
+
+      # call-seq:
+      #    attr.prev? -> (true|false)
+      #
+      # Determine whether there is a previous attribute.
+      def prev?
+        not self.prev.nil?
+      end
+
+      # Returns this node's type name
+      def node_type_name
+        if node_type == Node::ATTRIBUTE_NODE
+          'attribute'
+        else
+          raise(UnknownType, "Unknown node type: %n", node.node_type);
+        end
+      end
+
       # Iterates nodes and attributes
       def siblings(node, &blk)
         if n = node
@@ -13,9 +82,9 @@ module LibXML
             blk.call(n)
             break unless n = n.next
           end
-        end 
+        end
       end
-    
+
       def each_sibling(&blk)
         siblings(self,&blk)
       end