Unvendor'd text-format, now requires text-format gem

actionmailer/CHANGELOG

@@ -1,5 +1,7 @@
 *Rails 3.0 (pending)*
 
+* Unvendor'd text-format, now requires text-format gem
+
 * Whole new API added with tests.  See base.rb for full details.  Old API is deprecated.
 
 * The Mail::Message class has helped methods for all the field types that return 'common' defaults for the common use case, so to get the subject, mail.subject will give you a string, mail.date will give you a DateTime object, mail.from will give you an array of address specs (mikel@test.lindsaar.net) etc.  If you want to access the field object itself, call mail[:field_name] which will return the field object you want, which you can then chain, like mail[:from].formatted

actionmailer/actionmailer.gemspec

@@ -12,6 +12,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency('actionpack', '= 3.0.pre')
   s.add_dependency('mail', '~> 2.1.2')
+  s.add_dependency('text-format', '~> 1.0.0')
 
   s.files = Dir['CHANGELOG', 'README', 'MIT-LICENSE', 'lib/**/*']
   s.has_rdoc = true

actionmailer/lib/action_mailer.rb

@@ -45,5 +45,5 @@ end
 module Text
   extend ActiveSupport::Autoload
 
-  autoload :Format, 'action_mailer/vendor/text_format'
+  autoload :Format, 'text/format'
 end

actionmailer/lib/action_mailer/vendor/text_format.rb

@@ -1,10 +0,0 @@
-# Prefer gems to the bundled libs.
-require 'rubygems'
-
-begin
-  gem 'text-format', '>= 0.6.3'
-rescue Gem::LoadError
-  $:.unshift "#{File.dirname(__FILE__)}/text-format-0.6.3"
-end
-
-require 'text/format'