commonmarker 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcfe5afe736de6389674b8f9dde0ce59c2ef47edad89941fbe484a041bc86897
-  data.tar.gz: 581c06aee0a9045226dfe92e5fedd1625b9d5c9f8ffdff373930c660426398b8
+  metadata.gz: be52deebe50e109769f29b7eab77a0d5c02974c1ce2b435e4ac73bc31afca368
+  data.tar.gz: 968471b3c0cca03f9594aaf3ffdc4971a47fe0baa6b4e1c734b8a03a83ef7c82
 SHA512:
-  metadata.gz: 966b17cd354ce4e7798b66eca2c73a6363db0a9a3091160614b29cd1b48e1647b4c2b2dd0583dc5ddddf18acd045a99f19ac7505c93132d68a5975aeaa81e716
-  data.tar.gz: 7b78bfd01e7b53840fe9cd700ca7421320ede39a2cc53ab0edf2cb3def80fe09c8a8bf23b322a8e775b3b45eae8f45496b5f46beedbb3d3e2dca1140f7e0c20a
+  metadata.gz: '0282620e926dd8a97d68444e239423e4c0bac4b90cf379afbebcaa8d372aca330525a36efcd96c15e621c3fb39a88921336c8e2f01e39ade06dad0e4a76ef10d'
+  data.tar.gz: d8e90f12bc9e9cf1ccb81ae814945cd991845657482bd3d81797aae275db424bd6f2811bc0389a79af1405a3b35ea8affe3ede16c00f005a2bc5024bc083a7a8

data/Cargo.lock

@@ -19,47 +19,48 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.13"
+version = "0.6.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb"
+checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"
 dependencies = [
  "anstyle",
  "anstyle-parse",
  "anstyle-query",
  "anstyle-wincon",
  "colorchoice",
+ "is_terminal_polyfill",
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle"
-version = "1.0.6"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
+checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
+checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
+checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5"
 dependencies = [
  "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.2"
+version = "3.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
+checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19"
 dependencies = [
  "anstyle",
  "windows-sys 0.52.0",
@@ -97,7 +98,7 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.60",
+ "syn",
 ]
 
 [[package]]
@@ -135,9 +136,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
 name = "cc"
-version = "1.0.96"
+version = "1.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "065a29261d53ba54260972629f9ca6bffa69bac13cd1fed61420f7fa68b9f8bd"
+checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f"
 
 [[package]]
 name = "cexpr"
@@ -184,7 +185,7 @@ dependencies = [
  "anstream",
  "anstyle",
  "clap_lex",
- "strsim 0.11.1",
+ "strsim",
  "terminal_size",
 ]
 
@@ -197,7 +198,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn",
 ]
 
 [[package]]
@@ -208,9 +209,9 @@ checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
 
 [[package]]
 name = "colorchoice"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
 
 [[package]]
 name = "commonmarker"
@@ -226,15 +227,14 @@ dependencies = [
 
 [[package]]
 name = "comrak"
-version = "0.23.0"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab5681b26a36dc46800a908f7d932672a4e82f74759419dd4018bf40658457d5"
+checksum = "5a972c8ec1be8065f7b597b5f7f5b3be535db780280644aebdcd1966decf58dc"
 dependencies = [
  "clap",
  "derive_builder",
  "emojis",
  "entities",
- "in-place",
  "memchr",
  "once_cell",
  "regex",
@@ -248,18 +248,18 @@ dependencies = [
 
 [[package]]
 name = "crc32fast"
-version = "1.4.0"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "darling"
-version = "0.14.4"
+version = "0.20.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850"
+checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1"
 dependencies = [
  "darling_core",
  "darling_macro",
@@ -267,27 +267,27 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.14.4"
+version = "0.20.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0"
+checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120"
 dependencies = [
  "fnv",
  "ident_case",
  "proc-macro2",
  "quote",
- "strsim 0.10.0",
- "syn 1.0.109",
+ "strsim",
+ "syn",
 ]
 
 [[package]]
 name = "darling_macro"
-version = "0.14.4"
+version = "0.20.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e"
+checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178"
 dependencies = [
  "darling_core",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
@@ -301,52 +301,52 @@ dependencies = [
 
 [[package]]
 name = "derive_builder"
-version = "0.12.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8"
+checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7"
 dependencies = [
  "derive_builder_macro",
 ]
 
 [[package]]
 name = "derive_builder_core"
-version = "0.12.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f"
+checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d"
 dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "derive_builder_macro"
-version = "0.12.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e"
+checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b"
 dependencies = [
  "derive_builder_core",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "deunicode"
-version = "1.4.4"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "322ef0094744e63628e6f0eb2295517f79276a5b342a4c2ff3042566ca181d4e"
+checksum = "339544cc9e2c4dc3fc7149fd630c5f22263a4fdf18a98afd0075784968b5cf00"
 
 [[package]]
 name = "either"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"
+checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
 
 [[package]]
 name = "emojis"
-version = "0.5.3"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3407bc749191827d456a282321770847daf4b0a1128fde02597a8ed2e987b95d"
+checksum = "9f619a926616ae7149a0d82610b051134a0d6c4ae2962d990c06c847a445c5d9"
 dependencies = [
  "phf",
 ]
@@ -365,9 +365,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -383,12 +383,6 @@ dependencies = [
  "regex",
 ]
 
-[[package]]
-name = "fastrand"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
-
 [[package]]
 name = "flate2"
 version = "1.0.30"
@@ -429,15 +423,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
-[[package]]
-name = "in-place"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cdb69f3adfd5f493210cece799f4620417bf9965bc1536c22ae0e29ba27a8c0"
-dependencies = [
- "tempfile",
-]
-
 [[package]]
 name = "indexmap"
 version = "2.2.6"
@@ -448,6 +433,12 @@ dependencies = [
  "hashbrown",
 ]
 
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
+
 [[package]]
 name = "itertools"
 version = "0.12.1"
@@ -477,9 +468,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.154"
+version = "0.2.155"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
 
 [[package]]
 name = "libloading"
@@ -505,9 +496,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.13"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
 [[package]]
 name = "log"
@@ -535,7 +526,7 @@ checksum = "5968c820e2960565f647819f5928a42d6e874551cab9d88d75e3e0660d7f71e3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn",
 ]
 
 [[package]]
@@ -552,9 +543,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
+checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae"
 dependencies = [
  "adler",
 ]
@@ -649,9 +640,9 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.81"
+version = "1.0.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba"
+checksum = "0b33eb56c327dec362a9e55b3ad14f9d2f0904fb5a5b03b513ab5465399e9f43"
 dependencies = [
  "unicode-ident",
 ]
@@ -695,7 +686,7 @@ dependencies = [
  "quote",
  "regex",
  "shell-words",
- "syn 2.0.60",
+ "syn",
 ]
 
 [[package]]
@@ -760,9 +751,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "same-file"
@@ -781,29 +772,29 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4"
 
 [[package]]
 name = "serde"
-version = "1.0.200"
+version = "1.0.202"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f"
+checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.200"
+version = "1.0.202"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb"
+checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.116"
+version = "1.0.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813"
+checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
 dependencies = [
  "itoa",
  "ryu",
@@ -838,12 +829,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
 [[package]]
 name = "strsim"
 version = "0.11.1"
@@ -852,20 +837,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.60"
+version = "2.0.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3"
+checksum = "d2863d96a84c6439701d7a38f9de935ec562c8832cc55d1dde0f513b52fad106"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -895,18 +869,6 @@ dependencies = [
  "yaml-rust",
 ]
 
-[[package]]
-name = "tempfile"
-version = "3.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
-dependencies = [
- "cfg-if",
- "fastrand",
- "rustix",
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "terminal_size"
 version = "0.3.0"
@@ -919,22 +881,22 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.59"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa"
+checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.59"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66"
+checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn",
 ]
 
 [[package]]
@@ -1023,7 +985,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn",
  "wasm-bindgen-shared",
 ]
 
@@ -1045,7 +1007,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.60",
+ "syn",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]

data/ext/commonmarker/Cargo.toml

@@ -10,7 +10,7 @@ magnus = { version = "0.6", features = ["rb-sys"] }
 rb-sys = { version = "*", default-features = false, features = [
     "stable-api-compiled-fallback",
 ] }
-comrak = { version = "0.23", features = ["shortcodes"] }
+comrak = { version = "0.24", features = ["shortcodes"] }
 syntect = { version = "5.2", features = ["plist-load"] }
 typed-arena = "2.0"
 rctree = "0.6"

data/ext/commonmarker/src/lib.rs

@@ -1,27 +1,15 @@
 extern crate core;
 
-use std::path::PathBuf;
-
-use ::syntect::highlighting::ThemeSet;
-use comrak::{
-    adapters::SyntaxHighlighterAdapter,
-    markdown_to_html, markdown_to_html_with_plugins, parse_document,
-    plugins::syntect::{SyntectAdapter, SyntectAdapterBuilder},
-    ComrakOptions, ComrakPlugins,
-};
-use magnus::{
-    define_module, exception, function, r_hash::ForEach, scan_args, Error, RHash, Symbol, Value,
-};
+use comrak::{markdown_to_html_with_plugins, parse_document, ComrakOptions};
+use magnus::{define_module, function, r_hash::ForEach, scan_args, Error, RHash, Symbol, Value};
 use node::CommonmarkerNode;
+use plugins::syntax_highlighting::construct_syntax_highlighter_from_plugin;
 
 mod options;
 use options::iterate_options_hash;
 
 mod plugins;
-use plugins::{
-    syntax_highlighting::{fetch_syntax_highlighter_path, fetch_syntax_highlighter_theme},
-    SYNTAX_HIGHLIGHTER_PLUGIN,
-};
+
 use typed_arena::Arena;
 
 mod node;
@@ -63,6 +51,32 @@ fn commonmark_to_html(args: &[Value]) -> Result<String, magnus::Error> {
     )?;
     let (rb_options, rb_plugins) = kwargs.optional;
 
+    let comrak_options = match format_options(rb_options) {
+        Ok(options) => options,
+        Err(err) => return Err(err),
+    };
+
+    let mut comrak_plugins = comrak::Plugins::default();
+
+    let syntect_adapter = match construct_syntax_highlighter_from_plugin(rb_plugins) {
+        Ok(Some(adapter)) => Some(adapter),
+        Ok(None) => None,
+        Err(err) => return Err(err),
+    };
+
+    match syntect_adapter {
+        Some(ref adapter) => comrak_plugins.render.codefence_syntax_highlighter = Some(adapter),
+        None => comrak_plugins.render.codefence_syntax_highlighter = None,
+    }
+
+    Ok(markdown_to_html_with_plugins(
+        &rb_commonmark,
+        &comrak_options,
+        &comrak_plugins,
+    ))
+}
+
+fn format_options(rb_options: Option<RHash>) -> Result<comrak::Options, magnus::Error> {
     let mut comrak_options = ComrakOptions::default();
 
     if let Some(rb_options) = rb_options {
@@ -72,101 +86,7 @@ fn commonmark_to_html(args: &[Value]) -> Result<String, magnus::Error> {
         })?;
     }
 
-    if let Some(rb_plugins) = rb_plugins {
-        let mut comrak_plugins = ComrakPlugins::default();
-
-        let syntax_highlighter: Option<&dyn SyntaxHighlighterAdapter>;
-        let adapter: SyntectAdapter;
-
-        let theme = match rb_plugins.get(Symbol::new(SYNTAX_HIGHLIGHTER_PLUGIN)) {
-            Some(syntax_highlighter_options) => {
-                match fetch_syntax_highlighter_theme(syntax_highlighter_options) {
-                    Ok(theme) => theme,
-                    Err(e) => {
-                        return Err(e);
-                    }
-                }
-            }
-            None => None, // no `syntax_highlighter:` defined
-        };
-
-        match theme {
-            None => syntax_highlighter = None,
-            Some(theme) => {
-                if theme.is_empty() {
-                    // no theme? uss css classes
-                    adapter = SyntectAdapter::new(None);
-                    syntax_highlighter = Some(&adapter);
-                } else {
-                    let path = match rb_plugins.get(Symbol::new(SYNTAX_HIGHLIGHTER_PLUGIN)) {
-                        Some(syntax_highlighter_options) => {
-                            fetch_syntax_highlighter_path(syntax_highlighter_options)?
-                        }
-                        None => PathBuf::from("".to_string()), // no `syntax_highlighter:` defined
-                    };
-
-                    if path.exists() {
-                        if !path.is_dir() {
-                            return Err(Error::new(
-                                exception::arg_error(),
-                                "`path` needs to be a directory",
-                            ));
-                        }
-
-                        let builder = SyntectAdapterBuilder::new();
-                        let mut ts = ThemeSet::load_defaults();
-
-                        match ts.add_from_folder(&path) {
-                            Ok(_) => {}
-                            Err(e) => {
-                                return Err(Error::new(
-                                    exception::arg_error(),
-                                    format!("failed to load theme set from path: {e}"),
-                                ));
-                            }
-                        }
-
-                        // check if the theme exists in the dir
-                        match ts.themes.get(&theme) {
-                            Some(theme) => theme,
-                            None => {
-                                return Err(Error::new(
-                                    exception::arg_error(),
-                                    format!("theme `{}` does not exist", theme),
-                                ));
-                            }
-                        };
-
-                        adapter = builder.theme_set(ts).theme(&theme).build();
-
-                        syntax_highlighter = Some(&adapter);
-                    } else {
-                        // no path? default theme lookup
-                        ThemeSet::load_defaults()
-                            .themes
-                            .get(&theme)
-                            .ok_or_else(|| {
-                                Error::new(
-                                    exception::arg_error(),
-                                    format!("theme `{}` does not exist", theme),
-                                )
-                            })?;
-                        adapter = SyntectAdapter::new(Some(&theme));
-                        syntax_highlighter = Some(&adapter);
-                    }
-                }
-            }
-        }
-        comrak_plugins.render.codefence_syntax_highlighter = syntax_highlighter;
-
-        Ok(markdown_to_html_with_plugins(
-            &rb_commonmark,
-            &comrak_options,
-            &comrak_plugins,
-        ))
-    } else {
-        Ok(markdown_to_html(&rb_commonmark, &comrak_options))
-    }
+    Ok(comrak_options)
 }
 
 #[magnus::init]

data/ext/commonmarker/src/node.rs

@@ -1,20 +1,20 @@
+use comrak::arena_tree::Node as ComrakNode;
 use comrak::nodes::{
     Ast as ComrakAst, AstNode as ComrakAstNode, ListDelimType, ListType, NodeCode, NodeCodeBlock,
     NodeDescriptionItem, NodeFootnoteDefinition, NodeFootnoteReference, NodeHeading, NodeHtmlBlock,
     NodeLink, NodeList, NodeMath, NodeMultilineBlockQuote, NodeShortCode, NodeTable,
-    NodeValue as ComrakNodeValue, TableAlignment,
+    NodeValue as ComrakNodeValue, NodeWikiLink, TableAlignment,
 };
-use comrak::{arena_tree::Node as ComrakNode, ComrakOptions};
 use magnus::RArray;
-use magnus::{
-    function, method, r_hash::ForEach, scan_args, Module, Object, RHash, RModule, Symbol, Value,
-};
+use magnus::{function, method, scan_args, Module, Object, RHash, RModule, Symbol, Value};
 use rctree::Node;
 use typed_arena::Arena;
 
 use std::cell::RefCell;
 
-use crate::options::iterate_options_hash;
+use crate::format_options;
+
+use crate::plugins::syntax_highlighting::construct_syntax_highlighter_from_plugin;
 
 #[derive(Debug, Clone)]
 #[magnus::wrap(class = "Commonmarker::Node::Ast", size, mark)]
@@ -453,6 +453,15 @@ impl CommonmarkerNode {
             }
 
             "escaped" => ComrakNodeValue::Escaped,
+
+            "wikilink" => {
+                let kwargs =
+                    scan_args::get_kwargs::<_, (String,), (), ()>(args.keywords, &["url"], &[])?;
+
+                let (url,) = kwargs.required;
+
+                ComrakNodeValue::WikiLink(NodeWikiLink { url })
+            }
             _ => panic!("unknown node type {}", node_type),
         };
 
@@ -539,6 +548,7 @@ impl CommonmarkerNode {
             ComrakNodeValue::MultilineBlockQuote(_) => Symbol::new("multiline_block_quote"),
             ComrakNodeValue::Escaped => Symbol::new("escaped"),
             ComrakNodeValue::Math(..) => Symbol::new("math"),
+            ComrakNodeValue::WikiLink(..) => Symbol::new("wikilink"),
         }
     }
 
@@ -895,15 +905,24 @@ impl CommonmarkerNode {
             &[],
             &["options", "plugins"],
         )?;
-        let (rb_options, _rb_plugins) = kwargs.optional;
+        let (rb_options, rb_plugins) = kwargs.optional;
 
-        let mut comrak_options = ComrakOptions::default();
+        let comrak_options = match format_options(rb_options) {
+            Ok(options) => options,
+            Err(err) => return Err(err),
+        };
+
+        let mut comrak_plugins = comrak::Plugins::default();
+
+        let syntect_adapter = match construct_syntax_highlighter_from_plugin(rb_plugins) {
+            Ok(Some(adapter)) => Some(adapter),
+            Ok(None) => None,
+            Err(err) => return Err(err),
+        };
 
-        if let Some(rb_options) = rb_options {
-            rb_options.foreach(|key: Symbol, value: RHash| {
-                iterate_options_hash(&mut comrak_options, key, value)?;
-                Ok(ForEach::Continue)
-            })?;
+        match syntect_adapter {
+            Some(ref adapter) => comrak_plugins.render.codefence_syntax_highlighter = Some(adapter),
+            None => comrak_plugins.render.codefence_syntax_highlighter = None,
         }
 
         let arena: Arena<ComrakAstNode> = Arena::new();
@@ -936,7 +955,12 @@ impl CommonmarkerNode {
         }
 
         let mut output = vec![];
-        match comrak::format_html(&comrak_root_node, &comrak_options, &mut output) {
+        match comrak::format_html_with_plugins(
+            &comrak_root_node,
+            &comrak_options,
+            &mut output,
+            &comrak_plugins,
+        ) {
             Ok(_) => {}
             Err(e) => {
                 return Err(magnus::Error::new(
@@ -963,15 +987,25 @@ impl CommonmarkerNode {
             &[],
             &["options", "plugins"],
         )?;
-        let (rb_options, _rb_plugins) = kwargs.optional;
+        let (rb_options, rb_plugins) = kwargs.optional;
 
-        let mut comrak_options = ComrakOptions::default();
+        let _comrak_options = format_options(rb_options);
+        let comrak_options = match format_options(rb_options) {
+            Ok(options) => options,
+            Err(err) => return Err(err),
+        };
+
+        let mut comrak_plugins = comrak::Plugins::default();
+
+        let syntect_adapter = match construct_syntax_highlighter_from_plugin(rb_plugins) {
+            Ok(Some(adapter)) => Some(adapter),
+            Ok(None) => None,
+            Err(err) => return Err(err),
+        };
 
-        if let Some(rb_options) = rb_options {
-            rb_options.foreach(|key: Symbol, value: RHash| {
-                iterate_options_hash(&mut comrak_options, key, value)?;
-                Ok(ForEach::Continue)
-            })?;
+        match syntect_adapter {
+            Some(ref adapter) => comrak_plugins.render.codefence_syntax_highlighter = Some(adapter),
+            None => comrak_plugins.render.codefence_syntax_highlighter = None,
         }
 
         let arena: Arena<ComrakAstNode> = Arena::new();
@@ -1004,7 +1038,12 @@ impl CommonmarkerNode {
         }
 
         let mut output = vec![];
-        match comrak::format_commonmark(&comrak_root_node, &comrak_options, &mut output) {
+        match comrak::format_commonmark_with_plugins(
+            &comrak_root_node,
+            &comrak_options,
+            &mut output,
+            &comrak_plugins,
+        ) {
             Ok(_) => {}
             Err(e) => {
                 return Err(magnus::Error::new(

data/ext/commonmarker/src/options.rs

@@ -86,6 +86,8 @@ const EXTENSION_SHORTCODES: &str = "shortcodes";
 const EXTENSION_MULTILINE_BLOCK_QUOTES: &str = "multiline_block_quotes";
 const EXTENSION_MATH_DOLLARS: &str = "math_dollars";
 const EXTENSION_MATH_CODE: &str = "math_code";
+const EXTENSION_WIKILINKS_TITLE_AFTER_PIPE: &str = "wikilinks_title_after_pipe";
+const EXTENSION_WIKILINKS_TITLE_BEFORE_PIPE: &str = "wikilinks_title_before_pipe";
 
 fn iterate_extension_options(comrak_options: &mut ComrakOptions, options_hash: RHash) {
     options_hash
@@ -138,6 +140,14 @@ fn iterate_extension_options(comrak_options: &mut ComrakOptions, options_hash: R
                 Ok(Cow::Borrowed(EXTENSION_MATH_CODE)) => {
                     comrak_options.extension.math_code = TryConvert::try_convert(value)?;
                 }
+                Ok(Cow::Borrowed(EXTENSION_WIKILINKS_TITLE_AFTER_PIPE)) => {
+                    comrak_options.extension.wikilinks_title_after_pipe =
+                        TryConvert::try_convert(value)?;
+                }
+                Ok(Cow::Borrowed(EXTENSION_WIKILINKS_TITLE_BEFORE_PIPE)) => {
+                    comrak_options.extension.wikilinks_title_before_pipe =
+                        TryConvert::try_convert(value)?;
+                }
                 _ => {}
             }
             Ok(ForEach::Continue)

data/ext/commonmarker/src/plugins/syntax_highlighting.rs

@@ -1,14 +1,106 @@
 use std::path::PathBuf;
 
+use comrak::plugins::syntect::{SyntectAdapter, SyntectAdapterBuilder};
+
 use magnus::value::ReprValue;
-use magnus::{RHash, Symbol, TryConvert, Value};
+use magnus::{exception, RHash, Symbol, TryConvert, Value};
+use syntect::highlighting::ThemeSet;
 
 use crate::EMPTY_STR;
 
-pub const SYNTAX_HIGHLIGHTER_PLUGIN_THEME_KEY: &str = "theme";
-pub const SYNTAX_HIGHLIGHTER_PLUGIN_PATH_KEY: &str = "path";
+pub fn construct_syntax_highlighter_from_plugin(
+    rb_plugins: Option<RHash>,
+) -> Result<Option<SyntectAdapter>, magnus::Error> {
+    match rb_plugins {
+        None => Ok(None),
+        Some(rb_plugins) => {
+            let theme = match rb_plugins.get(Symbol::new(super::SYNTAX_HIGHLIGHTER_PLUGIN)) {
+                Some(syntax_highlighter_options) => {
+                    match fetch_syntax_highlighter_theme(syntax_highlighter_options) {
+                        Ok(theme) => theme,
+                        Err(e) => {
+                            return Err(e);
+                        }
+                    }
+                }
+                None => None, // no `syntax_highlighter:` defined
+            };
+
+            let adapter: SyntectAdapter;
+
+            match theme {
+                None => Ok(None),
+                Some(theme) => {
+                    if theme.is_empty() {
+                        // no theme? uss css classes
+                        adapter = SyntectAdapter::new(None);
+                        Ok(Some(adapter))
+                    } else {
+                        let path =
+                            match rb_plugins.get(Symbol::new(super::SYNTAX_HIGHLIGHTER_PLUGIN)) {
+                                Some(syntax_highlighter_options) => {
+                                    fetch_syntax_highlighter_path(syntax_highlighter_options)?
+                                }
+                                None => PathBuf::from("".to_string()), // no `syntax_highlighter:` defined
+                            };
+
+                        if path.exists() {
+                            if !path.is_dir() {
+                                return Err(magnus::Error::new(
+                                    exception::arg_error(),
+                                    "`path` needs to be a directory",
+                                ));
+                            }
+
+                            let builder = SyntectAdapterBuilder::new();
+                            let mut ts = ThemeSet::load_defaults();
+
+                            match ts.add_from_folder(&path) {
+                                Ok(_) => {}
+                                Err(e) => {
+                                    return Err(magnus::Error::new(
+                                        exception::arg_error(),
+                                        format!("failed to load theme set from path: {e}"),
+                                    ));
+                                }
+                            }
+
+                            // check if the theme exists in the dir
+                            match ts.themes.get(&theme) {
+                                Some(theme) => theme,
+                                None => {
+                                    return Err(magnus::Error::new(
+                                        exception::arg_error(),
+                                        format!("theme `{}` does not exist", theme),
+                                    ));
+                                }
+                            };
+
+                            adapter = builder.theme_set(ts).theme(&theme).build();
+
+                            Ok(Some(adapter))
+                        } else {
+                            // no path? default theme lookup
+                            ThemeSet::load_defaults()
+                                .themes
+                                .get(&theme)
+                                .ok_or_else(|| {
+                                    magnus::Error::new(
+                                        exception::arg_error(),
+                                        format!("theme `{}` does not exist", theme),
+                                    )
+                                })?;
+                            adapter = SyntectAdapter::new(Some(&theme));
+                            Ok(Some(adapter))
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
 
-pub fn fetch_syntax_highlighter_theme(value: Value) -> Result<Option<String>, magnus::Error> {
+fn fetch_syntax_highlighter_theme(value: Value) -> Result<Option<String>, magnus::Error> {
     if value.is_nil() {
         // `syntax_highlighter: nil`
         return Ok(None);
@@ -29,7 +121,7 @@ pub fn fetch_syntax_highlighter_theme(value: Value) -> Result<Option<String>, ma
         ));
     }
 
-    let theme_key = Symbol::new(SYNTAX_HIGHLIGHTER_PLUGIN_THEME_KEY);
+    let theme_key = Symbol::new(super::SYNTAX_HIGHLIGHTER_PLUGIN_THEME_KEY);
 
     match syntax_highlighter_plugin.get(theme_key) {
         Some(theme) => {
@@ -48,14 +140,14 @@ pub fn fetch_syntax_highlighter_theme(value: Value) -> Result<Option<String>, ma
     }
 }
 
-pub fn fetch_syntax_highlighter_path(value: Value) -> Result<PathBuf, magnus::Error> {
+fn fetch_syntax_highlighter_path(value: Value) -> Result<PathBuf, magnus::Error> {
     if value.is_nil() {
         // `syntax_highlighter: nil`
         return Ok(PathBuf::from(EMPTY_STR));
     }
 
     let syntax_highlighter_plugin: RHash = TryConvert::try_convert(value)?;
-    let path_key = Symbol::new(SYNTAX_HIGHLIGHTER_PLUGIN_PATH_KEY);
+    let path_key = Symbol::new(super::SYNTAX_HIGHLIGHTER_PLUGIN_PATH_KEY);
 
     match syntax_highlighter_plugin.get(path_key) {
         Some(path) => {

data/ext/commonmarker/src/plugins.rs

@@ -1,3 +1,6 @@
 pub mod syntax_highlighting;
 
 pub const SYNTAX_HIGHLIGHTER_PLUGIN: &str = "syntax_highlighter";
+
+pub const SYNTAX_HIGHLIGHTER_PLUGIN_THEME_KEY: &str = "theme";
+pub const SYNTAX_HIGHLIGHTER_PLUGIN_PATH_KEY: &str = "path";

data/lib/commonmarker/config.rb

@@ -34,6 +34,8 @@ module Commonmarker
         multiline_block_quotes: false,
         math_dollars: false,
         math_code: false,
+        wikilinks_title_before_pipe: false,
+        wikilinks_title_after_pipe: false,
       },
       format: [:html].freeze,
     }.freeze

data/lib/commonmarker/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Commonmarker
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commonmarker
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Garen Torikian
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-05-15 00:00:00.000000000 Z
+date: 2024-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb_sys