inkmark 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 426fe02b791d8fcf0b3d080cea874692f3027eb1528e07300de6685b869108e3
-  data.tar.gz: b1e8947dc0811dfcd70bc29b62c34c95536526f512941e73bd66664d5c5b7473
+  metadata.gz: 99be70c153a0446a98b513e0546389622cb5815d5907388f0b9160da7b1652cc
+  data.tar.gz: b156f0536a351ef5780816a10ccedbb4d5a5a3a6c8741f2ccbbd065247f249ed
 SHA512:
-  metadata.gz: 07d38e9bf03538f52a444d033fa48648bd235673c3c435e7137bd5435b31e82dce00b758b038840577540d451a1d8d82bbd8660d9be99429b0a7ed35a666b4b3
-  data.tar.gz: 9898e5c9780a4ea2423861f62b3054459d7c3dadad7ae9fb999fe3b5416a51a513df9b7d428f1a4af5093a67cc91eb86f7be5fc2c3054d9456b805a65e7b4438
+  metadata.gz: b7dcd628ed44d5c5ab757f257c95f2b23ad6880835f68db65f735ba45a6f7666de1bff0be3cc6e088ba18f3407848db0cc9c63d970e1a415bba1451ac58a15d7
+  data.tar.gz: b704a73b47b7e85db26b13b1c02dc5a840939fea7eed13b9f4e7b68f816a23add8ed1bc60d3278656d3f4951dad318519ac14d257286ea513abbcf55dc7d622e

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [0.2.2] - 2026-10-24
+
+- Updated dependencies, including pulldown-cmark 0.13.5 (upstream security fixes) and magnus 0.9.3.
+
+## [0.2.1] - 2026-09-25
+
+- Updated dependencies, including magnus 0.9.
+
 ## [0.2.0] - 2026-09-06
 
 - Ractor-safe: the native extension declares `rb_ext_ractor_safe`, and every public API works from non-main Ractors.

data/Cargo.lock

@@ -67,9 +67,9 @@ checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
 
 [[package]]
 name = "bitflags"
-version = "2.13.1"
+version = "2.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b588b76d00fde79687d7646a9b5bdf3cc0f655e0bbd080335a95d7e96f3587da"
+checksum = "3ded4057c258ba199e2d26386d3af3780957ecaee6c4ef4041c6b4b8b97c0b06"
 
 [[package]]
 name = "bstr"
@@ -92,9 +92,9 @@ dependencies = [
 
 [[package]]
 name = "cfg-if"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
+checksum = "4e7648175b45a9a48536d676f68d918270699102aa8dab5496df06904c914600"
 
 [[package]]
 name = "clang-sys"
@@ -109,9 +109,9 @@ dependencies = [
 
 [[package]]
 name = "crc32fast"
-version = "1.5.1"
+version = "1.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8498c871161e1742aaa9d52551b2d6ebdd4c3d45a3be423e3728f33b955be550"
+checksum = "0ba106e844045ddc02c20768ac4b0b7cb45f2cc2ecbd833ac9f5dacb183c2055"
 dependencies = [
  "cfg-if",
 ]
@@ -130,29 +130,29 @@ checksum = "c6232dd377dcc64799954cbd3a9bb882e9cdc1308ccd87b1c098f1fb2eaf82a8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.5",
+ "syn 3.0.9",
 ]
 
 [[package]]
 name = "either"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "252afb9ae5eaa683babdc6a068b3f5726eb19e05070c731f9b2a23a7c3e8ed34"
+checksum = "0e9c71c2167ca323c882b99918929403426e2373ea17242ff5653e0d5e1058be"
 
 [[package]]
 name = "emojis"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b1514ced566c94991ed9563258ecf61e311fd773bf0a3f20606830386bf66e3"
+checksum = "589871e639330783bc20ad89d32ac1b049e02c273d96c907ca27478c8bc674a2"
 dependencies = [
  "phf",
 ]
 
 [[package]]
 name = "equivalent"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+checksum = "00d174d5400e5e8fd687ad1049e2f578285fa914201b1af7e8b112a4546bd826"
 
 [[package]]
 name = "fancy-regex"
@@ -229,9 +229,9 @@ dependencies = [
 
 [[package]]
 name = "icu_collections"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa68d21081c4a05d5a901a1c62add574c77048b6a1c67be3b50ce0b60d4ca513"
+checksum = "fe090a42a0d3140fed8c63263ed1fecc02422cb2f4bfe55cd8de2de1b8e105dd"
 dependencies = [
  "displaydoc",
  "potential_utf",
@@ -243,9 +243,9 @@ dependencies = [
 
 [[package]]
 name = "icu_locale_core"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d56e28588da92eee5c3201a6eff33fabdd49b62269c8938d4ff050ce4d900deb"
+checksum = "25d29b57c17c6528d0dc4c2141cfa2d08200465acb537a3909c8b9b8a4a984c0"
 dependencies = [
  "displaydoc",
  "litemap",
@@ -256,9 +256,9 @@ dependencies = [
 
 [[package]]
 name = "icu_normalizer"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12f9cf5f235641ed274641dd81c3f28d870e276763d0797aeeab72317b1c646f"
+checksum = "404a3b8c486f205c87fe7f23ab6894d84a4ad76d6e4671ae1981ba7def87c599"
 dependencies = [
  "icu_collections",
  "icu_normalizer_data",
@@ -270,15 +270,15 @@ dependencies = [
 
 [[package]]
 name = "icu_normalizer_data"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1563da1ed3e0b3bf3d74c9b85917ac9c56464d2f57242270c09c9e752f8021a0"
+checksum = "20f0088bfb7441f7a37fa0c9e20cb1e9cba1cac6b9ce8cd2a6dc44294f8e8cbc"
 
 [[package]]
 name = "icu_properties"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e7ca276ad3145661a65914e6daf131ca5120cd3dcee8f8f3214b8875184a148"
+checksum = "2ea83d991c56158f7cf898bf86436c1dfe7c07ee82fe88951f2695c9f37a379f"
 dependencies = [
  "displaydoc",
  "icu_collections",
@@ -291,15 +291,15 @@ dependencies = [
 
 [[package]]
 name = "icu_properties_data"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e590f038c1464a96894fd6d10127e90a8be4509f56ff7ecef851b15cee0b7caa"
+checksum = "b98f29af82d02b163fe50161388350e743bb3107cc8e8c2f7314cb505faddfcf"
 
 [[package]]
 name = "icu_provider"
-version = "2.3.1"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d27bbb9d3abbefac45d55f647c9de1d44aafcd1186eb91879afef17c396c3e73"
+checksum = "413099315636c588ee8f011190b329b971a09a8fae9d157e01dcae8379468514"
 dependencies = [
  "displaydoc",
  "icu_locale_core",
@@ -333,7 +333,7 @@ dependencies = [
 
 [[package]]
 name = "inkmark"
-version = "0.2.0"
+version = "0.2.2"
 dependencies = [
  "deunicode",
  "emojis",
@@ -363,15 +363,15 @@ dependencies = [
 
 [[package]]
 name = "lazy_static"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+checksum = "20870f649af7073d53e38067b2a84312175d56ea15217e1b15bc83506ec50afb"
 
 [[package]]
 name = "libc"
-version = "0.2.189"
+version = "0.2.191"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2"
+checksum = "65cd87c9a6d60536580b316ad985726104730a5151c99845f2490428ef91240a"
 
 [[package]]
 name = "libloading"
@@ -406,9 +406,9 @@ checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6"
 
 [[package]]
 name = "magnus"
-version = "0.8.2"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b36a5b126bbe97eb0d02d07acfeb327036c6319fd816139a49824a83b7f9012"
+checksum = "40ef424404d166cbb71c8b8d19c9c589c748c4547c1afa1928c5504299f6c713"
 dependencies = [
  "magnus-macros",
  "rb-sys",
@@ -418,9 +418,9 @@ dependencies = [
 
 [[package]]
 name = "magnus-macros"
-version = "0.8.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47607461fd8e1513cb4f2076c197d8092d921a1ea75bd08af97398f593751892"
+checksum = "9dafde2eeb66f090e0f326112323eb8324b12cb32b5d1210e541d3df6b0ce77e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -509,9 +509,9 @@ dependencies = [
 
 [[package]]
 name = "pulldown-cmark"
-version = "0.13.4"
+version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9f068eba8e7071c5f9511831b44f32c740d5adf574e990f946ddb53db2f314e"
+checksum = "278e9268c93b9e498a2da46c34d90ba93a3255eb99009646398f34bc73ab36eb"
 dependencies = [
  "bitflags",
  "memchr",
@@ -527,9 +527,9 @@ checksum = "007d8adb5ddab6f8e3f491ac63566a7d5002cc7ed73901f72057943fa71ae1ae"
 
 [[package]]
 name = "pulldown-cmark-to-cmark"
-version = "22.0.1"
+version = "22.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab1ad36992cead65f02aa399a373a42730922f1525d988172634fdefdecb8a60"
+checksum = "84bbb29c624230c4bd1047bbdb2aa47e41c860e9665ce62ba9504eebe91bf867"
 dependencies = [
  "pulldown-cmark",
 ]
@@ -670,7 +670,7 @@ checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.5",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -693,15 +693,15 @@ checksum = "3a219298ac11a56ea9a6d2120044824d6f01aeb034955e7af7bc16858527deea"
 
 [[package]]
 name = "siphasher"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649"
+checksum = "33f4fe9184a62d842c9ef383018f3306d8ba224fd9d836f56d7288308847c256"
 
 [[package]]
 name = "smallvec"
-version = "1.16.0"
+version = "1.16.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9be42f50aa861c555654aa3a37f52f4b1074bacf4e48fe0ef7fa584e80f1f0f"
+checksum = "d0d5d4b1981b8bbbb7aed204cae5726d683d5d6ac7e74ec54122ea28f315e7c8"
 
 [[package]]
 name = "stable_deref_trait"
@@ -722,9 +722,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "3.0.5"
+version = "3.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12df2e0110f65b775f769bb17ef989067a1d931b2eb822bd4346631eeada89f9"
+checksum = "d78c8dee4c7bf0e14673097256fed6142ce9d3b85a408189d07482442145823b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -733,13 +733,13 @@ dependencies = [
 
 [[package]]
 name = "synstructure"
-version = "0.13.2"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
+checksum = "901704edd0dfe137f1987838ee4f259e4e063c31371bdb423f7ae38ec6f77f02"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.119",
+ "syn 3.0.9",
 ]
 
 [[package]]
@@ -762,29 +762,29 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.20"
+version = "2.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec86235f5fcc2a73650310756d2ac5b138a5780bbbdfae3eeccec992c435ba4f"
+checksum = "09e52cb86a36cede5cb101bf8908837b3e4c6e5e59fe7fd85c23fb56200d189e"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.20"
+version = "2.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc04cd3e1236dd4a98afca4569f2deb3f120e5422a4023be2cb683f8486292af"
+checksum = "fe5197923287db20a58125f0bc85c062f7f2c892de97b18c356f9efb14b28524"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.5",
+ "syn 3.0.9",
 ]
 
 [[package]]
 name = "tinystr"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1e27c91459209c2986af3dcf603a5a74a4368754ce37414f59acc971167f643"
+checksum = "abc840c238154d58f9e86b2792261edfde565a17696e1cda1a449de27979801a"
 dependencies = [
  "displaydoc",
  "zerovec",
@@ -792,15 +792,15 @@ dependencies = [
 
 [[package]]
 name = "unicase"
-version = "2.9.0"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142"
+checksum = "357cc3acc6a036009fd6c973ed009037c732d60d0b4f6c673e9041497482a28f"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.24"
+version = "1.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
+checksum = "a2c754d6c33795a1c324727428e5a7dedb5b06195f9890bdbcba760d3e246563"
 
 [[package]]
 name = "unicode-segmentation"
@@ -877,9 +877,9 @@ checksum = "3ad82d2a33cdc9674dc7465672f271e096168fcdbe0f799d9e6db8c5892679dc"
 
 [[package]]
 name = "yoke"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5"
+checksum = "417ef3fcf6c300b7dbd25c85531a746931c02ad536f3cf4786ed1e88223340b3"
 dependencies = [
  "stable_deref_trait",
  "yoke-derive",
@@ -888,13 +888,13 @@ dependencies = [
 
 [[package]]
 name = "yoke-derive"
-version = "0.8.2"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e"
+checksum = "ec8ebde2db3681e8c9980cc27822030e68752690ddfa9473e739aeb4dbde6d71"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.119",
+ "syn 3.0.9",
  "synstructure",
 ]
 
@@ -909,13 +909,13 @@ dependencies = [
 
 [[package]]
 name = "zerofrom-derive"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1"
+checksum = "f75b4683f6c7f45248d4d64056a24298c6281e0993356d7d1b4a1a962ef10d4a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.119",
+ "syn 3.0.9",
  "synstructure",
 ]
 
@@ -932,9 +932,9 @@ dependencies = [
 
 [[package]]
 name = "zerovec"
-version = "0.11.8"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb0464e17806c1d976d5cba29399c7f08e516e279e2ba493f63123b5fca67dd8"
+checksum = "f58a2799cfe9a1670c7ea8edbd52ef8edb93cb37a7f83bf31ba9e35d9dae6a40"
 dependencies = [
  "yoke",
  "zerofrom",
@@ -943,17 +943,17 @@ dependencies = [
 
 [[package]]
 name = "zerovec-derive"
-version = "0.11.6"
+version = "0.11.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34df6fc39dbd26ddc9c10e6a2984476e13acce22e64e4487636ef494369225da"
+checksum = "c3743ddbf47738d929cd1ae2e199d40d0162979dfe31aef8ae646d2bf00bf97a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.5",
+ "syn 3.0.9",
 ]
 
 [[package]]
 name = "zlib-rs"
-version = "0.6.7"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34b31d188d9d685a4f9c7b46d6e36631b07058d2cfe190267adce54dc230bf12"
+checksum = "b268e58e7c693d7c271f93ffc4ba3b380412554231c85bf61ca7af91042a4112"

data/ext/inkmark/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "inkmark"
-version = "0.2.0"
+version = "0.2.2"
 edition = "2021"
 authors = ["Yaroslav Markin <yaroslav@markin.net>"]
 license = "MIT"
@@ -10,7 +10,7 @@ publish = false
 crate-type = ["cdylib"]
 
 [dependencies]
-magnus = { version = "0.8.2" }
+magnus = { version = "0.9.0", default-features = false }
 rb-sys = { version = "0.9.130", features = ["stable-api-compiled-fallback"] }
 pulldown-cmark = { version = "0.13", default-features = false, features = ["html", "simd"] }
 pulldown-cmark-escape = "0.11"

data/ext/inkmark/src/chunks_by_heading.rs

@@ -54,17 +54,15 @@ pub fn native_chunks_by_heading(
     // when there are no headings at all. Emitted as an entry with
     // `heading: nil, level: 0, id: nil`. Skipped entirely when there
     // is no non-empty content before the first heading.
-    let with_counts = flags.statistics;
+    let content_opts = ContentOptions {
+        with_counts: flags.statistics,
+        truncate_params: truncate_params.as_ref(),
+    };
     let preamble_end = boundaries.first().map(|b| b.start).unwrap_or(events.len());
     if preamble_end > 0 {
         let preamble_events = &events[0..preamble_end];
         if !is_empty_content(preamble_events) {
-            result.push(build_preamble_hash(
-                ruby,
-                preamble_events,
-                with_counts,
-                truncate_params.as_ref(),
-            )?)?;
+            result.push(build_preamble_hash(ruby, preamble_events, &content_opts)?)?;
         }
     }
 
@@ -87,16 +85,17 @@ pub fn native_chunks_by_heading(
         }
         let breadcrumb: Vec<&str> = ancestors.iter().map(|(_, t)| t.as_str()).collect();
         let heading_text = collect_inline_text(&events[(boundary.start + 1)..boundary.end]);
+        // Content = events after End(Heading) up to the next section or
+        // end of document. Re-serialized through cmark_write.
+        let content_events = &events[(boundary.end + 1)..section_end];
         let hash = build_section_hash(
             ruby,
-            &events,
-            boundary,
-            section_end,
+            boundary.level,
             &heading_text,
             &breadcrumb,
+            content_events,
             &mut dedup,
-            with_counts,
-            truncate_params.as_ref(),
+            &content_opts,
         )?;
         result.push(hash)?;
         ancestors.push((level, heading_text));
@@ -113,6 +112,13 @@ struct HeadingBoundary {
     level: HeadingLevel,
 }
 
+/// How each entry's `content` is rendered: optionally truncated, and
+/// optionally accompanied by `character_count` / `word_count`.
+struct ContentOptions<'a> {
+    with_counts: bool,
+    truncate_params: Option<&'a TruncateParams>,
+}
+
 fn find_heading_boundaries(events: &[Event<'_>]) -> Vec<HeadingBoundary> {
     let mut boundaries = Vec::new();
     let mut i = 0;
@@ -165,8 +171,7 @@ fn find_section_end(boundaries: &[HeadingBoundary], i: usize, events_len: usize)
 fn build_preamble_hash(
     ruby: &Ruby,
     events: &[Event<'_>],
-    with_counts: bool,
-    truncate_params: Option<&TruncateParams>,
+    content_opts: &ContentOptions<'_>,
 ) -> Result<RHash, Error> {
     let hash = ruby.hash_new();
     hash.aset(ruby.to_symbol("heading"), ())?;
@@ -176,12 +181,12 @@ fn build_preamble_hash(
     // with proper sections so callers can treat every entry alike.
     hash.aset(ruby.to_symbol("breadcrumb"), ruby.ary_new_capa(0))?;
 
-    let content = match truncate_params {
+    let content = match content_opts.truncate_params {
         Some(params) => truncate::truncate_events(events, params),
         None => render_markdown(events),
     };
-    if with_counts {
-        let (chars, words) = count_post_truncate(events, truncate_params, &content);
+    if content_opts.with_counts {
+        let (chars, words) = count_post_truncate(events, content_opts.truncate_params, &content);
         hash.aset(ruby.to_symbol("character_count"), chars)?;
         hash.aset(ruby.to_symbol("word_count"), words)?;
     }
@@ -191,14 +196,12 @@ fn build_preamble_hash(
 
 fn build_section_hash(
     ruby: &Ruby,
-    events: &[Event<'_>],
-    boundary: &HeadingBoundary,
-    section_end: usize,
+    level: HeadingLevel,
     heading_text: &str,
     breadcrumb: &[&str],
+    content_events: &[Event<'_>],
     dedup: &mut SlugDeduplicator,
-    with_counts: bool,
-    truncate_params: Option<&TruncateParams>,
+    content_opts: &ContentOptions<'_>,
 ) -> Result<RHash, Error> {
     // Slug is the deduplicated slugify of the (filter-applied) heading
     // text, matching the ids `heading_ids` / `toc` would emit for the
@@ -210,13 +213,9 @@ fn build_section_hash(
         dedup.deduplicate(base)
     };
 
-    // Content = events after End(Heading) up to the next section or
-    // end of document. Re-serialized through cmark_write.
-    let content_events = &events[(boundary.end + 1)..section_end];
-
     let hash = ruby.hash_new();
     hash.aset(ruby.to_symbol("heading"), heading_text)?;
-    hash.aset(ruby.to_symbol("level"), toc::level_to_u8(boundary.level))?;
+    hash.aset(ruby.to_symbol("level"), toc::level_to_u8(level))?;
     if id.is_empty() {
         hash.aset(ruby.to_symbol("id"), ())?;
     } else {
@@ -228,12 +227,13 @@ fn build_section_hash(
     }
     hash.aset(ruby.to_symbol("breadcrumb"), breadcrumb_arr)?;
 
-    let content = match truncate_params {
+    let content = match content_opts.truncate_params {
         Some(params) => truncate::truncate_events(content_events, params),
         None => render_markdown(content_events),
     };
-    if with_counts {
-        let (chars, words) = count_post_truncate(content_events, truncate_params, &content);
+    if content_opts.with_counts {
+        let (chars, words) =
+            count_post_truncate(content_events, content_opts.truncate_params, &content);
         hash.aset(ruby.to_symbol("character_count"), chars)?;
         hash.aset(ruby.to_symbol("word_count"), words)?;
     }

data/ext/inkmark/src/document.rs

@@ -283,7 +283,7 @@ fn render_to_plain_text(source: &str, cm_opts: pulldown_cmark::Options, flags: F
     }
 
     let events = apply_filters(parser.collect(), &flags);
-    plain_text::write_plain_text(events.into_iter(), &mut buf);
+    plain_text::write_plain_text(events, &mut buf);
     buf
 }
 

data/ext/inkmark/src/emoji.rs

@@ -16,34 +16,23 @@ use pulldown_cmark::{CowStr, Event, Tag, TagEnd};
 /// Tracks code-block nesting depth so shortcodes inside fenced code blocks
 /// are preserved. Inline code (`Event::Code`) is passed through untouched
 /// because we only scan `Event::Text` events.
-pub fn replace(events: &mut Vec<Event<'_>>) {
+pub fn replace(events: &mut [Event<'_>]) {
     let mut code_depth: usize = 0;
 
-    for i in 0..events.len() {
-        match &events[i] {
+    for event in events.iter_mut() {
+        match event {
             Event::Start(Tag::CodeBlock(_)) => {
                 code_depth += 1;
-                continue;
             }
             Event::End(TagEnd::CodeBlock) => {
                 code_depth = code_depth.saturating_sub(1);
-                continue;
             }
-            Event::Text(_) if code_depth == 0 => {}
-            _ => continue,
-        }
-
-        // Take ownership of the text so we can feed it to `replace_shortcodes`
-        // and emit a new Text event with the result.
-        if let Event::Text(text) = std::mem::replace(&mut events[i], Event::SoftBreak) {
-            match replace_shortcodes(&text) {
-                Some(replaced) => {
-                    events[i] = Event::Text(CowStr::Boxed(replaced.into_boxed_str()));
-                }
-                None => {
-                    events[i] = Event::Text(text);
+            Event::Text(text) if code_depth == 0 => {
+                if let Some(replaced) = replace_shortcodes(text) {
+                    *text = CowStr::Boxed(replaced.into_boxed_str());
                 }
             }
+            _ => {}
         }
     }
 }

data/ext/inkmark/src/handler.rs

@@ -696,11 +696,7 @@ fn apply_mutations(node: &mut Node, event_obj: Value, _ruby: &Ruby) -> Result<()
     Ok(())
 }
 
-pub fn dispatch_handlers(
-    nodes: &mut Vec<Node>,
-    handlers: &RHash,
-    ruby: &Ruby,
-) -> Result<(), Error> {
+pub fn dispatch_handlers(nodes: &mut [Node], handlers: &RHash, ruby: &Ruby) -> Result<(), Error> {
     for node in nodes.iter_mut() {
         dispatch_handlers(&mut node.children, handlers, ruby)?;
 

data/ext/inkmark/src/stats.rs

@@ -16,9 +16,9 @@
 //! The collector is the single source of truth for the full-render path.
 //! Two independent Ruby-side knobs consume its output:
 //! - `statistics: true` => scalar counts and language
-//! detection (`to_statistics_hash`)
+//!   detection (`to_statistics_hash`)
 //! - `extract: {...}` => filtered arrays of structured
-//! records (`to_extracts_hash`)
+//!   records (`to_extracts_hash`)
 
 use std::ops::Range;
 
@@ -293,10 +293,8 @@ pub fn collect(events: &[(Event<'_>, Range<usize>)]) -> Stats {
                     }
                 }
             }
-            Event::SoftBreak | Event::HardBreak => {
-                if !in_code_block {
-                    text_buf.push(' ');
-                }
+            Event::SoftBreak | Event::HardBreak if !in_code_block => {
+                text_buf.push(' ');
             }
             _ => {}
         }

data/ext/inkmark/src/toc.rs

@@ -22,7 +22,7 @@ pub struct TocEntry {
 pub fn toc_to_markdown(entries: &[TocEntry], max_depth: Option<u8>) -> String {
     let filtered: Vec<&TocEntry> = entries
         .iter()
-        .filter(|e| max_depth.map_or(true, |max| level_to_u8(e.level) <= max))
+        .filter(|e| max_depth.is_none_or(|max| level_to_u8(e.level) <= max))
         .collect();
     if filtered.is_empty() {
         return String::new();
@@ -61,7 +61,7 @@ pub fn toc_to_markdown(entries: &[TocEntry], max_depth: Option<u8>) -> String {
 pub fn toc_to_html(entries: &[TocEntry], max_depth: Option<u8>) -> String {
     let filtered: Vec<&TocEntry> = entries
         .iter()
-        .filter(|e| max_depth.map_or(true, |max| level_to_u8(e.level) <= max))
+        .filter(|e| max_depth.is_none_or(|max| level_to_u8(e.level) <= max))
         .collect();
     if filtered.is_empty() {
         return String::new();

data/lib/inkmark/version.rb

@@ -2,5 +2,5 @@
 
 class Inkmark
   # Current gem version.
-  VERSION = "0.2.0"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inkmark
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Yaroslav Markin
@@ -113,14 +113,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.5
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.5
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -202,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.16
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Very fast, feature-packed, AI-first Markdown gem for Ruby.
 test_files: []