gitlab-glfm-markdown 0.0.11 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 272cab19bb613dc9e690ecc097aae89f3e95510c9ae3d6bbdf5a32061f51d6ab
-  data.tar.gz: b9b355778818f6b876803b47f2aafdcc0fb92f87214cdeb2f82e15e66ecea0c8
+  metadata.gz: 7ad74064b065f555fa6117f07ff344443187bc3457e6b545d8bf7736fcfc30d2
+  data.tar.gz: 544f6cc0bd0f3e1a023dea69899e511c0c37641a8cd75bced9b0ec4199e7f67f
 SHA512:
-  metadata.gz: 87e2152cd644426c847030d239b6925586c283bc3dbf13232c032318a41dd75e3a77380e96ec428ee442fd7fb562e73672d6c395e7bc91ef1b784003b7c85147
-  data.tar.gz: 26cdf5a061049470297a73e9b2c6c89998ffdb313a76033850cc506597bba5c4c88a1b6945aff72e2f4b614d14865ffa1ead1e0d5bc0a5a30c0e388d3de3ae25
+  metadata.gz: 5c26576dd663207055b1097e0f46d21be2701d227900b0a8e011e8e30fd700bc7c69ab24d24a92f9bd71f163a7f76a4fefacb622f5db1464a54692e15755de9a
+  data.tar.gz: 331f58687c3b2feb1210147add887a607f3ffd5635a1773c91bab4b5fc12c57bbc71aaf2d5c47d2733e36cf8e3343dd0b7ed85eca9df0d12d0076b7b8d8f53f5

data/Cargo.lock

@@ -216,9 +216,9 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
 
 [[package]]
 name = "comrak"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f18e72341e6cdc7489cffb76f993812a14a906db54dedb020044ccc211dcaae"
+checksum = "6751998a48e2327773c95f6f8e03c6e77c0156ce539d74c17d2199ff3d05e197"
 dependencies = [
  "derive_builder",
  "entities",
@@ -361,7 +361,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
 name = "glfm_markdown"
-version = "0.0.11"
+version = "0.0.13"
 dependencies = [
  "clap",
  "comrak",

data/ext/glfm_markdown/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "glfm_markdown"
-version = "0.0.11"
+version = "0.0.13"
 edition = "2021"
 authors = ["digitalmoksha <bwalker@gitlab.com>"]
 description = "GitLab Flavored Markdown parser and formatter. 100% CommonMark-compatible. Experimental."
@@ -15,7 +15,7 @@ required-features = ["cli"]
 
 [dependencies]
 clap = { version = "4.0", optional = true, features = ["derive", "string"] }
-comrak = { version = "0.20.0", default-features = false }
+comrak = { version = "0.21.0", default-features = false }
 magnus = "0.6.2"
 rb-sys = { version = "0.9.86", default-features = false, features = ["stable-api-compiled-fallback"] }
 

data/ext/glfm_markdown/src/glfm.rs

@@ -7,6 +7,8 @@ pub struct RenderOptions {
     pub full_info_string: bool,
     pub github_pre_lang: bool,
     pub hardbreaks: bool,
+    pub header_ids: Option<String>,
+    pub multiline_block_quotes: bool,
     pub relaxed_autolinks: bool,
     pub relaxed_tasklist_character: bool,
     pub sourcepos: bool,
@@ -31,6 +33,8 @@ fn render_comrak(text: String, options: RenderOptions) -> String {
     comrak_options.extension.autolink = options.autolink;
     comrak_options.extension.description_lists = options.description_lists;
     comrak_options.extension.footnotes = options.footnotes;
+    comrak_options.extension.header_ids = options.header_ids;
+    comrak_options.extension.multiline_block_quotes = options.multiline_block_quotes;
     comrak_options.extension.strikethrough = options.strikethrough;
     comrak_options.extension.superscript = options.superscript;
     comrak_options.extension.table = options.table;

data/ext/glfm_markdown/src/lib.rs

@@ -5,30 +5,36 @@ use glfm::{render, RenderOptions};
 
 /// Lookup symbol in provided `RHash`. Returns `false` if the key is not present
 /// or value cannot be converted to a boolean.
-fn get_opt(arg: &str, options: RHash) -> bool {
+fn get_bool_opt(arg: &str, options: RHash) -> bool {
     options.lookup(Symbol::new(arg)).unwrap_or_default()
 }
 
+fn get_string_opt(arg: &str, options: RHash) -> Option<String> {
+    options.lookup(Symbol::new(arg)).ok()
+}
+
 pub fn render_to_html_rs(text: String, options: RHash) -> String {
     let render_options = RenderOptions {
-        autolink: get_opt("autolink", options),
-        description_lists: get_opt("description_lists", options),
-        escape: get_opt("escape", options),
-        footnotes: get_opt("footnotes", options),
-        full_info_string: get_opt("full_info_string", options),
-        github_pre_lang: get_opt("github_pre_lang", options),
-        hardbreaks: get_opt("hardbreaks", options),
-        relaxed_autolinks: get_opt("relaxed_autolinks", options),
-        relaxed_tasklist_character: get_opt("relaxed_tasklist_character", options),
-        sourcepos: get_opt("sourcepos", options),
-        smart: get_opt("smart", options),
-        strikethrough: get_opt("strikethrough", options),
-        superscript: get_opt("superscript", options),
-        table: get_opt("table", options),
-        tagfilter: get_opt("tagfilter", options),
-        tasklist: get_opt("tasklist", options),
-        unsafe_: get_opt("unsafe", options),
-        debug: get_opt("debug", options),
+        autolink: get_bool_opt("autolink", options),
+        description_lists: get_bool_opt("description_lists", options),
+        escape: get_bool_opt("escape", options),
+        footnotes: get_bool_opt("footnotes", options),
+        full_info_string: get_bool_opt("full_info_string", options),
+        header_ids: get_string_opt("header_ids", options),
+        github_pre_lang: get_bool_opt("github_pre_lang", options),
+        hardbreaks: get_bool_opt("hardbreaks", options),
+        multiline_block_quotes: get_bool_opt("multiline_block_quotes", options),
+        relaxed_autolinks: get_bool_opt("relaxed_autolinks", options),
+        relaxed_tasklist_character: get_bool_opt("relaxed_tasklist_character", options),
+        sourcepos: get_bool_opt("sourcepos", options),
+        smart: get_bool_opt("smart", options),
+        strikethrough: get_bool_opt("strikethrough", options),
+        superscript: get_bool_opt("superscript", options),
+        table: get_bool_opt("table", options),
+        tagfilter: get_bool_opt("tagfilter", options),
+        tasklist: get_bool_opt("tasklist", options),
+        unsafe_: get_bool_opt("unsafe", options),
+        debug: get_bool_opt("debug", options),
     };
 
     render(text, render_options)

data/lib/glfm_markdown/version.rb

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

data/lib/glfm_markdown.rb

@@ -5,25 +5,26 @@ require_relative 'glfm_markdown/loader'
 
 load_rust_extension
 
-GLFM_DEFAULT_OPTIONS = {
-  autolink: true,
-  footnotes: true,
-  full_info_string: true,
-  github_pre_lang: false,
-  hardbreaks: false,
-  relaxed_autolinks: false,
-  sourcepos: true,
-  smart: false,
-  strikethrough: true,
-  table: true,
-  tagfilter: false,
-  tasklist: true,
-  unsafe: true,
+module GLFMMarkdown
+  GLFM_DEFAULT_OPTIONS = {
+    autolink: true,
+    footnotes: true,
+    full_info_string: true,
+    github_pre_lang: false,
+    hardbreaks: false,
+    multiline_block_quotes: true,
+    relaxed_autolinks: false,
+    sourcepos: true,
+    smart: false,
+    strikethrough: true,
+    table: true,
+    tagfilter: false,
+    tasklist: true,
+    unsafe: true,
 
-  debug: false
-}.freeze
+    debug: false
+  }.freeze
 
-module GLFMMarkdown
   class << self
     def to_html(markdown, options: {})
       raise TypeError, 'markdown must be a String' unless markdown.is_a?(String)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-glfm-markdown
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.13
 platform: ruby
 authors:
 - Brett Walker
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-19 00:00:00.000000000 Z
+date: 2024-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb_sys