nokogiri 1.11.2-x64-mingw32 → 1.11.3-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a141112c8a93b0192380d3f64ec1ca100f73383f4a15598974c830d1bdf45361
-  data.tar.gz: db5b3dd7ef56476d2df6552eb92f31be3f9144545576f54f6eadcc6dd3f1b41d
+  metadata.gz: 5a7f3fe2e2340e5f70277962b3a328c39a3fd7b197e099a8fa0846f514ae3ec4
+  data.tar.gz: c90d3a517e0e98e02809e7330b9b8955a825d0d9d206dedc82f5d0b9c275c920
 SHA512:
-  metadata.gz: 8994684a6a8e4324c5f4fe87ae3f8fec2b36097a9265a58b8ba5ab5af4f528dade9fc057624cec88e23667e737a052761156b58d9e6e992788b79d5b3db9e743
-  data.tar.gz: 757a1d348df009976fef7f3e7b0688b274df79eecc4d1ef55c85adcbd5d67feb1bb45d1bcc6b5b9e14f09d83d7669c8d85850b3b398df334799a52dea43f610e
+  metadata.gz: 5ff57d13f1a1b35673d5a24f2dfa610b7529a715139abe860b5bb540839b1db3838ddc699bbb429d1bca28981392d3ff91d4d81b8d2ab4603cc9965e6096c05c
+  data.tar.gz: 238c9810868256feef73248076569365192979fc0b081931ac7ff5b60f5a458029798367214554db4074ab35463d4aec4688b1263e6819b396ba3e0c5933744a

data/LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright 2008 -- 2020 by Mike Dalessio, Aaron Patterson, Yoko Harada, Akinori MUSHA, John Shahid, Karol Bucek, Lars Kanis, Sergio Arbeo, Timothy Elliott, Nobuyoshi Nakada, Charles Nutter, Patrick Mahoney.
+Copyright 2008 -- 2021 by Mike Dalessio, Aaron Patterson, Yoko Harada, Akinori MUSHA, John Shahid, Karol Bucek, Lars Kanis, Sergio Arbeo, Timothy Elliott, Nobuyoshi Nakada, Charles Nutter, Patrick Mahoney.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/README.md

@@ -57,7 +57,7 @@ Your first stops for learning more about Nokogiri should be:
 
 There are a few ways to ask exploratory questions:
 
-- The Discord chat channel is `#nokogiri-💎` at https://discord.gg/UyQnKrT
+- The Ruby Discord chat server is active at https://discord.gg/UyQnKrT
 - The Nokogiri mailing list is active at https://groups.google.com/group/nokogiri-talk
 - Open an issue using the "Help Request" template at https://github.com/sparklemotion/nokogiri/issues
 

data/ext/nokogiri/xml_document.c

@@ -141,42 +141,41 @@ url(VALUE self)
  * Set the root element on this document
  */
 static VALUE
-set_root(VALUE self, VALUE root)
+rb_xml_document_root_set(VALUE self, VALUE rb_new_root)
 {
-  xmlDocPtr doc;
-  xmlNodePtr new_root;
-  xmlNodePtr old_root;
-
-  Data_Get_Struct(self, xmlDoc, doc);
+  xmlDocPtr c_document;
+  xmlNodePtr c_new_root = NULL, c_current_root;
 
-  old_root = NULL;
-
-  if (NIL_P(root)) {
-    old_root = xmlDocGetRootElement(doc);
-
-    if (old_root) {
-      xmlUnlinkNode(old_root);
-      noko_xml_document_pin_node(old_root);
-    }
+  Data_Get_Struct(self, xmlDoc, c_document);
 
-    return root;
+  c_current_root = xmlDocGetRootElement(c_document);
+  if (c_current_root) {
+    xmlUnlinkNode(c_current_root);
+    noko_xml_document_pin_node(c_current_root);
   }
 
-  Data_Get_Struct(root, xmlNode, new_root);
+  if (!NIL_P(rb_new_root)) {
+    if (!rb_obj_is_kind_of(rb_new_root, cNokogiriXmlNode)) {
+      rb_raise(rb_eArgError,
+               "expected Nokogiri::XML::Node but received %"PRIsVALUE,
+               rb_obj_class(rb_new_root));
+    }
 
+    Data_Get_Struct(rb_new_root, xmlNode, c_new_root);
 
-  /* If the new root's document is not the same as the current document,
-   * then we need to dup the node in to this document. */
-  if (new_root->doc != doc) {
-    old_root = xmlDocGetRootElement(doc);
-    if (!(new_root = xmlDocCopyNode(new_root, doc, 1))) {
-      rb_raise(rb_eRuntimeError, "Could not reparent node (xmlDocCopyNode)");
+    /* If the new root's document is not the same as the current document,
+     * then we need to dup the node in to this document. */
+    if (c_new_root->doc != c_document) {
+      c_new_root = xmlDocCopyNode(c_new_root, c_document, 1);
+      if (!c_new_root) {
+        rb_raise(rb_eRuntimeError, "Could not reparent node (xmlDocCopyNode)");
+      }
     }
   }
 
-  xmlDocSetRootElement(doc, new_root);
-  if (old_root) { noko_xml_document_pin_node(old_root); }
-  return root;
+  xmlDocSetRootElement(c_document, c_new_root);
+
+  return rb_new_root;
 }
 
 /*
@@ -186,17 +185,19 @@ set_root(VALUE self, VALUE root)
  * Get the root node for this document.
  */
 static VALUE
-root(VALUE self)
+rb_xml_document_root(VALUE self)
 {
-  xmlDocPtr doc;
-  xmlNodePtr root;
+  xmlDocPtr c_document;
+  xmlNodePtr c_root;
 
-  Data_Get_Struct(self, xmlDoc, doc);
+  Data_Get_Struct(self, xmlDoc, c_document);
 
-  root = xmlDocGetRootElement(doc);
+  c_root = xmlDocGetRootElement(c_document);
+  if (!c_root) {
+    return Qnil;
+  }
 
-  if (!root) { return Qnil; }
-  return noko_xml_node_wrap(Qnil, root) ;
+  return noko_xml_node_wrap(Qnil, c_root) ;
 }
 
 /*
@@ -666,8 +667,8 @@ noko_init_xml_document()
   rb_define_singleton_method(cNokogiriXmlDocument, "read_io", read_io, 4);
   rb_define_singleton_method(cNokogiriXmlDocument, "new", new, -1);
 
-  rb_define_method(cNokogiriXmlDocument, "root", root, 0);
-  rb_define_method(cNokogiriXmlDocument, "root=", set_root, 1);
+  rb_define_method(cNokogiriXmlDocument, "root", rb_xml_document_root, 0);
+  rb_define_method(cNokogiriXmlDocument, "root=", rb_xml_document_root_set, 1);
   rb_define_method(cNokogiriXmlDocument, "encoding", encoding, 0);
   rb_define_method(cNokogiriXmlDocument, "encoding=", set_encoding, 1);
   rb_define_method(cNokogiriXmlDocument, "version", version, 0);

data/ext/nokogiri/xml_node.c

@@ -2,7 +2,7 @@
 
 VALUE cNokogiriXmlNode ;
 
-static ID decorate, decorate_bang;
+static ID id_decorate, id_decorate_bang;
 
 #ifdef DEBUG
 static void
@@ -357,7 +357,7 @@ ok:
 
   reparented_obj = noko_xml_node_wrap(Qnil, reparented);
 
-  rb_funcall(reparented_obj, decorate_bang, 0);
+  rb_funcall(reparented_obj, id_decorate_bang, 0);
 
   return reparented_obj ;
 }
@@ -1443,6 +1443,7 @@ add_namespace_definition(VALUE rb_node, VALUE rb_prefix, VALUE rb_href)
  *   Create a new node with +name+ sharing GC lifecycle with +document+.
  *   @param name [String]
  *   @param document [Nokogiri::XML::Document]
+ *   @yieldparam node [Nokogiri::XML::Node]
  *   @return [Nokogiri::XML::Node]
  *   @see Nokogiri::XML::Node#initialize
  */
@@ -1655,85 +1656,83 @@ in_context(VALUE self, VALUE _str, VALUE _options)
 
 
 VALUE
-noko_xml_node_wrap(VALUE klass, xmlNodePtr node)
+noko_xml_node_wrap(VALUE rb_class, xmlNodePtr c_node)
 {
-  VALUE document = Qnil ;
-  VALUE node_cache = Qnil ;
-  VALUE rb_node = Qnil ;
+  VALUE rb_document, rb_node_cache, rb_node;
   nokogiriTuplePtr node_has_a_document;
-  xmlDocPtr doc;
+  xmlDocPtr c_doc;
   void (*mark_method)(xmlNodePtr) = NULL ;
 
-  assert(node);
+  assert(c_node);
 
-  if (node->type == XML_DOCUMENT_NODE || node->type == XML_HTML_DOCUMENT_NODE) {
-    return DOC_RUBY_OBJECT(node->doc);
+  if (c_node->type == XML_DOCUMENT_NODE || c_node->type == XML_HTML_DOCUMENT_NODE) {
+    return DOC_RUBY_OBJECT(c_node->doc);
   }
 
   /* It's OK if the node doesn't have a fully-realized document (as in XML::Reader). */
   /* see https://github.com/sparklemotion/nokogiri/issues/95 */
   /* and https://github.com/sparklemotion/nokogiri/issues/439 */
-  doc = node->doc;
-  if (doc->type == XML_DOCUMENT_FRAG_NODE) { doc = doc->doc; }
-  node_has_a_document = DOC_RUBY_OBJECT_TEST(doc);
+  c_doc = c_node->doc;
+  if (c_doc->type == XML_DOCUMENT_FRAG_NODE) { c_doc = c_doc->doc; }
+  node_has_a_document = DOC_RUBY_OBJECT_TEST(c_doc);
 
-  if (node->_private && node_has_a_document) {
-    return (VALUE)node->_private;
+  if (c_node->_private && node_has_a_document) {
+    return (VALUE)c_node->_private;
   }
 
-  if (!RTEST(klass)) {
-    switch (node->type) {
+  if (!RTEST(rb_class)) {
+    switch (c_node->type) {
     case XML_ELEMENT_NODE:
-      klass = cNokogiriXmlElement;
+      rb_class = cNokogiriXmlElement;
       break;
     case XML_TEXT_NODE:
-      klass = cNokogiriXmlText;
+      rb_class = cNokogiriXmlText;
       break;
     case XML_ATTRIBUTE_NODE:
-      klass = cNokogiriXmlAttr;
+      rb_class = cNokogiriXmlAttr;
       break;
     case XML_ENTITY_REF_NODE:
-      klass = cNokogiriXmlEntityReference;
+      rb_class = cNokogiriXmlEntityReference;
       break;
     case XML_COMMENT_NODE:
-      klass = cNokogiriXmlComment;
+      rb_class = cNokogiriXmlComment;
       break;
     case XML_DOCUMENT_FRAG_NODE:
-      klass = cNokogiriXmlDocumentFragment;
+      rb_class = cNokogiriXmlDocumentFragment;
       break;
     case XML_PI_NODE:
-      klass = cNokogiriXmlProcessingInstruction;
+      rb_class = cNokogiriXmlProcessingInstruction;
       break;
     case XML_ENTITY_DECL:
-      klass = cNokogiriXmlEntityDecl;
+      rb_class = cNokogiriXmlEntityDecl;
       break;
     case XML_CDATA_SECTION_NODE:
-      klass = cNokogiriXmlCData;
+      rb_class = cNokogiriXmlCData;
       break;
     case XML_DTD_NODE:
-      klass = cNokogiriXmlDtd;
+      rb_class = cNokogiriXmlDtd;
       break;
     case XML_ATTRIBUTE_DECL:
-      klass = cNokogiriXmlAttributeDecl;
+      rb_class = cNokogiriXmlAttributeDecl;
       break;
     case XML_ELEMENT_DECL:
-      klass = cNokogiriXmlElementDecl;
+      rb_class = cNokogiriXmlElementDecl;
       break;
     default:
-      klass = cNokogiriXmlNode;
+      rb_class = cNokogiriXmlNode;
     }
   }
 
   mark_method = node_has_a_document ? mark : NULL ;
 
-  rb_node = Data_Wrap_Struct(klass, mark_method, debug_node_dealloc, node) ;
-  node->_private = (void *)rb_node;
+  rb_node = Data_Wrap_Struct(rb_class, mark_method, debug_node_dealloc, c_node) ;
+  c_node->_private = (void *)rb_node;
 
   if (node_has_a_document) {
-    document = DOC_RUBY_OBJECT(doc);
-    node_cache = DOC_NODE_CACHE(doc);
-    rb_ary_push(node_cache, rb_node);
-    rb_funcall(document, decorate, 1, rb_node);
+    rb_document = DOC_RUBY_OBJECT(c_doc);
+    rb_node_cache = DOC_NODE_CACHE(c_doc);
+    rb_ary_push(rb_node_cache, rb_node);
+    rb_funcall(rb_document, id_decorate, 1, rb_node);
   }
 
   return rb_node ;
@@ -1818,8 +1817,8 @@ noko_init_xml_node()
   rb_define_private_method(cNokogiriXmlNode, "set_namespace", set_namespace, 1);
   rb_define_private_method(cNokogiriXmlNode, "compare", compare, 1);
 
-  decorate      = rb_intern("decorate");
-  decorate_bang = rb_intern("decorate!");
+  id_decorate      = rb_intern("decorate");
+  id_decorate_bang = rb_intern("decorate!");
 }
 
 /* vim: set noet sw=4 sws=4 */

data/lib/nokogiri/version/constant.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module Nokogiri
   # The version of Nokogiri you are using
-  VERSION = "1.11.2"
+  VERSION = "1.11.3"
 end

data/lib/nokogiri/xml/document.rb

@@ -14,11 +14,12 @@ module Nokogiri
     # Nokogiri::XML::Searchable#xpath
     #
     class Document < Nokogiri::XML::Node
-      # I'm ignoring unicode characters here.
-      # See http://www.w3.org/TR/REC-xml-names/#ns-decl for more details.
+      # See http://www.w3.org/TR/REC-xml-names/#ns-decl for more details. Note that we're not
+      # attempting to handle unicode characters partly because libxml2 doesn't handle unicode
+      # characters in NCNAMEs.
       NCNAME_START_CHAR = "A-Za-z_"
-      NCNAME_CHAR       = NCNAME_START_CHAR + "\\-.0-9"
-      NCNAME_RE         = /^xmlns(:[#{NCNAME_START_CHAR}][#{NCNAME_CHAR}]*)?$/
+      NCNAME_CHAR       = NCNAME_START_CHAR + "\\-\\.0-9"
+      NCNAME_RE         = /^xmlns(?::([#{NCNAME_START_CHAR}][#{NCNAME_CHAR}]*))?$/
 
       ##
       # Parse an XML file.
@@ -118,33 +119,58 @@ module Nokogiri
       end
 
       ##
-      # Create an element with +name+, and optionally setting the content and attributes.
+      # Create a new +Element+ with +name+ sharing GC lifecycle with the document, optionally
+      # setting contents or attributes.
       #
-      #   doc.create_element "div" # <div></div>
-      #   doc.create_element "div", :class => "container" # <div class='container'></div>
-      #   doc.create_element "div", "contents" # <div>contents</div>
-      #   doc.create_element "div", "contents", :class => "container" # <div class='container'>contents</div>
-      #   doc.create_element "div" { |node| node['class'] = "container" } # <div class='container'></div>
+      # Arguments may be passed to initialize the element:
+      # - a +Hash+ argument will be used to set attributes
+      # - a non-Hash object that responds to +#to_s+ will be used to set the new node's contents
       #
-      def create_element name, *args, &block
+      # A block may be passed to mutate the node.
+      #
+      # @param name [String]
+      # @param contents_or_attrs [#to_s,Hash]
+      # @yieldparam node [Nokogiri::XML::Element]
+      # @return [Nokogiri::XML::Element]
+      #
+      # @example An empty element without attributes
+      #   doc.create_element("div")
+      #   # => <div></div>
+      #
+      # @example An element with contents
+      #   doc.create_element("div", "contents")
+      #   # => <div>contents</div>
+      #
+      # @example An element with attributes
+      #   doc.create_element("div", {"class" => "container"})
+      #   # => <div class='container'></div>
+      #
+      # @example An element with contents and attributes
+      #   doc.create_element("div", "contents", {"class" => "container"})
+      #   # => <div class='container'>contents</div>
+      #
+      # @example Passing a block to mutate the element
+      #   doc.create_element("div") { |node| node["class"] = "blue" if before_noon? }
+      #
+      def create_element(name, *contents_or_attrs, &block)
         elm = Nokogiri::XML::Element.new(name, self, &block)
-        args.each do |arg|
+        contents_or_attrs.each do |arg|
           case arg
           when Hash
-            arg.each { |k,v|
+            arg.each do |k, v|
               key = k.to_s
               if key =~ NCNAME_RE
-                ns_name = key.split(":", 2)[1]
-                elm.add_namespace_definition ns_name, v
+                ns_name = Regexp.last_match(1)
+                elm.add_namespace_definition(ns_name, v)
               else
                 elm[k.to_s] = v.to_s
               end
-            }
+            end
           else
             elm.content = arg
           end
         end
-        if ns = elm.namespace_definitions.find { |n| n.prefix.nil? or n.prefix == '' }
+        if ns = elm.namespace_definitions.find { |n| n.prefix.nil? || (n.prefix == '') }
           elm.namespace = ns
         end
         elm

data/lib/nokogiri/xml/node.rb

@@ -93,6 +93,7 @@ module Nokogiri
       # Create a new node with +name+ sharing GC lifecycle with +document+.
       # @param name [String]
       # @param document [Nokogiri::XML::Document]
+      # @yieldparam node [Nokogiri::XML::Node]
       # @return [Nokogiri::XML::Node]
       # @see Nokogiri::XML::Node.new
       def initialize(name, document)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri
 version: !ruby/object:Gem::Version
-  version: 1.11.2
+  version: 1.11.3
 platform: x64-mingw32
 authors:
 - Mike Dalessio
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-11 00:00:00.000000000 Z
+date: 2021-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: racc