libxml-ruby 2.2.2 → 2.3.0

data/ext/libxml/ruby_xml_sax2_handler.c

@@ -30,30 +30,28 @@ const char *value, int len)
 
   if (handler != Qnil)
   {
-    rb_funcall(handler, cbidOnCdataBlock,1,rb_str_new(value, len));
+    rb_funcall(handler, cbidOnCdataBlock,1, rxml_new_cstr_len(value, len, NULL));
   }
 }
 
-static void characters_callback(void *ctx,
-const char *chars, int len)
+static void characters_callback(void *ctx, const char *chars, int len)
 {
   VALUE handler = (VALUE) ctx;
 
   if (handler != Qnil)
   {
-    VALUE rchars = rb_str_new(chars, len);
+    VALUE rchars = rxml_new_cstr_len(chars, len, NULL);
     rb_funcall(handler, cbidOnCharacters, 1, rchars);
   }
 }
 
-static void comment_callback(void *ctx,
-const char *msg)
+static void comment_callback(void *ctx, const char *msg)
 {
   VALUE handler = (VALUE) ctx;
 
   if (handler != Qnil)
   {
-    rb_funcall(handler, cbidOnComment,1,rb_str_new2(msg));
+    rb_funcall(handler, cbidOnComment,1,rxml_new_cstr(msg, NULL));
   }
 }
 
@@ -81,21 +79,21 @@ static void end_element_ns_callback(void *ctx,
     VALUE name;
     if (xprefix)
     {
-      name = rb_str_new2(xprefix);
+      name = rxml_new_cstr(xprefix, NULL);
       rb_str_cat2(name, ":"); 
       rb_str_cat2(name, xlocalname); 
     }
     else
     {
-      name = rb_str_new2(xlocalname);
+      name = rxml_new_cstr(xlocalname, NULL);
     }
     rb_funcall(handler, cbidOnEndElement, 1, name);
   }
 
   rb_funcall(handler, cbidOnEndElementNs, 3, 
-             rb_str_new2(xlocalname),
-             xprefix ? rb_str_new2(xprefix) : Qnil,
-             xURI ? rb_str_new2(xURI) : Qnil);
+             rxml_new_cstr(xlocalname, NULL),
+             xprefix ? rxml_new_cstr(xprefix, NULL) : Qnil,
+             xURI ? rxml_new_cstr(xURI, NULL) : Qnil);
 }
 
 static void external_subset_callback(void *ctx, const char *name, const char *extid, const char *sysid)
@@ -104,9 +102,9 @@ static void external_subset_callback(void *ctx, const char *name, const char *ex
 
   if (handler != Qnil)
   {
-    VALUE rname = name ? rb_str_new2(name) : Qnil;
-    VALUE rextid = extid ? rb_str_new2(extid) : Qnil;
-    VALUE rsysid = sysid ? rb_str_new2(sysid) : Qnil;
+    VALUE rname = name ? rxml_new_cstr(name, NULL) : Qnil;
+    VALUE rextid = extid ? rxml_new_cstr(extid, NULL) : Qnil;
+    VALUE rsysid = sysid ? rxml_new_cstr(sysid, NULL) : Qnil;
     rb_funcall(handler, cbidOnExternalSubset, 3, rname, rextid, rsysid);
   }
 }
@@ -137,9 +135,9 @@ static void internal_subset_callback(void *ctx, const char *name, const char *ex
 
   if (handler != Qnil)
   {
-    VALUE rname = name ? rb_str_new2(name) : Qnil;
-    VALUE rextid = extid ? rb_str_new2(extid) : Qnil;
-    VALUE rsysid = sysid ? rb_str_new2(sysid) : Qnil;
+    VALUE rname = name ? rxml_new_cstr(name, NULL) : Qnil;
+    VALUE rextid = extid ? rxml_new_cstr(extid, NULL) : Qnil;
+    VALUE rsysid = sysid ? rxml_new_cstr(sysid, NULL) : Qnil;
     rb_funcall(handler, cbidOnInternalSubset, 3, rname, rextid, rsysid);
   }
 }
@@ -160,8 +158,8 @@ static void processing_instruction_callback(void *ctx, const char *target, const
 
   if (handler != Qnil)
   {
-    VALUE rtarget = target ? rb_str_new2(target) : Qnil;
-    VALUE rdata = data ? rb_str_new2(data) : Qnil;
+    VALUE rtarget = target ? rxml_new_cstr(target, NULL) : Qnil;
+    VALUE rdata = data ? rxml_new_cstr(data, NULL) : Qnil;
     rb_funcall(handler, cbidOnProcessingInstruction, 2, rtarget, rdata);
   }
 }
@@ -172,7 +170,7 @@ static void reference_callback(void *ctx, const char *name)
 
   if (handler != Qnil)
   {
-    rb_funcall(handler, cbidOnReference,1,rb_str_new2(name));
+    rb_funcall(handler, cbidOnReference,1,rxml_new_cstr(name, NULL));
   }
 }
 
@@ -188,8 +186,8 @@ static void start_document_callback(void *ctx)
 
 static void start_element_ns_callback(void *ctx, 
                                       const xmlChar *xlocalname, const xmlChar *xprefix, const xmlChar *xURI,
-                            					int nb_namespaces, const xmlChar **xnamespaces,
-					                            int nb_attributes, int nb_defaulted, const xmlChar **xattributes)
+                            		  int nb_namespaces, const xmlChar **xnamespaces,
+					                  int nb_attributes, int nb_defaulted, const xmlChar **xattributes)
 {
   VALUE handler = (VALUE) ctx;
   VALUE attributes = rb_hash_new();
@@ -204,10 +202,8 @@ static void start_element_ns_callback(void *ctx,
     int i;
     for (i = 0;i < nb_attributes * 5; i+=5) 
     {
-      VALUE attrName = rb_str_new2(xattributes[i+0]);
-      VALUE attrValue = rb_str_new(xattributes[i+3], xattributes[i+4] - xattributes[i+3]);
-      /* VALUE attrPrefix = xattributes[i+1] ? rb_str_new2(xattributes[i+1]) : Qnil;
-         VALUE attrURI = xattributes[i+2] ? rb_str_new2(xattributes[i+2]) : Qnil; */
+      VALUE attrName = rxml_new_cstr(xattributes[i+0], NULL);
+      VALUE attrValue = rxml_new_cstr_len(xattributes[i+3], xattributes[i+4] - xattributes[i+3], NULL);
 
       rb_hash_aset(attributes, attrName, attrValue);
     }
@@ -218,8 +214,8 @@ static void start_element_ns_callback(void *ctx,
     int i;
     for (i = 0;i < nb_namespaces * 2; i+=2) 
     {
-      VALUE nsPrefix = xnamespaces[i+0] ? rb_str_new2(xnamespaces[i+0]) : Qnil;
-      VALUE nsURI = xnamespaces[i+1] ? rb_str_new2(xnamespaces[i+1]) : Qnil;
+      VALUE nsPrefix = xnamespaces[i+0] ? rxml_new_cstr(xnamespaces[i+0], NULL) : Qnil;
+      VALUE nsURI = xnamespaces[i+1] ? rxml_new_cstr(xnamespaces[i+1], NULL) : Qnil;
       rb_hash_aset(namespaces, nsPrefix, nsURI);
     }
   }
@@ -230,22 +226,22 @@ static void start_element_ns_callback(void *ctx,
     VALUE name;
     if (xprefix)
     {
-      name = rb_str_new2(xprefix);
+      name = rxml_new_cstr(xprefix, NULL);
       rb_str_cat2(name, ":"); 
       rb_str_cat2(name, xlocalname); 
     }
     else
     {
-      name = rb_str_new2(xlocalname);
+      name = rxml_new_cstr(xlocalname, NULL);
     }
     rb_funcall(handler, cbidOnStartElement, 2, name, attributes);
   }
 
   rb_funcall(handler, cbidOnStartElementNs, 5, 
-             rb_str_new2(xlocalname),
+             rxml_new_cstr(xlocalname, NULL),
              attributes,
-             xprefix ? rb_str_new2(xprefix) : Qnil,
-             xURI ? rb_str_new2(xURI) : Qnil,
+             xprefix ? rxml_new_cstr(xprefix, NULL) : Qnil,
+             xURI ? rxml_new_cstr(xURI, NULL) : Qnil,
              namespaces);
 }
 

data/ext/libxml/ruby_xml_sax_parser.c

@@ -43,20 +43,6 @@ static ID CONTEXT_ATTR;
 
 /* ======  Parser  =========== */
 
-/*static int rxml_sax_parser_parse_io(VALUE self, VALUE input)
-{
-  VALUE handler = rb_ivar_get(self, CALLBACKS_ATTR);
-  VALUE io = rb_ivar_get(input, IO_ATTR);
-  VALUE encoding = rb_ivar_get(input, ENCODING_ATTR);
-  xmlCharEncoding xmlEncoding = NUM2INT(encoding);
-  xmlParserCtxtPtr ctxt =
-      xmlCreateIOParserCtxt((xmlSAXHandlerPtr) &rxml_sax_handler,
-          (void *) handler, (xmlInputReadCallback) rxml_read_callback, NULL,
-          (void *) io, xmlEncoding);
-  return xmlParseDocument(ctxt);
-}*/
-
-
 /*
  * call-seq:
  *    parser.initialize(context) -> XML::Parser

data/ext/libxml/ruby_xml_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  "2.2.2"
-#define RUBY_LIBXML_VERNUM   222
+#define RUBY_LIBXML_VERSION  "2.3.0"
+#define RUBY_LIBXML_VERNUM   230
 #define RUBY_LIBXML_VER_MAJ   2
-#define RUBY_LIBXML_VER_MIN   2
-#define RUBY_LIBXML_VER_MIC   2
+#define RUBY_LIBXML_VER_MIN   3
+#define RUBY_LIBXML_VER_MIC   0
 #define RUBY_LIBXML_VER_PATCH 0

data/lib/libxml/document.rb

@@ -56,7 +56,7 @@ module LibXML
       end
 
       # call-seq:
-      #    XML::Document.string(string)
+      #    XML::Document.string(string) -> XML::Document
       #    XML::Document.string(string, :encoding => XML::Encoding::UTF_8,
       #                               :options => XML::Parser::Options::NOENT
       #                               :base_uri="http://libxml.org") -> XML::Document
@@ -66,12 +66,12 @@ module LibXML
       # You may provide an optional hash table to control how the
       # parsing is performed.  Valid options are:
       #
-      #  base_uri - The base url for the parsed document.
-      #  encoding - The document encoding, defaults to nil. Valid values
-      #             are the encoding constants defined on XML::Encoding.
-      #  options - Parser options.  Valid values are the constants defined on
-      #            XML::Parser::Options.  Mutliple options can be combined
-      #            by using Bitwise OR (|).
+      #   base_uri - The base url for the parsed document.
+      #   encoding - The document encoding, defaults to nil. Valid values
+      #              are the encoding constants defined on XML::Encoding.
+      #   options  - Parser options.  Valid values are the constants defined on
+      #              XML::Parser::Options.  Mutliple options can be combined
+      #              by using Bitwise OR (|).
       def self.string(value, options = {})
         Parser.string(value, options).parse
       end
@@ -94,11 +94,13 @@ module LibXML
       # optionally using the specified namespace.  For more 
       # information about working with namespaces, please refer
       # to the XML::XPath documentation.
+      #
+      # call-seq:
+      #   document.find(xpath, nslist=nil) -> XML::XPath::Object
       # 
       # 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')
       #
@@ -131,14 +133,14 @@ module LibXML
       # 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);
+        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:

data/libxml-ruby.gemspec

@@ -16,7 +16,8 @@ Gem::Specification.new do |spec|
     by the informal benchmark below.
   EOS
   spec.authors = ['Ross Bamform', 'Wai-Sun Chia', 'Sean Chittenden',
-                  'Dan Janwoski', 'Anurag Priyam', 'Charlie Savage']
+                  'Dan Janwoski', 'Anurag Priyam', 'Charlie Savage',
+                  'Ryan Johnson']
   spec.platform = Gem::Platform::RUBY
   spec.bindir = "bin"
   spec.extensions = ["ext/libxml/extconf.rb"]
@@ -39,4 +40,4 @@ Gem::Specification.new do |spec|
   spec.test_files = Dir.glob("test/tc_*.rb")
   spec.required_ruby_version = '>= 1.8.6'
   spec.date = DateTime.now
-end
+end

data/test/c14n/given/doc.dtd

@@ -0,0 +1 @@
+<!-- Empty DTD -->

data/test/c14n/given/example-1.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+
+<?xml-stylesheet   href="doc.xsl"
+   type="text/xsl"   ?>
+
+<!DOCTYPE doc SYSTEM "doc.dtd">
+
+<doc>Hello, world!<!-- Comment 1 --></doc>
+
+<?pi-without-data     ?>
+
+<!-- Comment 2 -->
+
+<!-- Comment 3 -->

data/test/c14n/given/example-2.xml

@@ -0,0 +1,11 @@
+<doc>
+   <clean>   </clean>
+   <dirty>   A   B   </dirty>
+   <mixed>
+      A
+      <clean>   </clean>
+      B
+      <dirty>   A   B   </dirty>
+      C
+   </mixed>
+</doc>

data/test/c14n/given/example-3.xml

@@ -0,0 +1,18 @@
+<!DOCTYPE doc [<!ATTLIST e9 attr CDATA "default">]>
+<doc>
+   <e1   />
+   <e2   ></e2>
+   <e3    name = "elem3"   id="elem3"    />
+   <e4    name="elem4"   id="elem4"    ></e4>
+   <e5 a:attr="out" b:attr="sorted" attr2="all" attr="I'm"
+       xmlns:b="http://www.ietf.org" 
+       xmlns:a="http://www.w3.org"
+       xmlns="http://www.uvic.ca"/>
+   <e6 xmlns="" xmlns:a="http://www.w3.org">
+       <e7 xmlns="http://www.ietf.org">
+           <e8 xmlns="" xmlns:a="http://www.w3.org">
+               <e9 xmlns="" xmlns:a="http://www.ietf.org" attr="default"/>
+           </e8>
+       </e7>
+   </e6>
+</doc>

data/test/c14n/given/example-4.xml

@@ -0,0 +1,9 @@
+<!DOCTYPE doc [<!ATTLIST normId id ID #IMPLIED>]>
+<doc>
+   <text>First line&#x0d;&#10;Second line</text>
+   <value>&#x32;</value>
+   <compute><![CDATA[value>"0" && value<"10" ?"valid":"error"]]></compute>
+   <compute expr='value>"0" &amp;&amp; value&lt;"10" ?"valid":"error"'>valid</compute>
+   <norm attr=' &apos;   &#x20;&#13;&#xa;&#9;   &apos; '/>
+   <normId id=' &apos;   &#x20;&#13;&#xa;&#9;   &apos; '/>
+</doc>

data/test/c14n/given/example-5.xml

@@ -0,0 +1,12 @@
+<!DOCTYPE doc [
+<!ATTLIST doc attrExtEnt ENTITY #IMPLIED>
+<!ENTITY ent1 "Hello">
+<!ENTITY ent2 SYSTEM "world.txt">
+<!ENTITY entExt SYSTEM "earth.gif" NDATA gif>
+<!NOTATION gif SYSTEM "viewgif.exe">
+]>
+<doc attrExtEnt="entExt">
+   &ent1;, &ent2;!
+</doc>
+
+<!-- Let world.txt contain "world" (excluding the quotes) -->

data/test/c14n/given/example-6.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<doc>&#169;</doc>

data/test/c14n/given/example-7.xml

@@ -0,0 +1,11 @@
+<!DOCTYPE doc [
+<!ATTLIST e2 xml:space (default|preserve) 'preserve'>
+<!ATTLIST e3 id ID #IMPLIED>
+]>
+<doc xmlns="http://www.ietf.org" xmlns:w3c="http://www.w3.org">
+   <e1>
+      <e2 xmlns="">
+         <e3 id="E3"/>
+      </e2>
+   </e1>
+</doc>

data/test/c14n/given/example-8.xml

@@ -0,0 +1,11 @@
+<!DOCTYPE doc [
+<!ATTLIST e2 xml:space (default|preserve) 'preserve'>
+<!ATTLIST e3 id ID #IMPLIED>
+]>
+<doc xmlns="http://www.ietf.org" xmlns:w3c="http://www.w3.org" xml:base="something/else">
+   <e1>
+      <e2 xmlns="" xml:id="abc" xml:base="bar/">
+         <e3 id="E3" xml:base="foo"/>
+      </e2>
+   </e1>
+</doc>

data/test/c14n/given/example-8.xpath

@@ -0,0 +1,10 @@
+<XPath xmlns:ietf="http://www.ietf.org" >
+    (//.|//@*|//namespace::*)
+    [
+	self::ietf:e1
+	    or
+	(parent::ietf:e1 and not(self::text() or self::e2))
+	    or
+	count(id("E3")|ancestor-or-self::node()) = count(ancestor-or-self::node())
+    ]
+</XPath>

data/test/c14n/given/world.txt

@@ -0,0 +1 @@
+world

data/test/c14n/result/1-1-without-comments/example-1

@@ -0,0 +1,4 @@
+<?xml-stylesheet href="doc.xsl"
+   type="text/xsl"   ?>
+<doc>Hello, world!</doc>
+<?pi-without-data?>

data/test/c14n/result/1-1-without-comments/example-2

@@ -0,0 +1,11 @@
+<doc>
+   <clean>   </clean>
+   <dirty>   A   B   </dirty>
+   <mixed>
+      A
+      <clean>   </clean>
+      B
+      <dirty>   A   B   </dirty>
+      C
+   </mixed>
+</doc>

data/test/c14n/result/1-1-without-comments/example-3

@@ -0,0 +1,14 @@
+<doc>
+   <e1></e1>
+   <e2></e2>
+   <e3 id="elem3" name="elem3"></e3>
+   <e4 id="elem4" name="elem4"></e4>
+   <e5 xmlns="http://www.uvic.ca" xmlns:a="http://www.w3.org" xmlns:b="http://www.ietf.org" attr="I'm" attr2="all" b:attr="sorted" a:attr="out"></e5>
+   <e6 xmlns:a="http://www.w3.org">
+       <e7 xmlns="http://www.ietf.org">
+           <e8 xmlns="">
+               <e9 xmlns:a="http://www.ietf.org" attr="default"></e9>
+           </e8>
+       </e7>
+   </e6>
+</doc>

data/test/c14n/result/1-1-without-comments/example-4

@@ -0,0 +1,9 @@
+<doc>
+   <text>First line&#xD;
+Second line</text>
+   <value>2</value>
+   <compute>value&gt;"0" &amp;&amp; value&lt;"10" ?"valid":"error"</compute>
+   <compute expr="value>&quot;0&quot; &amp;&amp; value&lt;&quot;10&quot; ?&quot;valid&quot;:&quot;error&quot;">valid</compute>
+   <norm attr=" '    &#xD;&#xA;&#x9;   ' "></norm>
+   <normId id="' &#xD;&#xA;&#x9; '"></normId>
+</doc>