Require i18n-js 3.0.0.rc5.3 for proper dependency on configuration

[rails.git] / lib / rich_text.rb

diff --git a/lib/rich_text.rb b/lib/rich_text.rb
index 92be8903b03028d44483f24ba31fa5d96d331710..533c8fbb4617b8af0540664d685433f9b2341ae5 100644 (file)
--- a/lib/rich_text.rb
+++ b/lib/rich_text.rb
@@ -8,7 +8,18 @@ module RichText
     end
   end
 
+  class SimpleFormat
+    include ActionView::Helpers::TextHelper
+    include ActionView::Helpers::OutputSafetyHelper
+
+    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
@@ -26,11 +37,15 @@ module RichText
         link_proportion = 0
       end
 
-      return [link_proportion - 0.2, 0.0].max * 200 + link_count * 20
+      return [link_proportion - 0.2, 0.0].max * 200 + link_count * 40
     end
 
   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 +56,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 +77,7 @@ module RichText
     end
 
     def to_text
-      self
+      self.to_s
     end
 
   private
@@ -95,14 +107,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