libxml-ruby 0.9.5 → 0.9.6

data/ext/libxml/ruby_xml_xpath_context.h

@@ -1,9 +1,9 @@
-/* $Id: ruby_xml_xpath_context.h 614 2008-11-22 08:04:39Z cfis $ */
+/* $Id: ruby_xml_xpath_context.h 666 2008-12-07 00:16:50Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
-#ifndef __rxml_XPATH_CONTEXT__
-#define __rxml_XPATH_CONTEXT__
+#ifndef __RXML_XPATH_CONTEXT__
+#define __RXML_XPATH_CONTEXT__
 
 extern VALUE cXMLXPathContext;
 void ruby_init_xml_xpath_context(void);

data/ext/libxml/ruby_xml_xpath_expression.c

@@ -37,8 +37,8 @@ static VALUE rxml_xpath_expression_alloc(VALUE klass)
 /* call-seq:
  *    XPath::Expression.new(expression) -> XPath::Expression
  *
- * Compiled XPatch expression. Work faster when find called many times
- * same expression.
+ * Compiles an XPatch expression. This improves performance
+ * when an XPath expression is called multiple times.
  *
  *  doc = XML::Document.string('<header><first>hi</first></header>')
  *  expr = XPath::Expression.new('//first')
@@ -46,7 +46,7 @@ static VALUE rxml_xpath_expression_alloc(VALUE klass)
  */
 static VALUE rxml_xpath_expression_initialize(VALUE self, VALUE expression)
 {
-  xmlXPathCompExprPtr compexpr = xmlXPathCompile(StringValueCStr(expression));
+  xmlXPathCompExprPtr compexpr = xmlXPathCompile((const xmlChar*)StringValueCStr(expression));
 
   if (compexpr == NULL)
   {
@@ -62,8 +62,6 @@ void ruby_init_xml_xpath_expression(void)
 {
   cXMLXPathExpression = rb_define_class_under(mXPath, "Expression", rb_cObject);
   rb_define_alloc_func(cXMLXPathExpression, rxml_xpath_expression_alloc);
-  rb_define_singleton_method(cXMLXPathExpression, "compile",
-      rb_class_new_instance, 1);
-  rb_define_method(cXMLXPathExpression, "initialize",
-      rxml_xpath_expression_initialize, 1);
+  rb_define_singleton_method(cXMLXPathExpression, "compile", rb_class_new_instance, 1);
+  rb_define_method(cXMLXPathExpression, "initialize", rxml_xpath_expression_initialize, 1);
 }

data/ext/libxml/ruby_xml_xpath_expression.h

@@ -2,8 +2,8 @@
 
 /* Please see the LICENSE file for copyright and distribution information */
 
-#ifndef __rxml_XPATH_EXPRESSION__
-#define __rxml_XPATH_EXPRESSION__
+#ifndef __RXML_XPATH_EXPRESSION__
+#define __RXML_XPATH_EXPRESSION__
 
 extern VALUE cXMLXPathExpression;
 

data/ext/libxml/ruby_xml_xpath_object.c

@@ -83,7 +83,7 @@ VALUE rxml_xpath_object_wrap(xmlXPathObjectPtr xpop)
     xmlXPathFreeObject(xpop);
     break;
   case XPATH_STRING:
-    rval = rb_str_new2(xpop->stringval);
+    rval = rb_str_new2((const char*)xpop->stringval);
 
     xmlXPathFreeObject(xpop);
     break;
@@ -284,15 +284,15 @@ static VALUE rxml_xpath_object_string(VALUE self)
  */
 static VALUE rxml_xpath_object_debug(VALUE self)
 {
+#ifdef LIBXML_DEBUG_ENABLED
   xmlXPathObjectPtr xpop;
-
-#ifndef LIBXML_DEBUG_ENABLED
-  rb_raise(rb_eTypeError, "libxml was not compiled with debug support.");
-#endif
-
   Data_Get_Struct(self, xmlXPathObject, xpop);
   xmlXPathDebugDumpObject(stdout, xpop, 0);
-  return Qnil;
+  return Qtrue;
+#else
+  rb_warn("libxml was compiled without debugging support.")
+  return Qfalse;
+#endif
 }
 
 void ruby_init_xml_xpath_object(void)

data/ext/libxml/ruby_xml_xpath_object.h

@@ -1,7 +1,7 @@
 /* $Id $ */
 
-#ifndef __rxml_XPATH_OBJECT__
-#define __rxml_XPATH_OBJECT__
+#ifndef __RXML_XPATH_OBJECT__
+#define __RXML_XPATH_OBJECT__
 
 extern VALUE cXMLXPathObject;
 

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/ruby_xml_xpointer.h

@@ -1,9 +1,9 @@
-/* $Id: ruby_xml_xpointer.h 630 2008-11-24 06:53:01Z cfis $ */
+/* $Id: ruby_xml_xpointer.h 666 2008-12-07 00:16:50Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
-#ifndef __rxml_XPOINTER__
-#define __rxml_XPOINTER__
+#ifndef __RXML_XPOINTER__
+#define __RXML_XPOINTER__
 
 extern VALUE cXMLXPointer;
 

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.5"
+#define RUBY_LIBXML_VERSION  "0.9.6"
 #define RUBY_LIBXML_VERNUM   0
 #define RUBY_LIBXML_VER_MAJ   0
 #define RUBY_LIBXML_VER_MIN   9
-#define RUBY_LIBXML_VER_MIC   5
+#define RUBY_LIBXML_VER_MIC   6
 #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.5-x86-mswin32-60\lib\$(ProjectName).so"
+				OutputFile="C:\Development\ruby\lib\ruby\gems\1.8\gems\libxml-ruby-0.9.6-x86-mswin32-60\lib\$(ProjectName).so"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="C:\Development\ruby\lib;C:\Development\msys\local\lib"
 				GenerateDebugInformation="true"
@@ -222,11 +222,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\libxml\ruby_xml_node.c"
+				RelativePath="..\libxml\ruby_xml_namespace.c"
 				>
 			</File>
 			<File
-				RelativePath="..\libxml\ruby_xml_ns.c"
+				RelativePath="..\libxml\ruby_xml_namespaces.c"
+				>
+			</File>
+			<File
+				RelativePath="..\libxml\ruby_xml_node.c"
 				>
 			</File>
 			<File
@@ -324,11 +328,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\libxml\ruby_xml_node.h"
+				RelativePath="..\libxml\ruby_xml_namespace.h"
 				>
 			</File>
 			<File
-				RelativePath="..\libxml\ruby_xml_ns.h"
+				RelativePath="..\libxml\ruby_xml_namespaces.h"
+				>
+			</File>
+			<File
+				RelativePath="..\libxml\ruby_xml_node.h"
 				>
 			</File>
 			<File

data/lib/libxml.rb

@@ -1,4 +1,4 @@
-# $Id: libxml.rb 561 2008-11-18 04:17:29Z cfis $ 
+# $Id: libxml.rb 666 2008-12-07 00:16:50Z cfis $ 
 # Please see the LICENSE file for copyright and distribution information 
 
 # If running on Windows, then add the current directory to the PATH
@@ -17,7 +17,10 @@ require 'libxml/parser'
 require 'libxml/parser_options'
 require 'libxml/parser_context'
 require 'libxml/document'
+require 'libxml/namespaces'
+require 'libxml/namespace'
 require 'libxml/node'
+require 'libxml/ns'
 require 'libxml/attributes'
 require 'libxml/attr'
 require 'libxml/tree'

data/lib/libxml/document.rb

@@ -17,6 +17,20 @@ module LibXML
         Parser.io(value).parse
       end
 
+      # Returns a new XML::XPathContext for the document.
+      #
+      # call-seq:
+      #   document.context(namespaces=nil) -> XPath::Context
+      #
+      # Namespaces is an optional array of XML::NS objects
+      def context(nslist = nil)
+        context = XPath::Context.new(self)
+        context.node = self.root
+        context.register_namespaces_from_node(self.root)
+        context.register_namespaces(nslist) if nslist
+        context
+      end
+
       # Return the nodes matching the specified xpath expression, 
       # optionally using the specified namespace.  For more 
       # information about working with namespaces, please refer
@@ -47,12 +61,7 @@ module LibXML
       #  nodes = nil
       #  GC.start
       def find(xpath, nslist = nil)
-        context = XPath::Context.new(self)
-        context.node = self.root  
-        context.register_namespaces_from_node(self.root)
-        context.register_namespaces(nslist) if nslist
-
-        context.find(xpath)
+        self.context(nslist).find(xpath)
       end
     
       # Return the first node matching the specified xpath expression.
@@ -61,6 +70,31 @@ module LibXML
       def find_first(xpath, nslist = nil)
         find(xpath, nslist).first
       end
+      
+      def dump # :nodoc:
+        warn('Document#dump is deprecated.  Use Document#to_s instead.')
+        self.to_s
+      end
+
+      def format_dump # :nodoc:
+        warn('Document#format_dump is deprecated.  Use Document#to_s instead.')
+        self.to_s
+      end
+
+      def debug_dump # :nodoc:
+        warn('Document#debug_dump is deprecated.  Use Document#debug instead.')
+        self.debug
+      end
+
+      def debug_dump_head # :nodoc:
+        warn('Document#debug_dump_head is deprecated.  Use Document#debug instead.')
+        self.debug
+      end
+
+      def debug_format_dump  # :nodoc:
+        warn('Document#debug_format_dump is deprecated.  Use Document#to_s instead.')
+        self.to_s
+      end
     end
   end
 end