nokolexbor 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b4771596beb64967a2bcce8c591662357a98b18c07bf18443cafee4b4ebd486
-  data.tar.gz: 1eb686a5bc927787f62beeefa1b081251407fac43fd90468f3241fb9e20c1cf9
+  metadata.gz: eddfccec75e5089344c81814159f243d5c46e1d747d7cb2351a8efcdc554e46e
+  data.tar.gz: 1112c8ee0d902e2ef382f582a39e306a5a908ca03bb5b5bc6837e361663552fe
 SHA512:
-  metadata.gz: a812d6d52d8abc0feda530cd3893564d9304239dfd4f35bb29f0663f20e47d0e0856dd2b4d821c6e7cfda416720c1c0e5ab5774df20971e400263a2959c7ef7f
-  data.tar.gz: ff23c81587a8344c6bf79f4aecac56dde604341beff166a6dc55c25db0c073b9fe0e023a1816a1a4c129d1bbc29a0b00f17194f6be239e60fda3301679aa67b4
+  metadata.gz: 66ad9e8663b0f072a308b01e98314622fc2b920d0c3523c8fb8faa81555bf86cb45bd2c7dc230aeaf6333c6964c59d508eb97162ab88db4130eab07412297db4
+  data.tar.gz: 60255a5d4f8beefa0b51e37480138f6c52fa0fa4f414585409f3a71cfb00ee489a734ed93a6d34689c9601d70b1101af2ab831e4c6c207e069a441c66491d668

data/ext/nokolexbor/extconf.rb

@@ -64,14 +64,6 @@ end
 append_cflags("-DLEXBOR_STATIC")
 append_cflags("-DLIBXML_STATIC")
 
-def sys(cmd)
-  puts "-- #{cmd}"
-  unless ret = xsystem(cmd)
-    raise "ERROR: '#{cmd}' failed"
-  end
-  ret
-end
-
 # Thrown when we detect CMake is taking too long and we killed it
 class CMakeTimeout < StandardError
 end
@@ -138,7 +130,7 @@ Dir.chdir(LEXBOR_DIR) do
 
   Dir.chdir("build") do
     run_cmake(10 * 60, ".. -DCMAKE_INSTALL_PREFIX:PATH=#{INSTALL_DIR} #{lexbor_cmake_flags.join(' ')}")
-    sys("#{MAKE} install")
+    system("#{MAKE}", "install")
   end
 end
 

data/ext/nokolexbor/libxml/tree.h

@@ -23,7 +23,7 @@ extern "C" {
 #endif
 
 static size_t tmp_len;
-#define NODE_NAME(node) lxb_dom_node_name_qualified((node), &tmp_len)
+#define NODE_NAME(node) lxb_dom_node_name_qualified((lxb_dom_node_t *)(node), &tmp_len)
 #define NODE_NS_HREF(node) ((node)->prefix ? lxb_ns_by_id((node)->owner_document->ns, (node)->ns, &tmp_len) : NULL)
 #define NODE_NS_PREFIX(node) lxb_ns_by_id((node)->owner_document->prefix, (node)->prefix, &tmp_len)
 

data/ext/nokolexbor/nl_attribute.c

@@ -141,7 +141,7 @@ nl_attribute_parent(VALUE self)
   if (attr->owner == NULL) {
     return Qnil;
   }
-  return nl_rb_node_create(attr->owner, nl_rb_document_get(self));
+  return nl_rb_node_create((lxb_dom_node_t *)attr->owner, nl_rb_document_get(self));
 }
 
 /**
@@ -158,7 +158,7 @@ nl_attribute_previous(VALUE self)
   if (attr->prev == NULL) {
     return Qnil;
   }
-  return nl_rb_node_create(attr->prev, nl_rb_document_get(self));
+  return nl_rb_node_create((lxb_dom_node_t *)attr->prev, nl_rb_document_get(self));
 }
 
 /**
@@ -175,7 +175,7 @@ nl_attribute_next(VALUE self)
   if (attr->next == NULL) {
     return Qnil;
   }
-  return nl_rb_node_create(attr->next, nl_rb_document_get(self));
+  return nl_rb_node_create((lxb_dom_node_t *)attr->next, nl_rb_document_get(self));
 }
 
 static VALUE
@@ -189,7 +189,7 @@ nl_attribute_inspect(VALUE self)
 
   return rb_sprintf("#<%" PRIsVALUE " %s=\"%s\">", c,
                     lxb_dom_attr_qualified_name(attr, &len),
-                    attr_value == NULL ? "" : attr_value);
+                    attr_value == NULL ? "" : (char *)attr_value);
 }
 
 void Init_nl_attribute(void)

data/ext/nokolexbor/nl_document.c

@@ -5,11 +5,6 @@ extern VALUE mNokolexbor;
 extern VALUE cNokolexborNode;
 VALUE cNokolexborDocument;
 
-#ifdef HAVE_PTHREAD_H
-#include <pthread.h>
-pthread_key_t p_key_parser;
-#endif
-
 static void
 free_nl_document(lxb_html_document_t *document)
 {
@@ -20,7 +15,7 @@ const rb_data_type_t nl_document_type = {
     "Nokolexbor::Document",
     {
         0,
-        free_nl_document,
+        (RUBY_DATA_FUNC)free_nl_document,
     },
     0,
     0,
@@ -50,24 +45,19 @@ nl_document_parse(VALUE self, VALUE rb_string_or_io)
   const char *html_c = StringValuePtr(rb_html);
   size_t html_len = RSTRING_LEN(rb_html);
 
-#ifdef HAVE_PTHREAD_H
-  lxb_html_parser_t *g_parser = (lxb_html_parser_t *)pthread_getspecific(p_key_parser);
-#else
-  lxb_html_parser_t *g_parser = NULL;
-#endif
-  if (g_parser == NULL) {
-    g_parser = lxb_html_parser_create();
-    lxb_status_t status = lxb_html_parser_init(g_parser);
+  static lxb_html_parser_t *html_parser = NULL;
+  if (html_parser == NULL) {
+    html_parser = lxb_html_parser_create();
+    lxb_status_t status = lxb_html_parser_init(html_parser);
     if (status != LXB_STATUS_OK) {
+      lxb_html_parser_destroy(html_parser);
+      html_parser = NULL;
       nl_raise_lexbor_error(status);
     }
-    g_parser->tree->scripting = true;
-#ifdef HAVE_PTHREAD_H
-    pthread_setspecific(p_key_parser, g_parser);
-#endif
+    html_parser->tree->scripting = true;
   }
 
-  lxb_html_document_t *document = lxb_html_parse(g_parser, (const lxb_char_t *)html_c, html_len);
+  lxb_html_document_t *document = lxb_html_parse(html_parser, (const lxb_char_t *)html_c, html_len);
 
   if (document == NULL) {
     rb_raise(rb_eRuntimeError, "Error parsing document");
@@ -104,7 +94,7 @@ static VALUE
 nl_document_get_title(VALUE self)
 {
   size_t len;
-  lxb_char_t *str = lxb_html_document_title(nl_rb_document_unwrap(self), &len);
+  lxb_char_t *str = lxb_html_document_title((lxb_html_document_t *)nl_rb_document_unwrap(self), &len);
   return str == NULL ? rb_str_new("", 0) : rb_utf8_str_new(str, len);
 }
 
@@ -126,7 +116,7 @@ nl_document_set_title(VALUE self, VALUE rb_title)
 {
   const char *c_title = StringValuePtr(rb_title);
   size_t len = RSTRING_LEN(rb_title);
-  lxb_char_t *str = lxb_html_document_title_set(nl_rb_document_unwrap(self), (const lxb_char_t *)c_title, len);
+  lxb_html_document_title_set((lxb_html_document_t *)nl_rb_document_unwrap(self), (const lxb_char_t *)c_title, len);
   return rb_title;
 }
 
@@ -142,21 +132,8 @@ nl_document_root(VALUE self)
   return nl_rb_node_create(lxb_dom_document_root(doc), self);
 }
 
-static void
-free_parser(void *data)
-{
-  lxb_html_parser_t *g_parser = (lxb_html_parser_t *)data;
-  if (g_parser != NULL) {
-    g_parser = lxb_html_parser_destroy(g_parser);
-  }
-}
-
 void Init_nl_document(void)
 {
-#ifdef HAVE_PTHREAD_H
-  pthread_key_create(&p_key_parser, free_parser);
-#endif
-
   cNokolexborDocument = rb_define_class_under(mNokolexbor, "Document", cNokolexborNode);
   rb_define_singleton_method(cNokolexborDocument, "new", nl_document_new, 0);
   rb_define_singleton_method(cNokolexborDocument, "parse", nl_document_parse, 1);

data/ext/nokolexbor/nl_node.c

@@ -159,7 +159,7 @@ nl_node_attribute(VALUE self, VALUE rb_name)
   if (attr->owner == NULL) {
     attr->owner = lxb_dom_interface_element(node);
   }
-  return nl_rb_node_create(attr, nl_rb_document_get(self));
+  return nl_rb_node_create((lxb_dom_node_t *)attr, nl_rb_document_get(self));
 }
 
 /**
@@ -185,7 +185,7 @@ nl_node_attribute_nodes(VALUE self)
     if (attr->owner == NULL) {
       attr->owner = lxb_dom_interface_element(node);
     }
-    rb_ary_push(ary, nl_rb_node_create(attr, rb_doc));
+    rb_ary_push(ary, nl_rb_node_create((lxb_dom_node_t *)attr, rb_doc));
     attr = attr->next;
   }
 
@@ -366,28 +366,32 @@ nl_node_find(VALUE self, VALUE selector, lxb_selectors_cb_f cb, void *ctx)
   lxb_dom_node_t *node = nl_rb_node_unwrap(self);
 
   lxb_status_t status;
-  lxb_css_parser_t *parser = NULL;
-  lxb_selectors_t *selectors = NULL;
+  static lxb_css_parser_t *css_parser = NULL;
+  static lxb_selectors_t *selectors = NULL;
   lxb_css_selector_list_t *list = NULL;
 
-  /* Create CSS parser. */
-  parser = lxb_css_parser_create();
-  status = lxb_css_parser_init(parser, NULL, NULL);
-  if (status != LXB_STATUS_OK) {
-    goto cleanup;
+  /* CSS parser. */
+  if (css_parser == NULL) {
+    css_parser = lxb_css_parser_create();
+    status = lxb_css_parser_init(css_parser, NULL, NULL);
+    if (status != LXB_STATUS_OK) {
+      goto init_error;
+    }
   }
 
   /* Selectors. */
-  selectors = lxb_selectors_create();
-  status = lxb_selectors_init(selectors);
-  if (status != LXB_STATUS_OK) {
-    goto cleanup;
+  if (selectors == NULL) {
+    selectors = lxb_selectors_create();
+    status = lxb_selectors_init(selectors);
+    if (status != LXB_STATUS_OK) {
+      goto init_error;
+    }
   }
 
   /* Parse and get the log. */
-  list = lxb_css_selectors_parse_relative_list(parser, (const lxb_char_t *)selector_c, selector_len);
-  if (parser->status != LXB_STATUS_OK) {
-    status = parser->status;
+  list = lxb_css_selectors_parse_relative_list(css_parser, (const lxb_char_t *)selector_c, selector_len);
+  if (css_parser->status != LXB_STATUS_OK) {
+    status = css_parser->status;
     goto cleanup;
   }
 
@@ -398,11 +402,19 @@ nl_node_find(VALUE self, VALUE selector, lxb_selectors_cb_f cb, void *ctx)
   }
 
 cleanup:
+  /* Destroy all object for all CSS Selector List. */
+  lxb_css_selector_list_destroy_memory(list);
+
+  return status;
+
+init_error:
   /* Destroy Selectors object. */
-  (void)lxb_selectors_destroy(selectors, true);
+  lxb_selectors_destroy(selectors, true);
+  selectors = NULL;
 
   /* Destroy resources for CSS Parser. */
-  (void)lxb_css_parser_destroy(parser, true);
+  lxb_css_parser_destroy(css_parser, true);
+  css_parser = NULL;
 
   /* Destroy all object for all CSS Selector List. */
   lxb_css_selector_list_destroy_memory(list);
@@ -1014,9 +1026,9 @@ static VALUE
 nl_node_add_sibling(VALUE self, VALUE next_or_previous, VALUE new)
 {
   bool insert_after;
-  if (rb_eql(rb_String(next_or_previous), rb_str_new_literal("next"))) {
+  if (rb_str_cmp(rb_String(next_or_previous), rb_str_new_literal("next")) == 0) {
     insert_after = true;
-  } else if (rb_eql(rb_String(next_or_previous), rb_str_new_literal("previous"))) {
+  } else if (rb_str_cmp(rb_String(next_or_previous), rb_str_new_literal("previous")) == 0) {
     insert_after = false;
   } else {
     rb_raise(rb_eArgError, "Unsupported inserting position");

data/ext/nokolexbor/nl_node_set.c

@@ -30,7 +30,7 @@ const rb_data_type_t nl_node_set_type = {
     "Nokolexbor::NodeSet",
     {
         0,
-        free_nl_node_set,
+        (RUBY_DATA_FUNC)free_nl_node_set,
     },
     0,
     0,

data/ext/nokolexbor/xml_tree.c

@@ -339,8 +339,8 @@ nl_xmlGetNodePath(const lxb_dom_node_t *node)
 
         } else if (cur->type == LXB_DOM_NODE_TYPE_ATTRIBUTE) {
             sep = "/@";
-            name = (const char *) lxb_dom_attr_qualified_name(cur, &tmp_len);
-            next = ((lxb_dom_attr_t_ptr)cur)->owner;
+            name = (const char *) lxb_dom_attr_qualified_name((lxb_dom_attr_t_ptr)cur, &tmp_len);
+            next = (lxb_dom_node_t *)((lxb_dom_attr_t_ptr)cur)->owner;
         } else {
             nl_xmlFree(buf);
             nl_xmlFree(buffer);

data/ext/nokolexbor/xml_xpath.c

@@ -6389,7 +6389,7 @@ xmlXPathNodeValHash(lxb_dom_node_t_ptr node) {
 		return(0);
 	    return(string[0] + (string[1] << 8));
 	case LXB_DOM_NODE_TYPE_ATTRIBUTE:
-	    string = lxb_dom_attr_value(node, &tmp_len);
+	    string = lxb_dom_attr_value((lxb_dom_attr_t_ptr)node, &tmp_len);
 	    if (string == NULL)
 		return(0);
 	    if (string[0] == 0)
@@ -8452,9 +8452,9 @@ nl_xmlXPathNextAttribute(xmlXPathParserContextPtr ctxt, lxb_dom_node_t_ptr cur)
     if (cur == NULL) {
         if (ctxt->context->node == (lxb_dom_node_t_ptr) ctxt->context->doc)
 	    return(NULL);
-        return lxb_dom_element_first_attribute(ctxt->context->node);
+        return (lxb_dom_node_t_ptr)lxb_dom_element_first_attribute((lxb_dom_element_t *)ctxt->context->node);
     }
-    return(((lxb_dom_attr_t *)cur)->next);
+    return (lxb_dom_node_t_ptr)(((lxb_dom_attr_t *)cur)->next);
 }
 
 /************************************************************************

data/lib/nokolexbor/node.rb

@@ -717,18 +717,38 @@ module Nokolexbor
 
     def xpath_query_from_css_rule(rule, ns)
       ensure_nokogiri
-      if defined? Nokogiri::CSS::XPathVisitor::BuiltinsConfig
-        visitor = Nokogiri::CSS::XPathVisitor.new(
-          builtins: Nokogiri::CSS::XPathVisitor::BuiltinsConfig::OPTIMAL,
-          doctype: :html4,
-        )
+
+      unless defined?(Gem)
+        require 'rubygems'
+      end
+
+      v_1_17_0 = Gem::Version.new("1.17.0")
+      current_version = Gem::Version.new(Nokogiri::VERSION)
+
+      if current_version < v_1_17_0
+        if defined? Nokogiri::CSS::XPathVisitor::BuiltinsConfig
+          visitor = Nokogiri::CSS::XPathVisitor.new(
+            builtins: Nokogiri::CSS::XPathVisitor::BuiltinsConfig::OPTIMAL,
+            doctype: :html4,
+          )
+        else
+          visitor = Nokogiri::CSS::XPathVisitorOptimallyUseBuiltins.new
+        end
+        self.class::IMPLIED_XPATH_CONTEXTS.map do |implied_xpath_context|
+          Nokogiri::CSS.xpath_for(rule.to_s, { prefix: implied_xpath_context, ns: ns,
+                                    visitor: visitor, })
+        end.join(" | ")
       else
-        visitor = Nokogiri::CSS::XPathVisitorOptimallyUseBuiltins.new
+        self.class::IMPLIED_XPATH_CONTEXTS.map do |implied_xpath_context|
+          visitor = Nokogiri::CSS::XPathVisitor.new(
+            builtins: Nokogiri::CSS::XPathVisitor::BuiltinsConfig::OPTIMAL,
+            doctype: :html4,
+            prefix: implied_xpath_context,
+            namespaces: ns,
+          )
+          Nokogiri::CSS.xpath_for(rule.to_s, visitor: visitor)
+        end.join(" | ")
       end
-      self.class::IMPLIED_XPATH_CONTEXTS.map do |implied_xpath_context|
-        Nokogiri::CSS.xpath_for(rule.to_s, { prefix: implied_xpath_context, ns: ns,
-                                   visitor: visitor, })
-      end.join(" | ")
     end
 
     def extract_params(params)

data/lib/nokolexbor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Nokolexbor
-  VERSION = '0.5.3'
+  VERSION = '0.6.0'
 end

data/patches/0004-lexbor-fix-template-clone.patch

@@ -16,7 +16,7 @@ index a2153f4..8a9c69f 100755
  
 +        if (curr->local_name == LXB_TAG_TEMPLATE && curr->first_child != NULL && cnode->type == LXB_DOM_NODE_TYPE_DOCUMENT_FRAGMENT) {
 +            lxb_dom_node_remove(curr->first_child);
-+            lxb_html_interface_template(curr)->content = cnode;
++            lxb_html_interface_template(curr)->content = (lxb_dom_document_fragment_t *)cnode;
 +        }
 +
          lxb_dom_node_insert_child(curr, cnode);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nokolexbor
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Yicheng Zhou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-24 00:00:00.000000000 Z
+date: 2024-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler