From 1b93da3262de157e7a1339b1b4ce3ff5c22081a5 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson
Date: Sun, 20 Mar 2005 15:03:32 +0000
Subject: Added TextHelper#simple_format as a non-dependency text presentation
helper.Fixed TextHelper#markdown to use blank? instead of empty? so it can
deal with nil strings passed #814 [Johan Sorensen]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@933 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
actionpack/lib/action_view/helpers/text_helper.rb | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
(limited to 'actionpack/lib/action_view/helpers/text_helper.rb')
diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb
index b97b1e130a..aa4d3ab8af 100644
--- a/actionpack/lib/action_view/helpers/text_helper.rb
+++ b/actionpack/lib/action_view/helpers/text_helper.rb
@@ -90,11 +90,24 @@ module ActionView
# Returns the text with all the Markdown codes turned into HTML-tags.
# This method is only available if BlueCloth can be required.
def markdown(text)
- text.empty? ? "" : BlueCloth.new(text).to_html
+ text.blank? ? "" : BlueCloth.new(text).to_html
end
rescue LoadError
# We can't really help what's not there
end
+
+ # Returns +text+ transformed into html using very simple formatting rules
+ # Surrounds paragraphs with <p> tags, and converts line breaks into <br />
+ # Two consecutive newlines(\n\n) are considered as a paragraph, one newline (\n) is
+ # considered a linebreak, three or more consecutive newlines are turned into two newlines
+ def simple_format(text)
+ text.gsub!(/(\r\n|\n|\r)/, "\n") # lets make them newlines crossplatform
+ text.gsub!(/\n\n+/, "\n\n") # zap dupes
+ text.gsub!(/\n\n/, '
\0') # turn two newlines into paragraph
+ text.gsub!(/([^\n])(\n)([^\n])/, '\1\2
\3') # turn single newline into
+
+ return '
' + text + '
' # wrap the first and last line in paragraphs before we're done
+ end
# Turns all urls and email addresses into clickable links. The +link+ parameter can limit what should be linked.
# Options are :all (default), :email_addresses, and :urls.
--
cgit v1.2.3