nokolexbor 0.3.6 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29411076a95eae20060101aa8a270bfe53a48eda3b6e58cfad6ebe22b184049c
-  data.tar.gz: 920536ad4f69a635cfec9a6dea4d8bbe746c7c97d74c1b1daa6b22c41856d201
+  metadata.gz: f60315f588c46f8ae2927633d3e34ee8f3aa3f6fb97575851bc967f306d216a5
+  data.tar.gz: 8e71ffb858e63f59284b94eee695b90808875c9af388175937a4e04cfbff715c
 SHA512:
-  metadata.gz: d6ca49aa873ee254caf034600fbbb9384a2a4efaa86422e992a7fbb7970107af20541c4309e582c6f8863353209d36cd6e5d56fdb19b52fd54a233a4419202ea
-  data.tar.gz: f4c9413c2cd8683e6cf111d1c966a8511d4d605ec30008f595d2c05b402b028dc8f889c9480d3ff43b0f380e84861b2384c915f9f9cca68b6ad8f510a58a0b0a
+  metadata.gz: 70c50097ea4a844399ee4c74e7d0413a833dbdfd878208a8b7054ad2d01c2d96c35897b62848b199555b675a409f897a30e9cf90d2dd8c3e74c2fdf8b501340f
+  data.tar.gz: 7c772720a861bde11b10c1ff23d4796738a58eaa07d32b43478975a4feaab6402ef5fe8819eb9081619b50b970a422a40b613ce405fa2940b54da4929e352bc8

data/ext/nokolexbor/nl_attribute.c

@@ -178,6 +178,20 @@ nl_attribute_next(VALUE self)
   return nl_rb_node_create(attr->next, nl_rb_document_get(self));
 }
 
+static VALUE
+nl_attribute_inspect(VALUE self)
+{
+  VALUE c = rb_class_name(CLASS_OF(self));
+  lxb_dom_node_t *node = nl_rb_node_unwrap(self);
+  lxb_dom_attr_t *attr = lxb_dom_interface_attr(node);
+  size_t len;
+  lxb_char_t *attr_value = lxb_dom_attr_value(attr, &len);
+
+  return rb_sprintf("#<%" PRIsVALUE " %s=\"%s\">", c,
+                    lxb_dom_attr_qualified_name(attr, &len),
+                    attr_value == NULL ? "" : attr_value);
+}
+
 void Init_nl_attribute(void)
 {
   cNokolexborAttribute = rb_define_class_under(mNokolexbor, "Attribute", cNokolexborNode);
@@ -191,6 +205,7 @@ void Init_nl_attribute(void)
   rb_define_method(cNokolexborAttribute, "parent", nl_attribute_parent, 0);
   rb_define_method(cNokolexborAttribute, "previous", nl_attribute_previous, 0);
   rb_define_method(cNokolexborAttribute, "next", nl_attribute_next, 0);
+  rb_define_method(cNokolexborAttribute, "inspect", nl_attribute_inspect, 0);
 
   rb_define_alias(cNokolexborAttribute, "node_name", "name");
   rb_define_alias(cNokolexborAttribute, "node_name=", "name=");

data/ext/nokolexbor/nl_node.c

@@ -9,6 +9,7 @@ extern VALUE mNokolexbor;
 extern VALUE cNokolexborDocument;
 extern VALUE cNokolexborText;
 extern VALUE cNokolexborComment;
+extern VALUE cNokolexborCData;
 extern VALUE cNokolexborProcessingInstruction;
 extern VALUE cNokolexborNodeSet;
 extern VALUE cNokolexborDocumentFragment;
@@ -39,7 +40,7 @@ nl_rb_node_create(lxb_dom_node_t *node, VALUE rb_document)
     rb_class = cNokolexborText;
     break;
   case LXB_DOM_NODE_TYPE_CDATA_SECTION:
-    rb_class = cNokolexborCharacterData;
+    rb_class = cNokolexborCData;
     break;
   // case LXB_DOM_NODE_TYPE_ENTITY_REFERENCE:
   //   break;
@@ -801,6 +802,28 @@ nl_node_children(VALUE self)
   return nl_rb_node_set_create_with_data(array, nl_rb_document_get(self));
 }
 
+/**
+ * Get the element children of this node.
+ *
+ * @return [NodeSet] The set of this node's element children.
+ */
+static VALUE
+nl_node_element_children(VALUE self)
+{
+  lxb_dom_node_t *node = nl_rb_node_unwrap(self);
+  lxb_dom_node_t *child = node->first_child;
+  lexbor_array_t *array = lexbor_array_create();
+
+  while (child != NULL) {
+    if (child->type == LXB_DOM_NODE_TYPE_ELEMENT) {
+      lexbor_array_push(array, child);
+    }
+    child = child->next;
+  }
+
+  return nl_rb_node_set_create_with_data(array, nl_rb_document_get(self));
+}
+
 /**
  * Get the first child of this node.
  *
@@ -1106,6 +1129,32 @@ nl_node_clone(VALUE self)
   return nl_rb_node_create(clone, nl_rb_document_get(self));
 }
 
+static VALUE
+nl_node_inspect(int argc, VALUE *argv, VALUE self)
+{
+  lxb_dom_node_t *node = nl_rb_node_unwrap(self);
+  if (node->type == LXB_DOM_NODE_TYPE_DOCUMENT) {
+    return rb_call_super(argc, argv);
+  }
+
+  VALUE c = rb_class_name(CLASS_OF(self));
+  lexbor_str_t str = {0};
+  lxb_status_t status = lxb_html_serialize_str(node, &str);
+  if (status != LXB_STATUS_OK) {
+    if (str.data != NULL) {
+      lexbor_str_destroy(&str, node->owner_document->text, false);
+    }
+    return rb_call_super(argc, argv);
+  }
+
+  if (str.data != NULL) {
+    VALUE ret = rb_sprintf("#<%" PRIsVALUE " %s>", c, str.data);
+    lexbor_str_destroy(&str, node->owner_document->text, false);
+    return ret;
+  }
+  return rb_call_super(argc, argv);
+}
+
 void Init_nl_node(void)
 {
   cNokolexborNode = rb_define_class_under(mNokolexbor, "Node", rb_cObject);
@@ -1137,6 +1186,7 @@ void Init_nl_node(void)
   rb_define_method(cNokolexborNode, "next_element", nl_node_next_element, 0);
   rb_define_method(cNokolexborNode, "children", nl_node_children, 0);
   rb_define_method(cNokolexborNode, "child", nl_node_child, 0);
+  rb_define_method(cNokolexborNode, "element_children", nl_node_element_children, 0);
   rb_define_method(cNokolexborNode, "remove", nl_node_remove, 0);
   rb_define_method(cNokolexborNode, "destroy", nl_node_destroy, 0);
   rb_define_method(cNokolexborNode, "attrs", nl_node_attrs, 0);
@@ -1148,6 +1198,7 @@ void Init_nl_node(void)
   rb_define_method(cNokolexborNode, "first_element_child", nl_node_first_element_child, 0);
   rb_define_method(cNokolexborNode, "last_element_child", nl_node_last_element_child, 0);
   rb_define_method(cNokolexborNode, "clone", nl_node_clone, 0);
+  rb_define_method(cNokolexborNode, "inspect", nl_node_inspect, -1);
 
   rb_define_alias(cNokolexborNode, "attr", "[]");
   rb_define_alias(cNokolexborNode, "get_attribute", "[]");
@@ -1155,6 +1206,7 @@ void Init_nl_node(void)
   rb_define_alias(cNokolexborNode, "set_attribute", "[]=");
   rb_define_alias(cNokolexborNode, "has_attribute?", "key?");
   rb_define_alias(cNokolexborNode, "delete", "remove_attr");
+  rb_define_alias(cNokolexborNode, "elements", "element_children");
   rb_define_alias(cNokolexborNode, "remove_attribute", "remove_attr");
   rb_define_alias(cNokolexborNode, "text", "content");
   rb_define_alias(cNokolexborNode, "inner_text", "content");

data/ext/nokolexbor/nl_node_set.c

@@ -300,6 +300,64 @@ nl_node_set_union(VALUE self, VALUE other)
   return nl_rb_node_set_create_with_data(new_array, nl_rb_document_get(self));
 }
 
+/**
+ * @return [NodeSet] A new NodeSet with the common nodes only.
+ */
+static VALUE
+nl_node_set_intersection(VALUE self, VALUE other)
+{
+  if (!rb_obj_is_kind_of(other, cNokolexborNodeSet)) {
+    rb_raise(rb_eArgError, "Parameter must be a Nokolexbor::NodeSet");
+  }
+
+  lexbor_array_t *self_array = nl_rb_node_set_unwrap(self);
+  lexbor_array_t *other_array = nl_rb_node_set_unwrap(other);
+
+  lexbor_array_t *new_array = lexbor_array_create();
+
+  for (size_t i = 0; i < self_array->length; i++) {
+    for (size_t j = 0; j < other_array->length; j++) {
+      if (self_array->list[i] == other_array->list[j]) {
+        lexbor_array_push(new_array, self_array->list[i]);
+        break;
+      }
+    }
+  }
+
+  return nl_rb_node_set_create_with_data(new_array, nl_rb_document_get(self));
+}
+
+/**
+ * @return [NodeSet] A new NodeSet with the nodes in this NodeSet that aren't in +other+
+ */
+static VALUE
+nl_node_set_difference(VALUE self, VALUE other)
+{
+  if (!rb_obj_is_kind_of(other, cNokolexborNodeSet)) {
+    rb_raise(rb_eArgError, "Parameter must be a Nokolexbor::NodeSet");
+  }
+
+  lexbor_array_t *self_array = nl_rb_node_set_unwrap(self);
+  lexbor_array_t *other_array = nl_rb_node_set_unwrap(other);
+
+  lexbor_array_t *new_array = lexbor_array_create();
+
+  for (size_t i = 0; i < self_array->length; i++) {
+    bool found = false;
+    for (size_t j = 0; j < other_array->length; j++) {
+      if (self_array->list[i] == other_array->list[j]) {
+        found = true;
+        break;
+      }
+    }
+    if (!found) {
+      lexbor_array_push(new_array, self_array->list[i]);
+    }
+  }
+
+  return nl_rb_node_set_create_with_data(new_array, nl_rb_document_get(self));
+}
+
 static lxb_status_t
 nl_node_set_find(VALUE self, VALUE selector, lxb_selectors_cb_f cb, void *ctx)
 {
@@ -410,6 +468,8 @@ void Init_nl_node_set(void)
   rb_define_method(cNokolexborNodeSet, "[]", nl_node_set_slice, -1);
   rb_define_method(cNokolexborNodeSet, "push", nl_node_set_push, 1);
   rb_define_method(cNokolexborNodeSet, "|", nl_node_set_union, 1);
+  rb_define_method(cNokolexborNodeSet, "&", nl_node_set_intersection, 1);
+  rb_define_method(cNokolexborNodeSet, "-", nl_node_set_difference, 1);
   rb_define_method(cNokolexborNodeSet, "to_a", nl_node_set_to_array, 0);
   rb_define_method(cNokolexborNodeSet, "delete", nl_node_set_delete, 1);
   rb_define_method(cNokolexborNodeSet, "include?", nl_node_set_is_include, 1);

data/lib/nokolexbor/node_set.rb

@@ -54,6 +54,16 @@ module Nokolexbor
       length == 0
     end
 
+    # Insert +node+ before the first Node in this NodeSet
+    def before(node)
+      first.before(node)
+    end
+
+    # Insert +node+ after the last Node in this NodeSet
+    def after(node)
+      last.after(node)
+    end
+
     # @return [Integer] The index of the first node in this NodeSet that is equal to +node+ or meets the given block. Returns nil if no match is found.
     def index(node = nil)
       if node
@@ -169,6 +179,75 @@ module Nokolexbor
       self
     end
 
+    # Add the class attribute +name+ to all containing nodes.
+    #
+    # @see Node#add_class
+    def add_class(name)
+      each do |el|
+        el.add_class(name)
+      end
+      self
+    end
+
+    # Append the class attribute +name+ to all containing nodes.
+    #
+    # @see Node#append_class
+    def append_class(name)
+      each do |el|
+        el.append_class(name)
+      end
+      self
+    end
+
+    # Remove the class attribute +name+ from all containing nodes.
+    #
+    # @see Node#remove_class
+    def remove_class(name = nil)
+      each do |el|
+        el.remove_class(name)
+      end
+      self
+    end
+
+    # Remove the attributed named +name+ from all containing nodes.
+    #
+    # @see Node#remove_attr
+    def remove_attr(name)
+      each { |el| el.delete(name) }
+      self
+    end
+    alias_method :remove_attribute, :remove_attr
+
+    # Set attributes on each Node in the NodeSet, or get an
+    # attribute from the first Node in the NodeSet.
+    #
+    # @example Get an attribute from the first Node in a NodeSet.
+    #   node_set.attr("href")
+    #
+    # @example Set attributes on each node.
+    #   node_set.attr("href" => "http://example.com", "class" => "a")
+    #   node_set.attr("href", "http://example.com")
+    #   node_set.attr("href") { |node| "http://example.com" }
+    #
+    # @return [NodeSet] +self+, to support chaining of calls.
+    def attr(key, value = nil, &block)
+      unless key.is_a?(Hash) || (key && (value || block))
+        return first&.attribute(key)
+      end
+
+      hash = key.is_a?(Hash) ? key : { key => value }
+
+      hash.each do |k, v|
+        each do |node|
+          node[k] = v || yield(node)
+        end
+      end
+
+      self
+    end
+    alias_method :set, :attr
+    alias_method :attribute, :attr
+
     # (see Node#xpath)
     def xpath(*args)
       paths, handler, ns, binds = extract_params(args)
@@ -196,6 +275,10 @@ module Nokolexbor
       end
     end
 
+    def inspect
+      "[#{map(&:inspect).join(', ')}]"
+    end
+
     private
 
     IMPLIED_XPATH_CONTEXTS = [".//", "self::"].freeze # :nodoc:

data/lib/nokolexbor/version.rb

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

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

@@ -0,0 +1,24 @@
+diff --git a/source/lexbor/dom/interfaces/document.c b/source/lexbor/dom/interfaces/document.c
+index a2153f4..8a9c69f 100755
+--- a/source/lexbor/dom/interfaces/document.c
++++ b/source/lexbor/dom/interfaces/document.c
+@@ -12,6 +12,7 @@
+ #include "lexbor/dom/interfaces/cdata_section.h"
+ #include "lexbor/dom/interfaces/cdata_section.h"
+ #include "lexbor/dom/interfaces/processing_instruction.h"
++#include "lexbor/html/interfaces/template_element.h"
+ 
+ 
+ lxb_dom_document_t *
+@@ -449,6 +450,11 @@ lxb_dom_document_import_node(lxb_dom_document_t *doc, lxb_dom_node_t *node,
+             return NULL;
+         }
+ 
++        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_dom_node_insert_child(curr, cnode);
+ 
+         if (node->first_child != NULL) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nokolexbor
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0
 platform: ruby
 authors:
 - Yicheng Zhou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-04 00:00:00.000000000 Z
+date: 2023-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -130,6 +130,7 @@ files:
 - patches/0001-lexbor-support-text-pseudo-element.patch
 - patches/0002-lexbor-match-id-class-case-sensitive.patch
 - patches/0003-lexbor-attach-template-content-to-self.patch
+- patches/0004-lexbor-fix-template-clone.patch
 - vendor/lexbor/CMakeLists.txt
 - vendor/lexbor/config.cmake
 - vendor/lexbor/feature.cmake