From c3f4936dbb524237d1e3d465d2301627758c2180 Mon Sep 17 00:00:00 2001 From: hellekin Date: Tue, 27 Oct 2020 16:51:07 +0100 Subject: Add Markdown to format Resource.description --- app/helpers/application_helper.rb | 43 ++++++++++++++++++++++++++++++++++ app/views/resources/_resource.html.erb | 2 +- 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 0b22f4b..2b6e109 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -7,4 +7,47 @@ module ApplicationHelper current_agency.send(:"#{role}?") end end + + # Markdown helper + # Always use all extensions. Additional parser and render options may be + # passed as a second argument. + # + # @param markdown (String) a string to parse as Markdown source + # @param options (String or Array) an optional parser/renderer option + # @return String HTML-formatted from Mardkown source + def m(markdown, options = nil) + tag.div( + CommonMarker.render_doc( + markdown.to_s, + options.to_a + default_commonmarker_options, + default_commonmarker_extensions + ).to_html.html_safe, class: 'markdown') + end + + private + + # CommonMarker extensions + # See https://github.com/gjtorikian/commonmarker#extensions + def default_commonmarker_extensions + [ + :table, + :tasklist, + :strikethrough, + :autolink, + :tagfilter + ] + end + + # CommonMarker options + # See https://github.com/gjtorikian/commonmarker#options + def default_commonmarker_options + [ + #:HARDBREAKS, # only seems to work with render_html, but then all others + # only work with render_doc + :FOOTNOTES, + :SMART, + :STRIKETHROUGH_DOUBLE_TILDE, + :VALIDATE_UTF8 + ] + end end diff --git a/app/views/resources/_resource.html.erb b/app/views/resources/_resource.html.erb index 585bed8..2debec2 100644 --- a/app/views/resources/_resource.html.erb +++ b/app/views/resources/_resource.html.erb @@ -5,7 +5,7 @@