gitlab-glfm-markdown 0.0.42 → 0.0.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '05901fb48fae32f9bb573996251dd8d1af629dbea739b2fb8d3d01541b8fd13b'
-  data.tar.gz: 895c392cf75e43a585c80ca7611a1d7a8e4e1d9c248a5c249a5819d57e863e2c
+  metadata.gz: f236556687b3d729bf99f61ba5a52a27354e064584417318ab4d259d9646ba35
+  data.tar.gz: a66700301509b9ba291aca76d726f7129c32226350f2d281232d32d0b2c51ece
 SHA512:
-  metadata.gz: c13f49a35e8c78390bc8e77f5639b00c7f0f4347ca4a08af655384ebc562f3fdf1f32ea1b730b8f5498a5b3635bd186c4a2fe3893aaa17c3571df425d70a3409
-  data.tar.gz: 299b6575bfce5b79c475c3bb59fa36740b4d670eedd0b9de103cc5f8f1a1fbe3c8138db3d603239cc959f9e3bae39c4eeebc807baeb71298de7cdfc4a7262b41
+  metadata.gz: 9da0edd36ed0c3b9f503ccbbfa7a6193df3c4fe711f1bdfc6279a30896cff6ac01701d27c0ff9224e9782eddd1b4a47045a200e61e49fcc88e5acdb91036e5e4
+  data.tar.gz: bcb216c12079501fb0d9669fa71e04a5d81d28e09e40919dcd752cf23564f3906bf276863be1bd4fd51ec30aeb5f21d048002f6bce349e5f6ec8b4ee5cde5253

data/Cargo.lock

@@ -220,9 +220,9 @@ checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
 
 [[package]]
 name = "comrak"
-version = "0.53.0"
+version = "0.55.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9795cb30f4deefbf33488819707e0f9630535dd56208ec273c1b3f150196377a"
+checksum = "daa3d1ea6b01ce72405fa3f826768f51c7a44917527c89b37856ffdd17ee57e4"
 dependencies = [
  "caseless",
  "emojis",
@@ -328,7 +328,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
 name = "gitlab-glfm-markdown"
-version = "0.0.42"
+version = "0.0.43"
 dependencies = [
  "clap",
  "comrak",

data/README.md

@@ -4,7 +4,7 @@
 [![Latest Release](https://gitlab.com/gitlab-org/ruby/gems/gitlab-glfm-markdown/-/badges/release.svg)](https://gitlab.com/gitlab-org/ruby/gems/gitlab-glfm-markdown/-/releases)
 
 Implements GLFM (as used by GitLab) using the Rust-based Markdown parser
-[Comrak](https://github.com/kivikakk/comrak) (0.53.0), providing a Ruby interface.
+[Comrak](https://github.com/kivikakk/comrak) (0.55.0), providing a Ruby interface.
 
 This project is still in constant flux, so interfaces and functionality can change at any time.
 
@@ -57,6 +57,7 @@ GLFMMarkdown.to_html('# header', options: { sourcepos: true })
 | `hardbreaks`                  | Treat newlines as hard line breaks                                                                                                                                                |
 | `header_accessibility`        | Use new header/anchor combination in HTML output, per [!112](https://gitlab.com/gitlab-org/ruby/gems/gitlab-glfm-markdown/-/merge_requests/112). Requires `header_id_prefix` to be set. |
 | `header_id_prefix <PREFIX>`   | Enable the `header-id` extension, with the given ID prefix                                                                                                                        |
+| `header_id_prefix_in_href`    | Include `header_id_prefix` in the heading anchor's `href`. Requires `header_id_prefix` to be set.                                                                                 |
 | `header_slug_prefix <PREFIX>` | Prefix to prepend to heading anchor slugs. When set, slugs become `{header_slug_prefix}{anchorized_text}`. Requires `header_accessibility` to be set.                             |
 | `ignore_empty_links`          | Ignore empty links in input                                                                                                                                                       |
 | `ignore_setext`               | Ignore setext headings in input                                                                                                                                                   |
@@ -74,7 +75,6 @@ GLFMMarkdown.to_html('# header', options: { sourcepos: true })
 | `strikethrough`               | Enable the `strikethrough` extension                                                                                                                                              |
 | `superscript`                 | Enable the `superscript` extension                                                                                                                                                |
 | `table`                       | Enable the `table` extension                                                                                                                                                      |
-| `tagfilter`                   | Enable the `tagfilter` extension                                                                                                                                                  |
 | `tasklist_classes`            | Output classes on tasklist elements so that they can be styled with CSS                                                                                                           |
 | `tasklist_in_table`           | Enables parsing tasklist items within tables when they're the only content of a table cell                                                                                        |
 | `tasklist`                    | Enable the `tasklist` extension                                                                                                                                                   |

data/ext/gitlab_glfm_markdown/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "gitlab-glfm-markdown"
-version = "0.0.42"
+version = "0.0.43"
 edition = "2021"
 authors = ["digitalmoksha <bwalker@gitlab.com>", "Asherah Connor <aconnor@gitlab.com>"]
 description = "GitLab Flavored Markdown parser and formatter. 100% CommonMark-compatible."
@@ -15,7 +15,7 @@ required-features = ["cli"]
 
 [dependencies]
 clap = { version = "=4.4.18", optional = true, features = ["derive", "string"] }
-comrak = { version = "0.53.0", default-features = false, features = ["shortcodes"] }
+comrak = { version = "0.55.0", default-features = false, features = ["shortcodes"] }
 magnus = "0.8.2"
 rb-sys = { version = "0.9.124", default-features = false, features = ["stable-api-compiled-fallback"] }
 regex = "1.11.1"

data/ext/gitlab_glfm_markdown/src/formatter.rs

@@ -1,7 +1,7 @@
 use std::fmt::{self, Write};
 use std::sync::LazyLock;
 
-use comrak::html::{collect_text, format_node_default, render_sourcepos, ChildRendering, Context};
+use comrak::html::{format_node_default, render_sourcepos, ChildRendering, Context};
 use comrak::nodes::{
     ListType, NodeHeading, NodeLink, NodeList, NodeTaskItem, NodeValue, TableAlignment,
 };
@@ -487,7 +487,7 @@ fn render_heading(
         write!(context, "<h{}", nh.level)?;
 
         if let Some(ref prefix) = context.options.extension.header_id_prefix {
-            let text_content = collect_text(node);
+            let text_content = node.collect_text();
             let id = context.anchorizer.anchorize(&text_content);
             let id = if let Some(ref slug_prefix) = context.user.header_slug_prefix {
                 format!("{slug_prefix}{id}")
@@ -501,12 +501,17 @@ fn render_heading(
         render_sourcepos(context, node)?;
         context.write_str(">")?;
     } else {
-        if context.options.extension.header_id_prefix.is_some() {
+        if let Some(ref prefix) = context.options.extension.header_id_prefix {
+            let href_prefix = if context.options.extension.header_id_prefix_in_href {
+                prefix.clone()
+            } else {
+                String::new()
+            };
             let id = context.user.last_heading.take().unwrap();
-            let text_content = collect_text(node);
+            let text_content = node.collect_text();
             write!(
                 context,
-                r##"<a href="#{id}" aria-label="Link to heading '"##
+                r##"<a href="#{href_prefix}{id}" aria-label="Link to heading '"##
             )?;
             context.escape(&text_content)?;
             context.write_str(r#"'" data-heading-content=""#)?;

data/ext/gitlab_glfm_markdown/src/glfm.rs

@@ -30,6 +30,8 @@ pub struct RenderOptions {
     /// Requires `header_id_prefix` to generate heading anchors.
     pub header_accessibility: bool,
     pub header_id_prefix: Option<String>,
+    /// Include `header_id_prefix` in the heading anchor's `href`.
+    pub header_id_prefix_in_href: bool,
     /// Prefix to prepend to heading anchor slugs.
     /// When set, slugs become `{header_slug_prefix}{anchorized_text}`.
     /// Requires `header_accessibility` to be set.
@@ -57,7 +59,6 @@ pub struct RenderOptions {
     pub superscript: bool,
     // pub syntax_highlighting: String,
     pub table: bool,
-    pub tagfilter: bool,
     pub tasklist: bool,
     pub tasklist_classes: bool,
     pub tasklist_in_table: bool,
@@ -79,6 +80,7 @@ impl From<&RenderOptions> for comrak::Options<'_> {
         // comrak_options.extension.front_matter_delimiter = options.front_matter_delimiter;
         comrak_options.extension.greentext = options.greentext;
         comrak_options.extension.header_id_prefix = options.header_id_prefix.clone();
+        comrak_options.extension.header_id_prefix_in_href = options.header_id_prefix_in_href;
         comrak_options.extension.math_code = options.math_code;
         comrak_options.extension.math_dollars = options.math_dollars;
         comrak_options.extension.multiline_block_quotes = options.multiline_block_quotes;
@@ -88,7 +90,6 @@ impl From<&RenderOptions> for comrak::Options<'_> {
         comrak_options.extension.subscript = options.subscript;
         comrak_options.extension.superscript = options.superscript;
         comrak_options.extension.table = options.table;
-        comrak_options.extension.tagfilter = options.tagfilter;
         comrak_options.extension.tasklist = options.tasklist;
         comrak_options.extension.underline = options.underline;
         comrak_options.extension.wikilinks_title_after_pipe = options.wikilinks_title_after_pipe;

data/ext/gitlab_glfm_markdown/src/main.rs

@@ -93,6 +93,10 @@ struct Args {
     #[arg(long, value_name = "PREFIX")]
     header_id_prefix: Option<String>,
 
+    /// Include the header ID prefix in the heading anchor's href.
+    #[arg(long)]
+    header_id_prefix_in_href: bool,
+
     /// Prefix to prepend to heading anchor slugs.
     /// When set, slugs become `{header_slug_prefix}{anchorized_text}`.
     #[arg(long, value_name = "PREFIX")]
@@ -172,10 +176,6 @@ struct Args {
     #[arg(long)]
     table: bool,
 
-    /// Enable 'tagfilter' extension
-    #[arg(long)]
-    tagfilter: bool,
-
     /// Enable 'tasklist' extension
     #[arg(long)]
     tasklist: bool,
@@ -239,6 +239,7 @@ fn main() {
         hardbreaks: cli.hardbreaks,
         header_accessibility: cli.header_accessibility,
         header_id_prefix: cli.header_id_prefix,
+        header_id_prefix_in_href: cli.header_id_prefix_in_href,
         header_slug_prefix: cli.header_slug_prefix,
         ignore_empty_links: cli.ignore_empty_links,
         ignore_setext: cli.ignore_setext,
@@ -258,7 +259,6 @@ fn main() {
         superscript: cli.superscript,
         // syntax_highlighting:
         table: cli.table,
-        tagfilter: cli.tagfilter,
         tasklist: cli.tasklist,
         tasklist_classes: cli.tasklist_classes,
         tasklist_in_table: cli.tasklist_in_table,

data/lib/gitlab-glfm-markdown.rb

@@ -24,7 +24,6 @@ module GLFMMarkdown
     smart: false,
     strikethrough: true,
     table: true,
-    tagfilter: false,
     tasklist: true,
     tasklist_classes: true,
     unsafe: true
@@ -38,9 +37,6 @@ module GLFMMarkdown
 
       default_options = options[:glfm] ? GLFM_DEFAULT_OPTIONS : {}
 
-      # if you need to modify `options`, use `.merge` as `options` could be frozen
-      options = options.merge(unsafe: true) if options[:tagfilter]
-
       render_to_html_rs(markdown, default_options.merge(options))
     end
 

data/lib/gitlab_glfm_markdown/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GLFMMarkdown
-  VERSION = '0.0.42'
+  VERSION = '0.0.43'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-glfm-markdown
 version: !ruby/object:Gem::Version
-  version: 0.0.42
+  version: 0.0.43
 platform: ruby
 authors:
 - Brett Walker
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-07-08 00:00:00.000000000 Z
+date: 2026-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb_sys