libxml-ruby 2.8.0 → 3.2.1

data/Rakefile

@@ -1,79 +1,91 @@
-#!/usr/bin/env ruby
-
-require "rubygems"
-require "rake/extensiontask"
-require "rake/testtask"
-require "rubygems/package_task"
-require "rdoc/task"
-require "yaml"
-
-GEM_NAME = "libxml-ruby"
-SO_NAME  = "libxml_ruby"
-
-# Read the spec file
-spec = Gem::Specification.load("#{GEM_NAME}.gemspec")
-
-# Setup compile tasks
-Rake::ExtensionTask.new do |ext|
-  ext.gem_spec = spec
-  ext.name = SO_NAME
-  ext.ext_dir = "ext/libxml"
-  ext.lib_dir = "lib/#{RUBY_VERSION.sub(/\.\d$/, '')}"
-  ext.config_options << "--with-xml2-include=C:/MinGW/local/include/libxml2"
-  ext.config_options << "--with-zlib-dir=C:/MinGW/local"
-end
-
-# Setup generic gem
-Gem::PackageTask.new(spec) do |pkg|
-  pkg.package_dir = 'pkg'
-  pkg.need_tar    = false
-end
-
-# Setup Windows Gem
-if RUBY_PLATFORM.match(/win32|mingw32/)
-  binaries = (FileList['lib/**/*.so',
-                       'lib/**/*dll'])
-
-  # Windows specification
-  win_spec = spec.clone
-  win_spec.platform = Gem::Platform::CURRENT
-  win_spec.files += binaries.to_a
-  win_spec.instance_variable_set(:@cache_file, nil)
-
-  # Unset extensions
-  win_spec.extensions = nil
-
-  # Rake task to build the windows package
-  Gem::PackageTask.new(win_spec) do |pkg|
-    pkg.package_dir = 'pkg'
-    pkg.need_tar = false
-  end
-end
-
-# RDoc Task
-desc 'Generate rdoc documentation'
-RDoc::Task.new("rdoc") do |rdoc|
-  rdoc.rdoc_dir = 'website/_site/rdoc'
-  rdoc.title    = 'LibXML'
-  rdoc.generator = 'hanna'
-
-  # Show source inline with line numbers
-  rdoc.options << '--line-numbers'
-  rdoc.options << '--charset=utf-8'
-  # Make the readme file the start page for the generated html
-  rdoc.main = 'README.rdoc'
-  rdoc.rdoc_files.include('doc/*.rdoc',
-                          'ext/**/libxml.c',
-                          'ext/**/ruby_xml.c',
-                          'ext/**/*.c',
-                          'lib/**/*.rb',
-                          'README.rdoc',
-                          'HISTORY',
-                          'LICENSE')
-end
-
-# Test Task
-Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.verbose = true
+#!/usr/bin/env ruby
+
+require "rubygems"
+require "rake/extensiontask"
+require "rake/testtask"
+require "rubygems/package_task"
+require "rdoc/task"
+require "yaml"
+
+GEM_NAME = "libxml-ruby"
+SO_NAME  = "libxml_ruby"
+
+# Read the spec file
+spec = Gem::Specification.load("#{GEM_NAME}.gemspec")
+
+task :default => [:test]
+
+# Setup compile tasks
+if RUBY_PLATFORM.match(/mswin32|mswin64|mingw32/)
+  Rake::ExtensionTask.new do |ext|
+    ext.gem_spec = spec
+    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"
+  end
+else
+  Rake::ExtensionTask.new do |ext|
+    ext.gem_spec = spec
+    ext.name = SO_NAME
+    ext.ext_dir = "ext/libxml"
+    ext.lib_dir = "lib/#{RUBY_VERSION.sub(/\.\d$/, '')}"
+    ext.config_options << "--with-xml2-include=/usr/include/libxml2"
+  end
+end
+
+# Setup generic gem
+Gem::PackageTask.new(spec) do |pkg|
+  pkg.package_dir = 'pkg'
+  pkg.need_tar    = false
+end
+
+# Setup Windows Gem
+if RUBY_PLATFORM.match(/mswin32|mswin64|mingw32/)
+  binaries = (FileList['lib/**/*.so',
+                       'lib/**/*dll'])
+
+  # Windows specification
+  win_spec = spec.clone
+  win_spec.platform = Gem::Platform::CURRENT
+  win_spec.files += binaries.to_a
+  win_spec.instance_variable_set(:@cache_file, nil)
+
+  # Unset extensions
+  win_spec.extensions = nil
+
+  # Rake task to build the windows package
+  Gem::PackageTask.new(win_spec) do |pkg|
+    pkg.package_dir = 'pkg'
+    pkg.need_tar = false
+  end
+end
+
+# RDoc Task
+desc 'Generate rdoc documentation'
+RDoc::Task.new("rdoc") do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'LibXML'
+  rdoc.generator = 'hanna'
+
+  # Show source inline with line numbers
+  rdoc.options << '--line-numbers'
+  rdoc.options << '--charset=utf-8'
+  # Make the readme file the start page for the generated html
+  rdoc.main = 'README.rdoc'
+  rdoc.rdoc_files.include('doc/*.rdoc',
+                          'ext/**/libxml.c',
+                          'ext/**/ruby_xml.c',
+                          'ext/**/*.c',
+                          'lib/**/*.rb',
+                          'README.rdoc',
+                          'HISTORY',
+                          'LICENSE')
+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.h

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

data/ext/libxml/extconf.rb

@@ -1,116 +1,61 @@
-#!/usr/bin/env ruby
-
-require 'rbconfig'
-
-require 'mkmf'
-
-if defined?(CFLAGS)
-  if CFLAGS.index(CONFIG['CCDLFLAGS'])
-    $CFLAGS = CFLAGS + ' ' + CONFIG['CCDLFLAGS']
-  else
-    $CFLAGS = CFLAGS
-  end
-else
-  $CFLAGS = CONFIG['CFLAGS']
-end
-$LDFLAGS = CONFIG['LDFLAGS']
-$LIBPATH.push(RbConfig::CONFIG['libdir'])
-
-def crash(str)
-  printf(" extconf failure: %s\n", str)
-  exit 1
-end
-
-dir_config('iconv')
-dir_config('zlib')
-
-have_library('socket','socket')
-have_library('nsl','gethostbyname')
-
-unless have_library('m', 'atan')
-  # try again for gcc 4.0
-  saveflags = $CFLAGS
-  $CFLAGS += ' -fno-builtin'
-  unless have_library('m', 'atan')
-    crash('need libm')
-  end
-  $CFLAGS = saveflags
-end
-
-unless have_library('z', 'inflate') or
-       have_library('zlib', 'inflate') or
-       have_library('zlib1', 'inflate') or
-       have_library('libz', 'inflate')
-  crash('need zlib')
-else
-  $defs.push('-DHAVE_ZLIB_H')
-end
-
-unless have_library('iconv','iconv_open') or 
-       have_library('iconv','libiconv_open') or
-       have_library('libiconv', 'libiconv_open') or
-       have_library('libiconv', 'iconv_open') or
-       have_library('c','iconv_open') or
-       have_library('recode','iconv_open') or
-       have_library('iconv')
-  crash(<<EOL)
-need libiconv.
-
-Install the libiconv or try passing one of the following options
-to extconf.rb:
-
-  --with-iconv-dir=/path/to/iconv
-  --with-iconv-lib=/path/to/iconv/lib
-  --with-iconv-include=/path/to/iconv/include
-EOL
-end
-
-if (xc = with_config('xml2-config')) or RUBY_PLATFORM.match(/darwin/i) then
-  xc = 'xml2-config' if xc == true or xc.nil?
-  cflags = `#{xc} --cflags`.chomp
-  if $? != 0
-		cflags = nil
-	else
-  	libs = `#{xc} --libs`.chomp
-  	if $? != 0
-			libs = nil
-		else
-  		$CFLAGS += ' ' + cflags
-  		$libs = libs + " " + $libs
-		end
-	end
-else
-	dir_config('xml2')
-end
-
-unless (have_library('xml2', 'xmlParseDoc') or
-				have_library('libxml2', 'xmlParseDoc') or
-				find_library('xml2', 'xmlParseDoc', '/opt/lib', '/usr/local/lib', '/usr/lib')) and 
-			 (have_header('libxml/xmlversion.h') or
-			  find_header('libxml/xmlversion.h',
-										'/opt/include/libxml2', 
-										'/usr/local/include/libxml2',
-										'/usr/include/libxml2'))
-		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
-end
-
-have_func('rb_io_bufwrite', 'ruby/io.h')
-
-# For FreeBSD add /usr/local/include
-$INCFLAGS << " -I/usr/local/include"
-
-$CFLAGS << ' ' << $INCFLAGS
-
-#$INSTALLFILES = [["libxml.rb", "$(RUBYLIBDIR)", "../xml"]]
-
-create_header()
-create_makefile('libxml_ruby')
+#!/usr/bin/env ruby
+
+require 'mkmf'
+
+def crash(str)
+  printf(" extconf failure: %s\n", str)
+  exit 1
+end
+
+xc = with_config('xml2-config')
+if xc
+  cflags = `#{xc} --cflags`.chomp
+  if $? != 0
+    cflags = nil
+  else
+    libs = `#{xc} --libs`.chomp
+    if $? != 0
+      libs = nil
+    else
+      $CFLAGS += ' ' + cflags
+      $libs = libs + " " + $libs
+    end
+  end
+else
+  dir_config('xml2')
+end
+
+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
+
+create_header()
+create_makefile('libxml_ruby')

data/ext/libxml/libxml.c

@@ -1,76 +1,80 @@
-#include "ruby_libxml.h"
-
-#if RUBY_INTERN_H
-#include <ruby/util.h>
-#else
-#include <util.h>
-#endif
-
-
-VALUE mLibXML;
-
-static void rxml_init_memory(void)
-{
- /* Disable for now - broke attributes. 
-  xmlGcMemSetup(
-      (xmlFreeFunc)ruby_xfree,
-      (xmlMallocFunc)ruby_xmalloc,
-      (xmlMallocFunc)ruby_xmalloc,
-      (xmlReallocFunc)ruby_xrealloc,
-      (xmlStrdupFunc)ruby_strdup
-  );*/
-}
-
-void Init_libxml_ruby(void)
-{
-/* The libxml gem provides Ruby language bindings for GNOME's Libxml2
- * XML toolkit.  To get started you may:
- *
- *  require 'test_helper'
- *  document = XML::Document.new
- *
- * However, when creating an application or library you plan to
- * redistribute, it is best to not add the LibXML module to the global
- * namespace, in which case you can either write your code like this:
- *
- *  require 'libxml'
- *  document = LibXML::XML::Document.new
- *
- * Refer to the README file to get started and the LICENSE file for
- * copyright and distribution information.
- */
-  mLibXML = rb_define_module("LibXML");
-
-  rxml_init_memory();
-  rxml_init_xml();
-  rxml_init_io();
-  rxml_init_error();
-  rxml_init_encoding();
-  rxml_init_parser();
-  rxml_init_parser_context();
-  rxml_init_parser_options();
-  rxml_init_node();
-  rxml_init_attributes();
-  rxml_init_attr();
-  rxml_init_attr_decl();
-  rxml_init_document();
-  rxml_init_namespaces();
-  rxml_init_namespace();
-  rxml_init_sax_parser();
-  rxml_init_sax2_handler();
-  rxml_init_xinclude();
-  rxml_init_xpath();
-  rxml_init_xpath_object();
-  rxml_init_xpath_context();
-  rxml_init_xpath_expression();
-  rxml_init_xpointer();
-  rxml_init_html_parser();
-  rxml_init_html_parser_options();
-  rxml_init_html_parser_context();
-  rxml_init_input_callbacks();
-  rxml_init_dtd();
-  rxml_init_schema();
-  rxml_init_relaxng();
-  rxml_init_reader();
-  rxml_init_writer();
-}
+#include "ruby_libxml.h"
+
+#if RUBY_INTERN_H
+#include <ruby/util.h>
+#else
+#include <util.h>
+#endif
+
+
+VALUE mLibXML;
+
+static void rxml_init_memory(void)
+{
+ /* Disable for now - broke attributes. 
+  xmlGcMemSetup(
+      (xmlFreeFunc)ruby_xfree,
+      (xmlMallocFunc)ruby_xmalloc,
+      (xmlMallocFunc)ruby_xmalloc,
+      (xmlReallocFunc)ruby_xrealloc,
+      (xmlStrdupFunc)ruby_strdup
+  );*/
+}
+
+void Init_libxml_ruby(void)
+{
+/* The libxml gem provides Ruby language bindings for GNOME's Libxml2
+ * XML toolkit.  To get started you may:
+ *
+ *  require 'test_helper'
+ *  document = XML::Document.new
+ *
+ * However, when creating an application or library you plan to
+ * redistribute, it is best to not add the LibXML module to the global
+ * namespace, in which case you can either write your code like this:
+ *
+ *  require 'libxml'
+ *  document = LibXML::XML::Document.new
+ *
+ * Refer to the README file to get started and the LICENSE file for
+ * copyright and distribution information.
+ */
+
+  // Seutp for threading. http://xmlsoft.org/threads.html
+  xmlInitParser();
+
+  mLibXML = rb_define_module("LibXML");
+
+  rxml_init_memory();
+  rxml_init_xml();
+  rxml_init_io();
+  rxml_init_error();
+  rxml_init_encoding();
+  rxml_init_parser();
+  rxml_init_parser_context();
+  rxml_init_parser_options();
+  rxml_init_node();
+  rxml_init_attributes();
+  rxml_init_attr();
+  rxml_init_attr_decl();
+  rxml_init_document();
+  rxml_init_namespaces();
+  rxml_init_namespace();
+  rxml_init_sax_parser();
+  rxml_init_sax2_handler();
+  rxml_init_xinclude();
+  rxml_init_xpath();
+  rxml_init_xpath_object();
+  rxml_init_xpath_context();
+  rxml_init_xpath_expression();
+  rxml_init_xpointer();
+  rxml_init_html_parser();
+  rxml_init_html_parser_options();
+  rxml_init_html_parser_context();
+  rxml_init_input_callbacks();
+  rxml_init_dtd();
+  rxml_init_schema();
+  rxml_init_relaxng();
+  rxml_init_reader();
+  rxml_init_writer();
+}