From 9492d20a8752763c06952f600d3f5703be4fdc8a Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Mon, 19 Mar 2012 11:59:54 +0000
Subject: [PATCH] Avoid dragging ActionView::Helpers::TextHelper into RichText
 objects

Dragging in TextHelper gets us a truncate method which hides the one
we inherited from String and which we want.
---
 lib/rich_text.rb | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/lib/rich_text.rb b/lib/rich_text.rb
index 92be8903b..2b7e31009 100644
--- a/lib/rich_text.rb
+++ b/lib/rich_text.rb
@@ -8,7 +8,17 @@ module RichText
     end
   end
 
+  class SimpleFormat
+    include ActionView::Helpers::TextHelper
+
+    def sanitize(text)
+      Sanitize.clean(text, Sanitize::Config::OSM).html_safe
+    end
+  end
+
   class Base < String
+    include ActionView::Helpers::TagHelper
+
     def spam_score
       link_count = 0
       link_size = 0
@@ -31,6 +41,10 @@ module RichText
 
   protected
 
+    def simple_format(text)
+      SimpleFormat.new.simple_format(text)
+    end
+
     def linkify(text)
       if text.html_safe?
         Rinku.auto_link(text, :urls, tag_options(:rel => "nofollow")).html_safe
@@ -41,15 +55,12 @@ module RichText
   end
 
   class HTML < Base
-    include ActionView::Helpers::TextHelper
-    include ActionView::Helpers::TagHelper
-
     def to_html
       linkify(sanitize(simple_format(self)))
     end
 
     def to_text
-      self
+      self.to_s
     end
 
   private
@@ -65,7 +76,7 @@ module RichText
     end
 
     def to_text
-      self
+      self.to_s
     end
 
   private
@@ -95,14 +106,12 @@ module RichText
   end
 
   class Text < Base
-    include ActionView::Helpers::TextHelper
-
     def to_html
       linkify(simple_format(ERB::Util.html_escape(self)))
     end
 
     def to_text
-      self
+      self.to_s
     end
   end
 end
-- 
2.39.5