commonmarker 1.1.3 → 1.1.5

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

@@ -8,16 +8,22 @@ module Commonmarker
       parse: {
         smart: false,
         default_info_string: "",
+        relaxed_tasklist_matching: false,
         relaxed_autolinks: false,
       }.freeze,
       render: {
         hardbreaks: true,
         github_pre_lang: true,
+        full_info_string: false,
         width: 80,
         unsafe: false,
         escape: false,
         sourcepos: false,
         escaped_char_spans: true,
+        ignore_setext: false,
+        ignore_empty_links: false,
+        gfm_quirks: false,
+        prefer_fenced: false,
       }.freeze,
       extension: {
         strikethrough: true,
@@ -30,10 +36,15 @@ module Commonmarker
         footnotes: false,
         description_lists: false,
         front_matter_delimiter: "",
-        shortcodes: true,
         multiline_block_quotes: false,
         math_dollars: false,
         math_code: false,
+        shortcodes: true,
+        wikilinks_title_before_pipe: false,
+        wikilinks_title_after_pipe: false,
+        underline: false,
+        spoiler: false,
+        greentext: 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.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commonmarker
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.5
 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-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb_sys