nokogiri 1.11.2 → 1.11.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 452bb1cd5efd099165d1c7e0e6239fdafc0b2e3620f715ceda57b23f620cc1d0
-  data.tar.gz: 7776d8ab7ed9b0b528d48f0cd7882e5672cfab18671f146c5f67708ec9abf99c
+  metadata.gz: a73d0d0bba6227291bb1780b081dd2620881949ec0621e51d83457da13a98717
+  data.tar.gz: 2b6a3899b2368fa153d5de232e0dd7e04bd1a925ddebbfb0fb248956a9de8247
 SHA512:
-  metadata.gz: ca1b3d69c4653d4b5cbf0f46d1241897981196f0515c11b871e6502562da7241856dc567de19fac0f1e71a854aefcc6ec9bd8beac5a764368c53fc636677c7f4
-  data.tar.gz: b524df68b46b37ad5e5e09451ed808f6e0f68ca06e4a7e3e7b483c97d6e595cfe668de5a539c776e0ceb7c49eaa45d5cc6bcda9c835548c6e5633f0f410330fa
+  metadata.gz: f798c33192a0b25e1d57aa62b6eefbf3ccab6e0563f86357688e0cc75a7a714e83d48b0fc1cceb22f3c740005a61800c908e8e62cf6147663450950976941ca3
+  data.tar.gz: 0cbb1ab65d2299c10e39ff19b2df63fb7c50daf94ffc4062031239caa5455d1f81c6ac32ea4c3a5ca71a41e49184271fcccc28b8f8b226f64507de98775c71e0

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/dependencies.yml

@@ -1,10 +1,10 @@
 libxml2:
-  version: "2.9.10"
-  sha256: "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f"
+  version: "2.9.12"
+  sha256: "c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92"
   #  manually verified checksum:
   #
-  #    $ gpg --verify libxml2-2.9.10.tar.gz.asc ports/archives/libxml2-2.9.10.tar.gz 
-  #    gpg: Signature made Wed 30 Oct 2019 03:15:42 PM EDT
+  #    $ gpg --verify libxml2-2.9.12.tar.gz.asc ports/archives/libxml2-2.9.12.tar.gz
+  #    gpg: Signature made Thu 13 May 2021 02:59:16 PM EDT
   #    gpg:                using RSA key DB46681BB91ADCEA170FA2D415588B26596BEA5D
   #    gpg: Good signature from "Daniel Veillard (Red Hat work email) <veillard@redhat.com>" [unknown]
   #    gpg:                 aka "Daniel Veillard <Daniel.Veillard@w3.org>" [unknown]
@@ -17,14 +17,14 @@ libxml2:
   #
   #    -----BEGIN PGP SIGNATURE-----
   #    
-  #    iQEzBAABCAAdFiEE20ZoG7ka3OoXD6LUFViLJllr6l0FAl254V4ACgkQFViLJllr
-  #    6l0ldAf6Azt4/oKDfMKRd+xaykUrb+34dr2ZRsjRDS1cnelAtL9TCWhE5lOkLI3c
-  #    3FyNRaLhOEOOluZmKTJYyzS42JSSHDhxGj14gIeyafOjvRhHG3h1m5GvMmvgKWkd
-  #    qzxFrVFSG26iWJxMvxIA88t7M+QHb7ff7xR29ETJscewEmAd3LmZITglK02lWeGz
-  #    LfxfLuakM6RnCUu0dzacJKO0nMOKju+RL/N9bciI/UOhNYEkWqPnzC0GzbvFLqDu
-  #    rM+OvCSewSTziiejpdrUwYXkY5Ui2+cxUbacLauEr8iRLg7xXKqv27NORE4yeQcS
-  #    LgIhxG/qSNfihMS6E1ZO5bK2DbGCZQ==
-  #    =ZNuc
+  #    iQEzBAABCAAdFiEE20ZoG7ka3OoXD6LUFViLJllr6l0FAmCddwQACgkQFViLJllr
+  #    6l11LQgAioRTdfmcC+uK/7+6HPtF/3c5zkX6j8VGYuvFBwZ0jayqMRBAl++fcpjE
+  #    JUU/JKebSZ/KCYjzyeOWK/i3Gq77iqm3UbZFB85rqu4a5P3gmj/4STWVyAx0KU3z
+  #    G3jKqDhJOt7c0acXb5lh2DngfDa1dn/VGcQcIXsqplNxNr4ET7MnSJjZ3nlxYfW2
+  #    E5vWBdPCMUeXDBl6MjYvw9XnGGBLUAaEJWoFToG6jKmVf4GAd9nza20jj5dtbcJq
+  #    QEOaSDKDr+f9h2NS8haOhJ9vOpy52PdeGzaFlbRkXarGXuAr8kITgATVs8FAqcgv
+  #    MoVhmrO5r2hJf0dCM9fZoYqzpMfmNA==
+  #    =KfJ9
   #    -----END PGP SIGNATURE-----
   #
 

data/ext/nokogiri/nokogiri.c

@@ -191,7 +191,26 @@ Init_nokogiri()
   rb_const_set(mNokogiri, rb_intern("OTHER_LIBRARY_VERSIONS"), NOKOGIRI_STR_NEW2(NOKOGIRI_OTHER_LIBRARY_VERSIONS));
 #endif
 
+#if defined(_WIN32) && !defined(NOKOGIRI_PACKAGED_LIBRARIES)
+  /*
+   *  We choose *not* to do use Ruby's memory management functions with windows DLLs because of this
+   *  issue in libxml 2.9.12:
+   *
+   *    https://github.com/sparklemotion/nokogiri/issues/2241
+   *
+   *  If the atexit() issue gets fixed in a future version of libxml2, then we may be able to skip
+   *  this config only for the specific libxml2 versions 2.9.12.
+   *
+   *  Alternatively, now that Ruby has a generational GC, it might be OK to let libxml2 use its
+   *  default memory management functions (recall that this config was introduced to reduce memory
+   *  bloat and allow Ruby to GC more often); but we should *really* test with production workloads
+   *  before making that kind of a potentially-invasive change.
+   */
+  rb_const_set(mNokogiri, rb_intern("LIBXML_MEMORY_MANAGEMENT"), NOKOGIRI_STR_NEW2("default"));
+#else
+  rb_const_set(mNokogiri, rb_intern("LIBXML_MEMORY_MANAGEMENT"), NOKOGIRI_STR_NEW2("ruby"));
   xmlMemSetup((xmlFreeFunc)ruby_xfree, (xmlMallocFunc)ruby_xmalloc, (xmlReallocFunc)ruby_xrealloc, ruby_strdup);
+#endif
 
   xmlInitParser();
 

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 ;
 }
@@ -1292,17 +1292,25 @@ get_name(VALUE self)
  * Returns the path associated with this Node
  */
 static VALUE
-path(VALUE self)
+noko_xml_node_path(VALUE rb_node)
 {
-  xmlNodePtr node;
-  xmlChar *path ;
+  xmlNodePtr c_node;
+  xmlChar *c_path ;
   VALUE rval;
 
-  Data_Get_Struct(self, xmlNode, node);
+  Data_Get_Struct(rb_node, xmlNode, c_node);
+
+  c_path = xmlGetNodePath(c_node);
+  if (c_path == NULL) {
+    // see https://github.com/sparklemotion/nokogiri/issues/2250
+    // this behavior is clearly undesirable, but is what libxml <= 2.9.10 returned, and so we
+    // do this for now to preserve the behavior across libxml2 versions.
+    rval = NOKOGIRI_STR_NEW2("?");
+  } else {
+    rval = NOKOGIRI_STR_NEW2(c_path);
+    xmlFree(c_path);
+  }
 
-  path = xmlGetNodePath(node);
-  rval = NOKOGIRI_STR_NEW2(path);
-  xmlFree(path);
   return rval ;
 }
 
@@ -1443,6 +1451,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 +1664,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 ;
@@ -1780,7 +1787,7 @@ noko_init_xml_node()
   rb_define_method(cNokogiriXmlNode, "next_element", next_element, 0);
   rb_define_method(cNokogiriXmlNode, "previous_element", previous_element, 0);
   rb_define_method(cNokogiriXmlNode, "node_type", node_type, 0);
-  rb_define_method(cNokogiriXmlNode, "path", path, 0);
+  rb_define_method(cNokogiriXmlNode, "path", noko_xml_node_path, 0);
   rb_define_method(cNokogiriXmlNode, "key?", key_eh, 1);
   rb_define_method(cNokogiriXmlNode, "namespaced_key?", namespaced_key_eh, 2);
   rb_define_method(cNokogiriXmlNode, "blank?", blank_eh, 0);
@@ -1818,8 +1825,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.7"
 end

data/lib/nokogiri/version/info.rb

@@ -137,6 +137,7 @@ module Nokogiri
             else
               libxml["source"] = "system"
             end
+            libxml["memory_management"] = Nokogiri::LIBXML_MEMORY_MANAGEMENT
             libxml["iconv_enabled"] = libxml2_has_iconv?
             libxml["compiled"] = compiled_libxml_version.to_s
             libxml["loaded"] = loaded_libxml_version.to_s

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