nokogiri 1.12.2 → 1.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6685cffdafe1d8bd0a9c813904e74b56a8f6db8e4cccc2c3f9a54418bd46c38
-  data.tar.gz: 11dab171a5fa8be212ae8d33c2e949aa7c26a3bcd7a7f82afcaaee7e419e9af2
+  metadata.gz: 0d3800b4507f9401a8cb016c923012f1068e8d5eda52e42cd27b4ab9f0b3b8e2
+  data.tar.gz: 939e0cf0887a8ceb1e8ed9bb74aceea21c3a07a64641a141816747a61b9af96d
 SHA512:
-  metadata.gz: 7be759e17c515130f2a1b15398e4185ec2546ab12b70c6c55d682e88e9ebb11aee47c11d524b0f4ac2e0892c8c5a340a90dd3a1609e1169b424facabd2b24d2a
-  data.tar.gz: 91f864d6c7f2cc7c08a4aeb0bedb4ddf82fde037c97768c9364943d18c9018144e8b0661acaeece853fe91f0dbbb30f4cdb441c3aa776f62f9f990443d8f29bd
+  metadata.gz: 27717e6aefc536da3733113e14df2e47b6fc894537db343e06c32971defd4a8a81dc7e5d7083641887a2bcc2f1dde822284044d768a374aa924fee94eb2a6906
+  data.tar.gz: e078ee72fc995083b4685a009224c6d3b886e485f310a6a1049689dd3670a3f135d47ea3bd9fb8d7fceed3062b87bd9db55a032e003d3a19d106b2e32d0fa39b

data/ext/nokogiri/extconf.rb

@@ -594,6 +594,10 @@ append_cppflags(ENV["CPPFLAGS"].split) unless ENV["CPPFLAGS"].nil?
 append_ldflags(ENV["LDFLAGS"].split) unless ENV["LDFLAGS"].nil?
 $LIBS = concat_flags($LIBS, ENV["LIBS"])
 
+# nokogumbo code uses C90/C99 features, let's make sure older compilers won't give
+# errors/warnings. see #2302
+append_cflags(["-std=c99", "-Wno-declaration-after-statement"])
+
 # always include debugging information
 append_cflags("-g")
 

data/ext/nokogiri/gumbo.c

@@ -75,7 +75,7 @@ new_html_doc(const char *dtd_name, const char *system, const char *public)
   htmlDocPtr doc = htmlNewDocNoDtD(/* URI */ NULL, /* ExternalID */NULL);
   assert(doc);
   if (dtd_name) {
-    xmlCreateIntSubset(doc, BAD_CAST dtd_name, BAD_CAST public, BAD_CAST system);
+    xmlCreateIntSubset(doc, (const xmlChar *)dtd_name, (const xmlChar *)public, (const xmlChar *)system);
   }
   return doc;
 }
@@ -120,11 +120,11 @@ lookup_or_add_ns(
   const char *prefix
 )
 {
-  xmlNsPtr ns = xmlSearchNs(doc, root, BAD_CAST prefix);
+  xmlNsPtr ns = xmlSearchNs(doc, root, (const xmlChar *)prefix);
   if (ns) {
     return ns;
   }
-  return xmlNewNs(root, BAD_CAST href, BAD_CAST prefix);
+  return xmlNewNs(root, (const xmlChar *)href, (const xmlChar *)prefix);
 }
 
 static void
@@ -181,20 +181,20 @@ build_tree(
 
       case GUMBO_NODE_TEXT:
       case GUMBO_NODE_WHITESPACE:
-        xml_child = xmlNewDocText(doc, BAD_CAST gumbo_child->v.text.text);
+        xml_child = xmlNewDocText(doc, (const xmlChar *)gumbo_child->v.text.text);
         set_line(xml_child, gumbo_child->v.text.start_pos.line);
         xmlAddChild(xml_node, xml_child);
         break;
 
       case GUMBO_NODE_CDATA:
-        xml_child = xmlNewCDataBlock(doc, BAD_CAST gumbo_child->v.text.text,
+        xml_child = xmlNewCDataBlock(doc, (const xmlChar *)gumbo_child->v.text.text,
                                      (int) strlen(gumbo_child->v.text.text));
         set_line(xml_child, gumbo_child->v.text.start_pos.line);
         xmlAddChild(xml_node, xml_child);
         break;
 
       case GUMBO_NODE_COMMENT:
-        xml_child = xmlNewDocComment(doc, BAD_CAST gumbo_child->v.text.text);
+        xml_child = xmlNewDocComment(doc, (const xmlChar *)gumbo_child->v.text.text);
         set_line(xml_child, gumbo_child->v.text.start_pos.line);
         xmlAddChild(xml_node, xml_child);
         break;
@@ -202,7 +202,7 @@ build_tree(
       case GUMBO_NODE_TEMPLATE:
       // XXX: Should create a template element and a new DocumentFragment
       case GUMBO_NODE_ELEMENT: {
-        xml_child = xmlNewDocNode(doc, NULL, BAD_CAST gumbo_child->v.element.name, NULL);
+        xml_child = xmlNewDocNode(doc, NULL, (const xmlChar *)gumbo_child->v.element.name, NULL);
         set_line(xml_child, gumbo_child->v.element.start_pos.line);
         if (xml_root == NULL) {
           xml_root = xml_child;
@@ -244,7 +244,7 @@ build_tree(
             default:
               ns = NULL;
           }
-          xmlNewNsProp(xml_child, ns, BAD_CAST attr->name, BAD_CAST attr->value);
+          xmlNewNsProp(xml_child, ns, (const xmlChar *)attr->name, (const xmlChar *)attr->value);
         }
 
         // Add children for this element.
@@ -303,7 +303,7 @@ typedef struct {
 static VALUE
 parse_cleanup(VALUE parse_args)
 {
-  ParseArgs *args = (ParseArgs*)parse_args;
+  ParseArgs *args = (ParseArgs *)parse_args;
   gumbo_destroy_output(args->output);
   // Make sure garbage collection doesn't mark the objects as being live based
   // on references from the ParseArgs. This may be unnecessary.
@@ -342,7 +342,7 @@ parse(VALUE self, VALUE input, VALUE url, VALUE max_attributes, VALUE max_errors
 static VALUE
 parse_continue(VALUE parse_args)
 {
-  ParseArgs *args = (ParseArgs*)parse_args;
+  ParseArgs *args = (ParseArgs *)parse_args;
   GumboOutput *output = args->output;
   xmlDocPtr doc;
   if (output->document->v.document.has_doctype) {
@@ -552,7 +552,7 @@ error:
 static VALUE
 fragment_continue(VALUE parse_args)
 {
-  ParseArgs *args = (ParseArgs*)parse_args;
+  ParseArgs *args = (ParseArgs *)parse_args;
   GumboOutput *output = args->output;
   VALUE doc_fragment = args->url_or_frag;
   xmlDocPtr xml_doc = args->doc;

data/ext/nokogiri/html4_element_description.c

@@ -266,7 +266,7 @@ get_description(VALUE klass, VALUE tag_name)
                                     );
 
   if (NULL == description) { return Qnil; }
-  return Data_Wrap_Struct(klass, 0, 0, (void *)(uintptr_t)description);
+  return Data_Wrap_Struct(klass, 0, 0, DISCARD_CONST_QUAL(void *, description));
 }
 
 void

data/ext/nokogiri/html4_sax_parser_context.c

@@ -110,7 +110,8 @@ void
 noko_init_html_sax_parser_context()
 {
   assert(cNokogiriXmlSaxParserContext);
-  cNokogiriHtml4SaxParserContext = rb_define_class_under(mNokogiriHtml4Sax, "ParserContext", cNokogiriXmlSaxParserContext);
+  cNokogiriHtml4SaxParserContext = rb_define_class_under(mNokogiriHtml4Sax, "ParserContext",
+                                   cNokogiriXmlSaxParserContext);
 
   rb_define_singleton_method(cNokogiriHtml4SaxParserContext, "memory", parse_memory, 2);
   rb_define_singleton_method(cNokogiriHtml4SaxParserContext, "file", parse_file, 2);

data/ext/nokogiri/nokogiri.c

@@ -220,7 +220,7 @@ Init_nokogiri()
   xmlInitParser();
   exsltRegisterAll();
 
-  if (xsltExtModuleFunctionLookup((xmlChar*)"date-time", EXSLT_DATE_NAMESPACE)) {
+  if (xsltExtModuleFunctionLookup((const xmlChar *)"date-time", EXSLT_DATE_NAMESPACE)) {
     rb_const_set(mNokogiri, rb_intern("LIBXSLT_DATETIME_ENABLED"), Qtrue);
   } else {
     rb_const_set(mNokogiri, rb_intern("LIBXSLT_DATETIME_ENABLED"), Qfalse);

data/ext/nokogiri/nokogiri.h

@@ -197,6 +197,9 @@ NOKOPUBFUN VALUE Nokogiri_wrap_xml_document(VALUE klass,
 #define NOKOGIRI_SAX_TUPLE_NEW(_ctxt, _self) nokogiri_sax_tuple_new(_ctxt, _self)
 #define NOKOGIRI_SAX_TUPLE_DESTROY(_tuple) free(_tuple)
 
+#define DISCARD_CONST_QUAL(t, v) ((t)(uintptr_t)(v))
+#define DISCARD_CONST_QUAL_XMLCHAR(v) DISCARD_CONST_QUAL(xmlChar *, v)
+
 void Nokogiri_structured_error_func_save(libxmlStructuredErrorHandlerState *handler_state);
 void Nokogiri_structured_error_func_save_and_set(libxmlStructuredErrorHandlerState *handler_state, void *user_data,
     xmlStructuredErrorFunc handler);

data/ext/nokogiri/xml_document.c

@@ -213,7 +213,7 @@ set_encoding(VALUE self, VALUE encoding)
   Data_Get_Struct(self, xmlDoc, doc);
 
   if (doc->encoding) {
-    free((char *)(uintptr_t) doc->encoding);  /* avoid gcc cast warning */
+    xmlFree(DISCARD_CONST_QUAL_XMLCHAR(doc->encoding));
   }
 
   doc->encoding = xmlStrdup((xmlChar *)StringValueCStr(encoding));

data/ext/nokogiri/xml_namespace.c

@@ -33,10 +33,10 @@ dealloc_namespace(xmlNsPtr ns)
    */
   NOKOGIRI_DEBUG_START(ns) ;
   if (ns->href) {
-    xmlFree((xmlChar *)(uintptr_t)ns->href);
+    xmlFree(DISCARD_CONST_QUAL_XMLCHAR(ns->href));
   }
   if (ns->prefix) {
-    xmlFree((xmlChar *)(uintptr_t)ns->prefix);
+    xmlFree(DISCARD_CONST_QUAL_XMLCHAR(ns->prefix));
   }
   xmlFree(ns);
   NOKOGIRI_DEBUG_END(ns) ;

data/ext/nokogiri/xml_node.c

@@ -304,7 +304,7 @@ ok:
        *  issue #391, where new node's prefix may become the string "default"
        *  see libxml2 tree.c xmlNewReconciliedNs which implements this behavior.
        */
-      xmlFree((xmlChar *)reparentee->ns->prefix);
+      xmlFree(DISCARD_CONST_QUAL_XMLCHAR(reparentee->ns->prefix));
       reparentee->ns->prefix = NULL;
     }
   }
@@ -934,7 +934,7 @@ get(VALUE self, VALUE rattribute)
   Data_Get_Struct(self, xmlNode, node);
   attribute = xmlCharStrdup(StringValueCStr(rattribute));
 
-  colon = (xmlChar *)(uintptr_t)xmlStrchr(attribute, (const xmlChar)':');
+  colon = DISCARD_CONST_QUAL_XMLCHAR(xmlStrchr(attribute, (const xmlChar)':'));
   if (colon) {
     /* split the attribute string into separate prefix and name by
      * null-terminating the prefix at the colon */

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.12.2"
+  VERSION = "1.12.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri
 version: !ruby/object:Gem::Version
-  version: 1.12.2
+  version: 1.12.3
 platform: ruby
 authors:
 - Mike Dalessio
@@ -20,7 +20,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-04 00:00:00.000000000 Z
+date: 2021-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: racc