mail 2.5.3 → 2.6.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ecb5e9115e61802f251480eef90c6698ac665d0b
+  data.tar.gz: a1105d5defc2c7b374598a392e5f5dc4d1452a21
+SHA512:
+  metadata.gz: 103d2126c02d1aeb5ffd4982f261407af16652fd181f6e0fc63bf12702e5aa1ea3c7f863a3c39f822ba3b8e8cf704782d1beb7c4e2e28cba5f4fc2931151cf0e
+  data.tar.gz: 6f25c0decaf77a0314b42d0fbf6c61edfc7f2fe9b4bbeef004e34a7127882093b660108cd7728a108f26b1b3dcf2664beac4e5e6d0d0d3e68565f78fdd273d4e

data/CHANGELOG.rdoc

@@ -1,5 +1,75 @@
 == HEAD
 
+== Version 2.6.0 - Mon Jun 2 22:49 +1100 2014 Mikel Lindsaar <mikel@reinteractive.net>
+
+Features:
+* Allow interceptors and observers to be unregistered (zuhao)
+* Added feature to find the mail in uid (taketin)
+* Save settings passed to TestMailer#new (svanderbleek)
+* Allow the setting of envelope from directly (jeremy)
+* Accept other IETF/IANA-registered Content-Types and Content-Transfer-Encodings (jeremy)
+* Alias shift-jis charset to Shift_JIS Ruby encoding (jeremy)
+* Add support for ks_c_5601-1987 charset, aliased to CP949 Ruby encoding (jeremy)
+* Don't allow colons in header names (jeremy)
+* Can assign arrays of Message-IDs to References and In-Reply-To (jeremy)
+* Setting the html_ or text_part sets a default text/html or text/plain content type (jeremy)
+* Setting the html_ or text_part to nil removes it (jeremy)
+* Addresses without a parsable email or display name still format as their raw text (jeremy)
+* Close pull request 504 - Alias GB2312 charset to GB18030 Ruby encoding (bpot)
+* Close pull request 399 - Accept :ca_path and :ca_file options for SMTP delivery (ndbroadbent)
+* Close pull request 389 - Don't add superfluous message headers to MIME parts (djmaze, jeremy)
+
+Performance:
+* Migrate to RAGEL based parser, awesome work by (bpot)
+* Performance improvements for people parsing email headers (ConradIrwin)
+* Close pull request 488 - Speed up field construction & comparison (bpot)
+
+Bugs:
+* Fix for when content looks like field name (kjg)
+* Don't change original when you change a copy (TylerRick)
+* Don't include separating semicolon in paramter value when sanitizing (bpot)
+* Fix fencepost encoding problem with binhex strings and only one token (drasch)
+* Fix sendmail delivery to addresses with a leading hyphen (lifo, jeremy)
+* Correctly format mbox From headers per RFC4155 (bpot, jeremy)
+* Fix bogus '=' at the end of some quoted-printable messages (jeremy)
+* Shouldn't be fooled into encoding strings on 1.8 by unrelated Encoding constant (emiellohr, jeremy)
+* Header encoding should be US-ASCII, not the default external encoding (jeremy)
+* Address elements should return decoded display names by default (jeremy)
+* Fix up tests that depend on utf-8 external encoding; read fixtures as binary (jeremy)
+* Capture stderr from Sendmail and Exim deliveries (jeremy)
+* RFC2822 quoted_string content may be empty (jeremy)
+* Calling #to_s on a field with a nil value returns an empty string instead of nil (jeremy)
+* The Received header may contain zero name/value pairs, qmail-style (jeremy)
+* Fix that setting an attachment with a :mime_type and :encoding would override the :encoding (jeremy)
+* Fix that declaring an html_part but no text_part would use multipart/alternative anyway (jeremy)
+* Close pull request 508 - Don't add an extra CRLF to MIME parts; split MIME parts on correct CRLF boundaries (Aalanar)
+* Close pull request 506 - Escape backslashes in quoted strings (ConradIrwin)
+* Close pull request 496 - Correctly handle quoted-printable line breaks (jeremy)
+* Close pull request 493 - Repair misencoded quoted-printable line breaks (jeremy)
+* Close pull request 487 - Extract comments from group email addresses (bpot)
+* Close pull request 481 - Correctly quote filename attributes (bpot)
+* Close pull request 480 - Support mixed encodings in a single header body (adamvaughan)
+* Close pull request 471 - Fix Ruby 1.8 build when UTF16/32 default to little-endian (kennyj)
+
+Coping with third-party bugs:
+* Parse multipart boundary from Content-Type headers containing extra semicolons (jeremy)
+* Close pull request 389 - Only add Content-ID to inline attachments to appease Outlook (djmaze, jeremy)
+
+Housekeeping:
+* Add development gem dependency on rdoc (jeremy)
+* Refresh Bundler dependencies & setup (jeremy)
+* Remove i18n dependency and last vestiges of activesupport dependency in specs (jeremy)
+* Clarify that Sender is a single address, not an address list (jeremy)
+* Add an MIT-LICENSE file to make licensing clear & obvious; update to 2013 (jeremy)
+* Close pull request 501 - Tighten up header/body whitespace splitting (ConradIrwin)
+* Close pull request 499 - Clean up some dead code (ConradIrwin)
+* Close pull request 489, 495 - Docs typos (JackDanger, francois)
+* Close pull request 485 - Be explicit about unsupported address parsing (bpot)
+* Close pull request 484 - Remove #tree specs in preparation for deprecation removal (bpot)
+* Close pull request 482 - Update address field specs to reflect to #initialize API (bpot)
+* Close pull request 475 - Shush warning on Object#blank? redefinition (amatsuda)
+* Close pull request 472 - Clean up UTF8/UTF-8 internals (kennyj)
+
 == Version 2.5.3 - Sun Dec 4 15:52:00 +1100 2012 Mikel Lindsaar <mikel@reinteractive.net>
 
 * Close pull request 468 - Remove debug output to STDOUT (tadman)

data/CONTRIBUTING.md

@@ -12,12 +12,12 @@ pull request merged quickly:
 5. Add a spec for your change. Only refactoring and documentation changes
    require no new specs. If you are adding functionality or fixing a bug, we need
    a spec!
-6. Test the spec _at_ _least_ against MRI-1.9.2 and MRI-1.8.7
+6. Test the spec _at_ _least_ against MRI-1.9.3 and MRI-1.8.7
 7. Update the README if needed to reflect your change / addition
 8. With all specs passing push your changes back to your fork
 9. Send me a pull request
 
-Note, specs that break MRI 1.8.7 will not be accepted.
+Note, specs that break MRI 1.8.7 or 1.9.3 will not be accepted.
 
 At this point you're waiting on us. We like to at least comment on, if not
 accept, pull requests within three business days (and, typically, one business
@@ -28,7 +28,7 @@ taken straight from the Ruby on Rails guide:
 
 * Tell me you have tested it against more than one version of Ruby, RVM is great for
   this. I test against 7 rubies before I push into master.
-* Use good, idiomatic, strcutred and modular code
+* Use good, idiomatic, structured and modular code
 * Include tests that fail without your code, and pass with it
 * Update the documentation, the surrounding one, examples elsewhere, guides,
   whatever is affected by your contribution
@@ -42,4 +42,17 @@ Syntax:
 * a = b and not a=b.
 * Follow the conventions you see used in the source already.
 
-And in case we didn't emphasize it enough: we love specs!
+And in case we didn't emphasize it enough: we love specs!
+
+### Testing against mime-types versions:
+
+Use [appraisal](https://github.com/thoughtbot/appraisal) to run against all supported versions of mime-types.
+
+1. Run `(bundle check || bundle) && appraisal` so that all the 'appraised' gemfiles are bundled.
+2. Run either `appraisal rake` or `rake appraisal` to run all the tests.
+
+To run only one 'appraised' gemfile, run. e.g. `BUNDLE_GEMFILE=gemfiles/mime_types_edge.gemfile (bundle check || bundle) && rake`
+
+To change the appraisals, modify the `Appraisals` file, run `appraisal`, commit the generated gemfiles, and modify the .travis.yml matrix.
+
+To run on all rubies / gemfiles, just like TravisCI, see [WWTD](https://github.com/grosser/wwtd).

data/Dependencies.txt

@@ -1,3 +1,2 @@
-treetop: we need to include this in the gem spec
 tlsmail: if ruby < 1.8.6... we could make it optional, or embed it in Mail
 mime/types: I think we embed a simplified version, or help maintain it, it is old (2006)

data/Gemfile

@@ -1,26 +1,15 @@
-source :rubygems
+source "https://rubygems.org"
 
-gem "activesupport", ">= 2.3.6"
-gem "tlsmail" if RUBY_VERSION <= '1.8.6'
-gem "mime-types", "~> 1.16"
-gem "treetop", "~> 1.4.10"
-gem "i18n", ">= 0.4.0"
+gemspec
 
-if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
-  gem 'jruby-openssl'
+gem "tlsmail", "~> 0.0.1" if RUBY_VERSION <= "1.8.6"
+gem "jruby-openssl", :platforms => :jruby
+
+group :development, :test do
+  gem "appraisal", "~> 1.0"
 end
 
-group :test do
-  gem "rake",       "> 0.8.7"
-  gem "rspec",      "~> 2.12.0"
-  case
-  when defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
-    # Skip it
-  when RUBY_PLATFORM == 'java'
-    # Skip it
-  when RUBY_VERSION < '1.9'
-    gem "ruby-debug"
-  else
-    # Skip it
-  end
+# For gems not required to run tests
+group :local_development, :test do
+  gem "ruby-debug", :platforms => :mri_18
 end

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2009-2013 Mikel Lindsaar
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,4 +1,4 @@
-Mail
+Mail [![Build Status](https://travis-ci.org/mikel/mail.png?branch=master)](https://travis-ci.org/mikel/mail)
 ====
 
 Introduction
@@ -15,11 +15,11 @@ Built from my experience with TMail, it is designed to be a pure ruby
 implementation that makes generating, sending and parsing emails a no
 brainer.
 
-It is also designed form the ground up to work with Ruby 1.9.  This is because
-Ruby 1.9 handles text encodings much more magically than Ruby 1.8.x and so
-these features have been taken full advantage of in this library allowing
-Mail to handle a lot more messages more cleanly than TMail.  Mail does run on
-Ruby 1.8.x... it's just not as fun to code.
+It is also designed form the ground up to work with the more modern versions
+of Ruby.  This is because Ruby > 1.9 handles text encodings much more wonderfully
+than Ruby 1.8.x and so these features have been taken full advantage of in this
+library allowing Mail to handle a lot more messages more cleanly than TMail.
+Mail does run on Ruby 1.8.x... it's just not as fun to code.
 
 Finally, Mail has been designed with a very simple object oriented system
 that really opens up the email messages you are parsing, if you know what
@@ -42,15 +42,25 @@ me a nice email :)
 Compatibility
 -------------
 
-Mail is tested by Travis ([![Travis Build Status](https://travis-ci.org/mikel/mail.png "Build Status")](https://travis-ci.org/mikel/mail)) and works on the [following platforms](https://github.com/mikel/mail/blob/master/.travis.yml)
+Every Mail commit is tested by Travis on the [following platforms](https://github.com/mikel/mail/blob/master/.travis.yml)
 
-* ruby-1.8.7-p370 [ i686 ]
-* ruby-1.9.2-p290 [ x86_64 ]
+* ruby-1.8.7-p374 [ i686 ]
+* ruby-1.9.2-p320 [ x86_64 ]
 * ruby-1.9.3-p327 [ x86_64 ]
-* jruby-1.6.8 [ x86_64 ]
-* jruby-1.7.0 [ x86_64 ]
-* rbx-d18 [ x86_64 ]
-* rbx-d19 [ x86_64 ]
+* ruby-2.0.0-p451 [ x86_64 ]
+* ruby-2.1.2 [ x86_64 ]
+* ruby-head [ x86_64 ]
+* jruby [ x86_64 ]
+* jruby-head [ x86_64 ]
+* rbx-2 [ x86_64 ]
+
+Testing a specific mime type (needed for 1.8.7 for example) can be done manually with:
+
+  $ BUNDLE_GEMFILE=gemfiles/mime_types_1.16.gemfile bundle check
+  $ BUNDLE_GEMFILE=gemfiles/mime_types_1.16.gemfile bundle
+  $ BUNDLE_GEMFILE=gemfiles/mime_types_1.16.gemfile rake
+
+
 
 Discussion
 ----------
@@ -130,12 +140,12 @@ I have tried to simplify it some:
    it will include the header field and value and CRLF at the end and wrapped as
    needed.
 
-2. All objects that can render into an email, have a :decoded method.  Decoded will
+2. All objects that can render into an email, have a `#decoded` method.  Decoded will
    return the object's "value" only as a string.  This means it will not include
    the header fields (like 'To:' or 'Subject:').
 
 3. By default, calling <code>#to_s</code> on a container object will call its encoded
-   method, while <code>#to_s</code> on a field object will call it's decoded method.
+   method, while <code>#to_s</code> on a field object will call its decoded method.
    So calling <code>#to_s</code> on a Mail object will return the mail, all encoded
    ready to send, while calling <code>#to_s</code> on the From field or the body will
    return the decoded value of the object. The header object of Mail is considered a
@@ -185,6 +195,8 @@ mail['from'] = 'mikel@test.lindsaar.net'
 mail[:to]    = 'you@test.lindsaar.net'
 mail.subject = 'This is a test email'
 
+mail.header['X-Custom-Header'] = 'custom value'
+
 mail.to_s #=> "From: mikel@test.lindsaar.net\r\nTo: you@...
 ```
 
@@ -202,7 +214,7 @@ mail.to_s =~ /Message\-ID: <[\d\w_]+@.+.mail/ #=> 27
 Mail will automatically add a Message-ID field if it is missing and
 give it a unique, random Message-ID along the lines of:
 
-    <4a7ff76d7016_13a81ab802e1@local.fqdn.mail>
+    <4a7ff76d7016_13a81ab802e1@local.host.mail>
 
 ### Or do worry about Message-IDs:
 
@@ -227,10 +239,10 @@ easy as:
 
 ```ruby
 Mail.deliver do
-   from    'me@test.lindsaar.net'
-   to      'you@test.lindsaar.net'
-   subject 'Here is the image you wanted'
-   body    File.read('body.txt')
+  from     'me@test.lindsaar.net'
+  to       'you@test.lindsaar.net'
+  subject  'Here is the image you wanted'
+  body     File.read('body.txt')
   add_file '/full/path/to/somefile.png'
 end
 ```
@@ -265,7 +277,16 @@ mail.delivery_method :sendmail
 mail.deliver
 ```
 
-Exim requires it's own delivery manager, and can be used like so:
+Sending via smtp (for example to [mailcatcher](https://github.com/sj26/mailcatcher))
+```ruby
+
+Mail.defaults do
+  delivery_method :smtp, address: "localhost", port: 1025
+end
+```
+
+
+Exim requires its own delivery manager, and can be used like so:
 
 ```ruby
 mail.delivery_method :exim, :location => "/usr/bin/exim"
@@ -318,7 +339,7 @@ emails.length #=> LOTS!
 ```ruby
 mail = Mail.read('/path/to/message.eml')
 
-mail.envelope.from   #=> 'mikel@test.lindsaar.net'
+mail.envelope_from   #=> 'mikel@test.lindsaar.net'
 mail.from.addresses  #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
 mail.sender.address  #=> 'mikel@test.lindsaar.net'
 mail.to              #=> 'bob@test.lindsaar.net'
@@ -338,8 +359,8 @@ mail = Mail.read('multipart_email')
 
 mail.multipart?          #=> true
 mail.parts.length        #=> 2
-mail.preamble            #=> "Text before the first part"
-mail.epilogue            #=> "Text after the last part"
+mail.body.preamble       #=> "Text before the first part"
+mail.body.epilogue       #=> "Text after the last part"
 mail.parts.map { |p| p.content_type }  #=> ['text/plain', 'application/pdf']
 mail.parts.map { |p| p.class }         #=> [Mail::Message, Mail::Message]
 mail.parts[0].content_type_parameters  #=> {'charset' => 'ISO-8859-1'}
@@ -349,7 +370,7 @@ mail.parts[1].content_type_parameters  #=> {'name' => 'my.pdf'}
 Mail generates a tree of parts.  Each message has many or no parts.  Each part
 is another message which can have many or no parts.
 
-A message will only have parts if it is a multipart/mixed or related/mixed
+A message will only have parts if it is a multipart/mixed or multipart/related
 content type and has a boundary defined.
 
 ### Testing and extracting attachments
@@ -362,7 +383,7 @@ mail.attachments.each do | attachment |
     filename = attachment.filename
     begin
       File.open(images_dir + filename, "w+b", 0644) {|f| f.write attachment.body.decoded}
-    rescue Exception => e
+    rescue => e
       puts "Unable to save data for #{filename} because #{e.message}"
     end
   end
@@ -545,7 +566,7 @@ Using Mail with Testing or Spec'ing Libraries
 If mail is part of your system, you'll need a way to test it without actually
 sending emails, the TestMailer can do this for you.
 
-```
+```ruby
 require 'mail'
 => true
 Mail.defaults do
@@ -571,7 +592,7 @@ Mail::TestMailer.deliveries.clear
 
 There is also a set of RSpec matchers stolen fr^H^H^H^H^H^H^H^H inspired by Shoulda's ActionMailer matchers (you'll want to set <code>delivery_method</code> as above too):
 
-```
+```ruby
 Mail.defaults do
   delivery_method :test # in practice you'd do this in spec_helper.rb
 end
@@ -642,7 +663,7 @@ License
 
 (The MIT License)
 
-Copyright (c) 2009, 2010, 2011, 2012 Mikel Lindsaar
+Copyright (c) 2009-2013 Mikel Lindsaar
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,23 +1,8 @@
-begin
-  require "rubygems"
-  require "bundler"
-rescue LoadError
-  raise "Could not load the bundler gem. Install it with `gem install bundler`."
-end
-
-if Gem::Version.new(Bundler::VERSION) <= Gem::Version.new("1.0.0")
-  raise RuntimeError, "Your bundler version is too old for Mail" +
-   "Run `gem install bundler` to upgrade."
-end
-
-begin
-  # Set up load paths for all bundled gems
-  ENV["BUNDLE_GEMFILE"] = File.expand_path("../Gemfile", __FILE__)
-  Bundler.setup
-rescue Bundler::GemNotFound
-  raise RuntimeError, "Bundler couldn't find some gems." +
-    "Did you run `bundle install`?"
+if !ENV["APPRAISAL_INITIALIZED"] && !ENV["TRAVIS"]
+  ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __FILE__)
 end
+require 'rubygems'
+require 'bundler/setup'
 
 require 'rake/testtask'
 require 'rspec/core/rake_task'
@@ -34,5 +19,11 @@ RSpec::Core::RakeTask.new(:spec) do |t|
   t.rspec_opts = %w(--backtrace --color)
 end
 
+begin
+  require "appraisal"
+rescue LoadError
+  warn "Appraisal is only available in test/development"
+end
+
 # load custom rake tasks
-Dir["#{File.dirname(__FILE__)}/lib/tasks/**/*.rake"].sort.each { |ext| load ext }
+Dir["#{File.dirname(__FILE__)}/tasks/**/*.rake"].sort.each { |ext| load ext }

data/VERSION

@@ -0,0 +1,4 @@
+major:2
+minor:6
+patch:0
+build:

data/lib/mail/attachments_list.rb

@@ -60,7 +60,7 @@ module Mail
         if value[:mime_type]
           default_values[:content_type] = value.delete(:mime_type)
           @mime_type = MIME::Types[default_values[:content_type]].first
-          default_values[:content_transfer_encoding] = guess_encoding
+          default_values[:content_transfer_encoding] ||= guess_encoding
         end
 
         hash = default_values.merge(value)
@@ -94,7 +94,7 @@ module Mail
     def set_mime_type(filename)
       # Have to do this because MIME::Types is not Ruby 1.9 safe yet
       if RUBY_VERSION >= '1.9'
-         filename   = filename.encode(Encoding::UTF_8) if filename.respond_to?(:encode)
+        filename = filename.encode(Encoding::UTF_8) if filename.respond_to?(:encode)
       end
 
       @mime_type = MIME::Types.type_for(filename).first

data/lib/mail/body.rb

@@ -5,7 +5,7 @@ module Mail
   # 
   # The body is where the text of the email is stored.  Mail treats the body
   # as a single object.  The body itself has no information about boundaries
-  # used in the MIME standard, it just looks at it's content as either a single
+  # used in the MIME standard, it just looks at its content as either a single
   # block of text, or (if it is a multipart message) as an array of blocks of text.
   # 
   # A body has to be told to split itself up into a multipart message by calling
@@ -127,9 +127,9 @@ module Mail
     def sort_parts!
       @parts.each do |p|
         p.body.set_sort_order(@part_sort_order)
-        @parts.sort!(@part_sort_order)
         p.body.sort_parts!
       end
+      @parts.sort!(@part_sort_order)
     end
     
     # Returns the raw source that the body was initialized with, without
@@ -257,7 +257,7 @@ module Mail
     
     def split!(boundary)
       self.boundary = boundary
-      parts = raw_source.split(/--#{Regexp.escape(boundary)}(?=(?:--)?\s*$)/)
+      parts = raw_source.split(/(?:\A|\r\n)--#{Regexp.escape(boundary || "")}(?=(?:--)?\s*$)/)
       # Make the preamble equal to the preamble (if any)
       self.preamble = parts[0].to_s.strip
       # Make the epilogue equal to the epilogue (if any)
@@ -277,11 +277,11 @@ module Mail
     private
     
     def crlf_boundary
-      "\r\n\r\n--#{boundary}\r\n"
+      "\r\n--#{boundary}\r\n"
     end
     
     def end_boundary
-      "\r\n\r\n--#{boundary}--\r\n"
+      "\r\n--#{boundary}--\r\n"
     end
     
     def set_charset

data/lib/mail/check_delivery_params.rb

@@ -1,30 +1,20 @@
 module Mail
-
   module CheckDeliveryParams
+    def check_delivery_params(mail)
+      if mail.smtp_envelope_from.blank?
+        raise ArgumentError.new('An SMTP From address is required to send a message. Set the message smtp_envelope_from, return_path, sender, or from address.')
+      end
 
-    def self.included(klass)
-      klass.class_eval do
-
-        def check_params(mail)
-          envelope_from = mail.return_path || mail.sender || mail.from_addrs.first
-          if envelope_from.blank?
-            raise ArgumentError.new('A sender (Return-Path, Sender or From) required to send a message')
-          end
-
-          destinations ||= mail.destinations if mail.respond_to?(:destinations) && mail.destinations
-          if destinations.blank?
-            raise ArgumentError.new('At least one recipient (To, Cc or Bcc) is required to send a message')
-          end
-
-          message ||= mail.encoded if mail.respond_to?(:encoded)
-          if message.blank?
-            raise ArgumentError.new('A encoded content is required to send a message')
-          end
-
-          [envelope_from, destinations, message]
-        end
+      if mail.smtp_envelope_to.blank?
+        raise ArgumentError.new('An SMTP To address is required to send a message. Set the message smtp_envelope_to, to, cc, or bcc address.')
+      end
 
+      message = mail.encoded if mail.respond_to?(:encoded)
+      if message.blank?
+        raise ArgumentError.new('An encoded message is required to send an email')
       end
+
+      [mail.smtp_envelope_from, mail.smtp_envelope_to, message]
     end
   end
 end

data/lib/mail/core_extensions/object.rb

@@ -1,13 +1,13 @@
 # encoding: utf-8
 
-# This is not loaded if ActiveSupport is already loaded
-
-class Object
-  def blank?
-    if respond_to?(:empty?)
-      empty?
-    else
-     !self
+unless Object.method_defined? :blank?
+  class Object
+    def blank?
+      if respond_to?(:empty?)
+        empty?
+      else
+        !self
+      end
     end
   end
 end

data/lib/mail/core_extensions/smtp.rb

@@ -5,21 +5,20 @@ module Net
     # http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30294
     #
     # Fixed in what will be Ruby 1.9.3 - tlsconnect also does not exist in some early versions of ruby
-    remove_method :tlsconnect if defined?(Net::SMTP.new.tlsconnect)
+    begin
+      alias_method :original_tlsconnect, :tlsconnect
 
-    def tlsconnect(s)
-      verified = false
-      s = OpenSSL::SSL::SSLSocket.new s, @ssl_context
-      logging "TLS connection started"
-      s.sync_close = true
-      s.connect
-      if @ssl_context.verify_mode != OpenSSL::SSL::VERIFY_NONE
-        s.post_connection_check(@address)
+      def tlsconnect(s)
+        verified = false
+        begin
+          original_tlsconnect(s).tap { verified = true }
+        ensure
+          unless verified
+            s.close rescue nil
+          end
+        end
       end
-      verified = true
-      s
-    ensure
-      s.close unless verified
+    rescue NameError
     end
   end
 end

data/lib/mail/core_extensions/string.rb

@@ -1,11 +1,21 @@
 # encoding: utf-8
 class String #:nodoc:
+
+  if RUBY_VERSION >= '1.9'
+    # This 1.9 only regex can save a reasonable amount of time (~20%)
+    # by not matching "\r\n" so the string is returned unchanged in
+    # the common case.
+    CRLF_REGEX = Regexp.new("(?<!\r)\n|\r(?!\n)")
+  else
+    CRLF_REGEX = /\n|\r\n|\r/
+  end
+
   def to_crlf
-    to_str.gsub(/\n|\r\n|\r/) { "\r\n" }
+    to_str.gsub(CRLF_REGEX, "\r\n")
   end
 
   def to_lf
-    to_str.gsub(/\n|\r\n|\r/) { "\n" }
+    to_str.gsub(/\r\n|\r/, "\n")
   end
 
   unless String.instance_methods(false).map {|m| m.to_sym}.include?(:blank?)
@@ -15,12 +25,12 @@ class String #:nodoc:
   end
 
   unless method_defined?(:ascii_only?)
-    # Provides all strings with the Ruby 1.9 method of .ascii_only? and
-    # returns true or false
-    US_ASCII_REGEXP = %Q{\x00-\x7f}
+    # Backport from Ruby 1.9 checks for non-us-ascii characters.
     def ascii_only?
-      !(self =~ /[^#{US_ASCII_REGEXP}]/)
+      self !~ MATCH_NON_US_ASCII
     end
+
+    MATCH_NON_US_ASCII = /[^\x00-\x7f]/
   end
 
   def not_ascii_only?