Merged in latest changes from rails/master

2 files changed, 21 insertions, 1 deletions

diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index ab00bbba3c..9862c2265b 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -258,7 +258,8 @@ module ActionMailer #:nodoc:
     include AbstractController::Layouts
 
     include AbstractController::Helpers
-
+    helper ActionMailer::MailHelper
+    
     if Object.const_defined?(:ActionController)
       include ActionController::UrlWriter
     end
diff --git a/actionmailer/lib/action_mailer/mail_helper.rb b/actionmailer/lib/action_mailer/mail_helper.rb
new file mode 100644
index 0000000000..f4eeed0e42
--- /dev/null
+++ b/actionmailer/lib/action_mailer/mail_helper.rb
@@ -0,0 +1,19 @@
+module ActionMailer
+  module MailHelper
+    # Uses Text::Format to take the text and format it, indented two spaces for
+    # each line, and wrapped at 72 columns.
+    def block_format(text)
+      formatted = text.split(/\n\r\n/).collect { |paragraph|
+        Text::Format.new(
+          :columns => 72, :first_indent => 2, :body_indent => 2, :text => paragraph
+        ).format
+      }.join("\n")
+    
+      # Make list points stand on their own line
+      formatted.gsub!(/[ ]*([*]+) ([^*]*)/) { |s| "  #{$1} #{$2.strip}\n" }
+      formatted.gsub!(/[ ]*([#]+) ([^#]*)/) { |s| "  #{$1} #{$2.strip}\n" }
+ 
+      formatted
+    end
+  end
+end