nokogiri 1.15.2-java → 1.15.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74fb625bd596b0af0df336f0cdb8c002680527ff713401b548402152bfa27c82
-  data.tar.gz: c2f792ee9b213c6ac47b722c08ee18174584ee99c5519d9f6a65c4ae607853fb
+  metadata.gz: b5a06b0a60f3964c8165d605401030d4aafbec6c83b94adaaf2e918c48a4d6e7
+  data.tar.gz: 4e9a23386ca131ad8814c90179a011f6129785a3eec0802401c186eb5c9fe5d5
 SHA512:
-  metadata.gz: 1da1abd028c471cf295b55c4ea3240caecac29d843f8abed248158885633d21060cc1b89fa4984defd5390bf5c55287afddd79c841b66e2bd9736186de0374f6
-  data.tar.gz: cc0ca0cfccd426f25e10fccf64a474ac100e483a6ffd2486cba1c29864d1f58ce7dace3c6b3e856b503e6401e1703571e3b674c27b745950e3932c3dfc67f277
+  metadata.gz: 4d7036c6043ca62e69408a457b5422844c6af017eb06bfe31a9f05c29b131f8875373ffdbda17ee0985c1b288a16d902f5b9719a275dfd84f0955dfbc8bce041
+  data.tar.gz: c0e5807524bc9e5b670cadafb6e15a2f57ae73d1d1885d39ca597b5e0667d1f4a37b42d928054408820574f3aeccf42ec133541ed1616d2f395e1030e656516a

data/dependencies.yml

@@ -1,7 +1,7 @@
 libxml2:
-  version: "2.11.4"
-  sha256: "737e1d7f8ab3f139729ca13a2494fd17bf30ddb4b7a427cf336252cab57f57f7"
-  # sha-256 hash provided in https://download.gnome.org/sources/libxml2/2.11/libxml2-2.11.4.sha256sum
+  version: "2.11.5"
+  sha256: "3727b078c360ec69fa869de14bd6f75d7ee8d36987b071e6928d4720a28df3a6"
+  # sha-256 hash provided in https://download.gnome.org/sources/libxml2/2.11/libxml2-2.11.5.sha256sum
 
 libxslt:
   version: "1.1.38"

data/ext/java/nokogiri/XmlCdata.java

@@ -43,15 +43,19 @@ public class XmlCdata extends XmlText
     if (args.length < 2) {
       throw getRuntime().newArgumentError(args.length, 2);
     }
-    IRubyObject doc = args[0];
+    IRubyObject rbDocument = args[0];
     content = args[1];
 
-    if (!(doc instanceof XmlDocument)) {
+    if (!(rbDocument instanceof XmlNode)) {
+      String msg = "expected first parameter to be a Nokogiri::XML::Document, received " + rbDocument.getMetaClass();
+      throw context.runtime.newTypeError(msg);
+    }
+    if (!(rbDocument instanceof XmlDocument)) {
       // TODO: deprecate allowing Node
       context.runtime.getWarnings().warn("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.");
     }
 
-    Document document = ((XmlNode) doc).getOwnerDocument();
+    Document document = ((XmlNode) rbDocument).getOwnerDocument();
     Node node = document.createCDATASection(rubyStringToString(content));
     setNode(context.runtime, node);
   }

data/ext/java/nokogiri/XmlSchema.java

@@ -143,18 +143,22 @@ public class XmlSchema extends RubyObject
   public static IRubyObject
   from_document(ThreadContext context, IRubyObject klazz, IRubyObject[] args)
   {
-    IRubyObject document = args[0];
+    IRubyObject rbDocument = args[0];
     IRubyObject parseOptions = null;
     if (args.length > 1) {
       parseOptions = args[1];
     }
 
-    if (!(document instanceof XmlDocument)) {
+    if (!(rbDocument instanceof XmlNode)) {
+      String msg = "expected parameter to be a Nokogiri::XML::Document, received " + rbDocument.getMetaClass();
+      throw context.runtime.newTypeError(msg);
+    }
+    if (!(rbDocument instanceof XmlDocument)) {
       // TODO: deprecate allowing Node
       context.runtime.getWarnings().warn("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.");
     }
 
-    XmlDocument doc = ((XmlDocument)((XmlNode) document).document(context));
+    XmlDocument doc = ((XmlDocument)((XmlNode) rbDocument).document(context));
 
     RubyArray<?> errors = (RubyArray) doc.getInstanceVariable("@errors");
     if (!errors.isEmpty()) {

data/ext/java/nokogiri/XmlText.java

@@ -51,14 +51,18 @@ public class XmlText extends XmlNode
     }
 
     content = args[0];
-    IRubyObject xNode = args[1];
+    IRubyObject rbDocument = args[1];
 
-    if (!(xNode instanceof XmlDocument)) {
+    if (!(rbDocument instanceof XmlNode)) {
+      String msg = "expected second parameter to be a Nokogiri::XML::Document, received " + rbDocument.getMetaClass();
+      throw context.runtime.newTypeError(msg);
+    }
+    if (!(rbDocument instanceof XmlDocument)) {
       // TODO: deprecate allowing Node
       context.runtime.getWarnings().warn("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.");
     }
 
-    Document document = asXmlNode(context, xNode).getOwnerDocument();
+    Document document = asXmlNode(context, rbDocument).getOwnerDocument();
     // text node content should not be encoded when it is created by Text node.
     // while content should be encoded when it is created by Element node.
     Node node = document.createTextNode(rubyStringToString(content));

data/ext/java/nokogiri/internals/SaveContextVisitor.java

@@ -808,16 +808,13 @@ public class SaveContextVisitor
   }
 
   private boolean
-  isHtmlScript(Text text)
+  isCDATA(Text text)
   {
-    return htmlDoc && text.getParentNode().getNodeName().equals("script");
+    Node parentNode = text.getParentNode();
+    return htmlDoc && parentNode != null && (parentNode.getNodeName().equals("style")
+           || parentNode.getNodeName().equals("script"));
   }
 
-  private boolean
-  isHtmlStyle(Text text)
-  {
-    return htmlDoc && text.getParentNode().getNodeName().equals("style");
-  }
 
   public boolean
   enter(Text text)
@@ -831,7 +828,7 @@ public class SaveContextVisitor
       }
     }
 
-    if (shouldEncode(text) && !isHtmlScript(text) && !isHtmlStyle(text)) {
+    if (shouldEncode(text) && !isCDATA(text)) {
       textContent = encodeJavaString(textContent);
     }
 

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

@@ -100,11 +100,15 @@ memsize_node(const xmlNodePtr node)
 {
   /* note we don't count namespace definitions, just going for a good-enough number here */
   xmlNodePtr child;
+  xmlAttrPtr property;
   size_t memsize = 0;
 
   memsize += xmlStrlen(node->name);
-  for (child = (xmlNodePtr)node->properties; child; child = child->next) {
-    memsize += sizeof(xmlAttr) + memsize_node(child);
+
+  if (node->type == XML_ELEMENT_NODE) {
+    for (property = node->properties; property; property = property->next) {
+      memsize += sizeof(xmlAttr) + memsize_node((xmlNodePtr)property);
+    }
   }
   if (node->type == XML_TEXT_NODE) {
     memsize += xmlStrlen(node->content);

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/version/constant.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri
 version: !ruby/object:Gem::Version
-  version: 1.15.2
+  version: 1.15.4
 platform: java
 authors:
 - Mike Dalessio
@@ -20,7 +20,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-24 00:00:00.000000000 Z
+date: 2023-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement