libxml-ruby 0.7.0-x86-mswin32-60 → 0.8.0-x86-mswin32-60

data/ext/libxml/ruby_xml_xpointer.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_xpointer.c 351 2008-07-09 19:55:21Z cfis $ */
+/* $Id: ruby_xml_xpointer.c 461 2008-07-15 21:35:56Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -12,9 +12,12 @@ VALUE
 ruby_xml_xpointer_point(VALUE class, VALUE rnode, VALUE xptr_str) {
 #ifdef LIBXML_XPTR_ENABLED
   xmlNodePtr xnode;
-  xmlXPathContextPtr ctxt;
-  VALUE rxptr_xpth_ctxt, rxxp;
-  xmlXPathObjectPtr xpath;
+  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)
@@ -22,18 +25,18 @@ ruby_xml_xpointer_point(VALUE class, VALUE rnode, VALUE xptr_str) {
 
   Data_Get_Struct(rnode, xmlNode, xnode);
 
-  rxptr_xpth_ctxt =
-    ruby_xml_xpath_context_wrap(ctxt=xmlXPtrNewContext(xnode->doc, xnode, NULL));
-
-  if (NIL_P(rxptr_xpth_ctxt))
-    return(Qnil);
+  argv[0] = rb_funcall(rnode, rb_intern("doc"), 0);
+  context = rb_class_new_instance(1, argv, cXMLXPathContext);
+  Data_Get_Struct(context, xmlXPathContext, xctxt);
 
-  xpath = xmlXPtrEval((xmlChar*)StringValuePtr(xptr_str), ctxt);
-  if (xpath == NULL)
-    rb_raise(eXMLXPointerInvalidExpression, "invalid xpointer expression");
+  xpop = xmlXPtrEval((xmlChar*)StringValuePtr(xptr_str), xctxt);
+  if (!xpop)
+    rb_raise(eXMLXPointerInvalidExpression, "Invalid xpointer expression");
 
-  rxxp = ruby_xml_xpath_object_wrap(xpath);
-  return(rxxp);
+  result = ruby_xml_xpath_object_wrap(xpop);
+  rb_iv_set(result, "@context", context);
+  
+  return(result);
 #else
   rb_warn("libxml was compiled without XPointer support");
   return(Qfalse);
@@ -88,7 +91,8 @@ ruby_xml_xpointer_range(VALUE class, VALUE rstart, VALUE rend) {
 
 // Rdoc needs to know 
 #ifdef RDOC_NEVER_DEFINED
-  mXML = rb_define_module("XML");
+  mLibXML = rb_define_module("LibXML");
+  mXML = rb_define_module_under(mLibXML, "XML");
 #endif
 
 void

data/ext/libxml/ruby_xml_xpointer.h

@@ -1,27 +1,27 @@
-/* $Id: ruby_xml_xpointer.h 39 2006-02-21 20:40:16Z roscopeco $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RUBY_XML_XPOINTER__
-#define __RUBY_XML_XPOINTER__
-
-extern VALUE cXMLXPointer;
-extern VALUE eXMLXPointerInvalidExpression;
-
-typedef struct ruby_xml_xpointer {
-  VALUE xd;
-  VALUE ctxt;
-  /*
-   * This needs to go into a xpointer data struct:
-   *
-   * xmlLocationSetPtr xptr;
-   *
-   * I also need an xpointer data struct type.
-  */
-} ruby_xml_xpointer;
-
-VALUE ruby_xml_xpointer_point(VALUE class, VALUE node, VALUE xptr_string);
-VALUE ruby_xml_xpointer_point2(VALUE node, VALUE xptr_string);
-void ruby_init_xml_xpointer(void);
-
-#endif
+/* $Id: ruby_xml_xpointer.h 39 2006-02-21 20:40:16Z roscopeco $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RUBY_XML_XPOINTER__
+#define __RUBY_XML_XPOINTER__
+
+extern VALUE cXMLXPointer;
+extern VALUE eXMLXPointerInvalidExpression;
+
+typedef struct ruby_xml_xpointer {
+  VALUE xd;
+  VALUE ctxt;
+  /*
+   * This needs to go into a xpointer data struct:
+   *
+   * xmlLocationSetPtr xptr;
+   *
+   * I also need an xpointer data struct type.
+  */
+} ruby_xml_xpointer;
+
+VALUE ruby_xml_xpointer_point(VALUE class, VALUE node, VALUE xptr_string);
+VALUE ruby_xml_xpointer_point2(VALUE node, VALUE xptr_string);
+void ruby_init_xml_xpointer(void);
+
+#endif

data/ext/libxml/ruby_xml_xpointer_context.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_xpointer_context.c 300 2008-07-01 19:14:15Z cfis $ */
+/* $Id: ruby_xml_xpointer_context.c 461 2008-07-15 21:35:56Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -10,7 +10,8 @@ VALUE eXMLXPointerContextInvalidPath;
 
 // Rdoc needs to know 
 #ifdef RDOC_NEVER_DEFINED
-  mXML = rb_define_module("XML");
+  mLibXML = rb_define_module("LibXML");
+  mXML = rb_define_module_under(mLibXML, "XML");
   cXMLXPointer = rb_define_class_under(mXML, "XPointer", rb_cObject);
 #endif
 

data/ext/libxml/ruby_xml_xpointer_context.h

@@ -1,18 +1,18 @@
-/* $Id: ruby_xml_xpointer_context.h 39 2006-02-21 20:40:16Z roscopeco $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RUBY_XML_XPOINTER_CONTEXT__
-#define __RUBY_XML_XPOINTER_CONTEXT__
-
-extern VALUE cXMLXPointerContext;
-extern VALUE eXMLXPointerContextInvalidPath;
-
-typedef struct ruby_xml_xpointer_context {
-  VALUE xd;
-  xmlXPathContextPtr ctxt;
-} ruby_xml_xpointer_context;
-
-void ruby_init_xml_xpointer_context(void);
-
-#endif
+/* $Id: ruby_xml_xpointer_context.h 39 2006-02-21 20:40:16Z roscopeco $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RUBY_XML_XPOINTER_CONTEXT__
+#define __RUBY_XML_XPOINTER_CONTEXT__
+
+extern VALUE cXMLXPointerContext;
+extern VALUE eXMLXPointerContextInvalidPath;
+
+typedef struct ruby_xml_xpointer_context {
+  VALUE xd;
+  xmlXPathContextPtr ctxt;
+} ruby_xml_xpointer_context;
+
+void ruby_init_xml_xpointer_context(void);
+
+#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.7.0"
-#define RUBY_LIBXML_VERNUM   0
-#define RUBY_LIBXML_VER_MAJ   0
-#define RUBY_LIBXML_VER_MIN   7
-#define RUBY_LIBXML_VER_MIC   0
-#define RUBY_LIBXML_VER_PATCH 0
+/* 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.8.0"
+#define RUBY_LIBXML_VERNUM   0
+#define RUBY_LIBXML_VER_MAJ   0
+#define RUBY_LIBXML_VER_MIN   8
+#define RUBY_LIBXML_VER_MIC   0
+#define RUBY_LIBXML_VER_PATCH 0

data/lib/libxml.rb

@@ -1,134 +1,22 @@
-# $Id: libxml.rb 326 2008-07-08 23:00:50Z cfis $ 
+# $Id: libxml.rb 458 2008-07-15 21:10:55Z cfis $ 
 # Please see the LICENSE file for copyright and distribution information 
 
-require 'libxml_ruby.so'
+require 'libxml_ruby'
 
-module XML::XMLParserOptions
-  XML_PARSE_RECOVER = 1 # recover on errors
-  XML_PARSE_NOENT = 2 # substitute entities
-  XML_PARSE_DTDLOAD = 4 # load the external subset
-  XML_PARSE_DTDATTR = 8 # default DTD attributes
-  XML_PARSE_DTDVALID = 16 # validate with the DTD
-  XML_PARSE_NOERROR = 32 # suppress error reports
-  XML_PARSE_NOWARNING = 64 # suppress warning reports
-  XML_PARSE_PEDANTIC = 128 # pedantic error reporting
-  XML_PARSE_NOBLANKS = 256 # remove blank nodes
-  XML_PARSE_SAX1 = 512 # use the SAX1 interface internally
-  XML_PARSE_XINCLUDE = 1024 # Implement XInclude substitition
-  XML_PARSE_NONET = 2048 # Forbid network access
-  XML_PARSE_NODICT = 4096 # Do not reuse the context dictionnary
-  XML_PARSE_NSCLEAN = 8192 # remove redundant namespaces declarations
-  XML_PARSE_NOCDATA = 16384 # merge CDATA as text nodes
-  XML_PARSE_NOXINCNODE = 32768 # do not generate XINCLUDE START/END nodes
-  XML_PARSE_COMPACT = 65536 # compact small text nodes; no modification of the tree allowed afterwards (will possibly crash if you try to modify the tree)
-end
+require 'libxml/parser'
+require 'libxml/parser_options'
+require 'libxml/document'
+require 'libxml/node'
+require 'libxml/node_set'
+require 'libxml/attributes'
+require 'libxml/attr'
+require 'libxml/tree'
 
-class XML::Document
-  include Enumerable
+# Deprecated
+require 'libxml/properties'
 
-  # maybe, maybe not...
-  def each(&blk)
-    find('//*').each(&blk)
-  end
-end
-
-class XML::Node::Set 
-  include Enumerable 
-
-  # inefficient, but maybe can find a way to cache the
-  # ary and dump on change?
-  def [](i, count = nil) 
-    if count
-      to_a[i,count]
-    else
-      to_a[i]
-    end
-  end
-
-  def to_s #:nodoc:
-    to_a.to_s
-  end
-end
-
-module XML::SiblingEnum
-  def length
-    inject(0) do |result, node| 
-      result + 1
-    end
-  end
-  
-  private 
-  
-  # Iterates nodes and attributes
-  def siblings(node, &blk)
-    if n = node
-      loop do
-        blk.call(n)
-        break unless n = n.next
-      end
-    end 
-  end
-end
-
-class XML::Node
-  include XML::SiblingEnum
-  include Enumerable
-  
-  # maybe these don't belong on all nodes...
-  def each_child(&blk)
-    siblings(child, &blk)   
-  end
-
-  def each_attr(&blk)
-    siblings(properties, &blk)
-  end
-
-  # all siblings INCLUDING self
-  def each_sibling(&blk)
-    siblings(self, &blk)
-  end
-  
-  # I guess this is what you'd expect?
-  alias :each :each_child
-
-  def to_a
-    inject([]) do |ary,n|
-      ary << n
-      ary
-    end
-  end
-
-  def clone
-    copy(false)
-  end
-end
-
-class XML::Attr 
-  include XML::SiblingEnum
-  include Enumerable
-
-  def each_sibling(&blk)
-    siblings(self,&blk)
-  end
-  
-  alias :each_attr :each_sibling
-  alias :each :each_sibling
-  
-  def to_h
-    inject({}) do |h,a|
-      h[a.name] = a.value
-      h
-    end
-  end
-
-  def to_a
-    inject([]) do |ary,a| 
-      ary << [a.name, a.value]
-      ary
-    end
-  end
-  
-  def to_s
-    "#{name} = #{value}"
-  end
+# Map the LibXML module into the XML module for both backwards
+# compatibility and ease of use.
+module XML
+  include LibXML::XML
 end

data/lib/libxml/attr.rb

@@ -0,0 +1,45 @@
+# $Id: libxml.rb 374 2008-07-11 04:51:41Z cfis $ 
+# Please see the LICENSE file for copyright and distribution information 
+
+module LibXML
+  module XML
+    class Attr 
+      include Enumerable
+
+      # Iterates nodes and attributes
+      def siblings(node, &blk)
+        if n = node
+          loop do
+            blk.call(n)
+            break unless n = n.next
+          end
+        end 
+      end
+    
+      def each_sibling(&blk)
+        siblings(self,&blk)
+      end
+  
+      alias :each_attr :each_sibling
+      alias :each :each_sibling
+  
+      def to_h
+        inject({}) do |h,a|
+          h[a.name] = a.value
+          h
+        end
+      end
+
+      def to_a
+        inject([]) do |ary,a| 
+          ary << [a.name, a.value]
+          ary
+        end
+      end
+  
+      def to_s
+        "#{name} = #{value}"
+      end
+    end
+  end
+end

data/lib/libxml/attributes.rb

@@ -0,0 +1,15 @@
+# $Id: libxml.rb 374 2008-07-11 04:51:41Z cfis $ 
+# Please see the LICENSE file for copyright and distribution information 
+
+module LibXML
+  module XML
+    class Attributes
+      def to_h
+        inject({}) do |hash, attr|
+          hash[attr.name] = attr.value
+          hash
+        end
+      end
+    end
+  end
+end

data/lib/libxml/document.rb

@@ -0,0 +1,54 @@
+# $Id: libxml.rb 374 2008-07-11 04:51:41Z cfis $ 
+# Please see the LICENSE file for copyright and distribution information 
+
+module LibXML
+  module XML
+    class Document
+      # Return the nodes matching the specified xpath expression, 
+      # optionally using the specified namespace.  For more 
+      # information about working with namespaces, please refer
+      # to the XML::XPath documentation.
+      # 
+      # Parameters:
+      # * xpath - The xpath expression as a string
+      # * namespaces - An optional list of namespaces (see XML::XPath for information).
+      # * Returns - XML::XPath::Object
+      #
+      #  document.find('/foo', 'xlink:http://www.w3.org/1999/xlink')
+      #
+      # IMPORTANT - The returned XML::Node::Set must be freed before
+      # its associated document.  In a running Ruby program this will
+      # happen automatically via Ruby's mark and sweep garbage collector.
+      # However, if the program exits, Ruby does not guarantee the order
+      # in which objects are freed
+      # (see http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-core/17700).
+      # As a result, the associated document may be freed before the node
+      # list, which will cause a segmentation fault.
+      # To avoid this, use the following (non-ruby like) coding style:
+      #
+      #  nodes = doc.find('/header')
+      #  nodes.each do |node|
+      #    ... do stuff ...
+      #  end
+      #
+      #  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)
+      end
+    
+      # Return the first node matching the specified xpath expression.
+      # For more information, please refer to the documentation
+      # for XML::Document#find.
+      def find_first(xpath, nslist = nil)
+        find(xpath, nslist).first
+      end
+    end
+  end
+end