mail 2.2.5 → 2.2.19

data/CHANGELOG.rdoc

@@ -1,3 +1,159 @@
+== Tue Apr 26 09:49:54 UTC 2011 Mikel Lindsaar <mikel@rubyx.com>
+
+* Update activesupport require to use inflector - closes #217
+
+== Tue Apr 26 06:18:19 UTC 2011 Mikel Lindsaar <mikel@rubyx.com>
+
+* Fixed charset warning issue with multipart messages - https://github.com/arvindsv
+* Version bump to 2.2.18 and gem release
+
+== Wed 20 Apr 2011 15:16:20 UTC Mikel Lindsaar <mikel@rubyx.com>
+
+* Mail::Field.new("Subject: foobar", 'iso-2022-jp') does not set charset - https://github.com/yalab
+
+== Tue Apr 19 00:20:54 UTC 2011 Mikel Lindsaar <mikel@rubyx.com>
+
+* Fixed an exception with nil in Reply-To and References field - https://github.com/dcormier
+* Version bump to 2.2.17 and gem release
+
+== Sat Apr 16 12:57:27 UTC 2011 Mikel Lindsaar <mikel@rubyx.com>
+
+* Added support for open SMTP connections and returning the Mail server's response - https://github.com/spiegela
+* RE: not appended to subject when replying to a reply - https://github.com/prateekdayal
+* Support not ascii compatible charset mail send - https://github.com/yalab
+* Fix for issue 208 "mail.body after mail.add_file truncates message body" - https://github.com/glongman
+* Handle bad subject encoding (or ":invalid => :replace" is ineffective for utf-8 to utf-8 encoding) - https://github.com/choonkeat
+* Handle blank Received header field - https://github.com/bcantin
+* Handle part with missing content type - https://github.com/bcantin
+* Handle a "<>" Return field - https://github.com/bcantin
+* Performance improvements for 1.9 - https://github.com/nobu
+* Fix heavy CPU issues when messages are missing a space - https://github.com/scsmith
+* Tighten up allowed encodings - https://github.com/scsmith
+* Added to_yaml & from_yaml (as well as to_hash & from_hash) - https://github.com/srushti
+* Fix up some comments - https://github.com/takahashim
+* Version bump to 2.2.16 and gem release
+
+== Wed 26 Jan 2011 02:23:09 UTC Mikel Lindsaar <mikel@rubyx.com>
+
+* Update addresses passed into sendmail to escape them (Andy Lindeman)
+* Version bump to 2.2.15 and gem release
+
+== Mon  3 Jan 2011 12:48:59 UTC Mikel Lindsaar <mikel@rubyx.com>
+
+* Update field_spec to handle encodings, closes issues 44 and 120 (Luis Lopez)
+* Version bump to 2.2.14 and gem release
+
+== Mon  3 Jan 2011 00:09:27 UTC Mikel Lindsaar <mikel@rubyx.com>
+
+* Use default IANA port on the IMAP retriever_method (Adrian Silva)
+* Updated README to reflect latest ruby versions we test against (mikel)
+* Only remove tlsconnect if it exists (mikel)
+
+== Thu 23 Dec 2010 09:15:58 UTC Mikel Lindsaar <mikel@rubyx.com>
+
+* Added backport fix for net/smtp bug (Aaron Patterson)
+* Changed "Mail#text_part" so that it does not return a plain text attachment (Anton Mironov)
+* Added in rescue blocks for badly formatted dates as well as encoding problems (Karl Baum)
+* Fixed warning errors of duplicated regular expressions (Kouhei Sutou)
+* Removed duplication from Regex's containing [\w\d]+ as \w contains \d (mikel)
+* Add authentication selection for imap retriever (Björn Albers)
+* Removing warning on @name not being initialized (mikel)
+* Version bump to 2.2.13 and gem release
+
+== Fri 10 Dec 2010 09:06:49 UTC Mikel Lindsaar <mikel@rubyx.com>
+
+* Fixing problems with multibyte filenamed attachment (amatsuda)
+* Providing IMAP uid and imap object as options to IMAP calls (dball)
+* Fixing filename for windows (mikel)
+
+== Sun Dec  5 02:24:55 UTC 2010 Mikel Lindsaar <mikel@rubyx.com>
+
+* Updating requirement on i18n to be more relaxed for now until we nuke ActiveSupport dependency (Mikel)
+* Version bump to 2.2.12 and gem release
+
+== Tue 30 Nov 2010 00:36:11 UTC Mikel Lindsaar <mikel@rubyx.com>
+
+* Allow address lists to handle and ignore empty addresses (Donald Ball)
+* Allow address lists to handle repeating strings of commas (Donald Ball)
+* Noting pending test for malformed folding whitespace (Donald Ball)
+* Adding spec to test error email for missing addresses in to header (Mikel)
+* Bumping i18n dependency to ~> 0.5.0
+* Version bump to 2.2.11 and gem release
+
+== Wed 17 Nov 2010 00:43:31 UTC Mikel Lindsaar <mikel@rubyx.com>
+
+* Added test retriever and updated documentation (Donald Ball)
+* Fix test suite to work in any timezone (Donald Ball)
+* Added dependency for tlsmail for Ruby 1.8.6 (Donald Ball)
+* Added new feature, replies for mail message
+* Fix references header to use CFWS instead of comma as the separator per RFC2822
+* Version Bum to 2.2.10 and pushed.
+
+== Mon Nov 15 13:04:41 UTC 2010 Mikel Lindsaar <mikel@rubyx.com>
+
+* Add find_and_delete convenience method for consistency with POP3, document delete_after_find option (Donald Ball)
+* Documenting the openssl_verify_mode setting (Donald Ball)
+* Added ruby-1.8.6 back into the list of tested platforms (Donald Ball)
+* Relax i18n dependency until we remove active support requirement
+* Version Bump to 2.2.9.1 to include new i18n dependency
+
+== Tue Oct 26 07:14:36 UTC 2010 Mikel Lindsaar <mikel@rubyx.com>
+
+* Version Bump to 2.2.9 and tag
+* Updating Gemfile and gemspec to include i18n and sync dependency versions
+* Added work from Kendall Gifford closing issues #104, #107 and #117
+* Always encode mailbox names with UTF-7 (github: fasta)
+
+== Tue Oct 26 06:43:17 UTC 2010 Mikel Lindsaar <mikel@rubyx.com>
+
+* Added updates from Donald Ball (github: dball) to improve 1.8.6 support
+* Added patch from Ryan Bigg (github: ryanb) for #mark_for_delete
+
+== Thu Oct  7 15:44:31 UTC 2010 Mikel Lindsaar <mikel@rubyx.com>
+
+* Version Bump to 2.2.7
+* Release 2.2.7
+
+== Thu Oct  7 15:42:57 UTC 2010 Mikel Lindsaar <mikel@rubyx.com>
+
+* Added fix for Windows using 'rb' flags, thanks to Luis Lavena and dzhang for pointing it out
+* Fixed up Rakefile to require bundler to run specs and give more appropriate errors messages if this fails
+
+== Tue Sep 28 14:59:03 UTC 2010 Mikel Lindsaar <mikel@rubyx.com>
+
+* Merged POP3 delete support work from Michael Prendergast
+* Merged IMAP support work from Fabian Staubli
+
+== Mon Sep 13 02:31:21 UTC 2010 Mikel Lindsaar <mikel@rubyx.com>
+
+* Replace some missing documentation
+* Version bump to 2.2.6.1
+
+== Sat 11 Sep 2010 05:13:36 UTC Mikel Lindsaar <mikel@rubyx.com>
+
+* Fixed parsing an email with an empty In-Reply-To header (Reported by Eugene Pimenov)
+* Adding address spec for groupname+domain.com@example.com format emails
+* Version bump to 2.2.6
+
+== Sat Sep 11 01:56:59 UTC 2010 Mikel Lindsaar <mikel@rubyx.com>
+
+* Added new way to do versioning for rubygems
+* Added additional specs for Content-Disposition: inline which are not being encoded correctly - Shawn Pyle
+* Make sure Mail::Message#attachment? returns true/false - Simone Carletti
+* Replace hard-coded references to Mail with more generic self references to allow easier inheritance (closes #61) - Simone Carletti
+* Force encoding on Regexp for Ruby 1.9 to avoid encoding conflicts - Golubev Pavel
+* Added lazy evaluation to message body: body is not parsed until need. It greatly improves performance with big mails if you don't need to read the body (yet)
+* Added Mail.read_from_string as an explicit method (mcansky)
+* Fixed bounce detection for multipart reports that contain a human readable report status part
+* Closed Issue #65 found (incredibly) by quetz - major Kudos for bug hunting
+* Fixed missing trailing CRLF in content type field - Closes issue #57 - Kudos to Henry Flower for finding it
+* Version bump to 2.2.5.2
+
+== Sat Sep 11 01:32:13 UTC 2010 Mikel Lindsaar <mikel@rubyx.com>
+
+* Closed issue #58 - Content Type not parsing unless lower case.
+* Version bump to 2.2.5.1
+
 == Thu 17 Jun 2010 22:13:18 UTC Mikel Lindsaar <mikel@rubyx.com>
 
 * Added Mail::POP3.delete_all, including specs (Martijn Storck)
@@ -109,7 +265,7 @@
 
 == Sun Jan 28 02:59:34 UTC 2010 Mikel Lindsaar <raasdnil@gmail.com>
 
-* Removed old method of setting delivery_method 
+* Removed old method of setting delivery_method
 
 == Mon Jan 25 11:36:13 UTC 2010 Mikel Lindsaar <raasdnil@gmail.com>
 
@@ -148,13 +304,13 @@
 * Message now adds multipart/mixed as the content type if nothing is set and there are parts to the message
 * Added #display_names and #addrs to all address fields.  #addrs returns the actual Mail::Address object for each address in the field.
 * Body should call to_s on given input... incase someone gave it an IO.readlines result (Array)
-* 
+*
 
 == Thu Jan 21 05:27:17 UTC 2010 Mikel Lindsaar <raasdnil@gmail.com>
 
 * Version bump to 2.0.2
 * Major change to attachments, add_file now only accepts
-  {:filename => 'full/path/to/file.png'} or 
+  {:filename => 'full/path/to/file.png'} or
   {:filename => 'file.png', :content => 'string of file content'}
   you can also now do mail.attachments['filename.png'] = File.read('path/to/file.png')
   which is nice too!
@@ -229,8 +385,8 @@
 
 == Sun Dec 27 09:51:27 UTC 2009 Mikel Lindsaar <raasdnil@gmail.com>
 
-* Version bump to 1.4 because now :to_s calls :decoded for all fields and body 
-  while :to_s calls :encoded for Message and Header containers.  Makes sense... 
+* Version bump to 1.4 because now :to_s calls :decoded for all fields and body
+  while :to_s calls :encoded for Message and Header containers.  Makes sense...
   really.
 
 == Sun Dec 27 07:30:02 UTC 2009 Mikel Lindsaar <raasdnil@gmail.com>
@@ -339,7 +495,7 @@
 
 == Fri Nov  6 22:52:10 UTC 2009 Mikel Lindsaar <raasdnil@gmail.com>
 
-* a6ef2b4: Fixed Issue #4 - Can't call encoding on non existant 
+* a6ef2b4: Fixed Issue #4 - Can't call encoding on non existant
   content-transer-encoding header
 
 == Fri Nov  6 00:51:55 UTC 2009 Mikel Lindsaar <raasdnil@gmail.com>
@@ -380,7 +536,7 @@
 == Sun Nov  1 12:00:00 UTC 2009 Mikel Lindsaar <raasdnil@gmail.com>
 
 * handle OpenSSL::SSL::VERIFY_NONE returning 0 <jlindley>
-* doing Mail.new { content_type [text, plain, { charset => UTF-8 }] } is now 
+* doing Mail.new { content_type [text, plain, { charset => UTF-8 }] } is now
   possible (content type accepts an array) <mikel>
 
 == Sat Oct 31 11:00:41 UTC 2009 Mikel Lindsaar <raasdnil@gmail.com>

data/README.rdoc

@@ -27,15 +27,11 @@ you are doing, you can fiddle with every last bit of your email directly.
 
 Mail is tested and works on the following platforms:
 
-* jruby-1.4.0 [ [x86_64-java] ]
-* ree-1.8.7-2010.01 [ x86_64 ]
-* ruby-1.8.7-p249 [ x86_64 ]
-* ruby-1.9.1-head [ x86_64 ] (10 April 2010)
-* ruby-1.9.2-head [ x86_64 ] (10 April 2010)
-
-Mail seems to work fine on JRuby as well, however there is some weird QP
-problem that only shows up while running the specs, running it directly
-works fine.... weird.  Any jRuby gurus who want to help out, please do.
+* jruby-1.5.2 [ [x86_64-java] ]
+* ree-1.8.7-2010.02 [ x86_64 ]
+* ruby-1.8.6-p399 [ x86_64 ]
+* ruby-1.8.7-p302 [ x86_64 ]
+* ruby-1.9.2-p0 [ x86_64 ]
 
 == Discussion
 
@@ -62,7 +58,7 @@ field and continue parsing.
 
 This means Mail won't (ever) crunch your data (I think).
 
-You can also create MIME emails.  There are helper methods for making a 
+You can also create MIME emails.  There are helper methods for making a
 multipart/alternate email for text/plain and text/html (the most common pair)
 and you can manually create any other type of MIME email.
 
@@ -72,7 +68,6 @@ Next TODO:
 
 * Improve MIME support for character sets in headers, currently works, mostly, needs
   refinement.
-* Add IMAP wrapper
 
 == Testing Policy
 
@@ -93,23 +88,10 @@ Also, all private or protected methods to be declared as such - though this is s
 
 == Installation
 
-Installation is fairly simple, I host mail on gemcutter, so you can just do:
+Installation is fairly simple, I host mail on rubygems, so you can just do:
 
  # gem install mail
 
-if you are on gemcutter, if you aren't, you can by doing:
-
- # gem install gemcutter
- # gem tumble
- # gem install mail
- 
-Warning though, the above will change your first gem repository to gemcutter, this
-may or may not be a problem for you.
-
-If you want to install mail manually, you can download the gem from github and do:
-
- # gem install mail-2.2.0.gem
- 
 == Encodings
 
 If you didn't know, handling encodings in Emails is not as straight forward as you
@@ -121,26 +103,26 @@ I have tried to simplify it some:
    return the object as a complete string ready to send in the mail system, that is,
    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
    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 :to_s on a container object will call it's encoded method, while
    :to_s on a field object will call it's decoded method.  So calling :to_s on a Mail
    object will return the mail, all encoded ready to send, while calling :to_s on the
    From field or the body will return the decoded value of the object.  The header object
    of Mail is considered a container.  If you are in doubt, call :encoded, or :decoded
    explicitly, this is safer if you are not sure.
-   
+
 4. Structured fields that have parameter values that can be encoded (e.g. Content-Type) will
    provide decoded parameter values when you call the parameter names as methods against
    the object.
-   
+
 5. Structured fields that have parameter values that can be encoded (e.g. Content-Type) will
-   provide encoded parameter values when you call the parameter names through the 
+   provide encoded parameter values when you call the parameter names through the
    object.parameters['<parameter_name>'] method call.
- 
+
 == Contributing
 
 Please do!  Contributing is easy in Mail:
@@ -162,7 +144,7 @@ So, you should be able to just "require 'mail'" to get started.
 === Making an email
 
  require 'mail'
- 
+
  mail = Mail.new do
       from 'mikel@test.lindsaar.net'
         to 'you@test.lindsaar.net'
@@ -175,7 +157,7 @@ So, you should be able to just "require 'mail'" to get started.
 === Making an email, have it your way:
 
  require 'mail'
- 
+
  mail = Mail.new do
    body File.read('body.txt')
  end
@@ -183,35 +165,35 @@ So, you should be able to just "require 'mail'" to get started.
  mail['from'] = 'mikel@test.lindsaar.net'
  mail[:to]    = 'you@test.lindsaar.net'
  mail.subject = 'This is a test email'
- 
+
  mail.to_s #=> "From: mikel@test.lindsaar.net\r\nTo: you@...
 
 === Don't Worry About Message IDs:
 
  require 'mail'
- 
+
  mail = Mail.new do
      to 'you@test.lindsaar.net'
    body 'Some simple body'
  end
 
  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>
- 
+
 === Or do worry about Message-IDs:
 
  require 'mail'
- 
+
  mail = Mail.new do
           to 'you@test.lindsaar.net'
   message_id '<ThisIsMyMessageId@some.domain.com>'
         body 'Some simple body'
  end
- 
+
  mail.to_s =~ /Message\-ID: <ThisIsMyMessageId@some.domain.com>/ #=> 27
 
 Mail will take the message_id you assign to it trusting that you know
@@ -219,7 +201,7 @@ what you are doing.
 
 === Sending an email:
 
-Mail defaults to sending via SMTP to local host port 25.  If you have a 
+Mail defaults to sending via SMTP to local host port 25.  If you have a
 sendmail or postfix daemon running on on this port, sending email is as
 easy as:
 
@@ -232,7 +214,7 @@ easy as:
  end
 
 or
- 
+
  mail = Mail.new do
        from 'me@test.lindsaar.net'
          to 'you@test.lindsaar.net'
@@ -240,7 +222,7 @@ or
        body File.read('body.txt')
    add_file {:filename => 'somefile.png', :content => File.read('/somefile.png')}
  end
- 
+
  mail.deliver!
 
 Sending via sendmail can be done like so:
@@ -252,13 +234,18 @@ Sending via sendmail can be done like so:
         body File.read('body.txt')
     add_file {:filename => 'somefile.png', :content => File.read('/somefile.png')}
   end
-  
+
   mail.delivery_method :sendmail
-  
+
   mail.deliver
 
-mail.deliver!
+{Learn more about SMTP Delivery}[link:classes/Mail/SMTP.html]
+
+{Learn more about File Delivery}[link:classes/Mail/FileDelivery.html]
 
+{Learn more about Sendmail Delivery}[link:classes/Mail/Sendmail.html]
+
+{Learn more about Test Email Delivery}[link:classes/Mail/TestMailer.html]
 
 === Getting emails from a pop server:
 
@@ -305,12 +292,16 @@ Or even all emails:
 
  emails.length #=> LOTS!
 
+{Learn more about POP3}[link:classes/Mail/POP3.html]
+
+{Learn more about IMAP}[link:classes/Mail/IMAP.html]
+
 === Reading an Email
 
  require 'mail'
- 
+
  mail = Mail.read('/path/to/message.eml')
- 
+
  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'
@@ -326,9 +317,9 @@ Many more methods available.
 === Reading a Multipart Email
 
  require 'mail'
- 
+
  mail = Mail.read('multipart_email')
- 
+
  mail.multipart?          #=> true
  mail.parts.length        #=> 2
  mail.preamble            #=> "Text before the first part"
@@ -346,7 +337,7 @@ content type and has a boundary defined.
 
 === Writing and sending a multipart/alternative (html and text) email
 
-Mail makes some basic assumptions and makes doing the common thing as 
+Mail makes some basic assumptions and makes doing the common thing as
 simple as possible.... (asking a lot from a mail library)
 
  require 'mail'
@@ -363,7 +354,7 @@ simple as possible.... (asking a lot from a mail library)
      body '<h1>This is HTML</h1>'
    end
  end
- 
+
 Mail then delivers the email at the end of the block and returns the
 resulting Mail::Message object, which you can then inspect if you
 so desire...
@@ -399,7 +390,7 @@ so desire...
  <h1>This is HTML</h1>
  ----==_mimepart_4a914f0c911be_6f0f1ab8026659--
 
-Mail inserts the content transfer encoding, the mime version, 
+Mail inserts the content transfer encoding, the mime version,
 the content-id's and handles the content-type and boundary.
 
 Mail assumes that if your text in the body is only us-ascii, that your
@@ -413,7 +404,7 @@ can just do it declaratively.  However, you need to add Mail::Parts to
 an email, not Mail::Messages.
 
  require 'mail'
- 
+
  mail = Mail.new do
    to 'nicolas@test.lindsaar.net.au'
    from 'Mikel Lindsaar <mikel@test.lindsaar.net.au>'
@@ -423,12 +414,12 @@ an email, not Mail::Messages.
  text_part = Mail::Part.new do
    body 'This is plain text'
  end
- 
+
  html_part = Mail::Part.new do
    content_type 'text/html; charset=UTF-8'
    body '<h1>This is HTML</h1>'
  end
- 
+
  mail.text_part = text_part
  mail.html_part = html_part
 
@@ -437,14 +428,14 @@ Results in the same email as done using the block form
 === Getting error reports from an email:
 
  require 'mail'
- 
+
  @mail = Mail.read('/path/to/bounce_message.eml')
- 
+
  @mail.bounced?         #=> true
  @mail.final_recipient  #=> rfc822;mikel@dont.exist.com
  @mail.action           #=> failed
  @mail.error_status     #=> 5.5.0
- @mail.diagnostic_code  #=> smtp;550 Requested action not taken: mailbox unavailable 
+ @mail.diagnostic_code  #=> smtp;550 Requested action not taken: mailbox unavailable
  @mail.retryable?       #=> false
 
 === Attaching and Detaching Files
@@ -453,7 +444,7 @@ Results in the same email as done using the block form
 
 You can just read the file off an absolute path, Mail will try
 to guess the mime_type and will encode the file in Base64 for you.
-  
+
   @mail = Mail.new
   @mail.add_file("/path/to/file.jpg")
   @mail.parts.first.attachment? #=> true
@@ -464,7 +455,7 @@ to guess the mime_type and will encode the file in Base64 for you.
 
 Or You can pass in file_data and give it a filename, again, mail
 will try and guess the mime_type for you.
-  
+
   @mail = Mail.new
   @mail.attachments['myfile.pdf'] = File.read('path/to/myfile.pdf')
   @mail.parts.first.attachment? #=> true
@@ -497,7 +488,7 @@ Of course... Mail will round trip an attachment as well
   end
 
   @round_tripped_mail = Mail.new(@mail.encoded)
-  
+
   @round_tripped_mail.attachments.length #=> 1
   @round_tripped_mail.attachments.first.filename #=> 'myfile.pdf'
 
@@ -530,9 +521,9 @@ sending emails, the TestMailer can do this for you.
 
 == Excerpts from TREC Spam Corpus 2005
 
-The spec fixture files in spec/fixtures/emails/from_trec_2005 are from the 
+The spec fixture files in spec/fixtures/emails/from_trec_2005 are from the
 2005 TREC Public Spam Corpus. They remain copyrighted under the terms of
-that project and license agreement. They are used in this project to verify 
+that project and license agreement. They are used in this project to verify
 and describe the development of this email parser implementation.
 
 http://plg.uwaterloo.ca/~gvcormac/treccorpus/
@@ -543,14 +534,14 @@ They are used as allowed by 'Permitted Uses, Clause 3':
      or published in a scientific or technical context, solely for
      the purpose of describing the research and development and
      related issues."
-     
+
      -- http://plg.uwaterloo.ca/~gvcormac/treccorpus/
 
 == License:
 
 (The MIT License)
 
-Copyright (c) 2009
+Copyright (c) 2009, 2010, 2011
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,9 +1,29 @@
+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__)
 
 require 'rake/rdoctask'
 require 'rake/testtask'
 require 'spec/rake/spectask'
-require 'cucumber/rake/task'
 
 desc "Build a gem file"
 task :build do
@@ -11,9 +31,6 @@ task :build do
 end
 
 task :default => :spec
-Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = "spec/features --format pretty"
-end
 
 Spec::Rake::SpecTask.new(:rcov) do |t|
   t.spec_files = FileList['test/**/tc_*.rb', 'spec/**/*_spec.rb']
@@ -31,10 +48,18 @@ end
 
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Mail'
-  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.title    = 'Mail - A Ruby Mail Library'
+
+  rdoc.options << '-c' << 'utf-8'
+  rdoc.options << '--line-numbers'
+  rdoc.options << '--inline-source'
+  rdoc.options << '-m' << 'README.rdoc'
+
   rdoc.rdoc_files.include('README.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')
+  rdoc.rdoc_files.include('lib/network/**/*.rb')
+  rdoc.rdoc_files.exclude('lib/parsers/*')
+
 end
 
 # load custom rake tasks

data/lib/VERSION

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

data/lib/mail/attachments_list.rb

@@ -37,9 +37,10 @@ module Mail
     end
 
     def []=(name, value)
-      default_values = { :content_type => "#{set_mime_type(name)}; filename=\"#{name}\"",
+      encoded_name = Mail::Encodings.decode_encode name, :encode
+      default_values = { :content_type => "#{set_mime_type(name)}; filename=\"#{encoded_name}\"",
                          :content_transfer_encoding => "#{guess_encoding}",
-                         :content_disposition => "#{@content_disposition_type}; filename=\"#{name}\"" }
+                         :content_disposition => "#{@content_disposition_type}; filename=\"#{encoded_name}\"" }
 
       if value.is_a?(Hash)
 
@@ -73,7 +74,7 @@ module Mail
           hash[:body].force_encoding("BINARY")
         end
       end
-      
+
       attachment = Part.new(hash)
       attachment.add_content_id(hash[:content_id])
 
@@ -102,4 +103,3 @@ module Mail
 
   end
 end
-

data/lib/mail/body.rb

@@ -130,7 +130,6 @@ module Mail
         @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
@@ -163,7 +162,12 @@ module Mail
         else
             # Decode then encode to normalize and allow transforming 
             # from base64 to Q-P and vice versa
-            enc.encode(dec.decode(raw_source))
+            decoded = dec.decode(raw_source)
+            if defined?(Encoding) && charset && charset != "US-ASCII"
+              decoded.encode!(charset)
+              decoded.force_encoding('BINARY') unless Encoding.find(charset).ascii_compatible?
+            end
+            enc.encode(decoded)
         end
       end
     end