nokogiri 1.15.1-x86-mingw32 → 1.15.3-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b95072fcad1db8a6197e1721775095c78c3010557cfce3ff5d16f8fd82380413
-  data.tar.gz: c783e409e0a5a8e3763db82845c2e10f18ce1563dd3aa2373f052283ca4cc0bb
+  metadata.gz: 067b1ec07b7811bcf66618fbc14d82c3ab18406ddb290c7deb1ba0f2ac975c56
+  data.tar.gz: 2580c66f4f00754d8af4bdead7b59b0342963f72ad2fd40a70192704bf1559c6
 SHA512:
-  metadata.gz: caae54dc4bd01ddd25fd13d2ee7fd2bb4a0bebe3e9671c77fc771b37d326a665cda398993cf4916288e668dd15b057d022741d96c8df63f590f5028336bdf8b0
-  data.tar.gz: 05ba5769ab2c277c76452f0eae9782fbeec5ac420efc8450ef9661d7d97a9edf172af5b07efd79680fdf1a82c8d93254a6c4f8dcb4d4d5feca0eb65c98f18ff1
+  metadata.gz: f338a3b74fa08a9cb9e82c9cdd6d930bb2b01af86b9e2d6c9f177b0846e7620e62f7d61e14df609169e1a78ee236fb5a4e37f02bb8dd4b4a0a26f15db6e9d690
+  data.tar.gz: 6538eb3a8c61e77d09f401d3bfa7167043f3738e5b1ae87728047b4d07ef53b8ef142e3cf6fb46e49f1bd0015e70395d204896c6105e776c7e8661b12651841b

data/Gemfile

@@ -31,7 +31,7 @@ group :development do
     gem "rubocop", "1.51.0"
     gem "rubocop-minitest", "0.31.0"
     gem "rubocop-packaging", "0.5.2"
-    gem "rubocop-performance", "1.17.1"
+    gem "rubocop-performance", "1.18.0"
     gem "rubocop-rake", "= 0.6.0"
     gem "rubocop-shopify", "2.13.0"
   end

data/ext/nokogiri/xml_cdata.c

@@ -12,39 +12,45 @@ VALUE cNokogiriXmlCData;
  * raise a TypeError exception.
  */
 static VALUE
-new (int argc, VALUE *argv, VALUE klass)
+rb_xml_cdata_s_new(int argc, VALUE *argv, VALUE klass)
 {
-  xmlDocPtr xml_doc;
-  xmlNodePtr node;
-  VALUE doc;
-  VALUE content;
-  VALUE rest;
+  xmlDocPtr c_document;
+  xmlNodePtr c_node;
+  VALUE rb_document;
+  VALUE rb_content;
+  VALUE rb_rest;
   VALUE rb_node;
-  xmlChar *content_str = NULL;
-  int content_str_len = 0;
+  xmlChar *c_content = NULL;
+  int c_content_len = 0;
 
-  rb_scan_args(argc, argv, "2*", &doc, &content, &rest);
+  rb_scan_args(argc, argv, "2*", &rb_document, &rb_content, &rb_rest);
 
-  if (rb_obj_is_kind_of(doc, cNokogiriXmlDocument)) {
-    xml_doc = noko_xml_document_unwrap(doc);
-  } else {
+  if (!rb_obj_is_kind_of(rb_document, cNokogiriXmlNode)) {
+    rb_raise(rb_eTypeError,
+             "expected first parameter to be a Nokogiri::XML::Document, received %"PRIsVALUE,
+             rb_obj_class(rb_document));
+  }
+
+  if (!rb_obj_is_kind_of(rb_document, cNokogiriXmlDocument)) {
     xmlNodePtr deprecated_node_type_arg;
     // TODO: deprecate allowing Node
     NOKO_WARN_DEPRECATION("Passing a Node as the first parameter to CDATA.new is deprecated. Please pass a Document instead. This will become an error in a future release of Nokogiri.");
-    Noko_Node_Get_Struct(doc, xmlNode, deprecated_node_type_arg);
-    xml_doc = deprecated_node_type_arg->doc;
+    Noko_Node_Get_Struct(rb_document, xmlNode, deprecated_node_type_arg);
+    c_document = deprecated_node_type_arg->doc;
+  } else {
+    c_document = noko_xml_document_unwrap(rb_document);
   }
 
-  if (!NIL_P(content)) {
-    content_str = (xmlChar *)StringValuePtr(content);
-    content_str_len = RSTRING_LENINT(content);
+  if (!NIL_P(rb_content)) {
+    c_content = (xmlChar *)StringValuePtr(rb_content);
+    c_content_len = RSTRING_LENINT(rb_content);
   }
 
-  node = xmlNewCDataBlock(xml_doc, content_str, content_str_len);
+  c_node = xmlNewCDataBlock(c_document, c_content, c_content_len);
 
-  noko_xml_document_pin_node(node);
+  noko_xml_document_pin_node(c_node);
 
-  rb_node = noko_xml_node_wrap(klass, node);
+  rb_node = noko_xml_node_wrap(klass, c_node);
   rb_obj_call_init(rb_node, argc, argv);
 
   if (rb_block_given_p()) { rb_yield(rb_node); }
@@ -61,5 +67,5 @@ noko_init_xml_cdata(void)
    */
   cNokogiriXmlCData = rb_define_class_under(mNokogiriXml, "CDATA", cNokogiriXmlText);
 
-  rb_define_singleton_method(cNokogiriXmlCData, "new", new, -1);
+  rb_define_singleton_method(cNokogiriXmlCData, "new", rb_xml_cdata_s_new, -1);
 }

data/ext/nokogiri/xml_node.c

@@ -350,7 +350,7 @@ ok:
 
   xmlUnlinkNode(original_reparentee);
 
-  if (prf != xmlAddPrevSibling && prf != xmlAddNextSibling
+  if (prf != xmlAddPrevSibling && prf != xmlAddNextSibling && prf != xmlAddChild
       && reparentee->type == XML_TEXT_NODE && pivot->next && pivot->next->type == XML_TEXT_NODE) {
     /*
      *  libxml merges text nodes in a right-to-left fashion, meaning that if

data/ext/nokogiri/xml_schema.c

@@ -203,7 +203,7 @@ read_memory(int argc, VALUE *argv, VALUE klass)
  * [Returns] Nokogiri::XML::Schema
  */
 static VALUE
-from_document(int argc, VALUE *argv, VALUE klass)
+rb_xml_schema_s_from_document(int argc, VALUE *argv, VALUE klass)
 {
   VALUE rb_document;
   VALUE rb_parse_options;
@@ -214,14 +214,20 @@ from_document(int argc, VALUE *argv, VALUE klass)
 
   rb_scan_args(argc, argv, "11", &rb_document, &rb_parse_options);
 
-  if (rb_obj_is_kind_of(rb_document, cNokogiriXmlDocument)) {
-    c_document = noko_xml_document_unwrap(rb_document);
-  } else {
+  if (!rb_obj_is_kind_of(rb_document, cNokogiriXmlNode)) {
+    rb_raise(rb_eTypeError,
+             "expected parameter to be a Nokogiri::XML::Document, received %"PRIsVALUE,
+             rb_obj_class(rb_document));
+  }
+
+  if (!rb_obj_is_kind_of(rb_document, cNokogiriXmlDocument)) {
     xmlNodePtr deprecated_node_type_arg;
     // TODO: deprecate allowing Node
     NOKO_WARN_DEPRECATION("Passing a Node as the first parameter to Schema.from_document is deprecated. Please pass a Document instead. This will become an error in a future release of Nokogiri.");
     Noko_Node_Get_Struct(rb_document, xmlNode, deprecated_node_type_arg);
     c_document = deprecated_node_type_arg->doc;
+  } else {
+    c_document = noko_xml_document_unwrap(rb_document);
   }
 
   if (noko_xml_document_has_wrapped_blank_nodes_p(c_document)) {
@@ -249,7 +255,7 @@ noko_init_xml_schema(void)
   rb_undef_alloc_func(cNokogiriXmlSchema);
 
   rb_define_singleton_method(cNokogiriXmlSchema, "read_memory", read_memory, -1);
-  rb_define_singleton_method(cNokogiriXmlSchema, "from_document", from_document, -1);
+  rb_define_singleton_method(cNokogiriXmlSchema, "from_document", rb_xml_schema_s_from_document, -1);
 
   rb_define_private_method(cNokogiriXmlSchema, "validate_document", validate_document, 1);
   rb_define_private_method(cNokogiriXmlSchema, "validate_file",     validate_file, 1);

data/ext/nokogiri/xml_text.c

@@ -9,33 +9,39 @@ VALUE cNokogiriXmlText ;
  * Create a new Text element on the +document+ with +content+
  */
 static VALUE
-new (int argc, VALUE *argv, VALUE klass)
+rb_xml_text_s_new(int argc, VALUE *argv, VALUE klass)
 {
-  xmlDocPtr doc;
-  xmlNodePtr node;
-  VALUE string;
-  VALUE document;
-  VALUE rest;
+  xmlDocPtr c_document;
+  xmlNodePtr c_node;
+  VALUE rb_string;
+  VALUE rb_document;
+  VALUE rb_rest;
   VALUE rb_node;
 
-  rb_scan_args(argc, argv, "2*", &string, &document, &rest);
+  rb_scan_args(argc, argv, "2*", &rb_string, &rb_document, &rb_rest);
 
-  if (rb_obj_is_kind_of(document, cNokogiriXmlDocument)) {
-    doc = noko_xml_document_unwrap(document);
-  } else {
+  if (!rb_obj_is_kind_of(rb_document, cNokogiriXmlNode)) {
+    rb_raise(rb_eTypeError,
+             "expected second parameter to be a Nokogiri::XML::Document, received %"PRIsVALUE,
+             rb_obj_class(rb_document));
+  }
+
+  if (!rb_obj_is_kind_of(rb_document, cNokogiriXmlDocument)) {
     xmlNodePtr deprecated_node_type_arg;
     // TODO: deprecate allowing Node
     NOKO_WARN_DEPRECATION("Passing a Node as the second parameter to Text.new is deprecated. Please pass a Document instead. This will become an error in a future release of Nokogiri.");
-    Noko_Node_Get_Struct(document, xmlNode, deprecated_node_type_arg);
-    doc = deprecated_node_type_arg->doc;
+    Noko_Node_Get_Struct(rb_document, xmlNode, deprecated_node_type_arg);
+    c_document = deprecated_node_type_arg->doc;
+  } else {
+    c_document = noko_xml_document_unwrap(rb_document);
   }
 
-  node = xmlNewText((xmlChar *)StringValueCStr(string));
-  node->doc = doc;
+  c_node = xmlNewText((xmlChar *)StringValueCStr(rb_string));
+  c_node->doc = c_document;
 
-  noko_xml_document_pin_node(node);
+  noko_xml_document_pin_node(c_node);
 
-  rb_node = noko_xml_node_wrap(klass, node) ;
+  rb_node = noko_xml_node_wrap(klass, c_node) ;
   rb_obj_call_init(rb_node, argc, argv);
 
   if (rb_block_given_p()) { rb_yield(rb_node); }
@@ -52,5 +58,5 @@ noko_init_xml_text(void)
    */
   cNokogiriXmlText = rb_define_class_under(mNokogiriXml, "Text", cNokogiriXmlCharacterData);
 
-  rb_define_singleton_method(cNokogiriXmlText, "new", new, -1);
+  rb_define_singleton_method(cNokogiriXmlText, "new", rb_xml_text_s_new, -1);
 }

data/lib/nokogiri/jruby/nokogiri_jars.rb

@@ -6,10 +6,10 @@ rescue LoadError
   require 'net/sourceforge/htmlunit/neko-htmlunit/2.63.0/neko-htmlunit-2.63.0.jar'
   require 'nu/validator/jing/20200702VNU/jing-20200702VNU.jar'
   require 'xerces/xercesImpl/2.12.2/xercesImpl-2.12.2.jar'
-  require 'org/nokogiri/nekodtd/0.1.11.noko1/nekodtd-0.1.11.noko1.jar'
   require 'net/sf/saxon/Saxon-HE/9.6.0-4/Saxon-HE-9.6.0-4.jar'
   require 'xalan/xalan/2.7.3/xalan-2.7.3.jar'
   require 'xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar'
+  require 'org/nokogiri/nekodtd/0.1.11.noko2/nekodtd-0.1.11.noko2.jar'
   require 'isorelax/isorelax/20030108/isorelax-20030108.jar'
 end
 
@@ -18,10 +18,10 @@ if defined? Jars
   require_jar 'net.sourceforge.htmlunit', 'neko-htmlunit', '2.63.0'
   require_jar 'nu.validator', 'jing', '20200702VNU'
   require_jar 'xerces', 'xercesImpl', '2.12.2'
-  require_jar 'org.nokogiri', 'nekodtd', '0.1.11.noko1'
   require_jar 'net.sf.saxon', 'Saxon-HE', '9.6.0-4'
   require_jar 'xalan', 'xalan', '2.7.3'
   require_jar 'xml-apis', 'xml-apis', '1.4.01'
+  require_jar 'org.nokogiri', 'nekodtd', '0.1.11.noko2'
   require_jar 'isorelax', 'isorelax', '20030108'
 end
 
@@ -32,7 +32,7 @@ module Nokogiri
     "net.sf.saxon:Saxon-HE" => "9.6.0-4",
     "net.sourceforge.htmlunit:neko-htmlunit" => "2.63.0",
     "nu.validator:jing" => "20200702VNU",
-    "org.nokogiri:nekodtd" => "0.1.11.noko1",
+    "org.nokogiri:nekodtd" => "0.1.11.noko2",
     "xalan:serializer" => "2.7.3",
     "xalan:xalan" => "2.7.3",
     "xerces:xercesImpl" => "2.12.2",

data/lib/nokogiri/version/constant.rb

@@ -2,5 +2,5 @@
 
 module Nokogiri
   # The version of Nokogiri you are using
-  VERSION = "1.15.1"
+  VERSION = "1.15.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri
 version: !ruby/object:Gem::Version
-  version: 1.15.1
+  version: 1.15.3
 platform: x86-mingw32
 authors:
 - Mike Dalessio
@@ -20,7 +20,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-19 00:00:00.000000000 Z
+date: 2023-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: racc