libxml-ruby 0.9.8 → 0.9.9

data/ext/libxml/ruby_xml_xpath_context.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_xpath_context.h 666 2008-12-07 00:16:50Z cfis $ */
+/* $Id: ruby_xml_xpath_context.h 758 2009-01-25 20:36:03Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -6,6 +6,6 @@
 #define __RXML_XPATH_CONTEXT__
 
 extern VALUE cXMLXPathContext;
-void ruby_init_xml_xpath_context(void);
+void rxml_init_xpath_context(void);
 
 #endif

data/ext/libxml/ruby_xml_xpath_expression.c

@@ -34,6 +34,22 @@ static VALUE rxml_xpath_expression_alloc(VALUE klass)
       rxml_xpath_expression_free, NULL);
 }
 
+/* call-seq:
+ *    XPath::Expression.compile(expression) -> XPath::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')
+ *  nodes = doc.find(expr)
+ */
+static VALUE rxml_xpath_expression_compile(VALUE klass, VALUE expression)
+{
+  VALUE args[] = {expression};
+  return rb_class_new_instance(1, args, cXMLXPathExpression);
+}
+
 /* call-seq:
  *    XPath::Expression.new(expression) -> XPath::Expression
  *
@@ -58,16 +74,10 @@ static VALUE rxml_xpath_expression_initialize(VALUE self, VALUE expression)
   return self;
 }
 
-// Rdoc needs to know 
-#ifdef RDOC_NEVER_DEFINED
-  mLibXML = rb_define_module("LibXML");
-  mXPath = rb_define_module_under(mLibXML, "XPath");
-#endif
-
-void ruby_init_xml_xpath_expression(void)
+void rxml_init_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_singleton_method(cXMLXPathExpression, "compile", rxml_xpath_expression_compile, 1);
   rb_define_method(cXMLXPathExpression, "initialize", rxml_xpath_expression_initialize, 1);
 }

data/ext/libxml/ruby_xml_xpath_expression.h

@@ -7,6 +7,6 @@
 
 extern VALUE cXMLXPathExpression;
 
-void ruby_init_xml_xpath_expression(void);
+void rxml_init_xpath_expression(void);
 
 #endif

data/ext/libxml/ruby_xml_xpath_object.c

@@ -203,6 +203,23 @@ static VALUE rxml_xpath_object_first(VALUE self)
   return rxml_xpath_object_tabref(rxpop->xpop, 0);
 }
 
+/*
+ * call-seq:
+ *    xpath_object.last -> node
+ *
+ * Returns the last node in this node set, or nil if none exist.
+ */
+static VALUE rxml_xpath_object_last(VALUE self)
+{
+  rxml_xpath_object *rxpop;
+
+  if (rxml_xpath_object_empty_q(self) == Qtrue)
+    return Qnil;
+
+  Data_Get_Struct(self, rxml_xpath_object, rxpop);
+  return rxml_xpath_object_tabref(rxpop->xpop, -1);
+}
+
 /*
  * call-seq:
  * xpath_object[i] -> node
@@ -301,13 +318,7 @@ static VALUE rxml_xpath_object_debug(VALUE self)
 #endif
 }
 
-// Rdoc needs to know 
-#ifdef RDOC_NEVER_DEFINED
-  mLibXML = rb_define_module("LibXML");
-  mXPath = rb_define_module_under(mLibXML, "XPath");
-#endif
-
-void ruby_init_xml_xpath_object(void)
+void rxml_init_xpath_object(void)
 {
   cXMLXPathObject = rb_define_class_under(mXPath, "Object", rb_cObject);
   rb_include_module(cXMLXPathObject, rb_mEnumerable);
@@ -316,8 +327,8 @@ void ruby_init_xml_xpath_object(void)
   rb_define_method(cXMLXPathObject, "xpath_type", rxml_xpath_object_get_type, 0);
   rb_define_method(cXMLXPathObject, "empty?", rxml_xpath_object_empty_q, 0);
   rb_define_method(cXMLXPathObject, "first", rxml_xpath_object_first, 0);
+  rb_define_method(cXMLXPathObject, "last", rxml_xpath_object_last, 0);
   rb_define_method(cXMLXPathObject, "length", rxml_xpath_object_length, 0);
-  rb_define_method(cXMLXPathObject, "size", rxml_xpath_object_length, 0);
   rb_define_method(cXMLXPathObject, "to_a", rxml_xpath_object_to_a, 0);
   rb_define_method(cXMLXPathObject, "[]", rxml_xpath_object_aref, 1);
   rb_define_method(cXMLXPathObject, "string", rxml_xpath_object_string, 0);

data/ext/libxml/ruby_xml_xpath_object.h

@@ -13,7 +13,7 @@ typedef struct rxml_xpath_object
 } rxml_xpath_object;
 
 
-void ruby_init_xml_xpath_object(void);
+void rxml_init_xpath_object(void);
 VALUE rxml_xpath_object_wrap(xmlDocPtr xdoc, xmlXPathObjectPtr xpop);
 
 #endif

data/ext/libxml/ruby_xml_xpointer.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_xpointer.c 739 2009-01-23 03:42:09Z cfis $ */
+/* $Id: ruby_xml_xpointer.c 758 2009-01-25 20:36:03Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -94,13 +94,7 @@ static VALUE rxml_xpointer_range(VALUE class, VALUE rstart, VALUE rend)
 #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)
+void rxml_init_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,4 +1,4 @@
-/* $Id: ruby_xml_xpointer.h 666 2008-12-07 00:16:50Z cfis $ */
+/* $Id: ruby_xml_xpointer.h 758 2009-01-25 20:36:03Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -7,7 +7,7 @@
 
 extern VALUE cXMLXPointer;
 
-void ruby_init_xml_xpointer(void);
+void rxml_init_xpointer(void);
 VALUE rxml_xpointer_point2(VALUE node, VALUE xptr_str);
 
 #endif

data/ext/vc/libxml_ruby.sln

@@ -1,7 +1,9 @@
 
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml_ruby", "libxml_ruby.vcproj", "{0B65CD1D-EEB9-41AE-93BB-75496E504152}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml_ruby", "libxml_ruby_18\libxml_ruby.vcproj", "{0B65CD1D-EEB9-41AE-93BB-75496E504152}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml_ruby_19", "libxml_ruby_19\libxml_ruby_19.vcproj", "{0E73156F-E619-4FD9-8327-113FE3CC942E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,6 +15,10 @@ Global
 		{0B65CD1D-EEB9-41AE-93BB-75496E504152}.Debug|Win32.Build.0 = Debug|Win32
 		{0B65CD1D-EEB9-41AE-93BB-75496E504152}.Release|Win32.ActiveCfg = Release|Win32
 		{0B65CD1D-EEB9-41AE-93BB-75496E504152}.Release|Win32.Build.0 = Release|Win32
+		{0E73156F-E619-4FD9-8327-113FE3CC942E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0E73156F-E619-4FD9-8327-113FE3CC942E}.Debug|Win32.Build.0 = Debug|Win32
+		{0E73156F-E619-4FD9-8327-113FE3CC942E}.Release|Win32.ActiveCfg = Release|Win32
+		{0E73156F-E619-4FD9-8327-113FE3CC942E}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

data/lib/libxml.rb

@@ -1,6 +1,3 @@
-# $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
 # for the current process so it can find the pre-built libxml2 and 
 # iconv2 shared libraries (dlls).
@@ -30,12 +27,4 @@ require 'libxml/sax_callbacks'
 require 'libxml/xpath_object'
 
 # Deprecated
-require 'libxml/properties'
-
-# Map the LibXML module into the XML module for both backwards
-# compatibility and ease of use.
-# 
-# DEPRECATED: Use require 'xml' instead!
-#
-# include LibXML
-
+require 'libxml/properties'

data/lib/libxml/attr.rb

@@ -1,6 +1,3 @@
-# $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 

data/lib/libxml/attr_decl.rb

@@ -1,6 +1,3 @@
-# $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 AttrDecl

data/lib/libxml/attributes.rb

@@ -1,6 +1,3 @@
-# $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

data/lib/libxml/document.rb

@@ -114,9 +114,7 @@ module LibXML
       #  nodes.each do |node|
       #    ... do stuff ...
       #  end
-      #
-      #  nodes = nil
-      #  GC.start
+      # #  nodes = nil #  GC.start
       def find(xpath, nslist = nil)
         self.context(nslist).find(xpath)
       end
@@ -127,9 +125,37 @@ module LibXML
       def find_first(xpath, nslist = nil)
         find(xpath, nslist).first
       end
-
+      
+      # Returns this node's type name    
+      def node_type_name
+        case node_type
+          when XML::Node::DOCUMENT_NODE
+            'document_xml'
+          when XML::Node::DOCB_DOCUMENT_NODE
+            'document_docbook'
+          when XML::Node::HTML_DOCUMENT_NODE
+            'document_html'
+          else
+            raise(UnknownType, "Unknown node type: %n", node.node_type);
+        end
+      end
       # :enddoc:
 
+      # Specifies if this is an DOCTYPE node
+      def document?
+        node_type == XML::Node::DOCUMENT_NODE
+      end
+
+      # Specifies if this is an docbook node
+      def docbook_doc?
+        node_type == XML::Node::DOCB_DOCUMENT_NODE
+      end
+
+      # Specifies if this is an html node
+      def html_doc?
+        node_type == XML::Node::HTML_DOCUMENT_NODE
+      end
+
       def dump
         warn('Document#dump is deprecated.  Use Document#to_s instead.')
         self.to_s
@@ -161,4 +187,4 @@ module LibXML
       end
     end
   end
-end  
+end  

data/lib/libxml/error.rb

@@ -71,11 +71,15 @@ module LibXML
       end
 
       def to_s
-       msg = super
-       msg = msg ? msg.strip: ''
+        msg = super
+        msg = msg ? msg.strip: ''
 
-       sprintf("%s %s at %s:%d.", self.level_to_s, msg,
-                                  self.file, self.line)
+        if self.line
+          sprintf("%s %s at %s:%d.", self.level_to_s, msg,
+                                     self.file, self.line)
+        else
+          sprintf("%s %s.", self.level_to_s, msg)
+        end
       end
     end
   end

data/lib/libxml/properties.rb

@@ -1,8 +1,3 @@
-# $Id: libxml.rb 374 2008-07-11 04:51:41Z cfis $ 
-# Please see the LICENSE file for copyright and distribution information 
-
-
-# This is for backwards compatibility and is DEPRECATED
 module LibXML
   module XML
     class Node

data/lib/libxml/sax_callbacks.rb

@@ -66,19 +66,22 @@ module LibXML
       module VerboseCallbacks
         # Called for a CDATA block event.
         def on_cdata_block(cdata)
-          STDOUT << "on_cdata_block(" << cdata << ")\n"
+          STDOUT << "on_cdata_block" << "\n" <<
+                    "  cdata " << cdata << "\n"
           STDOUT.flush
         end
 
         # Called for a characters event.
         def on_characters(chars)
-          STDOUT << "on_characters(" << chars << ")\n"
+          STDOUT << "on_characters" << "\n" <<
+                    "  chars " << chars << "\n" 
           STDOUT.flush
         end
 
         # Called for a comment event.
-        def on_comment(msg)
-          STDOUT << "on_comment(" << msg << ")\n"
+        def on_comment(comment)
+          STDOUT << "on_comment" << "\n" <<
+                    "  comment: " << comment << "\n"
           STDOUT.flush
         end
 
@@ -90,22 +93,25 @@ module LibXML
 
         # 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 << "on_end_element_ns" << "\n" <<
+                    "  name: " << name << "\n" <<
+                    "  prefix: " << prefix << "\n" <<
+                    "  uri: " << uri << "\n"
           STDOUT.flush
         end
 
         # Called for parser errors.
         def on_error(error)
-          STDOUT << "on_error(" << error << ")\n"
+          STDOUT << "on_error" << "\n"
+                    "  error " << error << "\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"
+          STDOUT << "on_external_subset" << "\n"
+                    "  external_id " << external_id << "\n" <<
+                    "  system_id   " << system_id << "\n"
           STDOUT.flush
         end
 
@@ -123,7 +129,9 @@ module LibXML
 
         # 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 << "on_internal_subset" << "\n"
+                    "  external_id " << external_id << "\n" <<
+                    "  system_id   " << system_id << "\n"
           STDOUT.flush
         end
 
@@ -135,13 +143,16 @@ module LibXML
 
         # Called for an processing instruction event.
         def on_processing_instruction(target, data)
-          STDOUT << "on_characters(" << target << ", " << data << ")\n"
+          STDOUT << "on_characters" << "\n"
+                    "  target: " << target << "\n" <<
+                    "  data:   " << data << "\n"
           STDOUT.flush
         end
 
         # Called for a reference event.
         def on_reference(name)
-          STDOUT << "on_reference(" << name << ")\n"
+          STDOUT << "on_reference:" << "\n" <<
+                    "  name:" << name << "\n"
           STDOUT.flush
         end
 
@@ -153,12 +164,12 @@ module LibXML
 
         # 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 << "on_start_element_ns" << "\n" <<
+                    "  name: " << name << "\n" <<
+                    "  attr: " << (attributes || Hash.new).inspect << "\n" <<
+                    "  prefix: " << prefix << "\n" <<
+                    "  uri: " << uri << "\n" <<
+                    "  ns_defs: " << (namespaces || Hash.new).inspect << "\n"
           STDOUT.flush
         end
       end

data/lib/libxml/tree.rb

@@ -1,4 +1,3 @@
-# This is for backwards compatibility and is DEPRECATED
 module LibXML
   module XML
     class Tree # :nodoc:

data/lib/libxml/xpath_object.rb

@@ -4,19 +4,6 @@ module LibXML
       class Object
         alias :size :length
 
-        def first
-          self[0]
-        end
-
-        def empty?
-          self.length == 0
-        end
-
-        def debug
-          warn("XPath::Object#debug is no longer available.")
-          self
-        end
-
         def set
           warn("XPath::Object#set is deprecated.  Simply use the XPath::Object API instead")
           self

data/test/model/definition.dtd

@@ -0,0 +1,8 @@
+<!ELEMENT definition (primary_key|body|reasoning|products)* >
+  <!ATTLIST definition target_entity CDATA #REQUIRED>
+<!ELEMENT primary_key (#PCDATA)>
+  <!ATTLIST primary_key name CDATA #REQUIRED>
+<!ELEMENT body (#PCDATA)>
+<!ELEMENT reasoning (#PCDATA)>
+<!ELEMENT products (product*)>
+<!ENTITY % product SYSTEM "lib/dtds/product.dtd"> %product;