mail 2.4.4 → 2.5.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 483ee321c6ec26a7fb20deb57c50254f916c5055
+  data.tar.gz: 49bbe456db7b901b8f9a17cc404ed6cdd4ac84f2
+SHA512:
+  metadata.gz: bc79fcc391b2358f8aecd403453c934399a561bd2cf0c3cb32bf850815a6c99086c47104e0680a7d77a62585453bef8ca27d885f0345d102e0191a1f5354973d
+  data.tar.gz: cd1ea707e1b61aa29bb452d3b2eaa7a245721b28d17448061cef63beff93c794f3a05d0c104afa79a9cb7026f0b20376f422b76747170d35fe72a59ed64e40e6

data/CHANGELOG.rdoc

@@ -1,4 +1,143 @@
-== HEAD
+== Version 2.5.5 - 2017-06-09 Jeremy Daer <jeremydaer@gmail.com>
+
+Security:
+* #1097 – SMTP security: prevent command injection via To/From addresses. (jeremy)
+
+Bugs:
+* #633 – Cope with message parts that have an empty Content-Type (ThomasKoppensteiner, zeepeeare)
+* #689 - Fix Exim delivery method broken by #477 in 2.5.4. (jethrogb)
+
+== Version 2.5.4 - Tue May 14 14:45:00 +1100 2013 Mikel Lindsaar <mikel@lindsaar.net>
+
+Features:
+* 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:
+* Close pull request 488 - Speed up field construction & comparison (bpot)
+
+Bugs:
+* 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)
+* Fix up spec warnings
+* Remove un needed require
+* Ensure spec_helper constants only defined once
+* Use stub against time instead of DateTime to avoid double redefinition error
+
+== Version 2.5.2 - Sun Nov 18 15:01:00 +1100 2012 Mikel Lindsaar <mikel@reinteractive.net>
+
+* Removing double loading of treetop parsers to remove warnings
+* Making parsers auto compile on spec suite and load in production code to avoid error that caused yank of 2.5.0
+* Reapply pull request 443 - CC fields with semicolon are now parsed right (paulwittmann)
+
+== Version 2.5.1 - Sun Nov 18 14:01:00 +1100 2012 Mikel Lindsaar <mikel@reinteractive.net>
+
+* Yanked 2.5.0
+* Reverted pull request 443 - CC fields with semicolon are now parsed right (paulwittmann)
+
+== Version 2.5.0 - Sun Nov 18 12:20:00 +1100 2012 Mikel Lindsaar <mikel@reinteractive.net>
+
+Features:
+* Close pull request 406 - Add Mail#eager_autoload! to load all autoloaded files on demand (bpot)
+* Close pull request 461 - Allow string as delivery_method (skyeagle, radar)
+* Close pull request 407 - Do not require Net::IMAP or Net::POP if they're already loaded (bpot)
+* Close pull request 400 - Raise exception if delivery values or from values are missing completely from an email that is getting delivered (dmathieu)
+* Close pull request 397 - Support dots in local part of the addresses (eac)
+* Close pull request 477 - Fixed handling content_type with superfluous spaces (ledermann)
+* Close pull request 451 - Ignore nil in addresses so things do not blow up when e.g. a user had no email (grosser)
+* Close pull request 362 - Enable TLS in Ruby 1.8 (kingargyle)
+* Close pull request 358 - Fix Mail::CommonAddress#value=, Mail::CommonAddress#<< and Mail::Encodings.encode_non_usascii (mrkn)
+* Close pull request 350 - Makes mail Header object ennumerable (ged)
+
+Performance:
+* Close pull request 369 - Mail::Header#charset is called pretty often during header parser work (bogdan)
+* Close pull request 368 - Improve existing code by moving some objects to contstant instead of constructing them over and over again. (bogdan)
+* Close pull request 366 - Headers parsing performance optimization (bogdan)
+* Close pull request 365 - Add maximum_amount of parsed headers configuration parameter (bogdan)
+
+Bugs:
+* Close pull request 444 - Fix typo in spec (cczona)
+* Close pull request 439 - Fix Ruby 1.9 behaviour to match 1.8.7 behaviour on ignoring invalid or undefined characters (ochko)
+* Close pull request 430 - Unstructured field converts to string before calling encoding on it (brupm mikel)
+* Close pull request 424 - Use String#to_crlf instead of String#gsub (okkez)
+* Close pull request 429 - Fix an obvious bug in exim delivery_method (dskim)
+* Close pull request 425 - Remove Gemfile.lock from generated gem (kbackowski)
+* Close pull request 414 - Fix typo on "ignoring" (derwiki)
+* Close pull request 405 - Fix stack overflow (RegexpError) triggered by large emails with an envelope (bpot)
+* Close pull request 402 - Prevent InReplyTo, Keyword, References or ResentMessageId fields from  generating lines longer than 998 chars (pplr)
+* Close pull request 391 - Fixed failed attachment parsing when file name in headers contains spaces and is not wrapped in quotes (danieltreacy)
+* Close pull request 385 - Fix Multibyte::Chars#upcase/downcase (technoweenie)
+* Close pull request 384 - copy dat unicode over from active support (technoweenie)
+* Close pull request 380 - Split strictly on MIME boundary lines (ConradIrwin)
+* Close pull request 277 - Fix specific email decoding failure example (yalab)
+* Close pull request 361 - Support 8bit encoding for ruby 1.9 (bogdan)
+* Close pull request 346 - Fix two bugs of TestRetriever (ermaker)
+* Close pull request 337 - Make the behavior of value_decode the same between Ruby 1.8 and Ruby 1.9. (kennyj)
+* Close pull request 336 - Fix more warning: possibly useless use of == in void context (kennyj)
+* Close pull request 293 - make charset and mime type more resliant to bad header values (kmeehl)
+* Fix failing spec Issue 453 on Ruby 1.9.3
+* Fix mail reading: don't raise invalid byte sequence in UTF-8 when reading non-UTF-8 emails (mreinsch)
+* Close pull request 353 - define NilClass#blank? only if not defined yet (amatsuda)
+* Close pull request 357 - Fixes #349 an inverted condition on imap open read_only (felixroeser)
+* Remove duplicated line feed from regexp
+* Remove unused variable
+* Updated IMAP documentation
+* Tweak publisher
 
 == Version 2.4.4 - Wed Mar 14 22:44:00 +1100 2012 Mikel Lindsaar <mikel@reinteractive.net>
 

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,4 @@ 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!

data/Gemfile

@@ -1,17 +1,23 @@
-source :rubygems
+source 'https://rubygems.org'
 
-gem "activesupport", ">= 2.3.6"
+gemspec
+
+if RUBY_VERSION < '1.9.3'
+  gem 'activesupport', '< 4'
+elsif RUBY_VERSION < '2.2.2'
+  gem 'activesupport', '< 5'
+end
+gem 'i18n', '< 0.7.0' if RUBY_VERSION < '1.9.3'
 gem "tlsmail" if RUBY_VERSION <= '1.8.6'
 gem "mime-types", "~> 1.16"
 gem "treetop", "~> 1.4.10"
-gem "i18n", ">= 0.4.0"
 
-if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
-  gem 'jruby-openssl'
-end
+gem 'jruby-openssl', :platform => :jruby
 
-group :test do
-  gem "rake",       "> 0.8.7"
+# For gems not required to run tests
+group :local_development, :test do
+  gem 'rake', '> 0.8.7', '< 11.0.1'
+  gem 'rdoc', '< 4.3' if RUBY_VERSION < '1.9.3'
   gem "rspec",      "~> 2.8.0"
   case
   when defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'

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
@@ -29,7 +29,7 @@ Donations
 -------------
 
 Mail has been downloaded millions of times, by people around the world, in fact,
-it represents more than 1% of *all* gems downloaded.  
+it represents more than 1% of *all* gems downloaded.
 
 It is (like all open source software) a labour of love and something I am doing
 with my own free time.  If you would like to say thanks, please feel free to
@@ -42,14 +42,15 @@ me a nice email :)
 Compatibility
 -------------
 
-Mail is tested by Travis (![Travis Build Status](https://secure.travis-ci.org/mikel/mail.png "Build Status")) and works on the following platforms:
+Mail supports Ruby 1.8.7+, including JRuby and Rubinius.
 
-* jruby-1.6.5.1 [ x86_64 ]
-* rbx-head-d18 [ x86_64 ]
-* ree-1.8.7-2011.03 [ i686 ]
-* ruby-1.8.7-p357 [ i686 ]
-* ruby-1.9.2-p290 [ x86_64 ]
-* ruby-1.9.3-p0 [ x86_64 ]
+Every Mail commit is tested by Travis on [all supported Ruby versions](https://github.com/mikel/mail/blob/master/.travis.yml).
+
+Testing a specific version of mime-types (needed for Ruby 1.8.7, for example) can be done manually with:
+
+```sh
+BUNDLE_GEMFILE=gemfiles/mime_types_1.16.gemfile bundle && rake
+```
 
 Discussion
 ----------
@@ -104,7 +105,7 @@ It also means you can be sure Mail will behave correctly.
 API Policy
 ----------
 
-No API removals within a single point release.  All removals to be depreciated with
+No API removals within a single point release.  All removals to be deprecated with
 warnings for at least one MINOR point release before removal.
 
 Also, all private or protected methods to be declared as such - though this is still I/P.
@@ -129,12 +130,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
@@ -201,7 +202,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:
 
@@ -264,7 +265,7 @@ mail.delivery_method :sendmail
 mail.deliver
 ```
 
-Exim requires it's own delivery manager, and can be used like so:
+Exim requires its own delivery manager, and can be used like so:
 
 ```ruby
 mail.delivery_method :exim, :location => "/usr/bin/exim"
@@ -294,7 +295,7 @@ The most recent email:
 ```ruby
 Mail.all    #=> Returns an array of all emails
 Mail.first  #=> Returns the first unread email
-Mail.last   #=> Returns the first unread email
+Mail.last   #=> Returns the last unread email
 ```
 
 The first 10 emails sorted by date in ascending order:
@@ -337,8 +338,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'}
@@ -641,7 +642,7 @@ License
 
 (The MIT License)
 
-Copyright (c) 2009, 2010, 2011, 2012
+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,25 +1,6 @@
-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`?"
-end
-
-require File.expand_path('../spec/environment', __FILE__)
+ENV['BUNDLE_GEMFILE'] = File.expand_path('../Gemfile', __FILE__)
+require 'rubygems'
+require 'bundler/setup'
 
 require 'rake/testtask'
 require 'rspec/core/rake_task'

data/lib/VERSION

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

data/lib/load_parsers.rb

@@ -0,0 +1,35 @@
+# encoding: utf-8
+# This file loads up the parsers for mail to use.  It also will attempt to compile parsers
+# if they don't exist.
+#
+# It also only uses the compiler if we are running the SPEC suite
+module Mail # :doc:
+  require 'treetop/runtime'
+
+  def self.compile_parser(parser)
+    require 'treetop/compiler'
+    Treetop.load(File.join(File.dirname(__FILE__)) + "/mail/parsers/#{parser}")
+  end
+
+  parsers = %w[ rfc2822_obsolete rfc2822 address_lists phrase_lists
+                date_time received message_ids envelope_from rfc2045
+                mime_version content_type content_disposition
+                content_transfer_encoding content_location ]
+
+  if defined?(MAIL_SPEC_SUITE_RUNNING)
+    parsers.each do |parser|
+      compile_parser(parser)
+    end
+
+  else
+    parsers.each do |parser|
+      begin
+        require "mail/parsers/#{parser}"
+      rescue LoadError
+        compile_parser(parser)
+      end
+    end
+
+  end
+
+end

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,8 +5,8 @@ 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
-  # block of text, or (if it is a multipart message) as an array of blocks o text.
+  # 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
   # #split with the correct boundary.  This is because the body object has no way
@@ -257,7 +257,7 @@ module Mail
     
     def split!(boundary)
       self.boundary = boundary
-      parts = raw_source.split("--#{boundary}")
+      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

@@ -0,0 +1,57 @@
+module Mail
+  module CheckDeliveryParams #:nodoc:
+    class << self
+      def check(mail)
+        [ check_from(mail.smtp_envelope_from),
+          check_to(mail.smtp_envelope_to),
+          check_message(mail) ]
+      end
+
+      def check_from(addr)
+        if addr.blank?
+          raise ArgumentError, "SMTP From address may not be blank: #{addr.inspect}"
+        end
+
+        check_addr 'From', addr
+      end
+
+      def check_to(addrs)
+        if addrs.blank?
+          raise ArgumentError, "SMTP To address may not be blank: #{addrs.inspect}"
+        end
+
+        Array(addrs).map do |addr|
+          check_addr 'To', addr
+        end
+      end
+
+      def check_addr(addr_name, addr)
+        validate_smtp_addr addr do |error_message|
+          raise ArgumentError, "SMTP #{addr_name} address #{error_message}: #{addr.inspect}"
+        end
+      end
+
+      def validate_smtp_addr(addr)
+        if addr.bytesize > 2048
+          yield 'may not exceed 2kB'
+        end
+
+        if /[\r\n]/ =~ addr
+          yield 'may not contain CR or LF line breaks'
+        end
+
+        addr
+      end
+
+      def check_message(message)
+        message = message.encoded if message.respond_to?(:encoded)
+
+        if message.blank?
+          raise ArgumentError, 'An encoded message is required to send an email'
+        end
+
+        message
+      end
+    end
+  end
+end

data/lib/mail/configuration.rb

@@ -26,7 +26,7 @@ module Mail
     end
 
     def lookup_delivery_method(method)
-      case method
+      case method.is_a?(String) ? method.to_sym : method
       when nil
         Mail::SMTP
       when :smtp

data/lib/mail/core_extensions/nil.rb

@@ -3,8 +3,10 @@
 # This is not loaded if ActiveSupport is already loaded
 
 class NilClass #:nodoc:
-  def blank?
-    true
+  unless nil.respond_to? :blank?
+    def blank?
+      true
+    end
   end
 
   def to_crlf

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

@@ -15,12 +15,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?