nokolexbor 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 042127a2ed4027c52d3718c148921604cae07c274dddb7f3702c7caf0708863f
-  data.tar.gz: 60230b55b773ef41abdca313adc3ffdba38a0b8462c9d23c3365e57c68b63bd5
+  metadata.gz: 53cb1f54e475a0b10fc7773259866fe675e761d0ca204c5f685f4ed8dd60294a
+  data.tar.gz: 0e697320eae75b41e16ac431c6c679159507013b5e3a9858959377eb969355b2
 SHA512:
-  metadata.gz: f06063b84e62e23ba093a397ba6ffdbd802480e711ca24966d5b78be8bc8a7299754ab8bb4cd5d77d6dfe39efa7c21c705b105fe9d626d62eddc5e2e5a6ec9fb
-  data.tar.gz: 86ddfdb650b78827071385cfca708ddbffcd35204a71f439315f800e8e60ee73c2d49ce46e28192ac454df8bab7ef8cbc937b97830e0b488290dbadccd8e51d6
+  metadata.gz: 609b453f596331b53ab13b403c274cde9472e119307c0af63da19be28f0475603705ef285332c94f8b39a47b6850dfc138694ccee0ede531acffd67e31e915a9
+  data.tar.gz: 9f6d2c3ceba6d98bc8f87d59c846bd6c41fc2758681b66481c72de1027078d30e62344267cfe63ce58209e23f6749502750fa05f4365112275d79cee11641e9d

data/ext/nokolexbor/nl_attribute.c

@@ -0,0 +1,155 @@
+#include "nokolexbor.h"
+
+VALUE cNokolexborAttribute;
+extern VALUE mNokolexbor;
+extern VALUE cNokolexborNode;
+
+static VALUE
+nl_attribute_new(int argc, VALUE *argv, VALUE klass)
+{
+  lxb_dom_document_t *document;
+  VALUE rb_document;
+  VALUE rb_name;
+  VALUE rest;
+
+  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");
+  }
+
+  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);
+  if (attr == NULL) {
+    rb_raise(rb_eRuntimeError, "Error creating attribute");
+  }
+
+  lxb_dom_attr_set_name(attr, (const lxb_char_t *)c_name, name_len, false);
+
+  VALUE rb_node = nl_rb_node_create(&attr->node, rb_document);
+
+  if (rb_block_given_p()) {
+    rb_yield(rb_node);
+  }
+
+  return rb_node;
+}
+
+static VALUE
+nl_attribute_name(VALUE 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 *name = lxb_dom_attr_qualified_name(attr, &len);
+
+  return rb_utf8_str_new(name, len);
+}
+
+static VALUE
+nl_attribute_set_name(VALUE self, VALUE rb_name)
+{
+  lxb_dom_node_t *node = nl_rb_node_unwrap(self);
+  lxb_dom_attr_t *attr = lxb_dom_interface_attr(node);
+
+  const char *c_name = StringValuePtr(rb_name);
+  size_t name_len = RSTRING_LEN(rb_name);
+
+  lxb_status_t status = lxb_dom_attr_set_name(attr, (const lxb_char_t *)c_name, name_len, false);
+  if (status != LXB_STATUS_OK) {
+    nl_raise_lexbor_error(status);
+  }
+
+  return rb_name;
+}
+
+static VALUE
+nl_attribute_value(VALUE 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 *value = lxb_dom_attr_value(attr, &len);
+
+  return rb_utf8_str_new(value, len);
+}
+
+static VALUE
+nl_attribute_set_value(VALUE self, VALUE rb_content)
+{
+  lxb_dom_node_t *node = nl_rb_node_unwrap(self);
+  lxb_dom_attr_t *attr = lxb_dom_interface_attr(node);
+
+  const char *c_content = StringValuePtr(rb_content);
+  size_t content_len = RSTRING_LEN(rb_content);
+
+  lxb_status_t status = lxb_dom_attr_set_value(attr, (const lxb_char_t *)c_content, content_len);
+  if (status != LXB_STATUS_OK) {
+    nl_raise_lexbor_error(status);
+  }
+
+  return rb_content;
+}
+
+static VALUE
+nl_attribute_parent(VALUE self)
+{
+  lxb_dom_node_t *node = nl_rb_node_unwrap(self);
+  lxb_dom_attr_t *attr = lxb_dom_interface_attr(node);
+
+  if (attr->owner == NULL) {
+    return Qnil;
+  }
+  return nl_rb_node_create(attr->owner, nl_rb_document_get(self));
+}
+
+static VALUE
+nl_attribute_previous(VALUE self)
+{
+  lxb_dom_node_t *node = nl_rb_node_unwrap(self);
+  lxb_dom_attr_t *attr = lxb_dom_interface_attr(node);
+
+  if (attr->prev == NULL) {
+    return Qnil;
+  }
+  return nl_rb_node_create(attr->prev, nl_rb_document_get(self));
+}
+
+static VALUE
+nl_attribute_next(VALUE self)
+{
+  lxb_dom_node_t *node = nl_rb_node_unwrap(self);
+  lxb_dom_attr_t *attr = lxb_dom_interface_attr(node);
+
+  if (attr->next == NULL) {
+    return Qnil;
+  }
+  return nl_rb_node_create(attr->next, nl_rb_document_get(self));
+}
+
+void Init_nl_attribute(void)
+{
+  cNokolexborAttribute = rb_define_class_under(mNokolexbor, "Attribute", cNokolexborNode);
+
+  rb_define_singleton_method(cNokolexborAttribute, "new", nl_attribute_new, -1);
+
+  rb_define_method(cNokolexborAttribute, "name", nl_attribute_name, 0);
+  rb_define_method(cNokolexborAttribute, "name=", nl_attribute_set_name, 1);
+  rb_define_method(cNokolexborAttribute, "value", nl_attribute_value, 0);
+  rb_define_method(cNokolexborAttribute, "value=", nl_attribute_set_value, 1);
+  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_alias(cNokolexborAttribute, "node_name", "name");
+  rb_define_alias(cNokolexborAttribute, "node_name=", "name=");
+  rb_define_alias(cNokolexborAttribute, "text", "value");
+  rb_define_alias(cNokolexborAttribute, "content", "value");
+  rb_define_alias(cNokolexborAttribute, "to_s", "value");
+  rb_define_alias(cNokolexborAttribute, "to_str", "value");
+}

data/ext/nokolexbor/nl_node.c

@@ -12,6 +12,7 @@ extern VALUE cNokolexborComment;
 extern VALUE cNokolexborProcessingInstruction;
 extern VALUE cNokolexborNodeSet;
 extern VALUE cNokolexborDocumentFragment;
+extern VALUE cNokolexborAttribute;
 extern VALUE eLexborError;
 VALUE cNokolexborNode;
 VALUE cNokolexborElement;
@@ -31,8 +32,9 @@ nl_rb_node_create(lxb_dom_node_t *node, VALUE rb_document)
   case LXB_DOM_NODE_TYPE_ELEMENT:
     rb_class = cNokolexborElement;
     break;
-  // case LXB_DOM_NODE_TYPE_ATTRIBUTE:
-  //   break;
+  case LXB_DOM_NODE_TYPE_ATTRIBUTE:
+    rb_class = cNokolexborAttribute;
+    break;
   case LXB_DOM_NODE_TYPE_TEXT:
     rb_class = cNokolexborText;
     break;
@@ -111,6 +113,55 @@ nl_node_new(int argc, VALUE *argv, VALUE klass)
   return rb_node;
 }
 
+static VALUE
+nl_node_attribute(VALUE self, VALUE rb_name)
+{
+  lxb_dom_node_t *node = nl_rb_node_unwrap(self);
+
+  const char *c_name = StringValuePtr(rb_name);
+  size_t name_len = RSTRING_LEN(rb_name);
+
+  if (node->type != LXB_DOM_NODE_TYPE_ELEMENT) {
+    return Qnil;
+  }
+
+  lxb_dom_attr_t *attr = lxb_dom_element_attr_by_name(lxb_dom_interface_element(node), (const lxb_char_t *)c_name, name_len);
+  if (attr == NULL) {
+    return Qnil;
+  }
+  if (attr->owner == NULL) {
+    attr->owner = node;
+  }
+  return nl_rb_node_create(attr, nl_rb_document_get(self));
+}
+
+static VALUE
+nl_node_attribute_nodes(VALUE self)
+{
+  lxb_dom_node_t *node = nl_rb_node_unwrap(self);
+  VALUE ary = rb_ary_new();
+  if (node->type != LXB_DOM_NODE_TYPE_ELEMENT) {
+    return ary;
+  }
+
+  lxb_dom_attr_t *attr = lxb_dom_element_first_attribute(lxb_dom_interface_element(node));
+
+  if (attr == NULL) {
+    return ary;
+  }
+
+  VALUE rb_doc = nl_rb_document_get(self);
+  while (attr != NULL) {
+    if (attr->owner == NULL) {
+      attr->owner = node;
+    }
+    rb_ary_push(ary, nl_rb_node_create(attr, rb_doc));
+    attr = attr->next;
+  }
+
+  return ary;
+}
+
 static VALUE
 nl_node_content(VALUE self)
 {
@@ -836,7 +887,17 @@ static VALUE
 nl_node_clone(VALUE self)
 {
   lxb_dom_node_t *node = nl_rb_node_unwrap(self);
-  lxb_dom_node_t *clone = lxb_dom_node_clone(node, 1);
+  lxb_dom_node_t *clone;
+
+  switch (node->type) {
+  case LXB_DOM_NODE_TYPE_ATTRIBUTE:
+    clone = lxb_dom_attr_interface_clone(node->owner_document, lxb_dom_interface_attr(node));
+  case LXB_DOM_NODE_TYPE_CDATA_SECTION:
+    clone = lxb_dom_cdata_section_interface_clone(node->owner_document, lxb_dom_interface_cdata_section(node));
+  default:
+    clone = lxb_dom_node_clone(node, true);
+    break;
+  }
   return nl_rb_node_create(clone, nl_rb_document_get(self));
 }
 
@@ -849,6 +910,8 @@ void Init_nl_node(void)
   cNokolexborCharacterData = rb_define_class_under(mNokolexbor, "CharacterData", cNokolexborNode);
 
   rb_define_singleton_method(cNokolexborNode, "new", nl_node_new, -1);
+  rb_define_method(cNokolexborNode, "attribute", nl_node_attribute, 1);
+  rb_define_method(cNokolexborNode, "attribute_nodes", nl_node_attribute_nodes, 0);
   rb_define_method(cNokolexborNode, "content", nl_node_content, 0);
   rb_define_method(cNokolexborNode, "content=", nl_node_content_set, 1);
   rb_define_method(cNokolexborNode, "[]", nl_node_get_attr, 1);

data/ext/nokolexbor/nokolexbor.c

@@ -17,5 +17,6 @@ void Init_nokolexbor(void)
   Init_nl_processing_instruction();
   Init_nl_node_set();
   Init_nl_document_fragment();
+  Init_nl_attribute();
   Init_nl_xpath_context();
 }

data/ext/nokolexbor/nokolexbor.h

@@ -18,6 +18,7 @@ void Init_nl_cdata(void);
 void Init_nl_processing_instruction(void);
 void Init_nl_node_set(void);
 void Init_nl_document_fragment(void);
+void Init_nl_attribute(void);
 void Init_nl_xpath_context(void);
 
 void nl_raise_lexbor_error(lxb_status_t error);

data/lib/nokolexbor/node.rb

@@ -145,13 +145,10 @@ module Nokolexbor
       ancestors.last.css(selector).any? { |node| node == self }
     end
 
-    def attribute(name)
-      return nil unless key?(name)
-      Attribute.new(name, attr(name))
-    end
-
     def attributes
-      attrs.map { |k, v| [k, Attribute.new(k, v)] }.to_h
+      attribute_nodes.each_with_object({}) do |node, hash|
+        hash[node.name] = node
+      end
     end
 
     def replace(node)

data/lib/nokolexbor/version.rb

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

data/lib/nokolexbor.rb

@@ -26,7 +26,6 @@ require 'nokolexbor/node'
 require 'nokolexbor/document'
 require 'nokolexbor/node_set'
 require 'nokolexbor/document_fragment'
-require 'nokolexbor/attribute'
 require 'nokolexbor/xpath'
 require 'nokolexbor/xpath_context'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nokolexbor
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Yicheng Zhou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-09 00:00:00.000000000 Z
+date: 2023-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -78,6 +78,7 @@ files:
 - ext/nokolexbor/libxml/xpath.h
 - ext/nokolexbor/libxml/xpathInternals.h
 - ext/nokolexbor/libxml/xpointer.h
+- ext/nokolexbor/nl_attribute.c
 - ext/nokolexbor/nl_cdata.c
 - ext/nokolexbor/nl_comment.c
 - ext/nokolexbor/nl_document.c
@@ -119,7 +120,6 @@ files:
 - ext/nokolexbor/xml_tree.c
 - ext/nokolexbor/xml_xpath.c
 - lib/nokolexbor.rb
-- lib/nokolexbor/attribute.rb
 - lib/nokolexbor/document.rb
 - lib/nokolexbor/document_fragment.rb
 - lib/nokolexbor/node.rb

data/lib/nokolexbor/attribute.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module Nokolexbor
-  class Attribute
-    attr_accessor :name
-    attr_accessor :value
-
-    def initialize(name, value)
-      @name = name
-      @value = value
-    end
-
-    alias_method :text, :value
-    alias_method :content, :value
-    alias_method :to_s, :value
-    alias_method :to_str, :value
-  end
-end