Merge pull request #203 from gjtorikian/frontmatter-parse-tweak

Frontmatter parse tweak
gjtorikian · Nov 21, 2022 · f331c3b · f331c3b
2 parents a718941 + b5ea1ea
commit f331c3b
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 9 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -26,5 +26,8 @@ jobs:
           cargo-cache: true
           cache-version: v1
 
+      - name: Compile comrak
+        run: bundle exec rake compile
+
       - name: Run Ruby tests
-        run: bundle exec rake compile test
+        run: bundle exec rake test
diff --git a/ext/commonmarker/src/comrak_options.rs b/ext/commonmarker/src/comrak_options.rs
@@ -15,8 +15,7 @@ fn iterate_parse_options(comrak_options: &mut ComrakOptions, options_hash: RHash
                     comrak_options.parse.smart = value.try_convert::<bool>()?;
                 }
                 Ok(Cow::Borrowed(PARSE_DEFAULT_INFO_STRING)) => {
-                    comrak_options.parse.default_info_string =
-                        Some(value.try_convert::<String>().unwrap());
+                    comrak_options.parse.default_info_string = try_convert_string(value);
                 }
                 _ => {}
             }
@@ -91,8 +90,7 @@ fn iterate_extension_options(comrak_options: &mut ComrakOptions, options_hash: R
                     comrak_options.extension.superscript = value.try_convert::<bool>()?;
                 }
                 Ok(Cow::Borrowed(EXTENSION_HEADER_IDS)) => {
-                    comrak_options.extension.header_ids =
-                        Some(value.try_convert::<String>().unwrap());
+                    comrak_options.extension.header_ids = try_convert_string(value);
                 }
                 Ok(Cow::Borrowed(EXTENSION_FOOTNOTES)) => {
                     comrak_options.extension.footnotes = value.try_convert::<bool>()?;
@@ -101,8 +99,7 @@ fn iterate_extension_options(comrak_options: &mut ComrakOptions, options_hash: R
                     comrak_options.extension.description_lists = value.try_convert::<bool>()?;
                 }
                 Ok(Cow::Borrowed(EXTENSION_FRONT_MATTER_DELIMITER)) => {
-                    comrak_options.extension.front_matter_delimiter =
-                        Some(value.try_convert::<String>().unwrap());
+                    comrak_options.extension.front_matter_delimiter = try_convert_string(value);
                 }
                 _ => {}
             }
@@ -129,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
+    }
+}
diff --git a/lib/commonmarker/config.rb b/lib/commonmarker/config.rb
@@ -26,7 +26,7 @@ module Config
         header_ids: "",
         footnotes: false,
         description_lists: false,
-        front_matter_delimiter: "",
+        front_matter_delimiter: nil,
       },
       format: [:html].freeze,
     }.freeze

diff --git a/lib/commonmarker/version.rb b/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
diff --git a/test/test_format_commonmark.rb b/test/test_format_commonmark.rb
diff --git a/test/test_frontmatter.rb b/test/test_frontmatter.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+class TestFrontmatter < Minitest::Test
+  def test_frontmatter_does_not_interfere_with_codeblock
+    md = "\n```\n\nx\n\n```\n"
+    expected = <<~HTML
+      <pre><code>
+      x
+
+      </code></pre>
+    HTML
+
+    assert_equal(expected, Commonmarker.to_html(md))
+  end
+end