commonmarker 1.0.0.pre-arm64-darwin → 1.0.2-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acd5eec51702525b0f4bfa71c05f48df28ca657a0ec0d9ecb228c8d030db7ced
-  data.tar.gz: f70be9c7d5dafc26c7dd08524823947d62f8b6fdc0337593667128afa70176d3
+  metadata.gz: 9cac69af3600623822b950fa75a3f2bb516fc5763070ce7b5e7e228ba4121daf
+  data.tar.gz: '08b0e3d2705a35151ad0c67f5fb23218279a223d9821c89c9be800cb38745d34'
 SHA512:
-  metadata.gz: 9677ef6656ff9ca7ef7d0076ad419f265dd674ef2393fa6c6b23dec8da904f9b4b37ee88a1e171c42ff29f550cf72985afebe6d396962a97cdac65da66e8396b
-  data.tar.gz: 8401c92c9b8fc16e527954cc8230987d3888dd7daf055c3757270e6e66da7793d9b03938bfc7cacff3e178493d1d9b9c9e55db280ffe5365b87ffc34d35cd879
+  metadata.gz: e3adf83afae15cc449be6373fd988d58c71eacec0885f026304f41dbaaca20c3b97f532bf9ba7389da2672a3b38a574307091e2488b9723bd6a89b16fca17bbb
+  data.tar.gz: 80c077395a0e538216d5acb5f1cdbab6459730aea2bf485a32a6801c4bfabffa3484ab27d2311042699851ba33b38f032f28f499e07b08be20df53be48f0c0ad

data/README.md

@@ -7,7 +7,7 @@ Ruby wrapper for Rust's [comrak](https://github.com/kivikakk/comrak) crate.
 
 It passes all of the CommonMark test suite, and is therefore spec-complete. It also includes extensions to the CommonMark spec as documented in the [GitHub Flavored Markdown spec](http://github.github.com/gfm/), such as support for tables, strikethroughs, and autolinking.
 
-For more information on available extensions, see [the documentation below](#extensions).
+For more information on available extensions, see [the documentation below](#extension-options).
 
 ## Installation
 
@@ -27,7 +27,7 @@ Or install it yourself as:
 
 ### Converting to HTML
 
-Call `render_html` on a string to convert it to HTML:
+Call `to_html` on a string to convert it to HTML:
 
 ```ruby
 require 'commonmarker'
@@ -39,9 +39,11 @@ Commonmarker.to_html('"Hi *there*"', options: {
 
 The second argument is optional--[see below](#options) for more information.
 
-## Parse and Render Options
+## Options and plugins
 
-Commonmarker accepts the same options that comrak does, as a hash dictionary with symbol keys:
+### Options
+
+Commonmarker accepts the same parse, render, and extensions options that comrak does, as a hash dictionary with symbol keys:
 
 ```ruby
 Commonmarker.to_html('"Hi *there*"', options:{
@@ -66,14 +68,15 @@ Note that there is a distinction in comrak for "parse" options and "render" opti
 | `hardbreaks`      | [Soft line breaks](http://spec.commonmark.org/0.27/#soft-line-breaks) translate into hard line breaks. | `true`  |
 | `github_pre_lang` | GitHub-style `<pre lang="xyz">` is used for fenced code blocks with info tags.                         | `true`  |
 | `width`           | The wrap column when outputting CommonMark.                                                            | `80`    |
-| `unsafe_`         | Allow rendering of raw HTML and potentially dangerous links.                                           | `false` |
+| `unsafe`          | Allow rendering of raw HTML and potentially dangerous links.                                           | `false` |
 | `escape`          | Escape raw HTML instead of clobbering it.                                                              | `false` |
+| `sourcepos`       | Include source position attribute in HTML and XML output.                                              | `false` |
 
 As well, there are several extensions which you can toggle in the same manner:
 
 ```ruby
 Commonmarker.to_html('"Hi *there*"', options: {
-    extensions: { footnotes: true, description_lists: true },
+    extension: { footnotes: true, description_lists: true },
     render: { hardbreaks: false}
 })
 ```
@@ -90,11 +93,93 @@ Commonmarker.to_html('"Hi *there*"', options: {
 | `superscript`            | Enables the superscript Comrak extension.                                                                           | `false` |
 | `header_ids`             | Enables the header IDs Comrak extension. from the GFM spec.                                                         | `""`    |
 | `footnotes`              | Enables the footnotes extension per `cmark-gfm`.                                                                    | `false` |
-| `description_lists`      | Enables the description lists extension..                                                                           | `false` |
+| `description_lists`      | Enables the description lists extension.                                                                            | `false` |
 | `front_matter_delimiter` | Enables the front matter extension.                                                                                 | `""`    |
+| `shortcodes`             | Enables the shortcodes extension.                                                                                   | `true`  |
 
 For more information on these options, see [the comrak documentation](https://github.com/kivikakk/comrak#usage).
 
+### Plugins
+
+In addition to the possibilities provided by generic CommonMark rendering, Commonmarker also supports plugins as a means of
+providing further niceties.
+
+#### Syntax Highlighter Plugin
+
+The library comes with [a set of pre-existing themes](https://docs.rs/syntect/5.0.0/syntect/highlighting/struct.ThemeSet.html#implementations) for highlighting code:
+
+- `"base16-ocean.dark"`
+- `"base16-eighties.dark"`
+- `"base16-mocha.dark"`
+- `"base16-ocean.light"`
+- `"InspiredGitHub"`
+- `"Solarized (dark)"`
+- `"Solarized (light)"`
+
+````ruby
+code = <<~CODE
+  ```ruby
+  def hello
+    puts "hello"
+  end
+  ```
+CODE
+
+# pass in a theme name from a pre-existing set
+puts Commonmarker.to_html(code, plugins: { syntax_highlighter: { theme: "InspiredGitHub" } })
+
+# <pre style="background-color:#ffffff;" lang="ruby"><code>
+# <span style="font-weight:bold;color:#a71d5d;">def </span><span style="font-weight:bold;color:#795da3;">hello
+# </span><span style="color:#62a35c;">puts </span><span style="color:#183691;">&quot;hello&quot;
+# </span><span style="font-weight:bold;color:#a71d5d;">end
+# </span>
+# </code></pre>
+````
+
+By default, the plugin uses the `"base16-ocean.dark"` theme to syntax highlight code.
+
+To disable this plugin, set the value to `nil`:
+
+````ruby
+code = <<~CODE
+  ```ruby
+  def hello
+    puts "hello"
+  end
+  ```
+CODE
+
+Commonmarker.to_html(code, plugins: { syntax_highlighter: nil })
+
+# <pre lang="ruby"><code>def hello
+#   puts &quot;hello&quot;
+# end
+# </code></pre>
+````
+
+To output CSS classes instead of `style` attributes, set the `theme` key to `""`:
+
+````ruby
+code = <<~CODE
+  ```ruby
+  def hello
+    puts "hello"
+  end
+CODE
+
+Commonmarker.to_html(code, plugins: { syntax_highlighter: { theme: "" } })
+
+# <pre class="syntax-highlighting"><code><span class="source ruby"><span class="meta function ruby"><span class="keyword control def ruby">def</span></span><span class="meta function ruby"> # <span class="entity name function ruby">hello</span></span>
+#   <span class="support function builtin ruby">puts</span> <span class="string quoted double ruby"><span class="punctuation definition string begin ruby">&quot;</span>hello<span class="punctuation definition string end ruby">&quot;</span></span>
+# <span class="keyword control ruby">end</span>\n</span></code></pre>
+````
+
+To use a custom theme, you can provide a `path` to a directory containing `.tmtheme` files to load:
+
+```ruby
+Commonmarker.to_html(code, plugins: { syntax_highlighter: { theme: "Monokai", path: "./themes" } })
+```
+
 ## Output formats
 
 Commonmarker can currently only generate output in one format: HTML.
@@ -102,8 +187,7 @@ Commonmarker can currently only generate output in one format: HTML.
 ### HTML
 
 ```ruby
-html = CommonMarker.to_html('*Hello* world!', :DEFAULT)
-puts(html)
+puts Commonmarker.to_html('*Hello* world!')
 
 # <p><em>Hello</em> world!</p>
 ```

data/lib/commonmarker/config.rb

@@ -4,7 +4,7 @@ module Commonmarker
   module Config
     # For details, see
     # https://github.com/kivikakk/comrak/blob/162ef9354deb2c9b4a4e05be495aa372ba5bb696/src/main.rs#L201
-    OPTS = {
+    OPTIONS = {
       parse: {
         smart: false,
         default_info_string: "",
@@ -13,8 +13,9 @@ module Commonmarker
         hardbreaks: true,
         github_pre_lang: true,
         width: 80,
-        unsafe_: false,
+        unsafe: false,
         escape: false,
+        sourcepos: false,
       }.freeze,
       extension: {
         strikethrough: true,
@@ -27,13 +28,23 @@ module Commonmarker
         footnotes: false,
         description_lists: false,
         front_matter_delimiter: "",
+        shortcodes: true,
       },
       format: [:html].freeze,
     }.freeze
 
+    PLUGINS = {
+      syntax_highlighter: {
+        theme: "base16-ocean.dark",
+        path: "",
+      },
+    }
+
     class << self
+      include Commonmarker::Utils
+
       def merged_with_defaults(options)
-        Commonmarker::Config::OPTS.merge(process_options(options))
+        Commonmarker::Config::OPTIONS.merge(process_options(options))
       end
 
       def process_options(options)
@@ -43,29 +54,44 @@ module Commonmarker
           extension: process_extension_options(options[:extension]),
         }
       end
-  end
 
-    BOOLS = [true, false]
-    ["parse", "render", "extension"].each do |type|
-      define_singleton_method :"process_#{type}_options" do |options|
-        Commonmarker::Config::OPTS[type.to_sym].each_with_object({}) do |(key, value), hash|
-          if options.nil? # option not provided, go for the default
+      def process_plugins(plugins)
+        {
+          syntax_highlighter: process_syntax_highlighter_plugin(plugins&.fetch(:syntax_highlighter, nil)),
+        }
+      end
+    end
+
+    [:parse, :render, :extension].each do |type|
+      define_singleton_method :"process_#{type}_options" do |option|
+        Commonmarker::Config::OPTIONS[type].each_with_object({}) do |(key, value), hash|
+          if option.nil? # option not provided, go for the default
             hash[key] = value
             next
           end
 
           # option explicitly not included, remove it
-          next if options[key].nil?
+          next if option[key].nil?
 
-          value_klass = value.class
-          if BOOLS.include?(value) && BOOLS.include?(options[key])
-            hash[key] = options[key]
-          elsif options[key].is_a?(value_klass)
-            hash[key] = options[key]
-          else
-            expected_type = BOOLS.include?(value) ? "Boolean" : value_klass.to_s
-            raise TypeError, "#{type}_options[:#{key}] must be a #{expected_type}; got #{options[key].class}"
+          hash[key] = fetch_kv(option, key, value, type)
+        end
+      end
+    end
+
+    [:syntax_highlighter].each do |type|
+      define_singleton_method :"process_#{type}_plugin" do |plugin|
+        return if plugin.nil? # plugin explicitly nil, remove it
+
+        Commonmarker::Config::PLUGINS[type].each_with_object({}) do |(key, value), hash|
+          if plugin.nil? # option not provided, go for the default
+            hash[key] = value
+            next
           end
+
+          # option explicitly not included, remove it
+          next if plugin[key].nil?
+
+          hash[key] = fetch_kv(plugin, key, value, type)
         end
       end
     end

data/lib/commonmarker/constants.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Commonmarker
+  module Constants
+    BOOLS = [true, false].freeze
+  end
+end

data/lib/commonmarker/extension.rb

@@ -3,7 +3,7 @@
 begin
   # native precompiled gems package shared libraries in <gem_dir>/lib/commonmarker/<ruby_version>
   # load the precompiled extension file
-  ruby_version = /\d+\.\d+/.match(::RUBY_VERSION)
+  ruby_version = /\d+\.\d+/.match(RUBY_VERSION)
   require_relative "#{ruby_version}/commonmarker"
 rescue LoadError
   # fall back to the extension compiled upon installation.

data/lib/commonmarker/utils.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require "commonmarker/constants"
+
+module Commonmarker
+  module Utils
+    include Commonmarker::Constants
+
+    def fetch_kv(option, key, value, type)
+      value_klass = value.class
+
+      if Constants::BOOLS.include?(value) && BOOLS.include?(option[key])
+        option[key]
+      elsif option[key].is_a?(value_klass)
+        option[key]
+      else
+        expected_type = Constants::BOOLS.include?(value) ? "Boolean" : value_klass.to_s
+        raise TypeError, "#{type} option `:#{key}` must be #{expected_type}; got #{option[key].class}"
+      end
+    end
+  end
+end

data/lib/commonmarker/version.rb

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

data/lib/commonmarker.rb

@@ -2,29 +2,29 @@
 
 require_relative "commonmarker/extension"
 
+require "commonmarker/utils"
 require "commonmarker/config"
 require "commonmarker/renderer"
 require "commonmarker/version"
 
-if ENV.fetch("DEBUG", false)
-  require "awesome_print"
-  require "debug"
-end
-
 module Commonmarker
   class << self
     # Public: Parses a CommonMark string into an HTML string.
     #
     # text - A {String} of text
-    # option - A {Hash} of render, parse, and extension options to transform the text.
+    # options - A {Hash} of render, parse, and extension options to transform the text.
+    # plugins - A {Hash} of additional plugins.
     #
     # Returns a {String} of converted HTML.
-    def to_html(text, options: Commonmarker::Config::OPTS)
+    def to_html(text, options: Commonmarker::Config::OPTIONS, plugins: Commonmarker::Config::PLUGINS)
       raise TypeError, "text must be a String; got a #{text.class}!" unless text.is_a?(String)
+      raise TypeError, "text must be UTF-8 encoded; got #{text.encoding}!" unless text.encoding.name == "UTF-8"
       raise TypeError, "options must be a Hash; got a #{options.class}!" unless options.is_a?(Hash)
 
       opts = Config.process_options(options)
-      commonmark_to_html(text.encode("UTF-8"), opts)
+      plugins = Config.process_plugins(plugins)
+
+      commonmark_to_html(text, options: opts, plugins: plugins)
     end
   end
 end

metadata

@@ -1,30 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: commonmarker
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre
+  version: 1.0.2
 platform: arm64-darwin
 authors:
 - Garen Torikian
 - Ashe Connor
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-03 00:00:00.000000000 Z
+date: 2023-12-28 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rb_sys
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -53,40 +39,23 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: rake-compiler-dock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
 description: A fast, safe, extensible parser for CommonMark. This wraps the comrak
   Rust crate.
-email:
+email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE.txt
 - README.md
-- commonmarker.gemspec
-- ext/commonmarker/Cargo.toml
-- ext/commonmarker/_util.rb
-- ext/commonmarker/extconf.rb
-- ext/commonmarker/src/comrak_options.rs
-- ext/commonmarker/src/lib.rs
 - lib/commonmarker.rb
 - lib/commonmarker/3.1/commonmarker.bundle
+- lib/commonmarker/3.2/commonmarker.bundle
 - lib/commonmarker/config.rb
+- lib/commonmarker/constants.rb
 - lib/commonmarker/extension.rb
 - lib/commonmarker/renderer.rb
+- lib/commonmarker/utils.rb
 - lib/commonmarker/version.rb
 homepage: https://github.com/gjtorikian/commonmarker
 licenses:
@@ -96,7 +65,7 @@ metadata:
   funding_uri: https://github.com/sponsors/gjtorikian/
   source_code_uri: https://github.com/gjtorikian/commonmarker
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -107,15 +76,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '3.1'
   - - "<"
     - !ruby/object:Gem::Version
-      version: 3.2.dev
+      version: 3.3.dev
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 3.3.22
 requirements: []
-rubygems_version: 3.3.22
-signing_key:
+rubygems_version: 3.4.4
+signing_key: 
 specification_version: 4
 summary: CommonMark parser and renderer. Written in Rust, wrapped in Ruby.
 test_files: []

data/commonmarker.gemspec

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-lib = File.expand_path("lib", __dir__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "commonmarker/version"
-
-Gem::Specification.new do |spec|
-  spec.name = "commonmarker"
-  spec.version = Commonmarker::VERSION
-  spec.summary = "CommonMark parser and renderer. Written in Rust, wrapped in Ruby."
-  spec.description = "A fast, safe, extensible parser for CommonMark. This wraps the comrak Rust crate."
-  spec.authors = ["Garen Torikian", "Ashe Connor"]
-  spec.license = "MIT"
-  spec.homepage = "https://github.com/gjtorikian/commonmarker"
-
-  spec.required_ruby_version = "~> 3.1"
-  # https://github.com/rubygems/rubygems/pull/5852#issuecomment-1231118509
-  spec.required_rubygems_version = ">= 3.3.22"
-
-  spec.files = ["LICENSE.txt", "README.md", "commonmarker.gemspec"]
-  spec.files += Dir.glob("lib/**/*.rb")
-  spec.files += Dir.glob("ext/**/*.{rs,toml,lock,rb}")
-  spec.bindir = "exe"
-  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
-
-  spec.require_paths = ["lib"]
-  spec.extensions = ["ext/commonmarker/Cargo.toml"]
-
-  spec.metadata = {
-    "allowed_push_host" => "https://rubygems.org",
-    "funding_uri" => "https://github.com/sponsors/gjtorikian/",
-    "source_code_uri" => "https://github.com/gjtorikian/commonmarker",
-    "rubygems_mfa_required" => "true",
-  }
-
-  spec.add_dependency("rb_sys", "~> 0.9")
-
-  spec.add_development_dependency("rake", "~> 13.0")
-  spec.add_development_dependency("rake-compiler", "~> 1.2")
-  spec.add_development_dependency("rake-compiler-dock", "~> 1.2")
-end

data/ext/commonmarker/Cargo.toml

@@ -1,12 +0,0 @@
-[package]
-name = "commonmarker"
-version = "1.0.0"
-edition = "2021"
-
-[dependencies]
-magnus = { git = "https://github.com/gjtorikian/magnus", branch = "main" } # waiting for release with full rb-sys backend
-comrak = "0.14.0"
-
-[lib]
-name = "commonmarker"
-crate-type = ["cdylib"]

data/ext/commonmarker/_util.rb

@@ -1,102 +0,0 @@
-# frozen_string_literal: true
-
-RUBY_MAJOR, RUBY_MINOR = RUBY_VERSION.split(".").collect(&:to_i)
-
-PACKAGE_ROOT_DIR = File.expand_path(File.join(File.dirname(__FILE__), "..", ".."))
-PACKAGE_EXT_DIR = File.join(PACKAGE_ROOT_DIR, "ext", "commonmarker")
-
-OS = case os = RbConfig::CONFIG["host_os"].downcase
-when /linux/
-  # The official ruby-alpine Docker containers pre-build Ruby. As a result,
-  # Ruby doesn't know that it's on a musl-based platform. `ldd` is the
-  # a more reliable way to detect musl.
-  # See https://github.com/skylightio/skylight-ruby/issues/92
-  if ENV["SKYLIGHT_MUSL"] || %x(ldd --version 2>&1).include?("musl")
-    "linux-musl"
-  else
-    "linux"
-  end
-when /darwin/
-  "darwin"
-when /freebsd/
-  "freebsd"
-when /netbsd/
-  "netbsd"
-when /openbsd/
-  "openbsd"
-when /sunos|solaris/
-  "solaris"
-when /mingw|mswin/
-  "windows"
-else
-  os
-end
-
-# Normalize the platform CPU
-ARCH = case cpu = RbConfig::CONFIG["host_cpu"].downcase
-when /amd64|x86_64|x64/
-  "x86_64"
-when /i?86|x86|i86pc/
-  "x86"
-when /ppc|powerpc/
-  "powerpc"
-when /^aarch/
-  "aarch"
-when /^arm/
-  "arm"
-else
-  cpu
-end
-
-def windows?
-  OS == "windows"
-end
-
-def solaris?
-  OS == solaries
-end
-
-def darwin?
-  OS == "darwin"
-end
-
-def macos?
-  darwin? || OS == "macos"
-end
-
-def openbsd?
-  OS == "openbsd"
-end
-
-def aix?
-  OS == "aix"
-end
-
-def nix?
-  !(windows? || solaris? || darwin?)
-end
-
-def x86_64?
-  ARCH == "x86_64"
-end
-
-def x86?
-  ARCH == "x86"
-end
-
-def abs_path(path)
-  File.join(PACKAGE_EXT_DIR, path)
-end
-
-def find_header_or_abort(header, *paths)
-  find_header(header, *paths) || abort("#{header} was expected in `#{paths.join(", ")}`, but it is missing.")
-end
-
-def find_library_or_abort(lib, func, *paths)
-  find_library(lib, func, *paths) || abort("#{lib} was expected in `#{paths.join(", ")}`, but it is missing.")
-end
-
-def concat_flags(*args)
-  args.compact.join(" ")
-end
-

data/ext/commonmarker/extconf.rb

@@ -1,6 +0,0 @@
-require "mkmf"
-require "rb_sys/mkmf"
-
-require_relative "_util"
-
-create_rust_makefile("commonmarker")

data/ext/commonmarker/src/comrak_options.rs

@@ -1,107 +0,0 @@
-use comrak::ComrakOptions;
-
-use magnus::{class, r_hash::ForEach, Error, RHash, Symbol, Value};
-
-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)
-    });
-}
-
-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>()?;
-        }
-
-        if key.name().unwrap() == "escape" {
-            comrak_options.render.escape = value.try_convert::<bool>()?;
-        }
-
-        Ok(ForEach::Continue)
-    });
-}
-
-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>()?;
-        }
-
-        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)
-    });
-}
-
-pub fn iterate_options_hash(
-    comrak_options: &mut ComrakOptions,
-    key: Symbol,
-    value: RHash,
-) -> Result<ForEach, Error> {
-    assert!(value.is_kind_of(class::hash()));
-
-    if key.name().unwrap() == "parse" {
-        iterate_parse_options(comrak_options, value);
-    }
-    if key.name().unwrap() == "render" {
-        iterate_render_options(comrak_options, value);
-    }
-    if key.name().unwrap() == "extension" {
-        iterate_extension_options(comrak_options, value);
-    }
-    Ok(ForEach::Continue)
-}

data/ext/commonmarker/src/lib.rs

@@ -1,27 +0,0 @@
-extern crate core;
-
-use comrak::{markdown_to_html, ComrakOptions};
-use magnus::{define_module, function, r_hash::ForEach, Error, RHash, Symbol};
-
-mod comrak_options;
-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)
-    });
-
-    markdown_to_html(&rb_commonmark, &comrak_options)
-}
-
-#[magnus::init]
-fn init() -> Result<(), Error> {
-    let module = define_module("Commonmarker")?;
-
-    module.define_module_function("commonmark_to_html", function!(commonmark_to_html, 2))?;
-
-    Ok(())
-}