makiri 0.15.0-aarch64-linux → 0.16.0-aarch64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9bef2471bfcd87d3e3c31bf6f4eeecef71202d81bf0bb46b7b71eee526cd1a4
-  data.tar.gz: 1836c1d1ee430cba8a058d63411259483ad84f3f4a1fdb69aae53621f1093f68
+  metadata.gz: 651fa28c960d1fd0099870394fc7f19bef09e328ac4851d7102ebfbf9136a6a7
+  data.tar.gz: e84db4b38c9fbe3184b90cee36976b005521dfdca1165d10adf1c70970a36918
 SHA512:
-  metadata.gz: 3f8c5b7d20a0190f05afd7e1d8c453979eeaf3dc7d1ec58e5314fdeb803e84d5a3bbbf6e1fa533b3827d0bc70b8b41269d5a5d2d06d79339c1244e3a5a10b7a4
-  data.tar.gz: e93f2d6a31337fc9e23782b4e3e5a37196e5ef95a92b206868721f8dc04d0263a593eb5361fef0c2fa0a67ab037a3777faafb65bcbe06fa0f45bdf215430bdd1
+  metadata.gz: 9d9e73501a9744ecf0b16610f52cdf0f8ed17473914654b5bf719cdf3e84fd333cbe77f12305b0d0be9d52da6a9652a659c7a970e0a6e317a98edbe8b4c84b6c
+  data.tar.gz: 11627962979c3a7649f3ce09fc4bd5b7bc019626c675263ae73bae9434ebd003b565d9726bb0e8d0d497c80c01bbebfd79c0b677e40f894dcbad1135749b7e53

data/CHANGELOG.md

@@ -1,5 +1,32 @@
 # Changelog
 
+## [0.16.0] - 2026-10-10
+
+### Added
+
+* `Makiri::NATIVE_VERSION` and `Makiri::NATIVE_RUBY_API_VERSION`: the gem
+  version and Ruby `MAJOR.MINOR` the native extension was built as.
+  `require "makiri"` raises `LoadError` for an extension built for another
+  Ruby (refused by the extension itself, before it defines anything) or as
+  another makiri version (e.g. a stale `lib/makiri/makiri.bundle` in a
+  checkout).
+* `Node#child_count`, `#child_at(i)`, `#element_child_count` and
+  `#element_child_at(i)` (HTML and XML): count and index a child list without
+  building `#children`. A loop over the indexes in order costs O(1) a step,
+  also while other lists are read in between. Any child-list edit in the
+  document resets that, so a loop that edits as it indexes walks from the
+  nearer end after each edit. `child_at` returns nil for a negative index or
+  one past the end.
+* `Node#first_child` (an alias of `#child`) and `#last_child`.
+* `Node#root_node`, DOM `getRootNode()`: the Document, a DocumentFragment, or
+  the top of a detached subtree. An Attr is its own root.
+
+### Changed
+
+* `#local_name`, `#prefix`, `#namespace_uri` and `#tag_name` return frozen,
+  interned Strings: every read of one name returns the same object. `#name`
+  still returns a new, mutable String.
+
 ## [0.15.0] - 2026-10-09
 
 ### Added

data/lib/makiri/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Makiri
-  VERSION = "0.15.0"
+  VERSION = "0.16.0"
 end

data/lib/makiri.rb

@@ -2,17 +2,36 @@
 
 require_relative "makiri/version"
 
-# Native extension (a Rust crate). Located at lib/makiri/<ruby_abi>/makiri.{so,bundle}
-# (created by rake-compiler). Loading is gated so the gem can be required
-# in environments where the binary is not yet built (the require error
-# is then surfaced clearly).
-begin
-  RUBY_VERSION =~ /(\d+\.\d+)/
-  require_relative "makiri/#{Regexp.last_match(1)}/makiri"
-rescue LoadError
+# Native extension (a Rust crate): lib/makiri/<major.minor>/makiri.<dlext> in a
+# precompiled gem (one per Ruby), else lib/makiri/makiri.<dlext> (a source
+# install, or a checkout's `rake compile`). The versioned one is required only
+# if it is there: rescuing LoadError instead would also swallow the extension's
+# own refusal (a binary built for another Ruby raises LoadError from its init)
+# and load the fallback over it.
+versioned = "makiri/#{RUBY_VERSION[/\A\d+\.\d+/]}/makiri"
+if File.exist?(File.join(__dir__, "#{versioned}.#{RbConfig::CONFIG["DLEXT"]}"))
+  require_relative versioned
+else
   require_relative "makiri/makiri"
 end
 
+# The fallback loads lib/makiri/makiri.<dlext> whichever version of this gem's
+# Ruby code is asking: a checkout (or a Bundler `path:` gem) keeps one binary
+# from its last compile, and one from another gem version lacks or misnames
+# methods. The extension states what it was built as, and a mismatch stops
+# here; a binary older than the constant states nothing, a mismatch too. (A
+# binary for another Ruby never gets this far: the extension refuses it
+# before it defines anything.)
+module Makiri
+  native_version = const_defined?(:NATIVE_VERSION, false) ? NATIVE_VERSION : "(unknown)"
+  if native_version != VERSION
+    raise LoadError,
+          "makiri's native extension was built as makiri #{native_version}, but was " \
+          "loaded by makiri #{VERSION}; rebuild it (`bundle exec rake clean compile` in a " \
+          "checkout, or reinstall the gem)"
+  end
+end
+
 require_relative "makiri/error"
 require_relative "makiri/clone_via_dup"
 require_relative "makiri/xpath_syntax"

data/script/check_unsafe_boundaries.rb

@@ -33,12 +33,12 @@ UNSAFE_ISLANDS = {
   "bridge/doc.rs" => 3,
   "bridge/fragment.rs" => 6,
   "bridge/gvl.rs" => 5,
-  "bridge/html.rs" => 17,
+  "bridge/html.rs" => 18,
   "bridge/node_set.rs" => 8,
   "bridge/node_wrap.rs" => 1,
-  "bridge/ruby.rs" => 18,
+  "bridge/ruby.rs" => 19,
   "bridge/stack.rs" => 1,
-  "bridge/string.rs" => 30,
+  "bridge/string.rs" => 31,
   "bridge/typed.rs" => 21,
   "bridge/wrapper.rs" => 20,
   "bridge/xml.rs" => 11,
@@ -90,37 +90,37 @@ UNSAFE_ISLANDS = {
 FORBID_ROOTS = %w[css/mod.rs glue/mod.rs lexbor/css_match/mod.rs xml/mod.rs xpath/mod.rs].freeze
 
 FORBID_FILES = %w[
-  bridge/dom_error.rs css/build.rs css/lower.rs
-  css/mod.rs cutf8.rs cutf8/verify.rs
-  dom_rules.rs engine_error.rs falloc/verify.rs
-  glue/css.rs glue/html_doc.rs glue/html_node/css.rs
-  glue/html_node/mutate.rs glue/html_node/read.rs glue/html_node/serialize.rs
-  glue/mod.rs glue/node.rs glue/node_set.rs
-  glue/query.rs glue/xml_doc.rs glue/xml_node/css.rs
-  glue/xml_node/mod.rs glue/xml_node/mutate.rs glue/xml_node/ns.rs
-  glue/xml_node/read.rs glue/xml_node/serialize.rs glue/xml_node/strings.rs
-  glue/xpath_context.rs lexbor/adapter/dom_index.rs lexbor/contains_guard.rs
-  lexbor/css_match/mod.rs lexbor/selector_text.rs limits.rs
-  node_type.rs ptr_table.rs rust_tests.rs
-  stack.rs text.rs utf8_input.rs
-  xml/arena.rs xml/attr_key.rs xml/chars/expand.rs
-  xml/chars/mod.rs xml/dom_name.rs xml/encoding_sniff.rs
-  xml/index.rs xml/mod.rs xml/model.rs
-  xml/mutate/attr.rs xml/mutate/copy.rs xml/mutate/edit.rs
-  xml/mutate/factory.rs xml/mutate/insert.rs xml/mutate/mod.rs
-  xml/mutate/ns.rs xml/ns_scope.rs xml/qname.rs
-  xml/selftest.rs xml/serialize/bindings.rs xml/serialize/c14n.rs
-  xml/serialize/mod.rs xml/serialize/out.rs xml/serialize/xml.rs
-  xml/tree/cursor.rs xml/tree/decl.rs xml/tree/dtd.rs
-  xml/tree/mod.rs xml/tree/scope.rs xml/verify.rs
-  xml/xpath.rs xpath/abi.rs xpath/ast.rs
-  xpath/ast_ops.rs xpath/attr_pred.rs xpath/axis.rs
-  xpath/ctx.rs xpath/dom.rs xpath/eval.rs
-  xpath/funcs/ext.rs xpath/funcs/mod.rs xpath/lex.rs
-  xpath/limits.rs xpath/mod.rs xpath/nodetest.rs
-  xpath/number.rs xpath/order.rs xpath/parse.rs
-  xpath/step_index.rs xpath/str_cache.rs xpath/tests.rs
-  xpath/value.rs xpath/verify.rs
+  bridge/dom_error.rs child_index.rs css/build.rs
+  css/lower.rs css/mod.rs cutf8.rs
+  cutf8/verify.rs dom_rules.rs engine_error.rs
+  falloc/verify.rs glue/css.rs glue/html_doc.rs
+  glue/html_node/css.rs glue/html_node/mutate.rs glue/html_node/read.rs
+  glue/html_node/serialize.rs glue/mod.rs glue/node.rs
+  glue/node_set.rs glue/query.rs glue/xml_doc.rs
+  glue/xml_node/css.rs glue/xml_node/mod.rs glue/xml_node/mutate.rs
+  glue/xml_node/ns.rs glue/xml_node/read.rs glue/xml_node/serialize.rs
+  glue/xml_node/strings.rs glue/xpath_context.rs lexbor/adapter/dom_index.rs
+  lexbor/contains_guard.rs lexbor/css_match/mod.rs lexbor/selector_text.rs
+  limits.rs node_type.rs ptr_table.rs
+  rust_tests.rs stack.rs text.rs
+  utf8_input.rs xml/arena.rs xml/attr_key.rs
+  xml/chars/expand.rs xml/chars/mod.rs xml/dom_name.rs
+  xml/encoding_sniff.rs xml/index.rs xml/mod.rs
+  xml/model.rs xml/mutate/attr.rs xml/mutate/copy.rs
+  xml/mutate/edit.rs xml/mutate/factory.rs xml/mutate/insert.rs
+  xml/mutate/mod.rs xml/mutate/ns.rs xml/ns_scope.rs
+  xml/qname.rs xml/selftest.rs xml/serialize/bindings.rs
+  xml/serialize/c14n.rs xml/serialize/mod.rs xml/serialize/out.rs
+  xml/serialize/xml.rs xml/tree/cursor.rs xml/tree/decl.rs
+  xml/tree/dtd.rs xml/tree/mod.rs xml/tree/scope.rs
+  xml/verify.rs xml/xpath.rs xpath/abi.rs
+  xpath/ast.rs xpath/ast_ops.rs xpath/attr_pred.rs
+  xpath/axis.rs xpath/ctx.rs xpath/dom.rs
+  xpath/eval.rs xpath/funcs/ext.rs xpath/funcs/mod.rs
+  xpath/lex.rs xpath/limits.rs xpath/mod.rs
+  xpath/nodetest.rs xpath/number.rs xpath/order.rs
+  xpath/parse.rs xpath/step_index.rs xpath/str_cache.rs
+  xpath/tests.rs xpath/value.rs xpath/verify.rs
 ].freeze
 
 UNSAFE_USE = /\bunsafe\s*(?:\{|fn\b|impl\b|trait\b|extern\b)/
@@ -166,7 +166,11 @@ RAW_NODE_CROSSING_COUNTS = {
   "bridge/fragment.rs" => 3,
   # 8th: an Attr's owner, read as the wrapper cache's identity key for the
   # owner-frozen check (`check_attr_owner_frozen`); it does not escape.
-  "bridge/html.rs" => 8,
+  # 9th/10th: `TokenTree for HtmlTree` (`child_count` / `child_at`), a node's pointer as
+  # the child-position memo's token and back. `child_index::ChildPositionMemo`
+  # answers only for the `tree_version` it was filled under, so a token read
+  # back is still that child; the node is never handed out raw, only wrapped.
+  "bridge/html.rs" => 10,
   "bridge/wrapper.rs" => 3,
 }.freeze
 
@@ -718,6 +722,10 @@ def unwrapped_entries(rust)
     code.to_enum(:scan, REGISTRATION).each do
       m = Regexp.last_match
       fpath = first_argument(code, m.end(0) - 1)
+      # A generic function registered per representation
+      # (`child_count::<HtmlSelf>`) is one definition: resolve it without its
+      # type arguments.
+      fpath = fpath&.sub(/::<[\w:, ]+>\z/, "")
       unless fpath&.match?(/\A[\w:]+\z/)
         missing << "#{rel}: registration of `#{fpath}` is not a function path"
         next

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: makiri
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: aarch64-linux
 authors:
 - takahashim