More work on user tests

[rails.git] / lib / rich_text.rb

diff --git a/lib/rich_text.rb b/lib/rich_text.rb
index 503ecedbd5af1780727265b42ead375c8607c250..7325a2a28f0825e19e575e800a25ac58d755d7e2 100644 (file)
--- a/lib/rich_text.rb
+++ b/lib/rich_text.rb
@@ -4,7 +4,6 @@ module RichText
     when "html" then HTML.new(text || "")
     when "markdown" then Markdown.new(text || "")
     when "text" then Text.new(text || "")
-    else; nil
     end
   end
 
@@ -73,18 +72,19 @@ module RichText
 
   class Markdown < Base
     def to_html
-      html_parser.render(self).html_safe
+      Markdown.html_parser.render(self).html_safe
     end
 
     def to_text
       to_s
     end
 
-    private
+    def self.html_renderer
+      @html_renderer ||= Renderer.new(:filter_html => true, :safe_links_only => true)
+    end
 
-    def html_parser
-      @@html_renderer ||= Renderer.new(:filter_html => true, :safe_links_only => true)
-      @@html_parser ||= Redcarpet::Markdown.new(@@html_renderer,         :no_intra_emphasis => true, :autolink => true, :space_after_headers => true)
+    def self.html_parser
+      @html_parser ||= Redcarpet::Markdown.new(html_renderer, :no_intra_emphasis => true, :autolink => true, :space_after_headers => true)
     end
 
     class Renderer < Redcarpet::Render::XHTML