libxml-ruby 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5738b9c6f8515720321fdc1c4909d71642dae0eb6ece45df56715fc9e3a07c2f
-  data.tar.gz: 84b056d7300ad1b03cc09f9799839bbaaf648c50b3508c55f1d2c9aa9c554e04
+  metadata.gz: 791562c871b9c8d9680778bf68bdde22c5911ad147bd28634f3051d2c3b5bf6a
+  data.tar.gz: e2782de74edb9609634ef022f9d94d98591d3e49c38cb5d667af407ffa87b5da
 SHA512:
-  metadata.gz: 76ba083abeb55264d7fbba86c82127afd4794cbdf93a1437623c2e71f02037f96fab3ef8a20b2648a61d53ec049af18f19917397dcefaab185135abbeae698b0
-  data.tar.gz: 807e907bde2917f2a1157a0e3c8fbf7b0da7cfa0cdf2806a28965aa1d51a630b0f81f93efc2e96449d407e947e597a613323f7a9265117af40e5daf877c6bb31
+  metadata.gz: f3569183ea0e3cc00895c2fa3760b280dd1244f7c69144e661c7fbbdc575f57c67b479b5f0074a6cbf13c93d25bb6e9bd1c89df443388187f8f6472ba00ddfd8
+  data.tar.gz: d856e272adb85fa91aca6d83fd3a5d1c4ae4e1e40f2cb318d9e369ed86c14df973c942c74a4c84e76c83f270eaaadc47021571852e1e39ef750927a3c5930f07

data/HISTORY

@@ -1,5 +1,10 @@
 = Release History
 
+== 4.1.1 / 2023-05-01
+
+* Fix compile warning (or error) for input_callbacks_register_input_callbacks (Charlie Savage)
+* Remove call to deprecated function htmlDefaultSAXHandlerInit (Charlie Savage)
+
 == 4.1.0 / 2023-04-30
 
 * Fix compile warning (or error) for rxml_encoding_to_rb_encoding (Charlie Savage)

data/ext/libxml/ruby_xml_error.c

@@ -44,7 +44,7 @@ static ID ERROR_HANDLER_ID;
  * Returns the proc that will be called when libxml generates
  * warning, error or fatal error messages.
  */
-static VALUE rxml_error_get_handler(void)
+static VALUE rxml_error_get_handler(VALUE self)
 {
   VALUE block = rb_cvar_get(eXMLError, ERROR_HANDLER_ID);
   return block;
@@ -102,7 +102,7 @@ static void structuredErrorFunc(void *userData, xmlErrorPtr xerror)
   VALUE error = rxml_error_wrap(xerror);
 
   /* Wrap error up as Ruby object and send it off to ruby */
-  VALUE block = rxml_error_get_handler();
+  VALUE block = rxml_error_get_handler(error);
 
   /* Now call global handler */
   if (block != Qnil)

data/ext/libxml/ruby_xml_html_parser_context.c

@@ -243,7 +243,6 @@ static VALUE rxml_html_parser_context_string(VALUE klass, VALUE string)
      sets to 0 and xmlCtxtUseOptionsInternal sets to 1.  So we have to call both. */
   htmlCtxtUseOptions(ctxt, rxml_libxml_default_options());
 
-  htmlDefaultSAXHandlerInit();
   if (ctxt->sax != NULL)
     memcpy(ctxt->sax, &htmlDefaultSAXHandler, sizeof(xmlSAXHandlerV1));
   

data/ext/libxml/ruby_xml_input_cbg.c

@@ -88,7 +88,7 @@ int ic_close(void *context)
  *
  * Register a new set of I/O callback for handling parser input.
  */
-static VALUE input_callbacks_register_input_callbacks(void)
+static VALUE input_callbacks_register_input_callbacks(VALUE self)
 {
   xmlRegisterInputCallbacks(ic_match, ic_open, ic_read, ic_close);
   return (Qtrue);
@@ -182,10 +182,7 @@ void rxml_init_input_callbacks(void)
   cInputCallbacks = rb_define_class_under(mXML, "InputCallbacks", rb_cObject);
 
   /* Class Methods */
-  rb_define_singleton_method(cInputCallbacks, "register",
-      input_callbacks_register_input_callbacks, 0);
-  rb_define_singleton_method(cInputCallbacks, "add_scheme",
-      input_callbacks_add_scheme, 2);
-  rb_define_singleton_method(cInputCallbacks, "remove_scheme",
-      input_callbacks_remove_scheme, 1);
+  rb_define_singleton_method(cInputCallbacks, "register", input_callbacks_register_input_callbacks, 0);
+  rb_define_singleton_method(cInputCallbacks, "add_scheme", input_callbacks_add_scheme, 2);
+  rb_define_singleton_method(cInputCallbacks, "remove_scheme", input_callbacks_remove_scheme, 1);
 }

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  "4.1.0"
+#define RUBY_LIBXML_VERSION  "4.1.1"
 #define RUBY_LIBXML_VERNUM   400
 #define RUBY_LIBXML_VER_MAJ   4
 #define RUBY_LIBXML_VER_MIN   1
-#define RUBY_LIBXML_VER_MIC   0
+#define RUBY_LIBXML_VER_MIC   1
 #define RUBY_LIBXML_VER_PATCH 0

data/lib/libxml/error.rb

@@ -3,24 +3,24 @@
 module LibXML
   module XML
     class Error
-      # Create mapping from domain constant value to keys
+      # Create mapping from domain constant values to keys
       DOMAIN_CODE_MAP = [:NO_ERROR, :PARSER, :TREE, :NAMESPACE, :DTD, :HTML, :MEMORY,
                          :OUTPUT, :IO, :FTP, :HTTP, :XINCLUDE, :XPATH, :XPOINTER, :REGEXP,
                          :DATATYPE, :SCHEMASP, :SCHEMASV, :RELAXNGP, :RELAXNGV, :CATALOG,
                          :C14N, :XSLT, :VALID, :CHECK, :WRITER, :MODULE, :I18N, :SCHEMATRONV].inject(Hash.new) do |hash, code|
         if const_defined?(code)
-          hash[const_get(code)] = code.to_s
+          hash[const_get(code)] = code
         end
         hash
       end
 
-      # Create mapping from domain constant value to keys
+      # Create mapping from error constant values (so need to remove domain_codes) to keys
       ERROR_CODE_MAP = Hash.new.tap do |map|
         (constants -
          DOMAIN_CODE_MAP.values - #Domains
          [:NONE, :WARNING, :ERROR, :FATAL] # Levels
          ).each do |code|
-          map[const_get(code)] = code.to_s
+          map[const_get(code)] = code
         end
       end
       
@@ -70,11 +70,11 @@ module LibXML
       end
 
       def domain_to_s
-        DOMAIN_CODE_MAP[self.domain]
+        DOMAIN_CODE_MAP[self.domain].to_s
       end
 
       def code_to_s
-        ERROR_CODE_MAP[self.code]
+        ERROR_CODE_MAP[self.code].to_s
       end
 
       def to_s
@@ -92,4 +92,4 @@ module LibXML
   end
 end
 
-LibXML::XML::Error.set_handler(&LibXML::XML::Error::VERBOSE_HANDLER)
+LibXML::XML::Error.set_handler(&LibXML::XML::Error::VERBOSE_HANDLER)

data/test/test_error.rb

@@ -4,135 +4,153 @@ require_relative './test_helper'
 require 'stringio'
 
 class TestError < Minitest::Test
-  # def test_error_codes
-  #   assert_equal(4, LibXML::XML::Error::DTD)
-  #   assert_equal(4, LibXML::XML::Error.const_get('DTD'))
-  #
-  #   assert_equal(4, LibXML::XML::Error::DOCUMENT_EMPTY)
-  #   assert_equal(4, LibXML::XML::Error.const_get('DOCUMENT_EMPTY'))
-  # end
-  #
-  # def test_invalid_handler
-  #   assert_raises(RuntimeError) do
-  #     LibXML::XML::Error.set_handler
-  #   end
-  # end
-  #
-  # def test_handler
-  #   exception = nil
-  #   LibXML::XML::Error.set_handler do |error|
-  #     exception = error
-  #   end
-  #
-  #   # Raise the error
-  #   error = assert_raises(LibXML::XML::Error) do
-  #     LibXML::XML::Reader.string('<foo').read
-  #   end
-  #   assert_equal(exception, error)
-  #
-  #   # Check the handler worked
-  #   refute_nil(exception)
-  #   assert_kind_of(LibXML::XML::Error, exception)
-  #   assert_equal("Fatal error: Couldn't find end of Start Tag foo at :1.", exception.message)
-  #   assert_equal(LibXML::XML::Error::PARSER, exception.domain)
-  #   assert_equal(LibXML::XML::Error::GT_REQUIRED, exception.code)
-  #   assert_equal(LibXML::XML::Error::FATAL, exception.level)
-  #   assert_nil(exception.file)
-  #   assert_equal(1, exception.line)
-  #   assert_equal('foo', exception.str1)
-  #   assert_nil(exception.str2)
-  #   assert_nil(exception.str3)
-  #   assert_equal(0, exception.int1)
-  #   assert_equal(5, exception.int2)
-  #   assert_nil(exception.node)
-  # end
-  #
-  # def test_reset_handler
-  #   exception = nil
-  #   LibXML::XML::Error.set_handler do |error|
-  #     exception = error
-  #   end
-  #
-  #   LibXML::XML::Error.reset_handler
-  #   LibXML::XML::Reader.string('<foo')
-  #   assert_nil(exception)
-  # end
-  #
-  # def test_get_handler
-  #   assert_respond_to(LibXML::XML::Error, :get_handler)
-  #   assert_equal(0, LibXML::XML::Error.method(:get_handler).arity)
-  #
-  #   saved_handler = LibXML::XML::Error.get_handler
-  #   LibXML::XML::Error.set_handler{ puts "New handler" }
-  #   refute_equal(LibXML::XML::Error.get_handler, saved_handler)
-  #
-  #   LibXML::XML::Error.set_handler(&saved_handler)
-  #   assert_equal(LibXML::XML::Error.get_handler, saved_handler)
-  # end
-  #
-  # def test_verbose_handler
-  #   LibXML::XML::Error.set_handler(&LibXML::XML::Error::VERBOSE_HANDLER)
-  #   output = StringIO.new
-  #   original_stderr = Object::STDERR
-  #
-  #   Object.const_set(:STDERR, output)
-  #   begin
-  #     assert_raises(LibXML::XML::Error) do
-  #       LibXML::XML::Parser.string('<foo><bar/></foz>').parse
-  #     end
-  #   ensure
-  #     Object.const_set(:STDERR, original_stderr)
-  #   end
-  #   assert_equal("Fatal error: Opening and ending tag mismatch: foo line 1 and foz at :1.\n", output.string)
-  # end
-  #
-  # def test_no_hanlder
-  #   LibXML::XML::Error.reset_handler
-  #   output = StringIO.new
-  #   original_stderr = Object::STDERR
-  #
-  #   Object.const_set(:STDERR, output)
-  #   begin
-  #     assert_raises(LibXML::XML::Error) do
-  #       LibXML::XML::Parser.string('<foo><bar/></foz>').parse
-  #     end
-  #   ensure
-  #     Object.const_set(:STDERR, original_stderr)
-  #   end
-  #   assert_equal('', output.string)
-  # end
-  #
-  # def test_parse_error
-  #   exception = assert_raises(LibXML::XML::Error) do
-  #     LibXML::XML::Parser.string('<foo><bar/></foz>').parse
-  #   end
-  #
-  #   assert_instance_of(LibXML::XML::Error, exception)
-  #   assert_equal("Fatal error: Opening and ending tag mismatch: foo line 1 and foz at :1.", exception.message)
-  #   assert_equal(LibXML::XML::Error::PARSER, exception.domain)
-  #   assert_equal(LibXML::XML::Error::TAG_NAME_MISMATCH, exception.code)
-  #   assert_equal(LibXML::XML::Error::FATAL, exception.level)
-  #   assert_nil(exception.file)
-  #   assert_equal(1, exception.line)
-  # end
-  #
-  # def test_xpath_error
-  #   doc = LibXML::XML::Document.file(File.join(File.dirname(__FILE__), 'model/soap.xml'))
-  #
-  #   exception = assert_raises(LibXML::XML::Error) do
-  #     doc.find('/foo[bar=test')
-  #   end
-  #
-  #   assert_instance_of(LibXML::XML::Error, exception)
-  #   assert_equal("Error: Invalid predicate.", exception.message)
-  #   assert_equal(LibXML::XML::Error::XPATH, exception.domain)
-  #   assert_equal(LibXML::XML::Error::XPATH_INVALID_PREDICATE_ERROR, exception.code)
-  #   assert_equal(LibXML::XML::Error::ERROR, exception.level)
-  #   assert_nil(exception.file)
-  #   assert_nil(nil)
-  # end
+  def test_error_codes
+    assert_equal(4, LibXML::XML::Error::DTD)
+    assert_equal(4, LibXML::XML::Error.const_get('DTD'))
+
+    assert_equal(4, LibXML::XML::Error::DOCUMENT_EMPTY)
+    assert_equal(4, LibXML::XML::Error.const_get('DOCUMENT_EMPTY'))
+  end
+
+  def test_invalid_handler
+    assert_raises(RuntimeError) do
+      LibXML::XML::Error.set_handler
+    end
+  end
+
+  def test_handler
+    exception = nil
+    LibXML::XML::Error.set_handler do |error|
+      exception = error
+    end
+
+    # Raise the error
+    error = assert_raises(LibXML::XML::Error) do
+      LibXML::XML::Reader.string('<foo').read
+    end
+    assert_equal(exception, error)
+
+    # Check the handler worked
+    refute_nil(exception)
+    assert_kind_of(LibXML::XML::Error, exception)
+    assert_equal("Fatal error: Couldn't find end of Start Tag foo at :1.", exception.message)
+    assert_equal(LibXML::XML::Error::PARSER, exception.domain)
+    assert_equal(LibXML::XML::Error::GT_REQUIRED, exception.code)
+    assert_equal(LibXML::XML::Error::FATAL, exception.level)
+    assert_nil(exception.file)
+    assert_equal(1, exception.line)
+    assert_equal('foo', exception.str1)
+    assert_nil(exception.str2)
+    assert_nil(exception.str3)
+    assert_equal(0, exception.int1)
+    assert_equal(5, exception.int2)
+    assert_nil(exception.node)
+  end
+
+  def test_reset_handler
+    exception = nil
+    LibXML::XML::Error.set_handler do |error|
+      exception = error
+    end
+
+    LibXML::XML::Error.reset_handler
+    LibXML::XML::Reader.string('<foo')
+    assert_nil(exception)
+  end
+
+  def test_get_handler
+    assert_respond_to(LibXML::XML::Error, :get_handler)
+    assert_equal(0, LibXML::XML::Error.method(:get_handler).arity)
+
+    saved_handler = LibXML::XML::Error.get_handler
+    LibXML::XML::Error.set_handler { puts "New handler" }
+    refute_equal(LibXML::XML::Error.get_handler, saved_handler)
+
+    if saved_handler
+      LibXML::XML::Error.set_handler &saved_handler
+    else
+      LibXML::XML::Error.reset_handler
+    end
+
+    assert_equal(LibXML::XML::Error.get_handler, saved_handler)
+  end
+
+  def test_verbose_handler
+    LibXML::XML::Error.set_handler(&LibXML::XML::Error::VERBOSE_HANDLER)
+    output = StringIO.new
+    original_stderr = Object::STDERR
+
+    Object.const_set(:STDERR, output)
+    begin
+      assert_raises(LibXML::XML::Error) do
+        LibXML::XML::Parser.string('<foo><bar/></foz>').parse
+      end
+    ensure
+      Object.const_set(:STDERR, original_stderr)
+    end
+    assert_equal("Fatal error: Opening and ending tag mismatch: foo line 1 and foz at :1.\n", output.string)
+  end
+
+  def test_no_handler
+    LibXML::XML::Error.reset_handler
+    output = StringIO.new
+    original_stderr = Object::STDERR
+
+    Object.const_set(:STDERR, output)
+    begin
+      assert_raises(LibXML::XML::Error) do
+        LibXML::XML::Parser.string('<foo><bar/></foz>').parse
+      end
+    ensure
+      Object.const_set(:STDERR, original_stderr)
+    end
+    assert_equal('', output.string)
+  end
+
+  def test_parse_error
+    exception = assert_raises(LibXML::XML::Error) do
+      LibXML::XML::Parser.string('<foo><bar/></foz>').parse
+    end
+
+    assert_instance_of(LibXML::XML::Error, exception)
+    assert_equal("Fatal error: Opening and ending tag mismatch: foo line 1 and foz at :1.", exception.message)
+    assert_equal(LibXML::XML::Error::PARSER, exception.domain)
+    assert_equal(LibXML::XML::Error::TAG_NAME_MISMATCH, exception.code)
+    assert_equal(LibXML::XML::Error::FATAL, exception.level)
+    assert_nil(exception.file)
+    assert_equal(1, exception.line)
+  end
+
+  def test_xpath_error
+    doc = LibXML::XML::Document.file(File.join(File.dirname(__FILE__), 'model/soap.xml'))
+
+    exception = assert_raises(LibXML::XML::Error) do
+      doc.find('/foo[bar=test')
+    end
+
+    assert_instance_of(LibXML::XML::Error, exception)
+    assert_equal("Error: Invalid predicate.", exception.message)
+    assert_equal(LibXML::XML::Error::XPATH, exception.domain)
+    assert_equal(LibXML::XML::Error::XPATH_INVALID_PREDICATE_ERROR, exception.code)
+    assert_equal(LibXML::XML::Error::ERROR, exception.level)
+    assert_nil(exception.file)
+    assert_nil(nil)
+  end
 
   def test_double_parse
+    LibXML::XML::Error.set_handler {|msg| nil }
+    parser = LibXML::XML::Parser.string("<test>something</test>")
+    parser.parse
+
+    error = assert_raises(LibXML::XML::Error) do
+      # Try parsing a second time
+      parser.parse
+    end
+
+    assert_equal(" LibXML::XML::Error.", error.to_s)
+  end
+
+  def test_double_parse_register_handler
     LibXML::XML::Parser.register_error_handler(lambda {|msg| nil })
     parser = LibXML::XML::Parser.string("<test>something</test>")
     parser.parse
@@ -145,34 +163,32 @@ class TestError < Minitest::Test
     assert_equal(" LibXML::XML::Error.", error.to_s)
   end
 
-  # def test_libxml_parser_empty_string
-  #   xp = LibXML::XML::Parser.new
-  #
-  #   error = assert_raises(TypeError) do
-  #     xp.string = nil
-  #   end
-  #   assert_equal('wrong argument type nil (expected String)', error.to_s)
-  #
-  #   error = assert_raises(ArgumentError) do
-  #     xp.string = ''
-  #   end
-  #   assert_equal('Must specify a string with one or more characters', error.to_s)
-  # end
-  #
-  # def test_error_domain_to_s
-  #   exception = assert_raises(LibXML::XML::Error) do
-  #     LibXML::XML::Parser.string('<foo href="http://example.org/cgi?k1=v1&k2=v2"></foo>').parse
-  #   end
-  #
-  #   assert_equal(LibXML::XML::Error::PARSER, exception.domain)
-  #   assert_equal("PARSER",exception.domain_to_s)
-  # end
-  #
-  # def test_error_code_to_s
-  #   exception = assert_raises(LibXML::XML::Error) do
-  #     LibXML::XML::Parser.string('<foo href="http://example.org/cgi?k1=v1&k2=v2"></foo>').parse
-  #   end
-  #   assert_equal(LibXML::XML::Error::ENTITYREF_SEMICOL_MISSING, exception.code)
-  #   assert_equal("ENTITYREF_SEMICOL_MISSING",exception.code_to_s)
-  # end
+  def test_libxml_parser_empty_string
+    error = assert_raises(TypeError) do
+      LibXML::XML::Parser.string(nil)
+    end
+    assert_equal('wrong argument type nil (expected String)', error.to_s)
+
+    error = assert_raises(ArgumentError) do
+      LibXML::XML::Parser.string("")
+    end
+    assert_equal('Must specify a string with one or more characters', error.to_s)
+  end
+
+  def test_error_domain_to_s
+    exception = assert_raises(LibXML::XML::Error) do
+      LibXML::XML::Parser.string('<foo href="http://example.org/cgi?k1=v1&k2=v2"></foo>').parse
+    end
+
+    assert_equal(LibXML::XML::Error::PARSER, exception.domain)
+    assert_equal("PARSER", exception.domain_to_s)
+  end
+
+  def test_error_code_to_s
+    exception = assert_raises(LibXML::XML::Error) do
+      LibXML::XML::Parser.string('<foo href="http://example.org/cgi?k1=v1&k2=v2"></foo>').parse
+    end
+    assert_equal(LibXML::XML::Error::ENTITYREF_SEMICOL_MISSING, exception.code)
+    assert_equal("ENTITYREF_SEMICOL_MISSING", exception.code_to_s)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libxml-ruby
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Ross Bamform
@@ -14,7 +14,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-30 00:00:00.000000000 Z
+date: 2023-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -274,7 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.8
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Ruby Bindings for LibXML2