libxml-ruby 2.0.5 → 2.0.6

data/HISTORY

@@ -1,5 +1,11 @@
 = Release History
 
+== 2.0.6 / 2011-05-23 Charlie Savage
+
+* Fix segfault that sometimes occurred when looking up encodings on 1.9.
+  In some cases the Ruby encoding infrastructure was not properly
+  initialized (nkriege).
+
 == 2.0.5 / 2011-05-05 Charlie Savage
 
 * Document#validate_dtd would sometimes cause segmentation faults due to

data/ext/libxml/ruby_xml_document.c

@@ -894,7 +894,6 @@ static VALUE rxml_document_validate_relaxng(VALUE self, VALUE relaxng)
  */
 static VALUE rxml_document_validate_dtd(VALUE self, VALUE dtd)
 {
-  VALUE error = Qnil;
   xmlValidCtxt ctxt;
   xmlDocPtr xdoc;
   xmlDtdPtr xdtd;
@@ -904,11 +903,10 @@ static VALUE rxml_document_validate_dtd(VALUE self, VALUE dtd)
 
   /* Setup context */
   memset(&ctxt, 0, sizeof(xmlValidCtxt));
-  ctxt.userData = &error;
 
   if (xmlValidateDtd(&ctxt, xdoc, xdtd))
   {
-    return (Qtrue);
+    return Qtrue;
   }
   else
   {

data/ext/libxml/ruby_xml_encoding.c

@@ -75,74 +75,80 @@ static VALUE rxml_encoding_to_s(VALUE klass, VALUE encoding)
 }
 
 #ifdef HAVE_RUBY_ENCODING_H
+/*
+ * Converts an xmlCharEncoding enum value into a Ruby Encoding object (available
+ * on Ruby 1.9.* and higher).
+ */
 VALUE rxml_xml_encoding_to_rb_encoding(VALUE klass, xmlCharEncoding xmlEncoding)
 {
-  ID encoding_name;
+  const char* encodingName;
 
   switch (xmlEncoding)
   {
     case XML_CHAR_ENCODING_UTF8:
-      encoding_name = rb_intern("UTF_8");
+      encodingName = "UTF-8";
       break;
     case XML_CHAR_ENCODING_UTF16LE:
-      encoding_name = rb_intern("UTF_16LE");
+      encodingName = "UTF-16LE";
       break;
     case XML_CHAR_ENCODING_UTF16BE:
-      encoding_name = rb_intern("UTF_16BE");
+      encodingName = "UTF-16BE";
       break;
     case XML_CHAR_ENCODING_UCS4LE:
-      encoding_name = rb_intern("UCS_4LE");
+      encodingName = "UCS-4LE";
       break;
     case XML_CHAR_ENCODING_UCS4BE:
-      encoding_name = rb_intern("UCS_4BE");
+      encodingName = "UCS-4BE";
       break;
     case XML_CHAR_ENCODING_UCS2:
-      encoding_name = rb_intern("UCS_2");
+      encodingName = "UCS-2";
       break;
     case XML_CHAR_ENCODING_8859_1:
-      encoding_name = rb_intern("ISO8859_1");
+      encodingName = "ISO8859-1";
       break;
     case XML_CHAR_ENCODING_8859_2:
-      encoding_name = rb_intern("ISO8859_2");
+      encodingName = "ISO8859-2";
       break;
     case XML_CHAR_ENCODING_8859_3:
-      encoding_name = rb_intern("ISO8859_3");
+      encodingName = "ISO8859-3";
       break;
     case XML_CHAR_ENCODING_8859_4:
-      encoding_name = rb_intern("ISO8859_4");
+      encodingName = "ISO8859-4";
       break;
     case XML_CHAR_ENCODING_8859_5:
-      encoding_name = rb_intern("ISO8859_5");
+      encodingName = "ISO8859-5";
       break;
     case XML_CHAR_ENCODING_8859_6:
-      encoding_name = rb_intern("ISO8859_6");
+      encodingName = "ISO8859-6";
       break;
     case XML_CHAR_ENCODING_8859_7:
-      encoding_name = rb_intern("ISO8859_7");
+      encodingName = "ISO8859-7";
       break;
     case XML_CHAR_ENCODING_8859_8:
-      encoding_name = rb_intern("ISO8859_8");
+      encodingName = "ISO8859-8";
       break;
     case XML_CHAR_ENCODING_8859_9:
-      encoding_name = rb_intern("ISO8859_9");
+      encodingName = "ISO8859-9";
       break;
     case XML_CHAR_ENCODING_2022_JP:
-      encoding_name = rb_intern("ISO_2022_JP");
+      encodingName = "ISO-2022-JP";
       break;
     case XML_CHAR_ENCODING_SHIFT_JIS:
-      encoding_name = rb_intern("SHIFT_JIS");
+      encodingName = "SHIFT-JIS";
       break;
     case XML_CHAR_ENCODING_EUC_JP:
-      encoding_name = rb_intern("EUC_JP");
+      encodingName = "EUC-JP";
       break;
     case XML_CHAR_ENCODING_ASCII:
-      encoding_name = rb_intern("US-ASCII");
+      encodingName = "US-ASCII";
       break;
     default:
       /* Covers XML_CHAR_ENCODING_ERROR, XML_CHAR_ENCODING_NONE, XML_CHAR_ENCODING_EBCDIC */
-      encoding_name = rb_intern("ASCII_8BIT");
+      encodingName = "ASCII-8BIT";
+      break;
   }
-  return rb_const_get(rb_cEncoding, encoding_name);
+
+  return rb_enc_from_encoding(rb_enc_find(encodingName));
 }
 
 /*

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.0.5"
-#define RUBY_LIBXML_VERNUM   205
+#define RUBY_LIBXML_VERSION  "2.0.6"
+#define RUBY_LIBXML_VERNUM   206
 #define RUBY_LIBXML_VER_MAJ   2
 #define RUBY_LIBXML_VER_MIN   0
-#define RUBY_LIBXML_VER_MIC   5
+#define RUBY_LIBXML_VER_MIC   6
 #define RUBY_LIBXML_VER_PATCH 0

data/test/model/shiporder.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shiporder orderid="889923"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:noNamespaceSchemaLocation="shiporder.xsd">
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:noNamespaceSchemaLocation="shiporder.xsd">
   <orderperson>John Smith</orderperson>
   <shipto>
     <name>Ola Nordmann</name>

data/test/tc_schema.rb

@@ -15,7 +15,7 @@ class TestSchema < Test::Unit::TestCase
   
   def schema
     document = XML::Document.file(File.join(File.dirname(__FILE__), 'model/shiporder.xsd'))
-    schema = XML::Schema.document(document)
+    XML::Schema.document(document)
   end
 
   def test_from_doc

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: libxml-ruby
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 2
   - 0
-  - 5
-  version: 2.0.5
+  - 6
+  version: 2.0.6
 platform: ruby
 authors: 
 - Ross Bamform
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-05 00:00:00 Z
+date: 2011-05-23 00:00:00 Z
 dependencies: []
 
 description: "    The Libxml-Ruby project provides Ruby language bindings for the GNOME\n    Libxml2 XML toolkit. It is free software, released under the MIT License.\n    Libxml-ruby's primary advantage over REXML is performance - if speed\n    is your need, these are good libraries to consider, as demonstrated\n    by the informal benchmark below.\n"