nokolexbor 0.3.5 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23409daec8c9cbe801afef6c39e6507fc938eb35cad2458ef80fc99e6bf5bece
-  data.tar.gz: 06e83318711ac6e6c2582d78fcd87f5a0efeaceff7421a1880cd8e698637d803
+  metadata.gz: 25a206e02eaf74545bf1e7abe7e43a53e38fd8626b337e8de7d6c207e352a686
+  data.tar.gz: 2b9f7c8a339b2618dbb2de5824b249f0a8fa690713028a9e22b8627a8bb0163a
 SHA512:
-  metadata.gz: d77bb45c508edba84043156149ff1dfce0249b7f4d52d871c0552b4f590c01e0879c77b0bf039a46ee019be4e445b072a658fbb9fc3872c8b1d6f48e4801b0dd
-  data.tar.gz: 8ec494323f66188fbd39455c05a63e6be0fa5f8979fcb43310dc80a429a3d77355b8875988fa800041a04f1746254b0d88d9522780c085469efe18308a3d4576
+  metadata.gz: 70e579aa1e64ae9cfcf71dd2d0bf3b77b634b69764d43c04aaa02b6db0c5b26cb992d0094ad4b2b9177ca2be46c6b32df38381224bd579bfb722c538075b436e
+  data.tar.gz: c89997e12178393f171bb5e3735346d99ee67047fb985ec02b08e9433aadc6f18d68278a5256c99ab7174ddd436f9bb49fb97a97808923205803097b083f7ed3

data/ext/nokolexbor/extconf.rb

@@ -5,6 +5,10 @@ if ENV["CC"]
   RbConfig::CONFIG["CC"] = RbConfig::MAKEFILE_CONFIG["CC"] = ENV["CC"]
 end
 
+def windows?
+  RbConfig::CONFIG["target_os"].match?(/mingw|mswin/)
+end
+
 # From: https://stackoverflow.com/questions/2108727
 # Cross-platform way of finding an executable in the $PATH.
 #
@@ -23,9 +27,9 @@ end
 cmake_flags = [ ENV["CMAKE_FLAGS"] ]
 cmake_flags << "-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY"
 # Set system name explicitly when cross-compiling
-cmake_flags << "-DCMAKE_SYSTEM_NAME=Windows -DWIN32=1" if Gem.win_platform?
+cmake_flags << "-DCMAKE_SYSTEM_NAME=Windows -DWIN32=1" if windows?
 # On Windows, Ruby-DevKit is MSYS-based, so ensure to use MSYS Makefiles.
-cmake_flags << "-G \"MSYS Makefiles\"" if Gem.win_platform? && !ENV['NOKOLEXBOR_CROSS_COMPILE']
+cmake_flags << "-G \"MSYS Makefiles\"" if windows? && !ENV['NOKOLEXBOR_CROSS_COMPILE']
 
 if ENV['NOKOLEXBOR_CROSS_COMPILE']
   # use the same toolchain for cross-compiling lexbor
@@ -74,7 +78,7 @@ end
 
 def self.run_cmake(timeout, args)
   # Set to process group so we can kill it and its children
-  pgroup = (Gem.win_platform? && !ENV['NOKOLEXBOR_CROSS_COMPILE']) ? :new_pgroup : :pgroup
+  pgroup = (windows? && !ENV['NOKOLEXBOR_CROSS_COMPILE']) ? :new_pgroup : :pgroup
   pid = Process.spawn("cmake #{args}", pgroup => true)
 
   Timeout.timeout(timeout) do
@@ -104,7 +108,7 @@ def apply_patch(patch_file, chdir)
 end
 
 
-MAKE = if Gem.win_platform?
+MAKE = if windows?
   # On Windows, Ruby-DevKit only has 'make'.
   find_executable('make')
 else
@@ -143,7 +147,7 @@ Dir.chdir(EXT_DIR) do
   Dir.mkdir("build") if !Dir.exist?("build")
 
   Dir.chdir("build") do
-    run_cmake(10 * 60, ".. #{cmake_flags.join(' ')} #{Gem.win_platform? ? "-DLIBXML2_WITH_THREADS=OFF" : ""}")
+    run_cmake(10 * 60, ".. #{cmake_flags.join(' ')} #{windows? ? "-DLIBXML2_WITH_THREADS=OFF" : ""}")
   end
 end
 

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;
@@ -383,7 +384,6 @@ nl_node_find(VALUE self, VALUE selector, lxb_selectors_cb_f cb, void *ctx)
   }
 
   /* Parse and get the log. */
-  // TODO: Cache the list for reuse, improves performance
   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;
@@ -1107,6 +1107,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);
@@ -1149,6 +1175,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", "[]");

data/lib/nokolexbor/node_set.rb

@@ -196,6 +196,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.5'
+  VERSION = '0.3.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nokolexbor
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.7
 platform: ruby
 authors:
 - Yicheng Zhou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-25 00:00:00.000000000 Z
+date: 2023-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler