Updates commonmark gem version to 1.1.5 which switches from libcmark-gfm to comrak/Rust.

git-svn-id: https://svn.redmine.org/redmine/trunk@23188 e93f8b46-1217-0410-a6f0-8f06a7374b81

2 files changed, 22 insertions, 21 deletions

diff --git a/lib/redmine/wiki_formatting/common_mark/formatter.rb b/lib/redmine/wiki_formatting/common_mark/formatter.rb
index 42cae4f3a..4a0a7ec53 100644
--- a/lib/redmine/wiki_formatting/common_mark/formatter.rb
+++ b/lib/redmine/wiki_formatting/common_mark/formatter.rb
@@ -26,29 +26,26 @@ module Redmine
       # configuration of the rendering pipeline
       PIPELINE_CONFIG = {
         # https://github.com/gjtorikian/commonmarker#extension-options
-        commonmarker_extensions: [
-          :table,
-          :strikethrough,
-          :tagfilter,
-          :autolink
-        ].freeze,
+        commonmarker_extensions: {
+          table: true,
+          strikethrough: true,
+          tagfilter: true,
+          autolink: true,
+          footnotes: true,
+        }.freeze,
 
         # https://github.com/gjtorikian/commonmarker#parse-options
-        commonmarker_parse_options: [
-          :FOOTNOTES,
-          :STRIKETHROUGH_DOUBLE_TILDE,
-          :UNSAFE,
-          :VALIDATE_UTF8
-        ].freeze,
+        commonmarker_parse_options: {
+        }.freeze,
 
         # https://github.com/gjtorikian/commonmarker#render-options
-        commonmarker_render_options: [
-          :UNSAFE
-        ],
+        commonmarker_render_options: {
+          unsafe: true
+        },
       }.freeze
 
       if Redmine::Configuration['common_mark_enable_hardbreaks'] == true
-        PIPELINE_CONFIG[:commonmarker_render_options].push(:HARDBREAKS)
+        PIPELINE_CONFIG[:commonmarker_render_options].merge!({hardbreaks: true})
       end
       PIPELINE_CONFIG[:commonmarker_render_options].freeze
 
diff --git a/lib/redmine/wiki_formatting/common_mark/markdown_filter.rb b/lib/redmine/wiki_formatting/common_mark/markdown_filter.rb
index 916c8883c..abde25443 100644
--- a/lib/redmine/wiki_formatting/common_mark/markdown_filter.rb
+++ b/lib/redmine/wiki_formatting/common_mark/markdown_filter.rb
@@ -32,8 +32,12 @@ module Redmine
         end
 
         def call
-          doc = CommonMarker.render_doc(@text, parse_options, extensions)
-          html = doc.to_html render_options, extensions
+          html = Commonmarker.to_html(@text, options: {
+            extension: extensions,
+            render: render_options,
+            parse: parse_options
+          })
+
           html.rstrip!
           html
         end
@@ -41,15 +45,15 @@ module Redmine
         private
 
         def extensions
-          context.fetch :commonmarker_extensions, []
+          context.fetch :commonmarker_extensions, {}
         end
 
         def parse_options
-          context.fetch :commonmarker_parse_options, :DEFAULT
+          context.fetch :commonmarker_parse_options, {}
         end
 
         def render_options
-          context.fetch :commonmarker_render_options, :DEFAULT
+          context.fetch :commonmarker_render_options, {}
         end
       end
     end