commonmarker 1.0.0.pre → 1.0.0.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85a99af1031da784a9618bc20f6cca8fae6a0e30418bab8b28321d284e2f0186
-  data.tar.gz: 0cc0fd0f0efe60f8c09ab8dd4fd8b242797e290842690f83291306765e08929a
+  metadata.gz: 50518c47228bb2c8fa7316a72874bd80441a7461e6763e7c267138a958b8f5bd
+  data.tar.gz: 20df9a9139bef07fbd0748c5b0ceeee9217c61ba521dca4aca9e7e71a5ba9ed7
 SHA512:
-  metadata.gz: f8156096352b9519ce2e8dd1e2154152e2c3963ba6c3b4268cdbfea5314da6500eaf974613a1e1d5b9463ab256ca44fe17d165ce3a987288791ac0dffebc6287
-  data.tar.gz: 8ded44525de5d687f2488a60d6e7ba7fd2226ba973de9c6de5d9032b3b51bf49f249b0e0adf9685b2cea621326d2d41cf119426dd6fbded03dda3811ea7c5c03
+  metadata.gz: 1c64b798bbfb45a53c70e2a07f7a5bd279ff49ebb7518d62d404af71c3d46a1a6f929f33f03b0bf4819bb28a5d7df83962626ca5cef431e07ba4a8d8dea08ef0
+  data.tar.gz: 5d5dbae1cb19fcafbdf9f83ae263ea60bcb0ad59adc2802b52c80af676b755900f875a6cf217f81e9124e519ae45d7b07f4e07e7dcba2cfdd5d64c3957fac846

data/ext/commonmarker/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2021"
 
 [dependencies]
 magnus = { git = "https://github.com/gjtorikian/magnus", branch = "main" } # waiting for release with full rb-sys backend
-comrak = "0.14.0"
+comrak = "0.15.0"
 
 [lib]
 name = "commonmarker"

data/ext/commonmarker/src/comrak_options.rs

@@ -1,90 +1,111 @@
+use std::borrow::Cow;
+
 use comrak::ComrakOptions;
 
 use magnus::{class, r_hash::ForEach, Error, RHash, Symbol, Value};
 
+const PARSE_SMART: &str = "smart";
+const PARSE_DEFAULT_INFO_STRING: &str = "default_info_string";
+
 fn iterate_parse_options(comrak_options: &mut ComrakOptions, options_hash: RHash) {
-    options_hash.foreach(|key: Symbol, value: Value| {
-        if key.name().unwrap() == "smart" {
-            comrak_options.parse.smart = value.try_convert::<bool>()?;
-        }
-        if key.name().unwrap() == "default_info_string" {
-            comrak_options.parse.default_info_string = Some(value.try_convert::<String>().unwrap());
-        }
-        Ok(ForEach::Continue)
-    });
+    options_hash
+        .foreach(|key: Symbol, value: Value| {
+            match key.name() {
+                Ok(Cow::Borrowed(PARSE_SMART)) => {
+                    comrak_options.parse.smart = value.try_convert::<bool>()?;
+                }
+                Ok(Cow::Borrowed(PARSE_DEFAULT_INFO_STRING)) => {
+                    comrak_options.parse.default_info_string = try_convert_string(value);
+                }
+                _ => {}
+            }
+            Ok(ForEach::Continue)
+        })
+        .unwrap();
 }
 
-fn iterate_render_options(comrak_options: &mut ComrakOptions, options_hash: RHash) {
-    options_hash.foreach(|key: Symbol, value: Value| {
-        if key.name().unwrap() == "hardbreaks" {
-            comrak_options.render.hardbreaks = value.try_convert::<bool>()?;
-        }
-
-        if key.name().unwrap() == "github_pre_lang" {
-            comrak_options.render.github_pre_lang = value.try_convert::<bool>()?;
-        }
-
-        if key.name().unwrap() == "width" {
-            comrak_options.render.width = value.try_convert::<usize>()?;
-        }
-
-        if key.name().unwrap() == "unsafe_" {
-            comrak_options.render.unsafe_ = value.try_convert::<bool>()?;
-        }
+const RENDER_HARDBREAKS: &str = "hardbreaks";
+const RENDER_GITHUB_PRE_LANG: &str = "github_pre_lang";
+const RENDER_WIDTH: &str = "width";
+const RENDER_UNSAFE: &str = "unsafe_";
+const RENDER_ESCAPE: &str = "escape";
 
-        if key.name().unwrap() == "escape" {
-            comrak_options.render.escape = value.try_convert::<bool>()?;
-        }
-
-        Ok(ForEach::Continue)
-    });
+fn iterate_render_options(comrak_options: &mut ComrakOptions, options_hash: RHash) {
+    options_hash
+        .foreach(|key: Symbol, value: Value| {
+            match key.name() {
+                Ok(Cow::Borrowed(RENDER_HARDBREAKS)) => {
+                    comrak_options.render.hardbreaks = value.try_convert::<bool>()?;
+                }
+                Ok(Cow::Borrowed(RENDER_GITHUB_PRE_LANG)) => {
+                    comrak_options.render.github_pre_lang = value.try_convert::<bool>()?;
+                }
+                Ok(Cow::Borrowed(RENDER_WIDTH)) => {
+                    comrak_options.render.width = value.try_convert::<usize>()?;
+                }
+                Ok(Cow::Borrowed(RENDER_UNSAFE)) => {
+                    comrak_options.render.unsafe_ = value.try_convert::<bool>()?;
+                }
+                Ok(Cow::Borrowed(RENDER_ESCAPE)) => {
+                    comrak_options.render.escape = value.try_convert::<bool>()?;
+                }
+                _ => {}
+            }
+            Ok(ForEach::Continue)
+        })
+        .unwrap();
 }
 
-fn iterate_extension_options(comrak_options: &mut ComrakOptions, options_hash: RHash) {
-    options_hash.foreach(|key: Symbol, value: Value| {
-        if key.name().unwrap() == "strikethrough" {
-            comrak_options.extension.strikethrough = value.try_convert::<bool>()?;
-        }
-
-        if key.name().unwrap() == "tagfilter" {
-            comrak_options.extension.tagfilter = value.try_convert::<bool>()?;
-        }
-
-        if key.name().unwrap() == "table" {
-            comrak_options.extension.table = value.try_convert::<bool>()?;
-        }
+const EXTENSION_STRIKETHROUGH: &str = "strikethrough";
+const EXTENSION_TAGFILTER: &str = "tagfilter";
+const EXTENSION_TABLE: &str = "table";
+const EXTENSION_AUTOLINK: &str = "autolink";
+const EXTENSION_TASKLIST: &str = "tasklist";
+const EXTENSION_SUPERSCRIPT: &str = "superscript";
+const EXTENSION_HEADER_IDS: &str = "header_ids";
+const EXTENSION_FOOTNOTES: &str = "footnotes";
+const EXTENSION_DESCRIPTION_LISTS: &str = "description_lists";
+const EXTENSION_FRONT_MATTER_DELIMITER: &str = "front_matter_delimiter";
 
-        if key.name().unwrap() == "autolink" {
-            comrak_options.extension.autolink = value.try_convert::<bool>()?;
-        }
-
-        if key.name().unwrap() == "tasklist" {
-            comrak_options.extension.tasklist = value.try_convert::<bool>()?;
-        }
-
-        if key.name().unwrap() == "superscript" {
-            comrak_options.extension.superscript = value.try_convert::<bool>()?;
-        }
-
-        if key.name().unwrap() == "header_ids" {
-            comrak_options.extension.header_ids = Some(value.try_convert::<String>().unwrap());
-        }
-
-        if key.name().unwrap() == "footnotes" {
-            comrak_options.extension.footnotes = value.try_convert::<bool>()?;
-        }
-
-        if key.name().unwrap() == "description_lists" {
-            comrak_options.extension.description_lists = value.try_convert::<bool>()?;
-        }
-
-        if key.name().unwrap() == "front_matter_delimiter" {
-            comrak_options.extension.front_matter_delimiter =
-                Some(value.try_convert::<String>().unwrap());
-        }
-
-        Ok(ForEach::Continue)
-    });
+fn iterate_extension_options(comrak_options: &mut ComrakOptions, options_hash: RHash) {
+    options_hash
+        .foreach(|key: Symbol, value: Value| {
+            match key.name() {
+                Ok(Cow::Borrowed(EXTENSION_STRIKETHROUGH)) => {
+                    comrak_options.extension.strikethrough = value.try_convert::<bool>()?;
+                }
+                Ok(Cow::Borrowed(EXTENSION_TAGFILTER)) => {
+                    comrak_options.extension.tagfilter = value.try_convert::<bool>()?;
+                }
+                Ok(Cow::Borrowed(EXTENSION_TABLE)) => {
+                    comrak_options.extension.table = value.try_convert::<bool>()?;
+                }
+                Ok(Cow::Borrowed(EXTENSION_AUTOLINK)) => {
+                    comrak_options.extension.autolink = value.try_convert::<bool>()?;
+                }
+                Ok(Cow::Borrowed(EXTENSION_TASKLIST)) => {
+                    comrak_options.extension.tasklist = value.try_convert::<bool>()?;
+                }
+                Ok(Cow::Borrowed(EXTENSION_SUPERSCRIPT)) => {
+                    comrak_options.extension.superscript = value.try_convert::<bool>()?;
+                }
+                Ok(Cow::Borrowed(EXTENSION_HEADER_IDS)) => {
+                    comrak_options.extension.header_ids = try_convert_string(value);
+                }
+                Ok(Cow::Borrowed(EXTENSION_FOOTNOTES)) => {
+                    comrak_options.extension.footnotes = value.try_convert::<bool>()?;
+                }
+                Ok(Cow::Borrowed(EXTENSION_DESCRIPTION_LISTS)) => {
+                    comrak_options.extension.description_lists = value.try_convert::<bool>()?;
+                }
+                Ok(Cow::Borrowed(EXTENSION_FRONT_MATTER_DELIMITER)) => {
+                    comrak_options.extension.front_matter_delimiter = try_convert_string(value);
+                }
+                _ => {}
+            }
+            Ok(ForEach::Continue)
+        })
+        .unwrap();
 }
 
 pub fn iterate_options_hash(
@@ -105,3 +126,11 @@ pub fn iterate_options_hash(
     }
     Ok(ForEach::Continue)
 }
+
+fn try_convert_string(value: Value) -> Option<String> {
+    if value.is_kind_of(class::string()) {
+        Some(value.try_convert::<String>().unwrap())
+    } else {
+        None
+    }
+}

data/ext/commonmarker/src/lib.rs

@@ -9,10 +9,12 @@ use comrak_options::iterate_options_hash;
 fn commonmark_to_html(rb_commonmark: String, rb_options: magnus::RHash) -> String {
     let mut comrak_options = ComrakOptions::default();
 
-    rb_options.foreach(|key: Symbol, value: RHash| {
-        iterate_options_hash(&mut comrak_options, key, value);
-        Ok(ForEach::Continue)
-    });
+    rb_options
+        .foreach(|key: Symbol, value: RHash| {
+            iterate_options_hash(&mut comrak_options, key, value).unwrap();
+            Ok(ForEach::Continue)
+        })
+        .unwrap();
 
     markdown_to_html(&rb_commonmark, &comrak_options)
 }

data/lib/commonmarker/config.rb

@@ -26,7 +26,7 @@ module Commonmarker
         header_ids: "",
         footnotes: false,
         description_lists: false,
-        front_matter_delimiter: "",
+        front_matter_delimiter: nil,
       },
       format: [:html].freeze,
     }.freeze

data/lib/commonmarker/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Commonmarker
-  VERSION = "1.0.0.pre"
+  VERSION = "1.0.0.pre.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commonmarker
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre
+  version: 1.0.0.pre.2
 platform: ruby
 authors:
 - Garen Torikian
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-03 00:00:00.000000000 Z
+date: 2022-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb_sys