diff options
| author | wycats <wycats@gmail.com> | 2010-06-02 15:53:10 +0200 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-06-02 15:53:10 +0200 |
| commit | 26c5680bd01bd0e525eccc5d47a2e7126d9383f7 (patch) | |
| tree | c655c56511ef89ba55c554a0aa7d82b1cd062f78 /actionmailer | |
| parent | b870daba5ff71973b237616fb95f90bb321ae7fb (diff) | |
| parent | 4b91daff13be43ed913a97ffc8ad1b3f77fd9690 (diff) | |
| download | rails-26c5680bd01bd0e525eccc5d47a2e7126d9383f7.tar.gz rails-26c5680bd01bd0e525eccc5d47a2e7126d9383f7.tar.bz2 rails-26c5680bd01bd0e525eccc5d47a2e7126d9383f7.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/actionmailer.gemspec | 1 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer.rb | 6 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/mail_helper.rb | 7 |
3 files changed, 7 insertions, 7 deletions
diff --git a/actionmailer/actionmailer.gemspec b/actionmailer/actionmailer.gemspec index 280771e4db..4706b63b79 100644 --- a/actionmailer/actionmailer.gemspec +++ b/actionmailer/actionmailer.gemspec @@ -21,5 +21,4 @@ Gem::Specification.new do |s| s.add_dependency('actionpack', version) s.add_dependency('mail', '~> 2.2.1') - s.add_dependency('text-format', '~> 1.0.0') end diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb index 70cc312634..6e2d288082 100644 --- a/actionmailer/lib/action_mailer.rb +++ b/actionmailer/lib/action_mailer.rb @@ -49,9 +49,3 @@ module ActionMailer autoload :TestCase autoload :TestHelper end - -module Text - extend ActiveSupport::Autoload - - autoload :Format, 'text/format' -end diff --git a/actionmailer/lib/action_mailer/mail_helper.rb b/actionmailer/lib/action_mailer/mail_helper.rb index ab5c3469b2..aab6e12387 100644 --- a/actionmailer/lib/action_mailer/mail_helper.rb +++ b/actionmailer/lib/action_mailer/mail_helper.rb @@ -3,6 +3,13 @@ module ActionMailer # 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) + begin + require 'text/format' + rescue LoadError => e + $stderr.puts "You don't have text-format installed in your application. Please add it to your Gemfile and run bundle install" + raise e + end unless defined?(Text::Format) + formatted = text.split(/\n\r\n/).collect { |paragraph| Text::Format.new( :columns => 72, :first_indent => 2, :body_indent => 2, :text => paragraph |