libxml-ruby 3.0.0-x64-mingw32 → 3.2.2-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 98683119a9004ba121e958d8eca9035a5cdda0f9
-  data.tar.gz: 3f2702937fc217d90588e06a56b92677a7b521c6
+SHA256:
+  metadata.gz: 96fdb761fe5ba6333b9d6cedf5cfb395d6a177bc02ad5aed1bf2f269d027cd04
+  data.tar.gz: c4761509dee6f67a3736718349f33c516d2c617429d559a732c73c855a725506
 SHA512:
-  metadata.gz: abbc680e716649d1ec53c8a4326c1fb38acfba8b207bea7c54ec746b91c162bbe978b0dc45e5b1c2ce925b18b0740d7db28f7c0397407741443d492c3d7e3864
-  data.tar.gz: 9f8dec8ab22d170646644e7982a2a097fde6dd993a8f186b90b5ce9172363f8b6f689643731068c4861cd834a39f010de6cac1ec6ed01a48152fd18053ef377e
+  metadata.gz: 8b0cdc74c5c3ebe00a65c811e15eb60d47937b2a6050a004d5c08e6d3e275918da7929ce874b7353daed587432b7e83c8d754a240a5e295c4c7abdb2086523d3
+  data.tar.gz: 3851c2f2155f3dbe9674821208b128eb0480a51795e05ec6593aded6ec61628c98f765baa64f8d81313b2e6a24e2478aaf6dfc575c6903cab272da7e9073f6d9

data/HISTORY

@@ -1,5 +1,42 @@
 = Release History
 
+== 3.2.2 / 2022-01-15
+* Switch to Github actions for CI/CD (Greg)
+* Test fixes (Greg, Sergio Durigan Junior)
+* Fix typo on test/test_sax_parser.rb (Sergio Durigan Junior)
+* Update homepage in gemspec (Pirate Praveen Arimbrathodiyil)
+
+== 3.2.1 / 2020-11-05
+
+* Fix incorrect handling of encodings when using XMLWriter.io (Charlie Savage)
+* Clean up README  (Richard Michael)
+
+== 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 expected 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)
+* Fix deprecated "assert_equal(nil, expected)" calls. #148 and #151. (utilum)
+* Remove assigned but unused variables. #150 (utilum)
+* Add Gemfile. #146. (Dorian Marié)
+* Remove duplicate hash key in setup.rb. #147. (Dorian Marié)
+* Fix gemspec by requiring Date. #149 (utilum)
+* Restore default internal encoding after tests are completed. #123 (Charlie Savage)
+* Remove duplicate method definitions. #145. (Charlie Savage)
+* Remove SchemaElement#minOccurs and SchemaElement#maxOccurs since they actually did not work (Charlie Savage)
+* Rename test files to follow Ruby conventions (Charlie Savage)
+* Fix handling of node returned by Reader#expand. #142. (Charlie Savage)
+* Add Travis Build support (Charlie Savage)
+* Fix Fixnum deprecation (Charlie Savage)
+* Cleanup schema code (Charlie Savage)
+* Update Visual Studio project to 2017 (Charlie Savage)
+
 == 3.0.0 / 2017-02-07 Charlie Savage
 
 * Revamp how libxml-ruby manages memory.  Instead of trying to return the same ruby object for each xmlnode,

data/MANIFEST

@@ -122,40 +122,40 @@ test/model/shiporder.xml
 test/model/shiporder.xsd
 test/model/soap.xml
 test/model/xinclude.xml
-test/tc_attr.rb
-test/tc_attr_decl.rb
-test/tc_attributes.rb
-test/tc_deprecated_require.rb
-test/tc_document.rb
-test/tc_document_write.rb
-test/tc_dtd.rb
-test/tc_error.rb
-test/tc_html_parser.rb
-test/tc_namespace.rb
-test/tc_namespaces.rb
-test/tc_node.rb
-test/tc_node_cdata.rb
-test/tc_node_comment.rb
-test/tc_node_copy.rb
-test/tc_node_edit.rb
-test/tc_node_pi.rb
-test/tc_node_text.rb
-test/tc_node_write.rb
-test/tc_node_xlink.rb
-test/tc_parser.rb
-test/tc_parser_context.rb
-test/tc_properties.rb
-test/tc_reader.rb
-test/tc_relaxng.rb
-test/tc_sax_parser.rb
-test/tc_schema.rb
-test/tc_traversal.rb
-test/tc_xinclude.rb
-test/tc_xml.rb
-test/tc_xpath.rb
-test/tc_xpath_context.rb
-test/tc_xpath_expression.rb
-test/tc_xpointer.rb
+test/test_attr.rb
+test/test_attr_decl.rb
+test/test_attributes.rb
+test/test_deprecated_require.rb
+test/test_document.rb
+test/test_document_write.rb
+test/test_dtd.rb
+test/test_error.rb
+test/test_html_parser.rb
+test/test_namespace.rb
+test/test_namespaces.rb
+test/test_node.rb
+test/test_node_cdata.rb
+test/test_node_comment.rb
+test/test_node_copy.rb
+test/test_node_edit.rb
+test/test_node_pi.rb
+test/test_node_text.rb
+test/test_node_write.rb
+test/test_node_xlink.rb
+test/test_parser.rb
+test/test_parser_context.rb
+test/test_properties.rb
+test/test_reader.rb
+test/test_relaxng.rb
+test/test_sax_parser.rb
+test/test_schema.rb
+test/test_traversal.rb
+test/test_xinclude.rb
+test/test_xml.rb
+test/test_xpath.rb
+test/test_xpath_context.rb
+test/test_xpath_expression.rb
+test/test_xpointer.rb
 test/test_suite.rb
 Rakefile
 HISTORY.rdoc

data/README.rdoc

@@ -11,8 +11,8 @@ We think libxml-ruby is the best XML library for Ruby because:
 * Conformance - It passes all 1800+ tests from the OASIS XML Tests Suite
 
 == Requirements
-libxml-ruby requires Ruby 1.8.4 or higher.  It depends on libxml2 to
-function propoerly.  libxml2, in turn, depends on:
+libxml-ruby requires Ruby 1.8.7 or higher.  It depends on libxml2 to
+function properly.  libxml2, in turn, depends on:
 
 * libm      (math routines: very standard)
 * libz      (zlib)
@@ -21,25 +21,41 @@ function propoerly.  libxml2, in turn, depends on:
 If you are running Linux or Unix you'll need a C compiler so the
 extension can be compiled when it is installed.  If you are running
 Windows, then install the x64-mingw32 gem or build it yourself using
-Devkit (http://rubyinstaller.org/add-ons/devkit/) or
-msys2 (https://msys2.github.io/).
+Devkit[http://rubyinstaller.org/add-ons/devkit/] or
+msys2[https://msys2.github.io/].
 
-== INSTALLATION
-The easiest way to install libxml-ruby is via Ruby Gems.  To install:
+== Installation
+The easiest way to install libxml-ruby is via RubyGems.  To install:
 
 <tt>gem install libxml-ruby</tt>
 
+If the extension compile process cannot find libxml2, you may need to indicate
+the location of the libxml2 configuration utility as it is used to find the
+required header and include files.  (If you need to indicate a location for the
+libxml2 library or header files different than reported by <tt>xml2-config</tt>,
+see the additional configuration options.)
+
+This may be done with RubyGems:
+
+<tt>gem install libxml-ruby -- --with-xml2-dir=/path/to/xml2-config</tt>
+
+Or bundler:
+
+<tt>bundle config build.libxml-ruby --with-xml2-config=/path/to/xml2-config</tt>
+
+<tt>bundle install libxml-ruby</tt>
+
 If you are running Windows, then install the libxml-ruby-x64-mingw32 gem.
-THe gem inncludes prebuilt extensions for Ruby 2.3.  These
+The gem includes prebuilt extensions for Ruby 2.3.  These
 extensions are built using MinGW64 and libxml2 version 2.9.3,
 iconv version 1.14 and zlib version 1.2.8. Note these binaries
-are available in the lib\libs directory.  To use them, put them
-someplace on your path.
+are available in the <tt>lib\\libs</tt> directory.  To use them, put them
+on your <tt>PATH</tt>.
 
 The gem also includes a Microsoft VC++ 2012 solution and XCode 5 project - these
 are very useful for debugging.
 
-libxml-ruby's source codes lives on Github at https://github.com/xml4r/libxml-ruby.
+libxml-ruby's source codes lives on GitHub[https://github.com/xml4r/libxml-ruby].
 
 == Getting Started
 Using libxml is easy. First decide what parser you want to use:
@@ -60,7 +76,7 @@ Beyond the basics of parsing and processing XML and HTML documents,
 libxml provides a wealth of additional functionality.
 
 Most commonly, you'll want to use its LibXML::XML::XPath support, which makes
-it easy to find data inside a XML document.  Although not as popular,
+it easy to find data inside an XML document.  Although not as popular,
 LibXML::XML::XPointer provides another API for finding data inside an XML document.
 
 Often times you'll need to validate data before processing it. For example,
@@ -72,17 +88,16 @@ This can be done using libxml's powerful set of validators:
 * Relax Schemas (LibXML::XML::RelaxNG)
 * XML Schema (LibXML::XML::Schema)
 
-Finally, if you'd like to use XSL Transformations to process data,
-then install the libxslt gem which is available at
-https://github.com/xml4r/libxslt-ruby.
+Finally, if you'd like to use XSL Transformations to process data, then install
+the {libxslt gem}[https://github.com/xml4r/libxslt-rubygem].
 
 == Usage
-For information about using libxml-ruby please refer to its documentation at
-http://xml4r.github.com/libxml-ruby/rdoc/index.html. Some tutorials are also
-available at https://github.com/xml4r/libxml-ruby/wiki.
+For information about using libxml-ruby please refer to its
+documentation[http://xml4r.github.io/libxml-ruby]. Some tutorials are also
+available[https://github.com/xml4r/libxml-ruby/wiki].
 
 All libxml classes are in the LibXML::XML module. The easiest
-way to use libxml is to require 'xml'.  This will mixin
+way to use libxml is to <tt>require 'xml'</tt>.  This will mixin
 the LibXML module into the global namespace, allowing you to
 write code like this:
 
@@ -118,11 +133,24 @@ libxml-ruby fully supports native, background Ruby threads.  This of course
 only applies to Ruby 1.9.x and higher since earlier versions of Ruby do not
 support native threads.
 
+== Tests
+
+To run tests you first need to build the shared libary:
+
+  rake compile
+
+Once you have build the shared libary, you can then run tests using rake:
+
+  rake test
+
++Travis build status: {<img src="https://travis-ci.org/xml4r/libxml-ruby.svg?branch=master" alt="Build Status" />}[https://travis-ci.org/xml4r/libxml-ruby]
+
 == Performance
+
 In addition to being feature rich and conformation, the main reason
-people use libxml-ruby is for performance.  Here are the results 
+people use libxml-ruby is for performance.  Here are the results
 of a couple simple benchmarks recently blogged about on the
-Web (you can find them in the benchmark directory of the 
+Web (you can find them in the benchmark directory of the
 libxml distribution).
 
 From http://depixelate.com/2008/4/23/ruby-xml-parsing-benchmarks
@@ -144,44 +172,45 @@ From https://svn.concord.org/svn/projects/trunk/common/ruby/xml_benchmarks/
 Documentation is available via rdoc, and is installed automatically with the
 gem.
 
-libxml-ruby's online documentation is generated using Hanna, which is a
-development gem dependency.
+libxml-ruby's {online
+documentation}[https://xml4r.github.io/libxml-ruby/rdoc/index.html] is generated
+using Hanna, which is a development gem dependency.
 
 Note that older versions of Rdoc, which ship with Ruby 1.8.x, will report
 a number of errors.  To avoid them, install Rdoc 2.1 or higher.  Once you have
 installed the gem, you'll have to disable the version of Rdoc that Ruby 1.8.x
-includes.  An easy way to do that is rename the directory ruby/lib/ruby/1.8/rdoc to
-ruby/lib/ruby/1.8/rdoc_old.
+includes.  An easy way to do that is rename the directory
+<tt>ruby/lib/ruby/1.8/rdoc</tt> to
+<tt>ruby/lib/ruby/1.8/rdoc_old</tt>.
 
 == Support
-
-If you have any questions about using libxml-ruby, please report them to
-Git Hub at https://github.com/xml4r/libxml-ruby/issues
+If you have any questions about using libxml-ruby, please report an issue
+on GitHub[https://github.com/xml4r/libxml-ruby/issues].
 
 == Memory Management
 libxml-ruby automatically manages memory associated with the
 underlying libxml2 library.  The bindings create a one-to-one mapping between
-ruby objects and libxml documents and libxml parent nodes (ie, nodes that do not
-have a parent and do not belong to a document). In these cases,
+Ruby objects and libxml documents and libxml parent nodes (ie, nodes that do not
+have a parent and do not belong to a document).  In these cases,
 the bindings manage the memory.  They do this by installing a free
 function and storing a back pointer to the Ruby object from the xmlnode
 using the _private member on libxml structures.  When the Ruby object
 goes out of scope, the underlying libxml structure is freed.  Libxml
-itself then frees all child node (recursively).
+itself then frees all child nodes (recursively).
 
 For all other nodes (the vast majority), the bindings create temporary
 Ruby objects that get freed once they go out of scope. Thus there can be
-more than one ruby object pointing to the same xml node. To mostly hide
-this from programmers on the ruby side, the #eql? and #== methods are
-overriden to check if two ruby objects wrap the same xmlnode.  If they do,
+more than one Ruby object pointing to the same xml node. To mostly hide
+this from a programmer on the Ruby side, the <tt>#eql?</tt> and <tt>#==</tt> methods are
+overriden to check if two Ruby objects wrap the same xmlnode.  If they do,
 then the methods return true.  During the mark phase, each of these temporary
 objects marks its owning document, thereby keeping the Ruby document object
 alive and thus the xmldoc tree.
 
 In the sweep phase of the garbage collector, or when a program ends,
-there is no order to how Ruby objects are freed. In fact, the ruby document
-object is almost always freed before any ruby objects that wrap child nodes.
-However, this is ok because those ruby objects do not have a free function
+there is no order to how Ruby objects are freed.  In fact, the Ruby document
+object is almost always freed before any Ruby objects that wrap child nodes.
+However, this is ok because those Ruby objects do not have a free function
 and are no longer in scope (since if they were the document would not be freed).
 
 == License

data/Rakefile

@@ -21,8 +21,25 @@ Rake::ExtensionTask.new do |ext|
   ext.name = SO_NAME
   ext.ext_dir = "ext/libxml"
   ext.lib_dir = "lib/#{RUBY_VERSION.sub(/\.\d$/, '')}"
-  ext.config_options << "--with-xml2-include=C:/msys64/mingw64/include/libxml2"
-  ext.config_options << "--with-zlib-dir=C:/msys64/mingw64"
+  if RUBY_PLATFORM.match(/mswin|mingw/)
+    ext.config_options <<
+      if (dir = ENV['WINDOWS_XML2_INCLUDE'])
+        "--with-xml2-include=#{dir}"
+      else
+        case RUBY_PLATFORM
+        when 'i386-mingw32'
+          '--with-xml2-include=C:/msys64/mingw32/include/libxml2'
+        when 'x64-mingw32'
+          '--with-xml2-include=C:/msys64/mingw64/include/libxml2'
+        when 'x64-mingw-ucrt'
+          '--with-xml2-include=C:/msys64/ucrt64/include/libxml2'
+        else
+          raise "Unknown Windows Ruby, please set ENV['WINDOWS_XML2_INCLUDE']"
+        end
+      end
+  else
+    ext.config_options << '--with-xml2-include=/usr/include/libxml2'
+  end
 end
 
 # Setup generic gem
@@ -32,7 +49,7 @@ Gem::PackageTask.new(spec) do |pkg|
 end
 
 # Setup Windows Gem
-if RUBY_PLATFORM.match(/win32|mingw32/)
+if RUBY_PLATFORM.match(/mswin|mingw/)
   binaries = (FileList['lib/**/*.so',
                        'lib/**/*dll'])
 
@@ -77,5 +94,6 @@ end
 # Test Task
 Rake::TestTask.new do |t|
   t.libs << "test"
+  t.test_files = FileList['test/test*.rb'] - ['test/test_suite.rb']
   t.verbose = true
 end

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

@@ -483,7 +483,6 @@ static VALUE rxml_document_encoding_get(VALUE self)
  * Returns the Ruby encoding specified by this document
  * (available on Ruby 1.9.x and higher).
  */
-#ifdef HAVE_RUBY_ENCODING_H
 static VALUE rxml_document_rb_encoding_get(VALUE self)
 {
   xmlDocPtr xdoc;
@@ -493,7 +492,6 @@ static VALUE rxml_document_rb_encoding_get(VALUE self)
   rbencoding = rxml_xml_encoding_to_rb_encoding(mXMLEncoding, xmlParseCharEncoding((const char*)xdoc->encoding));
   return rb_enc_from_encoding(rbencoding);
 }
-#endif
 
 /*
  * call-seq:
@@ -738,7 +736,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);
 
@@ -1097,9 +1095,7 @@ void rxml_init_document(void)
   rb_define_method(cXMLDocument, "compression?", rxml_document_compression_q, 0);
   rb_define_method(cXMLDocument, "debug", rxml_document_debug, 0);
   rb_define_method(cXMLDocument, "encoding", rxml_document_encoding_get, 0);
-#ifdef HAVE_RUBY_ENCODING_H
   rb_define_method(cXMLDocument, "rb_encoding", rxml_document_rb_encoding_get, 0);
-#endif
   rb_define_method(cXMLDocument, "encoding=", rxml_document_encoding_set, 1);
   rb_define_method(cXMLDocument, "import", rxml_document_import, 1);
   rb_define_method(cXMLDocument, "last", rxml_document_last_get, 0);

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_encoding.c

@@ -74,7 +74,6 @@ static VALUE rxml_encoding_to_s(VALUE klass, VALUE encoding)
     return rxml_new_cstr(xencoding, xencoding);
 }
 
-#ifdef HAVE_RUBY_ENCODING_H
 /*
  * Converts an xmlCharEncoding enum value into a Ruby Encoding object (available
  * on Ruby 1.9.* and higher).
@@ -179,26 +178,17 @@ rb_encoding* rxml_figure_encoding(const xmlChar* xencoding)
   }
   return result;
 }
-#endif
 
 VALUE rxml_new_cstr(const xmlChar* xstr, const xmlChar* xencoding)
 {
-#ifdef HAVE_RUBY_ENCODING_H
   rb_encoding *rbencoding = rxml_figure_encoding(xencoding);
   return rb_external_str_new_with_enc((const char*)xstr, strlen((const char*)xstr), rbencoding);
-#else
-  return rb_str_new2((const char*)xstr);
-#endif
 }
 
 VALUE rxml_new_cstr_len(const xmlChar* xstr, const long length, const xmlChar* xencoding)
 {
-#ifdef HAVE_RUBY_ENCODING_H
   rb_encoding *rbencoding = rxml_figure_encoding(xencoding);
   return rb_external_str_new_with_enc((const char*)xstr, length, rbencoding);
-#else
-  return rb_str_new((const char*)xstr, length);
-#endif
 }
 
 void rxml_init_encoding(void)
@@ -207,9 +197,7 @@ void rxml_init_encoding(void)
   rb_define_module_function(mXMLEncoding, "from_s", rxml_encoding_from_s, 1);
   rb_define_module_function(mXMLEncoding, "to_s", rxml_encoding_to_s, 1);
 
-#ifdef HAVE_RUBY_ENCODING_H
- // rb_define_module_function(mXMLEncoding, "to_rb_encoding", rxml_encoding_to_rb_encoding, 2);
-#endif
+  rb_define_module_function(mXMLEncoding, "to_rb_encoding", rxml_encoding_to_rb_encoding, 2);
 
   /* -1: No char encoding detected. */
   rb_define_const(mXMLEncoding, "ERROR", INT2NUM(XML_CHAR_ENCODING_ERROR));

data/ext/libxml/ruby_xml_encoding.h

@@ -7,13 +7,10 @@ extern VALUE mXMLEncoding;
 
 void rxml_init_encoding();
 
-// Ruby 1.8/1.9 encoding compatibility
 VALUE rxml_new_cstr(const xmlChar* xstr, const xmlChar* xencoding);
 VALUE rxml_new_cstr_len(const xmlChar* xstr, const long length, const xmlChar* xencoding);
 
-#ifdef HAVE_RUBY_ENCODING_H
 rb_encoding* rxml_xml_encoding_to_rb_encoding(VALUE klass, xmlCharEncoding xmlEncoding);
 rb_encoding* rxml_figure_encoding(const xmlChar* xencoding);
-#endif
 
 #endif

data/ext/libxml/ruby_xml_error.c

@@ -158,7 +158,7 @@ static VALUE rxml_error_reset_handler(VALUE self)
   return self;
 }
 
-void rxml_raise(xmlErrorPtr xerror)
+NORETURN(void rxml_raise(xmlErrorPtr xerror))
 {
   /* Wrap error up as Ruby object and send it off to ruby */
   VALUE error = rxml_error_wrap(xerror);

data/ext/libxml/ruby_xml_error.h

@@ -7,6 +7,6 @@ extern VALUE eXMLError;
 
 void rxml_init_error();
 VALUE rxml_error_wrap(xmlErrorPtr xerror);
-void rxml_raise(xmlErrorPtr xerror);
+NORETURN(void rxml_raise(xmlErrorPtr xerror));
 
 #endif