libxml-ruby 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81e91ce08249acf16aa724c8aee17e94f86c384d8f9564d983dcd23f91ab9649
-  data.tar.gz: d3f48115d66b97da8a9cda69efc5ca261974795906a98d60256eddd1c5f4d8ec
+  metadata.gz: 6e28e87b2fe506944adbde7b4562e216ef39a858dfd3c75257bbbbf8b4ea22a8
+  data.tar.gz: 8fc1f4d3684c17f6fcc83697c6ec2846742ce102ee8c56876dec6a9704d4fee0
 SHA512:
-  metadata.gz: aafb9a7cead282d2219162b12117b15ac0504106054f71a5c86c88490bcfcfd0f347312482699bed03b87051378fc3997c270adab84dbf50523088177f86da79
-  data.tar.gz: bff4aa7c451552565e9cf2a6af287c249228e63c955ee2e3e0fe89f45f86d8c5ce454c617e27aee31ca778c1fa6c56f3cd53b20664209f8a011d14560616c17a
+  metadata.gz: '035593030f9bbaa922f967e25869d36203efe96fa3cbc63e18d02abf6a615352574d1c82bfd1c6ad7792daa5fe95873902821e45442ed513ae567fc22fc1ac95'
+  data.tar.gz: 62ef0548e25879fe1b1414a5e9b82ff97f8fe5f7cb9308bf5957c33cf2e8ac9c73a529f78112d9166a842bfbd684c10d4835c4321ff6e740e65b3ed9a9ba7698

data/HISTORY

@@ -1,5 +1,13 @@
 = Release History
 
+== 3.2.0 / 2020-05-09 Charlie Savage
+
+* Fix crash when creating an empty DTD
+* Modernize tests to use Bundler to load gem
+* Add libxml-ruby.rb file so gem loads in expted way.
+* Add support for xmlSaveNoEmptyTags.
+* Clean up extconf.rb file
+
 == 3.1.0 / 2018-02-03 Charlie Savage
 
 * Fix segmentation fault when adding one node to another node (Charlie Savage)

data/ext/libxml/extconf.h

@@ -0,0 +1,3 @@
+#ifndef EXTCONF_H
+#define EXTCONF_H
+#endif

data/ext/libxml/extconf.rb

@@ -25,33 +25,37 @@ else
   dir_config('xml2')
 end
 
-unless find_header('libxml/xmlversion.h',
-                   '/opt/include/libxml2',
-                   '/opt/local/include/libxml2',
-                   '/usr/local/include/libxml2',
-                   '/usr/include/libxml2') &&
-        find_library('xml2', 'xmlParseDoc',
-                     '/opt/lib',
-                     '/opt/local/lib',
-                     '/usr/local/lib',
-                     '/usr/lib')
-    crash(<<EOL)
-need libxml2.
-
-    Install the library or try one of the following options to extconf.rb:
-
-      --with-xml2-config=/path/to/xml2-config
-      --with-xml2-dir=/path/to/libxml2
-      --with-xml2-lib=/path/to/libxml2/lib
-      --with-xml2-include=/path/to/libxml2/include
-EOL
+found_header = find_header('libxml/xmlversion.h',
+                           '/opt/include/libxml2',
+                           '/opt/local/include/libxml2',
+                           '/usr/local/include/libxml2',
+                           '/usr/include/libxml2',
+                           '/usr/local/include')
+
+found_lib = find_library('xml2', 'xmlParseDoc',
+                         '/opt/lib',
+                         '/opt/local/lib',
+                         '/usr/local/lib',
+                         '/usr/lib')
+
+found_lib ||= find_library('libxml2', 'xmlParseDoc',
+                           '/opt/lib',
+                           '/opt/local/lib',
+                           '/usr/local/lib',
+                           '/usr/lib')
+
+if !found_header || !found_lib
+    crash(<<~EOL)
+      Cannot find libxml2.
+
+      Install the library or try one of the following options to extconf.rb:
+  
+        --with-xml2-config=/path/to/xml2-config
+        --with-xml2-dir=/path/to/libxml2
+        --with-xml2-lib=/path/to/libxml2/lib
+        --with-xml2-include=/path/to/libxml2/include
+    EOL
 end
 
-have_func('rb_io_bufwrite', 'ruby/io.h')
-
-# For FreeBSD add /usr/local/include
-$INCFLAGS << " -I/usr/local/include"
-$CFLAGS << ' ' << $INCFLAGS
-
 create_header()
 create_makefile('libxml_ruby')

data/ext/libxml/ruby_libxml.h

@@ -16,15 +16,7 @@
 #include <libxml/xmlreader.h>
 #include <libxml/c14n.h>
 
-/* Needed prior to Ruby 1.9.1 */
-#ifndef RHASH_TBL
-#define RHASH_TBL(s) (RHASH(s)->tbl)
-#endif
-
-// Encoding support added in Ruby 1.9.*
-#ifdef HAVE_RUBY_ENCODING_H
 #include <ruby/encoding.h>
-#endif
 
 #ifdef LIBXML_DEBUG_ENABLED
 #include <libxml/xpathInternals.h>

data/ext/libxml/ruby_xml.c

@@ -717,6 +717,44 @@ static VALUE rxml_default_compression_set(VALUE klass, VALUE num)
 #endif
 }
 
+/*
+ * call-seq:
+ *    XML.default_save_no_empty_tags -> (true|false)
+ *
+ * Determine whether serializer outputs empty tags by default.
+ */
+static VALUE rxml_default_save_no_empty_tags_get(VALUE klass)
+{
+  if (xmlSaveNoEmptyTags)
+    return (Qtrue);
+  else
+    return (Qfalse);
+}
+
+/*
+ * call-seq:
+ *    XML.default_save_no_empty_tags = true|false
+ *
+ * Controls whether serializer outputs empty tags by default.
+ */
+static VALUE rxml_default_save_no_empty_tags_set(VALUE klass, VALUE value)
+{
+  if (value == Qfalse)
+  {
+    xmlSaveNoEmptyTags = 0;
+    return (Qfalse);
+  }
+  else if (value == Qtrue)
+  {
+    xmlSaveNoEmptyTags = 1;
+    return (Qtrue);
+  }
+  else
+  {
+    rb_raise(rb_eArgError, "Invalid argument, must be a boolean");
+  }
+}
+
 /*
  * call-seq:
  *    XML.features -> ["feature", ..., "feature"]
@@ -885,6 +923,8 @@ void rxml_init_xml(void)
   rb_define_module_function(mXML, "default_validity_checking=", rxml_default_validity_checking_set, 1);
   rb_define_module_function(mXML, "default_warnings", rxml_default_warnings_get, 0);
   rb_define_module_function(mXML, "default_warnings=", rxml_default_warnings_set, 1);
+  rb_define_module_function(mXML, "default_save_no_empty_tags", rxml_default_save_no_empty_tags_get, 0);
+  rb_define_module_function(mXML, "default_save_no_empty_tags=", rxml_default_save_no_empty_tags_set, 1);
   rb_define_module_function(mXML, "features", rxml_features, 0);
   rb_define_module_function(mXML, "indent_tree_output", rxml_indent_tree_output_get, 0);
   rb_define_module_function(mXML, "indent_tree_output=", rxml_indent_tree_output_set, 1);

data/ext/libxml/ruby_xml_document.c

@@ -738,7 +738,7 @@ static VALUE rxml_document_root_set(VALUE self, VALUE node)
   Data_Get_Struct(node, xmlNode, xnode);
 
   if (xnode->doc != NULL && xnode->doc != xdoc)
-    rb_raise(eXMLError, "Nodes belong to different documents.  You must first import the node by calling XML::Document.import");
+    rb_raise(eXMLError, "Nodes belong to different documents.  You must first import the node by calling LibXML::XML::Document.import");
 
   xmlDocSetRootElement(xdoc, xnode);
 

data/ext/libxml/ruby_xml_dtd.c

@@ -38,13 +38,11 @@ void rxml_dtd_free(xmlDtdPtr xdtd)
 
 void rxml_dtd_mark(xmlDtdPtr xdtd)
 {
-  VALUE doc = Qnil;
-
-  if (xdtd == NULL)
-    return;
-
-  doc = (VALUE)xdtd->doc->_private;
-  rb_gc_mark(doc);
+  if (xdtd && xdtd->doc)
+  {
+      VALUE doc = (VALUE)xdtd->doc->_private;
+      rb_gc_mark(doc);
+  }
 }
 
 static VALUE rxml_dtd_alloc(VALUE klass)
@@ -173,7 +171,7 @@ static VALUE rxml_dtd_initialize(int argc, VALUE *argv, VALUE self)
       }
       if (doc != Qnil) {
         if (rb_obj_is_kind_of(doc, cXMLDocument) == Qfalse)
-          rb_raise(rb_eTypeError, "Must pass an XML::Document object");
+          rb_raise(rb_eTypeError, "Must pass an LibXML::XML::Document object");
         Data_Get_Struct(doc, xmlDoc, xdoc);
       }
 

data/ext/libxml/ruby_xml_node.c

@@ -310,7 +310,7 @@ static VALUE rxml_node_modify_dom(VALUE self, VALUE target,
   xtarget = rxml_get_xnode(target);
 
   if (xtarget->doc != NULL && xtarget->doc != xnode->doc)
-    rb_raise(eXMLError, "Nodes belong to different documents.  You must first import the node by calling XML::Document.import");
+    rb_raise(eXMLError, "Nodes belong to different documents.  You must first import the node by calling LibXML::XML::Document.import");
 
   xmlUnlinkNode(xtarget);
 

data/ext/libxml/ruby_xml_parser_context.c

@@ -47,7 +47,7 @@ static VALUE rxml_parser_context_document(VALUE klass, VALUE document)
   int length;
 
   if (rb_obj_is_kind_of(document, cXMLDocument) == Qfalse)
-    rb_raise(rb_eTypeError, "Must pass an XML::Document object");
+    rb_raise(rb_eTypeError, "Must pass an LibXML::XML::Document object");
 
   Data_Get_Struct(document, xmlDoc, xdoc);
   xmlDocDumpFormatMemoryEnc(xdoc, &buffer, &length, (const char*)xdoc->encoding, 0);

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  "3.1.0"
-#define RUBY_LIBXML_VERNUM   310
+#define RUBY_LIBXML_VERSION  "3.2.0"
+#define RUBY_LIBXML_VERNUM   320
 #define RUBY_LIBXML_VER_MAJ   3
-#define RUBY_LIBXML_VER_MIN   1
+#define RUBY_LIBXML_VER_MIN   2
 #define RUBY_LIBXML_VER_MIC   0
 #define RUBY_LIBXML_VER_PATCH 0

data/lib/libxml-ruby.rb

@@ -0,0 +1,30 @@
+# encoding: UTF-8
+
+# Load the C-based binding.
+begin
+  RUBY_VERSION =~ /(\d+.\d+)/
+  require "#{$1}/libxml_ruby"
+rescue LoadError
+  require "libxml_ruby"
+end
+
+# Load Ruby supporting code.
+require 'libxml/error'
+require 'libxml/parser'
+require 'libxml/document'
+require 'libxml/namespaces'
+require 'libxml/namespace'
+require 'libxml/node'
+require 'libxml/attributes'
+require 'libxml/attr'
+require 'libxml/attr_decl'
+require 'libxml/tree'
+require 'libxml/html_parser'
+require 'libxml/sax_parser'
+require 'libxml/sax_callbacks'
+
+#Schema Interface
+require 'libxml/schema'
+require 'libxml/schema/type'
+require 'libxml/schema/element'
+require 'libxml/schema/attribute'

data/lib/libxml.rb

@@ -1,30 +1,5 @@
 # encoding: UTF-8
+#
+# This include is deprecated, use libxml-ruby instead!
 
-# Load the C-based binding.
-begin
-  RUBY_VERSION =~ /(\d+.\d+)/
-  require "#{$1}/libxml_ruby"
-rescue LoadError
-  require "libxml_ruby"
-end
-
-# Load Ruby supporting code.
-require 'libxml/error'
-require 'libxml/parser'
-require 'libxml/document'
-require 'libxml/namespaces'
-require 'libxml/namespace'
-require 'libxml/node'
-require 'libxml/attributes'
-require 'libxml/attr'
-require 'libxml/attr_decl'
-require 'libxml/tree'
-require 'libxml/html_parser'
-require 'libxml/sax_parser'
-require 'libxml/sax_callbacks'
-
-#Schema Interface
-require 'libxml/schema'
-require 'libxml/schema/type'
-require 'libxml/schema/element'
-require 'libxml/schema/attribute'
+require 'libxml-ruby'

data/libxml-ruby.gemspec

@@ -38,10 +38,10 @@ Gem::Specification.new do |spec|
                          'lib/**/*.rb',
                          'script/**/*',
                          'test/**/*'])
+
   spec.test_files = Dir.glob('test/test_*.rb')
-  spec.required_ruby_version = '>= 1.8.6'
+  spec.required_ruby_version = '>= 2.5'
   spec.date = DateTime.now
-  #spec.add_development_dependency('hanna-nouveau')
   spec.add_development_dependency('rake-compiler')
   spec.add_development_dependency('minitest')
   spec.license = 'MIT'

data/test/test_attr.rb

@@ -1,10 +1,10 @@
 # encoding: UTF-8
 
-require File.expand_path('../test_helper', __FILE__)
+require_relative './test_helper'
 
 class AttrNodeTest < Minitest::Test
   def setup
-    xp = XML::Parser.string(<<-EOS)
+    xp = LibXML::XML::Parser.string(<<-EOS)
     <CityModel
       xmlns="http://www.opengis.net/examples"
       xmlns:city="http://www.opengis.net/examples"
@@ -34,19 +34,19 @@ class AttrNodeTest < Minitest::Test
 
   def test_doc
     refute_nil(@doc)
-    assert_equal(XML::Encoding::NONE, @doc.encoding)
+    assert_equal(LibXML::XML::Encoding::NONE, @doc.encoding)
   end
 
   def test_types
     attribute = city_member.attributes.get_attribute('name')
-    assert_instance_of(XML::Attr, attribute)
+    assert_instance_of(LibXML::XML::Attr, attribute)
     assert_equal('attribute', attribute.node_type_name)
   end
 
   def test_name
     attribute = city_member.attributes.get_attribute('name')
     assert_equal('name', attribute.name)
-    assert_equal(Encoding::UTF_8, attribute.name.encoding) if defined?(Encoding)
+    assert_equal(Encoding::UTF_8, attribute.name.encoding)
 
     attribute = city_member.attributes.get_attribute('href')
     assert_equal('href', attribute.name)
@@ -62,7 +62,7 @@ class AttrNodeTest < Minitest::Test
   def test_value
     attribute = city_member.attributes.get_attribute('name')
     assert_equal('Cambridge', attribute.value)
-    assert_equal(Encoding::UTF_8, attribute.value.encoding) if defined?(Encoding)
+    assert_equal(Encoding::UTF_8, attribute.value.encoding)
 
     attribute = city_member.attributes.get_attribute('href')
     assert_equal('http://www.foo.net/cgi-bin/wfs?FeatureID=C10239', attribute.value)
@@ -72,12 +72,12 @@ class AttrNodeTest < Minitest::Test
     attribute = city_member.attributes.get_attribute('name')
     attribute.value = 'London'
     assert_equal('London', attribute.value)
-    assert_equal(Encoding::UTF_8, attribute.value.encoding) if defined?(Encoding)
+    assert_equal(Encoding::UTF_8, attribute.value.encoding)
 
     attribute = city_member.attributes.get_attribute('href')
     attribute.value = 'http://i.have.changed'
     assert_equal('http://i.have.changed', attribute.value)
-    assert_equal(Encoding::UTF_8, attribute.value.encoding) if defined?(Encoding)
+    assert_equal(Encoding::UTF_8, attribute.value.encoding)
   end
 
   def test_set_nil
@@ -91,8 +91,8 @@ class AttrNodeTest < Minitest::Test
     attributes = city_member.attributes
     assert_equal(5, attributes.length)
 
-    attr = XML::Attr.new(city_member, 'size', '50,000')
-    assert_instance_of(XML::Attr, attr)
+    attr = LibXML::XML::Attr.new(city_member, 'size', '50,000')
+    assert_instance_of(LibXML::XML::Attr, attr)
 
     attributes = city_member.attributes
     assert_equal(6, attributes.length)
@@ -115,9 +115,9 @@ class AttrNodeTest < Minitest::Test
   def test_create_ns
     assert_equal(5, city_member.attributes.length)
 
-    ns = XML::Namespace.new(city_member, 'my_namepace', 'http://www.mynamespace.com')
-    attr = XML::Attr.new(city_member, 'rating', 'rocks', ns)
-    assert_instance_of(XML::Attr, attr)
+    ns = LibXML::XML::Namespace.new(city_member, 'my_namepace', 'http://www.mynamespace.com')
+    attr = LibXML::XML::Attr.new(city_member, 'rating', 'rocks', ns)
+    assert_instance_of(LibXML::XML::Attr, attr)
     assert_equal('rating', attr.name)
     assert_equal('rocks', attr.value)
 
@@ -144,27 +144,27 @@ class AttrNodeTest < Minitest::Test
 
   def test_first
     attribute = city_member.attributes.first
-    assert_instance_of(XML::Attr, attribute)
+    assert_instance_of(LibXML::XML::Attr, attribute)
     assert_equal('name', attribute.name)
     assert_equal('Cambridge', attribute.value)
 
     attribute = attribute.next
-    assert_instance_of(XML::Attr, attribute)
+    assert_instance_of(LibXML::XML::Attr, attribute)
     assert_equal('type', attribute.name)
     assert_equal('simple', attribute.value)
 
     attribute = attribute.next
-    assert_instance_of(XML::Attr, attribute)
+    assert_instance_of(LibXML::XML::Attr, attribute)
     assert_equal('title', attribute.name)
     assert_equal('Trinity Lane', attribute.value)
 
     attribute = attribute.next
-    assert_instance_of(XML::Attr, attribute)
+    assert_instance_of(LibXML::XML::Attr, attribute)
     assert_equal('href', attribute.name)
     assert_equal('http://www.foo.net/cgi-bin/wfs?FeatureID=C10239', attribute.value)
 
     attribute = attribute.next
-    assert_instance_of(XML::Attr, attribute)
+    assert_instance_of(LibXML::XML::Attr, attribute)
     assert_equal('remoteSchema', attribute.name)
     assert_equal("city.xsd#xpointer(//complexType[@name='RoadType'])", attribute.value)
 

data/test/test_attr_decl.rb

@@ -1,10 +1,10 @@
 # encoding: UTF-8
 
-require File.expand_path('../test_helper', __FILE__)
+require_relative './test_helper'
 
 class AttrDeclTest < Minitest::Test
   def setup
-    xp = XML::Parser.string(<<-EOS)
+    xp = LibXML::XML::Parser.string(<<-EOS)
 	<!DOCTYPE test [
 	  <!ELEMENT root (property*)>
 	  <!ELEMENT property EMPTY>
@@ -42,7 +42,7 @@ class AttrDeclTest < Minitest::Test
     # Get the attr_decl
     attr = elem.attributes.get_attribute('access')
     refute_nil(attr)
-    assert_equal(XML::Node::ATTRIBUTE_NODE, attr.node_type)
+    assert_equal(LibXML::XML::Node::ATTRIBUTE_NODE, attr.node_type)
     assert_equal('attribute', attr.node_type_name)
 
     # Get its value
@@ -56,7 +56,7 @@ class AttrDeclTest < Minitest::Test
     # Get the attr_decl
     attr_decl = elem.attributes.get_attribute('access')
     refute_nil(attr_decl)
-    assert_equal(XML::Node::ATTRIBUTE_DECL, attr_decl.node_type)
+    assert_equal(LibXML::XML::Node::ATTRIBUTE_DECL, attr_decl.node_type)
     assert_equal('attribute declaration', attr_decl.node_type_name)
 
     # Get its value
@@ -69,7 +69,7 @@ class AttrDeclTest < Minitest::Test
     attr_decl = elem.attributes.get_attribute('access')
 
     refute_nil(attr_decl)
-    assert_equal(XML::Node::ATTRIBUTE_DECL, attr_decl.node_type)
+    assert_equal(LibXML::XML::Node::ATTRIBUTE_DECL, attr_decl.node_type)
     assert_equal('attribute declaration', attr_decl.node_type_name)
   end
   
@@ -99,12 +99,12 @@ class AttrDeclTest < Minitest::Test
     attr_decl = elem.attributes.get_attribute('access')
 
     first_decl = attr_decl.prev
-    assert_equal(XML::Node::ATTRIBUTE_DECL, first_decl.node_type)
+    assert_equal(LibXML::XML::Node::ATTRIBUTE_DECL, first_decl.node_type)
     assert_equal('name', first_decl.name)
     assert_nil(first_decl.value)
 
     elem_decl = first_decl.prev
-    assert_equal(XML::Node::ELEMENT_DECL, elem_decl.node_type)
+    assert_equal(LibXML::XML::Node::ELEMENT_DECL, elem_decl.node_type)
   end
 
   def test_next
@@ -127,6 +127,6 @@ class AttrDeclTest < Minitest::Test
     attr_decl = elem.attributes.get_attribute('access')
 
     parent = attr_decl.parent
-    assert_instance_of(XML::Dtd, parent)
+    assert_instance_of(LibXML::XML::Dtd, parent)
   end
 end