libxml-ruby 3.2.1-x64-mingw32 → 3.2.2-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfacaddafeb77f0b7ebd5badcdef2ccadad38ed0d0e0624a1d81bcd50a595b91
-  data.tar.gz: d93e00be745f3decdc5f97011485bfa386851ce838148537788cc353e0aea482
+  metadata.gz: 96fdb761fe5ba6333b9d6cedf5cfb395d6a177bc02ad5aed1bf2f269d027cd04
+  data.tar.gz: c4761509dee6f67a3736718349f33c516d2c617429d559a732c73c855a725506
 SHA512:
-  metadata.gz: 3a780f492bdeeb4a74d495ca255b1fd0d54b8fda9e15c5bc6c4de10303b6aaa24fc2a88aae09a8f228bd4c6a43b77689150545fb2a0f62b87ce7bbb018bff69d
-  data.tar.gz: 576512ee3ec3bca69b3023f13c6d62fa6801fb7d8f9d018d260f10c053a55280aa669ea613a1cdc33e4e47da04a61bd80201b2621c3a0c75c7461cc94a5d68eb
+  metadata.gz: 8b0cdc74c5c3ebe00a65c811e15eb60d47937b2a6050a004d5c08e6d3e275918da7929ce874b7353daed587432b7e83c8d754a240a5e295c4c7abdb2086523d3
+  data.tar.gz: 3851c2f2155f3dbe9674821208b128eb0480a51795e05ec6593aded6ec61628c98f765baa64f8d81313b2e6a24e2478aaf6dfc575c6903cab272da7e9073f6d9

data/HISTORY

@@ -1,5 +1,11 @@
 = 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)

data/Rakefile

@@ -16,21 +16,29 @@ 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"
+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$/, '')}"
+  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
 
@@ -41,7 +49,7 @@ Gem::PackageTask.new(spec) do |pkg|
 end
 
 # Setup Windows Gem
-if RUBY_PLATFORM.match(/mswin32|mswin64|mingw32/)
+if RUBY_PLATFORM.match(/mswin|mingw/)
   binaries = (FileList['lib/**/*.so',
                        'lib/**/*dll'])
 

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.2.1"
+#define RUBY_LIBXML_VERSION  "3.2.2"
 #define RUBY_LIBXML_VERNUM   321
 #define RUBY_LIBXML_VER_MAJ   3
 #define RUBY_LIBXML_VER_MIN   2
-#define RUBY_LIBXML_VER_MIC   1
+#define RUBY_LIBXML_VER_MIC   2
 #define RUBY_LIBXML_VER_PATCH 0

data/libxml-ruby.gemspec

@@ -7,7 +7,7 @@ version = File.read('ext/libxml/ruby_xml_version.h').match(/\s*RUBY_LIBXML_VERSI
 Gem::Specification.new do |spec|
   spec.name        = 'libxml-ruby'
   spec.version     = version
-  spec.homepage    = 'http://xml4r.github.com/libxml-ruby'
+  spec.homepage    = 'https://xml4r.github.io/libxml-ruby/'
   spec.summary     = 'Ruby Bindings for LibXML2'
   spec.description = <<-EOS
     The Libxml-Ruby project provides Ruby language bindings for the GNOME

data/test/test_document.rb

@@ -126,6 +126,7 @@ class TestDocument < Minitest::Test
   def test_nonet
     xml_string = '<ruby_array uga="booga" foo="bar"><fixnum>one</fixnum><fixnum>two</fixnum></ruby_array>'
     xml = LibXML::XML::Document.string(xml_string, options: LibXML::XML::Parser::Options::NONET)
-    schema_document = LibXML::XML::Document.file('d:/src/libxml-ruby/test/model/atom.xml', options: LibXML::XML::Parser::Options::NONET)
+    file = File.join(File.dirname(__FILE__), 'model/atom.xml')
+    schema_document = LibXML::XML::Document.file(file, options: LibXML::XML::Parser::Options::NONET)
   end
 end

data/test/test_dtd.rb

@@ -84,7 +84,8 @@ class TestDtd < Minitest::Test
     assert_nil(error.file)
     assert_nil(error.line)
     assert_equal('invalid', error.str1)
-    assert_nil(error.str2)
+    # Different answers across operating systems
+    # assert_nil(error.str2)
     assert_nil(error.str3)
     assert_equal(0, error.int1)
     assert_equal(0, error.int2)

data/test/test_helper.rb

@@ -5,3 +5,5 @@
 require 'bundler/setup'
 require 'minitest/autorun'
 require 'libxml-ruby'
+
+STDOUT.write "\nlibxml2: #{LibXML::XML::LIBXML_VERSION}\n#{RUBY_DESCRIPTION}\n\n"

data/test/test_parser.rb

@@ -271,7 +271,7 @@ class TestParser < Minitest::Test
     assert_equal('foz', error.str2)
     assert_nil(error.str3)
     assert_equal(1, error.int1)
-    assert_equal(20, error.int2)
+    assert([18, 20].include?(error.int2))
     assert_nil(error.node)
   end
 

data/test/test_parser_context.rb

@@ -127,12 +127,6 @@ class TestParserContext < Minitest::Test
     end
   end
 
-  if ENV['NOTWORKING']
-    def test_num_chars
-      assert_equal(17, context.num_chars)
-    end
-  end
-
   def test_replace_entities
     context = LibXML::XML::Parser::Context.new
     assert(!context.replace_entities?)
@@ -185,7 +179,7 @@ class TestParserContext < Minitest::Test
     assert_nil(context.name_node)
     assert_equal(0, context.name_depth)
     assert_equal(10, context.name_depth_max)
-    assert_equal(17, context.num_chars)
+    assert([0, 17].include?(context.num_chars))
     assert_equal(false, context.replace_entities?)
     assert_equal(1, context.space_depth)
     assert_equal(10, context.space_depth_max)

data/test/test_reader.rb

@@ -249,9 +249,10 @@ class TestReader < Minitest::Test
   end
 
   def test_bytes_consumed
+    ending_are_rn = File.binread(XML_FILE).include? "\r\n"
     reader = LibXML::XML::Reader.file(XML_FILE)
     reader.read
-    assert_equal(428, reader.byte_consumed)
+    assert_equal(ending_are_rn ? 428 : 416, reader.byte_consumed)
   end
 
   def test_node

data/test/test_sax_parser.rb

@@ -181,7 +181,7 @@ class TestSaxParser < Minitest::Test
     xml = File.read(saxtest_file)
     io = StringIO.new(xml)
     parser = LibXML::XML::SaxParser.io(io)
-    
+
     parser.callbacks = TestCaseCallbacks.new
     parser.parse
     verify(parser)
@@ -250,25 +250,32 @@ EOS
     result = parser.callbacks.result
 
     i = -1
+
+    base_err_msg = "Fatal error: (Premature end of data in tag Results line 1|EndTag: '<\\/' not found) at :2\\."
+    re_err_msg1 = /\A(error: )#{base_err_msg}\z/
+    re_err_msg2 = /\A#{base_err_msg}\z/
+
     assert_equal("startdoc", result[i+=1])
     assert_equal("start_element: Results, attr: {}", result[i+=1])
     assert_equal("start_element_ns: Results, attr: {}, prefix: , uri: , ns: {}", result[i+=1])
     assert_equal("characters: \n", result[i+=1])
-    assert_equal("error: Fatal error: EndTag: '</' not found at :2.", result[i+=1])
+    assert_match(re_err_msg1, result[i+=1])
     assert_equal("end_document", result[i+=1])
 
     refute_nil(error)
     assert_kind_of(LibXML::XML::Error, error)
-    assert_equal("Fatal error: EndTag: '</' not found at :2.", error.message)
+    assert_match(re_err_msg2, error.message)
     assert_equal(LibXML::XML::Error::PARSER, error.domain)
-    assert_equal(LibXML::XML::Error::LTSLASH_REQUIRED, error.code)
+
+    assert([LibXML::XML::Error::TAG_NOT_FINISHED, LibXML::XML::Error::LTSLASH_REQUIRED].include?(error.code))
     assert_equal(LibXML::XML::Error::FATAL, error.level)
     assert_nil(error.file)
     assert_equal(2, error.line)
-    assert_nil(error.str1)
+    # Sometimes this is nil and sometimes its not depending on OS and libxlm version
+    # assert_nil(error.str1)
     assert_nil(error.str2)
     assert_nil(error.str3)
-    assert_equal(0, error.int1)
+    assert([0, 1].include?(error.int1))
     assert_equal(1, error.int2)
     assert_nil(error.node)
   end

data/test/test_xml.rb

@@ -183,7 +183,8 @@ class TestXml < Minitest::Test
   end
 
   def test_enabled_iconv
-    assert(LibXML::XML.enabled_iconv?)
+    iconv_enabled = RUBY_PLATFORM !~ /darwin/
+    assert_equal(iconv_enabled, LibXML::XML.enabled_iconv?)
   end
 
   def test_enabled_memory_debug

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libxml-ruby
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.2
 platform: x64-mingw32
 authors:
 - Ross Bamform
@@ -11,10 +11,10 @@ authors:
 - Anurag Priyam
 - Charlie Savage
 - Ryan Johnson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-05 00:00:00.000000000 Z
+date: 2022-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -50,7 +50,7 @@ description: |2
       Libxml-ruby's primary advantage over REXML is performance - if speed
       is your need, these are good libraries to consider, as demonstrated
       by the informal benchmark below.
-email: 
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -60,7 +60,6 @@ files:
 - MANIFEST
 - README.rdoc
 - Rakefile
-- ext/libxml/extconf.h
 - ext/libxml/extconf.rb
 - ext/libxml/libxml.c
 - ext/libxml/libxml_ruby.def
@@ -138,7 +137,7 @@ files:
 - ext/libxml/ruby_xml_xpointer.c
 - ext/libxml/ruby_xml_xpointer.h
 - ext/vc/libxml_ruby.sln
-- lib/2.7/libxml_ruby.so
+- lib/3.0/libxml_ruby.so
 - lib/libxml-ruby.rb
 - lib/libxml.rb
 - lib/libxml/attr.rb
@@ -218,7 +217,6 @@ files:
 - test/model/shiporder.xsd
 - test/model/soap.xml
 - test/model/xinclude.xml
-- test/test.xml
 - test/test_attr.rb
 - test/test_attr_decl.rb
 - test/test_attributes.rb
@@ -260,11 +258,11 @@ files:
 - test/test_xpath_context.rb
 - test/test_xpath_expression.rb
 - test/test_xpointer.rb
-homepage: http://xml4r.github.com/libxml-ruby
+homepage: https://xml4r.github.io/libxml-ruby/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -279,14 +277,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.3.4
+signing_key:
 specification_version: 4
 summary: Ruby Bindings for LibXML2
 test_files:
 - test/test_attr.rb
-- test/test_attributes.rb
 - test/test_attr_decl.rb
+- test/test_attributes.rb
 - test/test_canonicalize.rb
 - test/test_deprecated_require.rb
 - test/test_document.rb

data/ext/libxml/extconf.h

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

data/test/test.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Name>François</Name>