Rearrange vendor bundles so gem overrides work correctly.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8112 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

actionmailer/lib/action_mailer.rb

@@ -31,23 +31,15 @@
   end
 end
 
-# attempt to load the TMail gem
-begin
-  require 'rubygems'
-  gem 'TMail', '> 1.1.0'
-  require 'tmail'
-rescue Gem::LoadError
-  # no gem, fall back to vendor copy
-end
-
-$:.unshift(File.dirname(__FILE__) + "/action_mailer/vendor/")
-
+require 'action_mailer/vendor'
 require 'tmail'
+
 require 'action_mailer/base'
 require 'action_mailer/helpers'
 require 'action_mailer/mail_helper'
 require 'action_mailer/quoting'
 require 'action_mailer/test_helper'
+
 require 'net/smtp'
 
 ActionMailer::Base.class_eval do

actionmailer/lib/action_mailer/vendor.rb

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