nokolexbor 0.6.2 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5095dc8ed38a170bab48cc78e7a7e4475657b3066cb114a46eab1d9f4ed25c36
-  data.tar.gz: c2a00a4ebc644dda81e0b010166063a5ad975ad7e2410739c69af2246cce560f
+  metadata.gz: 3615acd25f6233c5701c91d25ef6c94a73adf2de8433e2e1b6b3aa215f0581ab
+  data.tar.gz: ad3e9f8134a7f26924b2283a2ac10a8dfae2f5684dd650be5903faf069f595ef
 SHA512:
-  metadata.gz: 07df8df17e08dbe9293b6f0e1f878ee70d787f3370c33a00bcf0ca71dee007a708ecf4a7b069039cb05d95e93cd741654a3bdb8a11833804f2b9f63dd5d9fb4b
-  data.tar.gz: 31addbc3877af1b1d814cb720c17e8130d98280d35831794e135e259b790de0c719236004c202649092366323a7e82a9175003be0116ac0267639d15fd186081
+  metadata.gz: 2d84f341a6b3e1c4dcc8501ab9772e4376bc8c9acf2441753253c331ca381ff161c95cbb93f32568aada6ac03e3bedb01343bbc507d5201c468884f286008228
+  data.tar.gz: f8a85acb4fdd063714316490289bae356a731931aa8c4202a80f677b70d2f02258f69991e0d996cfaadf80dbcad8c505c61b4a6a91456514bbc972e0d7861148

data/ext/nokolexbor/nl_attribute.c

@@ -23,12 +23,16 @@ nl_attribute_new(int argc, VALUE *argv, VALUE klass)
 
   rb_scan_args(argc, argv, "2*", &rb_document, &rb_name, &rest);
 
-  if (!rb_obj_is_kind_of(rb_document, cNokolexborDocument)) {
-    rb_raise(rb_eArgError, "Document must be a Nokolexbor::Document");
+  if (rb_obj_is_kind_of(rb_document, cNokolexborDocument)) {
+    document = nl_rb_document_unwrap(rb_document);
+  } else if (rb_obj_is_kind_of(rb_document, cNokolexborNode)) {
+    lxb_dom_node_t *node = nl_rb_node_unwrap(rb_document);
+    document = node->owner_document;
+    rb_document = nl_rb_document_get(rb_document);
+  } else {
+    rb_raise(rb_eArgError, "Expected a Document or Node, got %s", rb_class2name(CLASS_OF(rb_document)));
   }
 
-  document = nl_rb_document_unwrap(rb_document);
-
   const char *c_name = StringValuePtr(rb_name);
   size_t name_len = RSTRING_LEN(rb_name);
   lxb_dom_attr_t *attr = lxb_dom_attr_interface_create(document);

data/ext/nokolexbor/nl_cdata.c

@@ -1,6 +1,7 @@
 #include "nokolexbor.h"
 
 VALUE cNokolexborCData;
+extern VALUE cNokolexborNode;
 extern VALUE cNokolexborText;
 extern VALUE mNokolexbor;
 
@@ -22,12 +23,16 @@ nl_cdata_new(int argc, VALUE *argv, VALUE klass)
 
   rb_scan_args(argc, argv, "2*", &rb_content, &rb_document, &rest);
 
-  if (!rb_obj_is_kind_of(rb_document, cNokolexborDocument)) {
-    rb_raise(rb_eArgError, "Document must be a Nokolexbor::Document");
+  if (rb_obj_is_kind_of(rb_document, cNokolexborDocument)) {
+    document = nl_rb_document_unwrap(rb_document);
+  } else if (rb_obj_is_kind_of(rb_document, cNokolexborNode)) {
+    lxb_dom_node_t *node = nl_rb_node_unwrap(rb_document);
+    document = node->owner_document;
+    rb_document = nl_rb_document_get(rb_document);
+  } else {
+    rb_raise(rb_eArgError, "Expected a Document or Node, got %s", rb_class2name(CLASS_OF(rb_document)));
   }
 
-  document = nl_rb_document_unwrap(rb_document);
-
   const char *c_content = StringValuePtr(rb_content);
   size_t content_len = RSTRING_LEN(rb_content);
   lxb_dom_cdata_section_t *element = lxb_dom_document_create_cdata_section(document, (const lxb_char_t *)c_content, content_len);

data/ext/nokolexbor/nl_comment.c

@@ -1,6 +1,7 @@
 #include "nokolexbor.h"
 
 VALUE cNokolexborComment;
+extern VALUE cNokolexborNode;
 extern VALUE cNokolexborCharacterData;
 extern VALUE mNokolexbor;
 
@@ -20,12 +21,16 @@ nl_comment_new(int argc, VALUE *argv, VALUE klass)
 
   rb_scan_args(argc, argv, "2*", &rb_content, &rb_document, &rest);
 
-  if (!rb_obj_is_kind_of(rb_document, cNokolexborDocument)) {
-    rb_raise(rb_eArgError, "Document must be a Nokolexbor::Document");
+  if (rb_obj_is_kind_of(rb_document, cNokolexborDocument)) {
+    document = nl_rb_document_unwrap(rb_document);
+  } else if (rb_obj_is_kind_of(rb_document, cNokolexborNode)) {
+    lxb_dom_node_t *node = nl_rb_node_unwrap(rb_document);
+    document = node->owner_document;
+    rb_document = nl_rb_document_get(rb_document);
+  } else {
+    rb_raise(rb_eArgError, "Expected a Document or Node, got %s", rb_class2name(CLASS_OF(rb_document)));
   }
 
-  document = nl_rb_document_unwrap(rb_document);
-
   const char *c_content = StringValuePtr(rb_content);
   size_t content_len = RSTRING_LEN(rb_content);
   lxb_dom_comment_t *element = lxb_dom_document_create_comment(document, (const lxb_char_t *)c_content, content_len);

data/ext/nokolexbor/nl_document.c

@@ -5,6 +5,11 @@ extern VALUE mNokolexbor;
 extern VALUE cNokolexborNode;
 VALUE cNokolexborDocument;
 
+#ifdef HAVE_PTHREAD_H
+#include <pthread.h>
+pthread_key_t p_key_html_parser;
+#endif
+
 static void
 free_nl_document(lxb_html_document_t *document)
 {
@@ -28,7 +33,11 @@ nl_document_parse_native(VALUE self, VALUE rb_html)
   const char *html_c = StringValuePtr(rb_html);
   size_t html_len = RSTRING_LEN(rb_html);
 
-  static lxb_html_parser_t *html_parser = NULL;
+#ifdef HAVE_PTHREAD_H
+  lxb_html_parser_t *html_parser = (lxb_html_parser_t *)pthread_getspecific(p_key_html_parser);
+#else
+  lxb_html_parser_t *html_parser = NULL;
+#endif
   if (html_parser == NULL) {
     html_parser = lxb_html_parser_create();
     lxb_status_t status = lxb_html_parser_init(html_parser);
@@ -38,10 +47,17 @@ nl_document_parse_native(VALUE self, VALUE rb_html)
       nl_raise_lexbor_error(status);
     }
     html_parser->tree->scripting = true;
+#ifdef HAVE_PTHREAD_H
+    pthread_setspecific(p_key_html_parser, html_parser);
+#endif
   }
 
   lxb_html_document_t *document = lxb_html_parse(html_parser, (const lxb_char_t *)html_c, html_len);
 
+#ifndef HAVE_PTHREAD_H
+  lxb_html_parser_destroy(html_parser);
+#endif
+
   if (document == NULL) {
     rb_raise(rb_eRuntimeError, "Error parsing document");
   }
@@ -115,8 +131,21 @@ nl_document_root(VALUE self)
   return nl_rb_node_create(lxb_dom_document_root(doc), self);
 }
 
+static void
+free_html_parser(void *data)
+{
+  lxb_html_parser_t *html_parser = (lxb_html_parser_t *)data;
+  if (html_parser != NULL) {
+    html_parser = lxb_html_parser_destroy(html_parser);
+  }
+}
+
 void Init_nl_document(void)
 {
+#ifdef HAVE_PTHREAD_H
+  pthread_key_create(&p_key_html_parser, free_html_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_native", nl_document_parse_native, 1);

data/ext/nokolexbor/nl_document_fragment.c

@@ -22,12 +22,16 @@ nl_document_fragment_new(int argc, VALUE *argv, VALUE klass)
 
   rb_scan_args(argc, argv, "1*", &rb_document, &rest);
 
-  if (!rb_obj_is_kind_of(rb_document, cNokolexborDocument)) {
-    rb_raise(rb_eArgError, "Document must be a Nokolexbor::Document");
+  if (rb_obj_is_kind_of(rb_document, cNokolexborDocument)) {
+    document = nl_rb_document_unwrap(rb_document);
+  } else if (rb_obj_is_kind_of(rb_document, cNokolexborNode)) {
+    lxb_dom_node_t *node = nl_rb_node_unwrap(rb_document);
+    document = node->owner_document;
+    rb_document = nl_rb_document_get(rb_document);
+  } else {
+    rb_raise(rb_eArgError, "Expected a Document or Node, got %s", rb_class2name(CLASS_OF(rb_document)));
   }
 
-  document = nl_rb_document_unwrap(rb_document);
-
   lxb_dom_document_fragment_t *node = lxb_dom_document_create_document_fragment(document);
   if (node == NULL) {
     rb_raise(rb_eRuntimeError, "Error creating document fragment");

data/ext/nokolexbor/nl_node.c

@@ -1,6 +1,13 @@
 #include "nokolexbor.h"
+#include "config.h"
 #include "libxml/tree.h"
 
+#ifdef HAVE_PTHREAD_H
+#include <pthread.h>
+pthread_key_t p_key_css_parser;
+pthread_key_t p_key_selectors;
+#endif
+
 #define SORT_NAME nl_css_result
 #define SORT_TYPE lxb_dom_node_t *
 #define SORT_CMP(x, y) (x->user >= y->user ? (x->user == y->user ? 0 : 1) : -1)
@@ -113,12 +120,16 @@ nl_node_new(int argc, VALUE *argv, VALUE klass)
 
   rb_scan_args(argc, argv, "2*", &rb_name, &rb_document, &rest);
 
-  if (!rb_obj_is_kind_of(rb_document, cNokolexborDocument)) {
-    rb_raise(rb_eArgError, "Document must be a Nokolexbor::Document");
+  if (rb_obj_is_kind_of(rb_document, cNokolexborDocument)) {
+    document = nl_rb_document_unwrap(rb_document);
+  } else if (rb_obj_is_kind_of(rb_document, cNokolexborNode)) {
+    lxb_dom_node_t *node = nl_rb_node_unwrap(rb_document);
+    document = node->owner_document;
+    rb_document = nl_rb_document_get(rb_document);
+  } else {
+    rb_raise(rb_eArgError, "Expected a Document or Node, got %s", rb_class2name(CLASS_OF(rb_document)));
   }
 
-  document = nl_rb_document_unwrap(rb_document);
-
   const char *c_name = StringValuePtr(rb_name);
   size_t name_len = RSTRING_LEN(rb_name);
   lxb_dom_element_t *element = lxb_dom_document_create_element(document, (const lxb_char_t *)c_name, name_len, NULL);
@@ -366,8 +377,13 @@ 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;
-  static lxb_css_parser_t *css_parser = NULL;
-  static lxb_selectors_t *selectors = NULL;
+#ifdef HAVE_PTHREAD_H
+  lxb_css_parser_t *css_parser = (lxb_css_parser_t *)pthread_getspecific(p_key_css_parser);
+  lxb_selectors_t *selectors = (lxb_selectors_t *)pthread_getspecific(p_key_selectors);
+#else
+  lxb_css_parser_t *css_parser = NULL;
+  lxb_selectors_t *selectors = NULL;
+#endif
   lxb_css_selector_list_t *list = NULL;
 
   /* CSS parser. */
@@ -377,6 +393,9 @@ nl_node_find(VALUE self, VALUE selector, lxb_selectors_cb_f cb, void *ctx)
     if (status != LXB_STATUS_OK) {
       goto init_error;
     }
+#ifdef HAVE_PTHREAD_H
+    pthread_setspecific(p_key_css_parser, css_parser);
+#endif
   }
 
   /* Selectors. */
@@ -386,6 +405,9 @@ nl_node_find(VALUE self, VALUE selector, lxb_selectors_cb_f cb, void *ctx)
     if (status != LXB_STATUS_OK) {
       goto init_error;
     }
+#ifdef HAVE_PTHREAD_H
+    pthread_setspecific(p_key_selectors, selectors);
+#endif
   }
 
   /* Parse and get the log. */
@@ -397,11 +419,16 @@ nl_node_find(VALUE self, VALUE selector, lxb_selectors_cb_f cb, void *ctx)
 
   /* Find HTML nodes by CSS Selectors. */
   status = lxb_selectors_find(selectors, node, list, cb, ctx);
-  if (status != LXB_STATUS_OK) {
-    goto cleanup;
-  }
 
 cleanup:
+#ifndef HAVE_PTHREAD_H
+  /* Destroy Selectors object. */
+  (void)lxb_selectors_destroy(selectors, true);
+
+  /* Destroy resources for CSS Parser. */
+  (void)lxb_css_parser_destroy(css_parser, true);
+#endif
+
   /* Destroy all object for all CSS Selector List. */
   lxb_css_selector_list_destroy_memory(list);
 
@@ -416,8 +443,10 @@ init_error:
   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);
+#ifdef HAVE_PTHREAD_H
+  pthread_setspecific(p_key_css_parser, NULL);
+  pthread_setspecific(p_key_selectors, NULL);
+#endif
 
   return status;
 }
@@ -1173,8 +1202,30 @@ nl_node_path(VALUE self)
   return ret;
 }
 
+static void
+free_css_parser(void *data)
+{
+  lxb_css_parser_t *css_parser = (lxb_css_parser_t *)data;
+  if (css_parser != NULL) {
+    lxb_css_parser_destroy(css_parser, true);
+  }
+}
+
+static void
+free_selectors(void *data)
+{
+  lxb_selectors_t *selectors = (lxb_selectors_t *)data;
+  if (selectors != NULL) {
+    lxb_selectors_destroy(selectors, true);
+  }
+}
+
 void Init_nl_node(void)
 {
+#ifdef HAVE_PTHREAD_H
+  pthread_key_create(&p_key_css_parser, free_css_parser);
+  pthread_key_create(&p_key_selectors, free_selectors);
+#endif
   cNokolexborNode = rb_define_class_under(mNokolexbor, "Node", rb_cObject);
   rb_undef_alloc_func(cNokolexborNode);
 

data/ext/nokolexbor/nl_processing_instruction.c

@@ -21,12 +21,16 @@ nl_processing_instruction_new(int argc, VALUE *argv, VALUE klass)
 
   rb_scan_args(argc, argv, "3*", &rb_name, &rb_content, &rb_document, &rest);
 
-  if (!rb_obj_is_kind_of(rb_document, cNokolexborDocument)) {
-    rb_raise(rb_eArgError, "Document must be a Nokolexbor::Document");
+  if (rb_obj_is_kind_of(rb_document, cNokolexborDocument)) {
+    document = nl_rb_document_unwrap(rb_document);
+  } else if (rb_obj_is_kind_of(rb_document, cNokolexborNode)) {
+    lxb_dom_node_t *node = nl_rb_node_unwrap(rb_document);
+    document = node->owner_document;
+    rb_document = nl_rb_document_get(rb_document);
+  } else {
+    rb_raise(rb_eArgError, "Expected a Document or Node, got %s", rb_class2name(CLASS_OF(rb_document)));
   }
 
-  document = nl_rb_document_unwrap(rb_document);
-
   const char *c_name = StringValuePtr(rb_name);
   size_t name_len = RSTRING_LEN(rb_name);
   const char *c_content = StringValuePtr(rb_content);

data/ext/nokolexbor/nl_text.c

@@ -1,6 +1,7 @@
 #include "nokolexbor.h"
 
 VALUE cNokolexborText;
+extern VALUE cNokolexborNode;
 extern VALUE cNokolexborCharacterData;
 extern VALUE mNokolexbor;
 
@@ -20,12 +21,16 @@ nl_text_new(int argc, VALUE *argv, VALUE klass)
 
   rb_scan_args(argc, argv, "2*", &rb_text, &rb_document, &rest);
 
-  if (!rb_obj_is_kind_of(rb_document, cNokolexborDocument)) {
-    rb_raise(rb_eArgError, "Document must be a Nokolexbor::Document");
+  if (rb_obj_is_kind_of(rb_document, cNokolexborDocument)) {
+    document = nl_rb_document_unwrap(rb_document);
+  } else if (rb_obj_is_kind_of(rb_document, cNokolexborNode)) {
+    lxb_dom_node_t *node = nl_rb_node_unwrap(rb_document);
+    document = node->owner_document;
+    rb_document = nl_rb_document_get(rb_document);
+  } else {
+    rb_raise(rb_eArgError, "Expected a Document or Node, got %s", rb_class2name(CLASS_OF(rb_document)));
   }
 
-  document = nl_rb_document_unwrap(rb_document);
-
   const char *c_text = StringValuePtr(rb_text);
   size_t text_len = RSTRING_LEN(rb_text);
   lxb_dom_text_t *element = lxb_dom_document_create_text_node(document, (const lxb_char_t *)c_text, text_len);

data/lib/nokolexbor/node_set.rb

@@ -11,7 +11,13 @@ module Nokolexbor
     # @return [Document]
     def self.new(document, list = [])
       obj = allocate
-      obj.instance_variable_set(:@document, document)
+      if document.is_a?(Document) || document.nil?
+        obj.instance_variable_set(:@document, document)
+      elsif document.is_a?(Node)
+        obj.instance_variable_set(:@document, document.document)
+      else
+        raise ArgumentError, "Expected a Document or Node, got #{document.class}"
+      end
       list.each { |x| obj << x }
       yield obj if block_given?
       obj

data/lib/nokolexbor/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nokolexbor
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.4
 platform: ruby
 authors:
 - Yicheng Zhou
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-13 00:00:00.000000000 Z
+date: 2026-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -538,7 +538,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: High-performance HTML5 parser, with support for both CSS selectors and XPath.