gitlab-glfm-markdown 0.0.36 → 0.0.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc1e0287e40c108ef4e38a49187bfba38d53a49d027007ea2251547ea58cb627
-  data.tar.gz: 554e5694728f96700b4effbc238a842d93e8529b132c38c4e405c2c2136a16e4
+  metadata.gz: 1912c815b560bc967a5627e3d676a697a7bf3eec232168c6a8ba9cdc554eb300
+  data.tar.gz: 3b36fb9b1f40453638d3ce053354dd9b047103d4c1d2e7be91f3e47a5961702e
 SHA512:
-  metadata.gz: 454c53b72e893c091f58328ccc095b1fc5a347c76583cfdb867a85dbedf9ec6967458edc71828114771a274563eeadcea1b40e430cc3b883a7c39d585720d1db
-  data.tar.gz: 32ab7039e48e2565cc1a299ddd7132a1a698ebbd6cf079914aee5b53c96826093adfb895951f5b4a6cc9aa091d7ac02890ccca5002287e0f3cf57dc536919496
+  metadata.gz: 741e900eb21ba3f4035c4670febadfb7311b443f20b1cc1ccc6f5782b57158eb4a6fc623525a91c727cf4eafb0ac0ec004388efc4896ee6765c1591693dbb05b
+  data.tar.gz: '07567018fcd25a9448575f6cd2e164a9b4df7e0742c10e3d5c897d012765dfdf80ef5aed7a6b27b87f38f749ab94d2ce547e7345cd57381d1d59ae3dfc156560'

data/Cargo.lock

@@ -129,12 +129,6 @@ version = "2.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
 
-[[package]]
-name = "bumpalo"
-version = "3.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
-
 [[package]]
 name = "caseless"
 version = "0.2.2"
@@ -227,15 +221,14 @@ checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
 
 [[package]]
 name = "comrak"
-version = "0.43.0"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ccfd7678fba9aff54a74a70352d952b345e568823ed9d5a92ebc8ad0adad8ea"
+checksum = "dc151d9c800c4fadd542c949b84c1dae6d1b424315ebcfd154e611d4f7910a97"
 dependencies = [
  "caseless",
  "emojis",
  "entities",
- "memchr",
- "slug",
+ "jetscii",
  "syntect",
  "typed-arena",
  "unicode_categories",
@@ -259,12 +252,6 @@ dependencies = [
  "powerfmt",
 ]
 
-[[package]]
-name = "deunicode"
-version = "1.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abd57806937c9cc163efc8ea3910e00a62e2aeb0b8119f1793a978088f8f6b04"
-
 [[package]]
 name = "either"
 version = "1.15.0"
@@ -320,7 +307,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
 name = "glfm_markdown"
-version = "0.0.36"
+version = "0.0.38"
 dependencies = [
  "clap",
  "comrak",
@@ -381,6 +368,12 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
+[[package]]
+name = "jetscii"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47f142fe24a9c9944451e8349de0a56af5f3e7226dc46f3ed4d4ecc0b85af75e"
+
 [[package]]
 name = "lazy_static"
 version = "1.5.0"
@@ -415,17 +408,11 @@ version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
-[[package]]
-name = "log"
-version = "0.4.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
-
 [[package]]
 name = "magnus"
-version = "0.6.4"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1597ef40aa8c36be098249e82c9a20cf7199278ac1c1a1a995eeead6a184479"
+checksum = "3b36a5b126bbe97eb0d02d07acfeb327036c6319fd816139a49824a83b7f9012"
 dependencies = [
  "magnus-macros",
  "rb-sys",
@@ -435,9 +422,9 @@ dependencies = [
 
 [[package]]
 name = "magnus-macros"
-version = "0.6.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5968c820e2960565f647819f5928a42d6e874551cab9d88d75e3e0660d7f71e3"
+checksum = "47607461fd8e1513cb4f2076c197d8092d921a1ea75bd08af97398f593751892"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -587,18 +574,18 @@ dependencies = [
 
 [[package]]
 name = "rb-sys"
-version = "0.9.116"
+version = "0.9.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7059846f68396df83155779c75336ca24567741cb95256e6308c9fcc370e8dad"
+checksum = "f900d1ce4629a2ebffaf5de74bd8f9c1188d4c5ed406df02f97e22f77a006f44"
 dependencies = [
  "rb-sys-build",
 ]
 
 [[package]]
 name = "rb-sys-build"
-version = "0.9.116"
+version = "0.9.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac217510df41b9ffc041573e68d7a02aaff770c49943c7494441c4b224b0ecd0"
+checksum = "ef1e9c857028f631056bcd6d88cec390c751e343ce2223ddb26d23eb4a151d59"
 dependencies = [
  "bindgen",
  "lazy_static",
@@ -611,9 +598,9 @@ dependencies = [
 
 [[package]]
 name = "rb-sys-env"
-version = "0.1.2"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a35802679f07360454b418a5d1735c89716bde01d35b1560fc953c1415a0b3bb"
+checksum = "08f8d2924cf136a1315e2b4c7460a39f62ef11ee5d522df9b2750fab55b868b6"
 
 [[package]]
 name = "regex"
@@ -650,12 +637,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
-[[package]]
-name = "rustversion"
-version = "1.0.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d"
-
 [[package]]
 name = "ryu"
 version = "1.0.20"
@@ -711,9 +692,9 @@ dependencies = [
 
 [[package]]
 name = "serde_magnus"
-version = "0.8.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76c20da583b5e1016e9199ef5f3260f7a8d1b253307d232600f6b12737262dbd"
+checksum = "c4a5121544138e6a14036e48ecbe589fb63577f35620caaa32642257b412c317"
 dependencies = [
  "magnus",
  "serde",
@@ -738,16 +719,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
 
-[[package]]
-name = "slug"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "882a80f72ee45de3cc9a5afeb2da0331d58df69e4e7d8eeb5d3c7784ae67e724"
-dependencies = [
- "deunicode",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "strsim"
 version = "0.10.0"
@@ -903,64 +874,6 @@ dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
-dependencies = [
- "cfg-if",
- "once_cell",
- "rustversion",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
-dependencies = [
- "bumpalo",
- "log",
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
-dependencies = [
- "unicode-ident",
-]
-
 [[package]]
 name = "winapi-util"
 version = "0.1.9"

data/README.md

@@ -3,9 +3,8 @@
 [![Pipeline status](https://gitlab.com/gitlab-org/ruby/gems/gitlab-glfm-markdown/badges/main/pipeline.svg)](https://gitlab.com/gitlab-org/ruby/gems/gitlab-glfm-markdown/-/commits/main)
 [![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)
-and providing a Ruby interface.\
-_Currently using `comrak 0.43.0`_.
+Implements GLFM (as used by GitLab) using the Rust-based Markdown parser
+[Comrak](https://github.com/kivikakk/comrak) (0.46.0), providing a Ruby interface.
 
 This project is still in constant flux, so interfaces and functionality can change at any time.
 
@@ -37,6 +36,7 @@ GLFMMarkdown.to_html('# header', options: { sourcepos: true })
 | Option name                   | Description                                                                                                                                                                 |
 |-------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `autolink`                    | Enable the `autolink` extension                                                                                                                                             |
+| `cjk_friendly_emphasis`       | Enable the [`cjk_friendly_emphasis` extension](https://github.com/tats-u/markdown-cjk-friendly)                                                                             |
 | `description_lists`           | Enable the `description-lists` extension                                                                                                                                    |
 | `escape`                      | Escape raw HTML instead of clobbering it                                                                                                                                    |
 | `escape_char_spans`           | Wrap escaped characters in a `<span>` to allow any post-processing to recognize them                                                                                        |
@@ -57,7 +57,7 @@ GLFMMarkdown.to_html('# header', options: { sourcepos: true })
 | `multiline_block_quotes`      | Enable the `multiline-block-quotes` extension                                                                                                                               |
 | `default_html`                | Disables any custom HTML, and returns default HTML from `comrak`                                                                                                            |
 | `placeholder_detection`       | Detect placeholder variables in the format `%{placeholder}`                                                                                                                 |
-| `relaxed_autolinks`           | Enable relaxing of autolink parsing, allowing links to be recognized when in brackets                                                                                       |
+| `relaxed_autolinks`           | Enable relaxing of autolink parsing, allowing links to be recognized when in brackets, with any scheme, and with dot-less hostnames                                         |
 | `relaxed_tasklist_character`  | Enable relaxing which character is allowed in tasklists                                                                                                                     |
 | `sourcepos`                   | Include source mappings in HTML attributes                                                                                                                                  |
 | `smart`                       | Use smart punctuation                                                                                                                                                       |
@@ -111,4 +111,8 @@ published to [RubyGems](https://rubygems.org/gems/gitlab-glfm-markdown).
 
 Bug reports and merge requests are welcome on GitLab at https://gitlab.com/gitlab-org/ruby/gems/gitlab-glfm-markdown.
 
+Visit the [Community Contribute](https://about.gitlab.com/community/contribute/)
+page for general information about contributing to GitLab, and using the
+[community fork](https://gitlab.com/gitlab-community/gitlab-org/ruby/gems/gitlab-glfm-markdown).
+
 Please refer to [CONTRIBUTING](CONTRIBUTING.md) for more details.

data/ext/glfm_markdown/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "glfm_markdown"
-version = "0.0.36"
+version = "0.0.38"
 edition = "2021"
 authors = ["digitalmoksha <bwalker@gitlab.com>", "Asherah Connor <aconnor@gitlab.com>"]
 description = "GitLab Flavored Markdown parser and formatter. 100% CommonMark-compatible. Experimental."
@@ -15,12 +15,12 @@ required-features = ["cli"]
 
 [dependencies]
 clap = { version = "=4.4.18", optional = true, features = ["derive", "string"] }
-comrak = { version = "0.43.0", default-features = false, features = ["shortcodes"] }
-magnus = "0.6.2"
-rb-sys = { version = "0.9.86", default-features = false, features = ["stable-api-compiled-fallback"] }
+comrak = { version = "0.46.0", default-features = false, features = ["shortcodes"] }
+magnus = "0.8.2"
+rb-sys = { version = "0.9.117", default-features = false, features = ["stable-api-compiled-fallback"] }
 regex = "1.11.1"
 lazy_static = "1.5.0"
-serde_magnus = "0.8.1"
+serde_magnus = "0.10.0"
 serde = { version = "1.0.219", features = ["serde_derive"] }
 
 [features]

data/ext/glfm_markdown/src/formatter.rs

@@ -68,7 +68,7 @@ fn render_image<'a>(
         context.write_str("<img")?;
         html::render_sourcepos(context, node)?;
         context.write_str(" src=\"")?;
-        if context.options.render.unsafe_ || !html::dangerous_url(&nl.url) {
+        if context.options.render.r#unsafe || !html::dangerous_url(&nl.url) {
             if let Some(rewriter) = &context.options.extension.image_url_rewriter {
                 context.escape_href(&rewriter.to_html(&nl.url))?;
             } else {
@@ -130,7 +130,7 @@ fn render_link<'a>(
             context.write_str("<a")?;
             html::render_sourcepos(context, node)?;
             context.write_str(" href=\"")?;
-            if context.options.render.unsafe_ || !html::dangerous_url(&nl.url) {
+            if context.options.render.r#unsafe || !html::dangerous_url(&nl.url) {
                 if let Some(rewriter) = &context.options.extension.link_url_rewriter {
                     context.escape_href(&rewriter.to_html(&nl.url))?;
                 } else {

data/ext/glfm_markdown/src/glfm.rs

@@ -1,4 +1,5 @@
-use comrak::{parse_document, Arena, Plugins};
+use comrak::options::Plugins;
+use comrak::{parse_document, Arena};
 use serde::Deserialize;
 
 use crate::formatter::{CustomFormatter, RenderUserData};
@@ -8,6 +9,7 @@ use crate::formatter::{CustomFormatter, RenderUserData};
 pub struct RenderOptions {
     pub alerts: bool,
     pub autolink: bool,
+    pub cjk_friendly_emphasis: bool,
     // pub default_info_string: String,
     pub description_lists: bool,
     pub escape: bool,
@@ -82,6 +84,7 @@ impl From<&RenderOptions> for comrak::Options<'_> {
 
         comrak_options.extension.alerts = options.alerts;
         comrak_options.extension.autolink = options.autolink;
+        comrak_options.extension.cjk_friendly_emphasis = options.cjk_friendly_emphasis;
         comrak_options.extension.description_lists = options.description_lists;
         comrak_options.extension.footnotes = options.footnotes;
         // comrak_options.extension.front_matter_delimiter = options.front_matter_delimiter;
@@ -110,24 +113,24 @@ impl From<&RenderOptions> for comrak::Options<'_> {
         comrak_options.render.github_pre_lang = options.github_pre_lang;
         comrak_options.render.hardbreaks = options.hardbreaks;
         comrak_options.render.ignore_empty_links = options.ignore_empty_links;
-        comrak_options.render.ignore_setext = options.ignore_setext;
         comrak_options.render.sourcepos = options.sourcepos;
         comrak_options.render.tasklist_classes = options.tasklist_classes;
         // comrak_options.render.syntax_highlighting = options.syntax_highlighting;
 
-        comrak_options.render.unsafe_ = options.r#unsafe;
+        comrak_options.render.r#unsafe = options.r#unsafe;
 
         // comrak_options.parse.default_info_string = options.default_info_string;
         comrak_options.parse.relaxed_autolinks = options.relaxed_autolinks;
         comrak_options.parse.relaxed_tasklist_matching = options.relaxed_tasklist_character;
         comrak_options.parse.smart = options.smart;
+        comrak_options.parse.ignore_setext = options.ignore_setext;
 
         comrak_options
     }
 }
 
 pub fn render(text: &str, options: &RenderOptions) -> String {
-    render_with_plugins(text, options, &comrak::Plugins::default())
+    render_with_plugins(text, options, &Plugins::default())
 }
 
 fn render_with_plugins(text: &str, render_options: &RenderOptions, plugins: &Plugins) -> String {

data/ext/glfm_markdown/src/lib.rs

@@ -1,13 +1,13 @@
 use comrak::{escape_commonmark_inline, escape_commonmark_link_destination};
-use magnus::{define_module, function, prelude::*, Error, RHash, RString};
+use magnus::{function, prelude::*, Error, RHash, RString, Ruby};
 use serde_magnus::deserialize;
 
 mod formatter;
 mod glfm;
 use glfm::{render, RenderOptions};
 
-pub fn render_to_html_rs(text: RString, options: RHash) -> Result<String, Error> {
-    let render_options: RenderOptions = deserialize(options)?;
+pub fn render_to_html_rs(ruby: &Ruby, text: RString, options: RHash) -> Result<String, Error> {
+    let render_options: RenderOptions = deserialize(ruby, options)?;
 
     // SAFETY: `RString::as_str` returns a reference directly to Ruby memory.
     // We do not hold onto or save the `&str`, or otherwise permit Ruby to GC or
@@ -35,8 +35,8 @@ pub fn escape_commonmark_link_destination_rs(text: RString) -> Result<String, Er
 }
 
 #[magnus::init]
-fn init() -> Result<(), Error> {
-    let module = define_module("GLFMMarkdown")?;
+fn init(ruby: &Ruby) -> Result<(), Error> {
+    let module = ruby.define_module("GLFMMarkdown")?;
 
     module.define_singleton_method("render_to_html_rs", function!(render_to_html_rs, 2))?;
     module.define_singleton_method(

data/ext/glfm_markdown/src/main.rs

@@ -157,8 +157,8 @@ struct Args {
     underline: bool,
 
     /// Allow raw HTML and dangerous URLs
-    #[arg(long = "unsafe")]
-    unsafe_: bool,
+    #[arg(long)]
+    r#unsafe: bool,
 
     /// Enable 'wikilink_title_after_pipe' extension
     #[arg(long)]
@@ -188,6 +188,10 @@ struct Args {
     #[arg(long)]
     only_escape_chars: Option<String>,
 
+    /// Enable 'cjk_friendly_emphasis' extension
+    #[arg(long)]
+    cjk_friendly_emphasis: bool,
+
     /// Show debug information
     #[arg(long)]
     debug: bool,
@@ -210,6 +214,7 @@ fn main() {
     let options = RenderOptions {
         alerts: cli.alerts,
         autolink: cli.autolink,
+        cjk_friendly_emphasis: cli.cjk_friendly_emphasis,
         // default_info_string:
         description_lists: cli.description_lists,
         escape: cli.escape,
@@ -244,7 +249,7 @@ fn main() {
         tasklist: cli.tasklist,
         tasklist_classes: cli.tasklist_classes,
         underline: cli.underline,
-        r#unsafe: cli.unsafe_,
+        r#unsafe: cli.r#unsafe,
         wikilinks_title_after_pipe: cli.wikilinks_title_after_pipe,
         wikilinks_title_before_pipe: cli.wikilinks_title_before_pipe,
 

data/lib/glfm_markdown/version.rb

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

data/lib/glfm_markdown.rb

@@ -8,6 +8,7 @@ load_rust_extension
 module GLFMMarkdown
   GLFM_DEFAULT_OPTIONS = {
     autolink: true,
+    cjk_friendly_emphasis: true,
     escaped_char_spans: false,
     footnotes: true,
     full_info_string: true,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-glfm-markdown
 version: !ruby/object:Gem::Version
-  version: 0.0.36
+  version: 0.0.38
 platform: ruby
 authors:
 - Brett Walker
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-02 00:00:00.000000000 Z
+date: 2025-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb_sys