From 98592e29039d158084b539b2b08e48ed1aa903f3 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 16 Mar 2012 17:00:59 +0000 Subject: [PATCH] Add a simple "text" format to the RichText module --- lib/rich_text.rb | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/lib/rich_text.rb b/lib/rich_text.rb index f2a558e6a..9c4a24fd5 100644 --- a/lib/rich_text.rb +++ b/lib/rich_text.rb @@ -3,6 +3,7 @@ module RichText case format when "html"; HTML.new(text || "") when "markdown"; Markdown.new(text || "") + when "text"; Text.new(text || "") else; nil end end @@ -27,6 +28,16 @@ module RichText return [link_proportion - 0.2, 0.0].max * 200 + link_count * 20 end + + protected + + def linkify(text) + if text.html_safe? + Rinku.auto_link(text, :urls, tag_options(:rel => "nofollow")).html_safe + else + Rinku.auto_link(text, :urls, tag_options(:rel => "nofollow")) + end + end end class HTML < Base @@ -46,14 +57,6 @@ module RichText def sanitize(text) Sanitize.clean(text, Sanitize::Config::OSM).html_safe end - - def linkify(text) - if text.html_safe? - Rinku.auto_link(text, :urls, tag_options(:rel => "nofollow")).html_safe - else - Rinku.auto_link(text, :urls, tag_options(:rel => "nofollow")) - end - end end class Markdown < Base @@ -76,4 +79,16 @@ module RichText }) end end + + class Text < Base + include ActionView::Helpers::TextHelper + + def to_html + linkify(simple_format(ERB::Util.html_escape(self))) + end + + def to_text + self + end + end end -- 2.39.5