mail 2.6.4 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f91f133d2e44832ecef1cb4bfe9cc57391aedf84
-  data.tar.gz: 23d0cdbc09cdbaafee76b01d7c3820a6c0dfb6d1
+SHA256:
+  metadata.gz: 19bd6b0f4442e909c23a9b7da4aecd758bc7f13f49f55b0d38cbcea5d18a91bf
+  data.tar.gz: 30187e6fef5ff7d5aaa6e1608bac3f74748946b6aa84f63bc0152b14f8ec0f70
 SHA512:
-  metadata.gz: c788407da309561bee6a59ec746efeea7c0cc8633206eb2085f08ad6b161df92475109a988de748e554248d2ca47e6cd31c3fd0394d0eddac5950e7bb28783a8
-  data.tar.gz: 55b70f9d539420d254373c7abfccf6bc85228f34c38696086be363a36fb4f966415238aaa8e9ec9e6eed02207af2a3940b9f85c5f3076e735cd19e095764abc2
+  metadata.gz: 1d0fca43599584febff0aee7cc250a9280005080a9274024fa011b99ab27e4d40ebf72161c60d7115641d844d560f34b87e07994b485c6c0ae2cbd102cd04b11
+  data.tar.gz: 47735a46f1117a0d9709a3b72db5030ea71c645418a60b8fb62637777c9cdd687079fca33f77dfc4388aa5f8d4136768a555890d1f88768b351b81aaea9ab486

data/README.md

@@ -1,89 +1,93 @@
-Mail [![Build Status](https://travis-ci.org/mikel/mail.png?branch=master)](https://travis-ci.org/mikel/mail)
-====
+# Mail [![Build Status](https://github.com/mikel/mail/actions/workflows/test.yml/badge.svg)](https://github.com/mikel/mail/actions/workflows/test.yml)
 
-Introduction
-------------
+## Introduction
 
-Mail is an internet library for Ruby that is designed to handle emails
+Mail is an internet library for Ruby that is designed to handle email
 generation, parsing and sending in a simple, rubyesque manner.
 
 The purpose of this library is to provide a single point of access to handle
-all email functions, including sending and receiving emails.  All network
+all email functions, including sending and receiving email.  All network
 type actions are done through proxy methods to Net::SMTP, Net::POP3 etc.
 
 Built from my experience with TMail, it is designed to be a pure ruby
-implementation that makes generating, sending and parsing emails a no
+implementation that makes generating, sending and parsing email a no
 brainer.
 
 It is also designed from 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.
+of Ruby.  Modern Rubies handle text encodings much more wonderfully than before
+so these features have been taken full advantage of in this library allowing
+Mail to handle a lot more messages more cleanly than TMail.
 
 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
 you are doing, you can fiddle with every last bit of your email directly.
 
-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 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
-[make a donation](http://www.pledgie.com/campaigns/8790) and feel free to send
-me a nice email :)
-
-<a href='http://www.pledgie.com/campaigns/8790'><img alt='Click here to lend your support to: mail and make a donation at www.pledgie.com !' src='http://www.pledgie.com/campaigns/8790.png?skin_name=chrome' border='0' /></a>
-
-
-Compatibility
--------------
-
-Every Mail commit is tested by Travis on the [following platforms](https://github.com/mikel/mail/blob/master/.travis.yml)
-
-* ruby-1.8.7 [ i686 ]
-* ruby-1.9.2 [ x86_64 ]
-* ruby-1.9.3 [ x86_64 ]
-* ruby-2.0.0 [ 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:
-
-```sh
-BUNDLE_GEMFILE=gemfiles/mime_types_1.16.gemfile (bundle check || bundle) && rake
-```
-
-Discussion
-----------
+## You can contribute to this library
+
+Yes, you! Mail is used in countless apps by people around the world. It is,
+like all open source software, a labour of love borne from our free time.
+If you would like to say thanks, please dig in and contribute alongside us!
+Triage and fix [GitHub issues](https://github.com/mikel/mail/issues), improve
+our documentation, add new features—up to you! Thank you for pitching in.
+
+
+# Contents
+* [Compatibility](#compatibility)
+* [Discussion](#discussion)
+* [Current Capabilities of Mail](#current-capabilities-of-mail)
+* [Roadmap](#roadmap)
+* [Testing Policy](#testing-policy)
+* [API Policy](#api-policy)
+* [Installation](#installation)
+* [Encodings](#encodings)
+* [Contributing](#contributing)
+* [Usage](#usage)
+* [Excerpts from TREC Spam Corpus 2005](#excerpts-from-trec-spam-corpus-2005)
+* [License](#license)
+
+## Compatibility
+
+Mail is tested against:
+
+* Ruby: 2.5
+* Ruby: 2.6
+* Ruby: 2.7
+* Ruby: 3.0
+* Ruby: 3.1
+* Ruby: 3.2
+* JRuby: 9.2
+* JRuby: 9.3
+* JRuby: 9.4
+* JRuby: stable
+* JRuby: head
+* Truffleruby: stable
+* Truffleruby: head
+
+As new versions of Ruby are released, Mail will be compatible with support for the "preview" and all "normal maintenance", "security maintenance" and the two most recent "end of life" versions listed at the [Ruby Maintenance Branches](https://www.ruby-lang.org/en/downloads/branches/) page.  Pull requests to assist in adding support for new preview releases are more than welcome.
+
+Every Mail commit is tested by GitHub Actions on [all supported Ruby versions](https://github.com/mikel/mail/blob/master/.github/workflows/test.yml).
+
+## Discussion
 
 If you want to discuss mail with like minded individuals, please subscribe to
 the [Google Group](http://groups.google.com/group/mail-ruby).
 
-Current Capabilities of Mail
-----------------------------
+## Current Capabilities of Mail
 
-* RFC2822 Support, Reading and Writing
-* RFC2045-2049 Support for multipart emails
-* Support for creating multipart alternate emails
-* Support for reading multipart/report emails &amp; getting details from such
-* Support for multibyte emails - needs quite a lot of work and testing
+* RFC5322 Support, Reading and Writing
+* RFC6532 Support, reading UTF-8 headers
+* RFC2045-2049 Support for multipart email
+* Support for creating multipart alternate email
+* Support for reading multipart/report email &amp; getting details from such
 * Wrappers for File, Net/POP3, Net/SMTP
-* Auto encoding of non US-ASCII header fields
-* Auto encoding of non US-ASCII bodies
+* Auto-encoding of non-US-ASCII bodies and header fields
 
-Mail is RFC2822 compliant now, that is, it can parse and generate valid US-ASCII
-emails.  There are a few obsoleted syntax emails that it will have problems with, but
-it also is quite robust, meaning, if it finds something it doesn't understand it will
-not crash, instead, it will skip the problem and keep parsing.  In the case of a header
-it doesn't understand, it will initialise the header as an optional unstructured
-field and continue parsing.
+Mail is RFC5322 and RFC6532 compliant now, that is, it can parse US-ASCII and UTF-8
+email and generate US-ASCII email. There are a few obsoleted email syntax that
+it will have problems with, but it also is quite robust, meaning, if it finds something
+it doesn't understand it will not crash, instead, it will skip the problem and keep
+parsing. In the case of a header it doesn't understand, it will initialise the header
+as an optional unstructured field and continue parsing.
 
 This means Mail won't (ever) crunch your data (I think).
 
@@ -91,16 +95,14 @@ 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.
 
-Roadmap
--------
+## Roadmap
 
 Next TODO:
 
 * Improve MIME support for character sets in headers, currently works, mostly, needs
   refinement.
 
-Testing Policy
---------------
+## Testing Policy
 
 Basically... we do BDD on Mail.  No method gets written in Mail without a
 corresponding or covering spec.  We expect as a minimum 100% coverage
@@ -110,25 +112,24 @@ the gem gets released.
 
 It also means you can be sure Mail will behave correctly.
 
-Note: If you care about core extensions (aka "monkey-patching"), please read the Core Extensions section near the end of this README.
+You can run tests locally by running `bundle exec rspec`.
+
+You can run tests on all supported Ruby versions by using [act](https://github.com/nektos/act).
 
-API Policy
-----------
+## API Policy
 
 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.
 
-Installation
-------------
+## Installation
 
 Installation is fairly simple, I host mail on rubygems, so you can just do:
 
     # gem install mail
 
-Encodings
----------
+## Encodings
 
 If you didn't know, handling encodings in Emails is not as straight forward as you
 would hope.
@@ -160,17 +161,17 @@ I have tried to simplify it some:
    provide encoded parameter values when you call the parameter names through the
    <code>object.parameters['<parameter_name>']</code> method call.
 
-Contributing
-------------
+## Contributing
 
-Please do!  Contributing is easy in Mail.  Please read the CONTRIBUTING.md document for more info
+Please do!  Contributing is easy in Mail.  Please read the [CONTRIBUTING.md](CONTRIBUTING.md) document for more info.
 
-Usage
------
+## Usage
 
 All major mail functions should be able to happen from the Mail module.
 So, you should be able to just <code>require 'mail'</code> to get started.
 
+`mail` is pretty well documented in its Ruby code.  You can look it up e.g. at [rubydoc.info](https://www.rubydoc.info/gems/mail).
+
 ### Making an email
 
 ```ruby
@@ -234,7 +235,7 @@ what you are doing.
 ### Sending an email:
 
 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
+sendmail or postfix daemon running on this port, sending email is as
 easy as:
 
 ```ruby
@@ -294,12 +295,23 @@ mail.delivery_method :exim, :location => "/usr/bin/exim"
 mail.deliver
 ```
 
-### Getting emails from a pop server:
+Mail may be "delivered" to a logfile, too, for development and testing:
+
+```ruby
+# Delivers by logging the encoded message to $stdout
+mail.delivery_method :logger
+
+# Delivers to an existing logger at :debug severity
+mail.delivery_method :logger, logger: other_logger, severity: :debug
+```
+
+### Getting Emails from a POP or IMAP Server:
 
 You can configure Mail to receive email using <code>retriever_method</code>
 within <code>Mail.defaults</code>:
 
 ```ruby
+# e.g. POP3
 Mail.defaults do
   retriever_method :pop3, :address    => "pop.gmail.com",
                           :port       => 995,
@@ -307,6 +319,15 @@ Mail.defaults do
                           :password   => '<password>',
                           :enable_ssl => true
 end
+
+# IMAP
+Mail.defaults do
+  retriever_method :imap, :address    => "imap.mailbox.org",
+                          :port       => 993,
+                          :user_name  => '<username>',
+                          :password   => '<password>',
+                          :enable_ssl => true
+end
 ```
 
 You can access incoming email in a number of ways.
@@ -347,7 +368,7 @@ mail.cc              #=> 'sam@test.lindsaar.net'
 mail.subject         #=> "This is the subject"
 mail.date.to_s       #=> '21 Nov 1997 09:55:06 -0600'
 mail.message_id      #=> '<4D6AA7EB.6490534@xxx.xxx>'
-mail.body.decoded    #=> 'This is the body of the email...
+mail.decoded         #=> 'This is the body of the email...
 ```
 
 Many more methods available.
@@ -373,7 +394,7 @@ is another message which can have many or no parts.
 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
+### Testing and Extracting Attachments
 ```ruby
 mail.attachments.each do | attachment |
   # Attachments is an AttachmentsList object containing a
@@ -382,32 +403,35 @@ mail.attachments.each do | attachment |
     # extracting images for example...
     filename = attachment.filename
     begin
-      File.open(images_dir + filename, "w+b", 0644) {|f| f.write attachment.body.decoded}
+      File.open(images_dir + filename, "w+b", 0644) {|f| f.write attachment.decoded}
     rescue => e
       puts "Unable to save data for #{filename} because #{e.message}"
     end
   end
 end
 ```
-### Writing and sending a multipart/alternative (html and text) email
+### Writing and Sending a Multipart/Alternative (HTML and Text) Email
 
 Mail makes some basic assumptions and makes doing the common thing as
 simple as possible.... (asking a lot from a mail library)
 
 ```ruby
 mail = Mail.deliver do
-  to      'nicolas@test.lindsaar.net.au'
-  from    'Mikel Lindsaar <mikel@test.lindsaar.net.au>'
-  subject 'First multipart email sent with Mail'
-
-  text_part do
-    body 'This is plain text'
-  end
-
-  html_part do
-    content_type 'text/html; charset=UTF-8'
-    body '<h1>This is HTML</h1>'
+  part :content_type => "multipart/mixed" do |p1|
+    p1.part :content_type => "multipart/related" do |p2|
+      p2.part :content_type => "multipart/alternative",
+              :content_disposition => "inline" do |p3|
+        p3.part :content_type => "text/plain; charset=utf-8",
+                :body => "Here is the attachment you wanted\n"
+        p3.part :content_type => "text/html; charset=utf-8",
+                :body => "<h1>Funky Title</h1><p>Here is the attachment you wanted</p>\n"
+      end
+    end
+    add_file '/path/to/myfile.pdf'
   end
+  from      "Mikel Lindsaar <mikel@test.lindsaar.net.au>"
+  to        "nicolas@test.lindsaar.net.au"
+  subject   "First multipart email sent with Mail"
 end
 ```
 
@@ -418,44 +442,86 @@ so desire...
 ```
 puts mail.to_s #=>
 
-To: nicolas@test.lindsaar.net.au
+Date: Tue, 26 Apr 2022 20:12:07 +0200
 From: Mikel Lindsaar <mikel@test.lindsaar.net.au>
+To: nicolas@test.lindsaar.net.au
+Message-ID: <626835f736e19_10873fdfa3c2ffd4947a3@sender.at.mail>
 Subject: First multipart email sent with Mail
+MIME-Version: 1.0
+Content-Type: multipart/mixed;
+ boundary=\"--==_mimepart_626835f733867_10873fdfa3c2ffd494636\";
+ charset=UTF-8
+Content-Transfer-Encoding: 7bit
+
+
+----==_mimepart_626835f733867_10873fdfa3c2ffd494636
+Content-Type: multipart/mixed;
+ boundary=\"--==_mimepart_626835f73382a_10873fdfa3c2ffd494518\";
+ charset=UTF-8
+Content-Transfer-Encoding: 7bit
+
+
+----==_mimepart_626835f73382a_10873fdfa3c2ffd494518
+Content-Type: multipart/related;
+ boundary=\"--==_mimepart_626835f7337f5_10873fdfa3c2ffd494438\";
+ charset=UTF-8
+Content-Transfer-Encoding: 7bit
+
+
+----==_mimepart_626835f7337f5_10873fdfa3c2ffd494438
 Content-Type: multipart/alternative;
-  boundary=--==_mimepart_4a914f0c911be_6f0f1ab8026659
-Message-ID: <4a914f12ac7e_6f0f1ab80267d1@baci.local.mail>
-Date: Mon, 24 Aug 2009 00:15:46 +1000
-Mime-Version: 1.0
+ boundary=\"--==_mimepart_626835f733702_10873fdfa3c2ffd494376\";
+ charset=UTF-8
 Content-Transfer-Encoding: 7bit
+Content-Disposition: inline
+Content-ID: <626835f738373_10873fdfa3c2ffd49488b@sender.at.mail>
 
 
-----==_mimepart_4a914f0c911be_6f0f1ab8026659
-Content-ID: <4a914f12c8c4_6f0f1ab80268d6@baci.local.mail>
-Date: Mon, 24 Aug 2009 00:15:46 +1000
-Mime-Version: 1.0
-Content-Type: text/plain
+----==_mimepart_626835f733702_10873fdfa3c2ffd494376
+Content-Type: text/plain;
+ charset=utf-8
 Content-Transfer-Encoding: 7bit
 
-This is plain text
-----==_mimepart_4a914f0c911be_6f0f1ab8026659
-Content-Type: text/html; charset=UTF-8
-Content-ID: <4a914f12cf86_6f0f1ab802692c@baci.local.mail>
-Date: Mon, 24 Aug 2009 00:15:46 +1000
-Mime-Version: 1.0
+Here is the attachment you wanted
+
+----==_mimepart_626835f733702_10873fdfa3c2ffd494376
+Content-Type: text/html;
+ charset=utf-8
+Content-Transfer-Encoding: 7bit
+
+<h1>Funky Title</h1><p>Here is the attachment you wanted</p>
+
+----==_mimepart_626835f733702_10873fdfa3c2ffd494376--
+
+----==_mimepart_626835f7337f5_10873fdfa3c2ffd494438--
+
+----==_mimepart_626835f73382a_10873fdfa3c2ffd494518--
+
+----==_mimepart_626835f733867_10873fdfa3c2ffd494636
+Content-Type: text/plain;
+ charset=UTF-8;
+ filename=myfile.txt
 Content-Transfer-Encoding: 7bit
+Content-Disposition: attachment;
+ filename=myfile.txt
+Content-ID: <6
+26835f7386ab_10873fdfa3c2ffd4949b8@sender.at.mail>
 
-<h1>This is HTML</h1>
-----==_mimepart_4a914f0c911be_6f0f1ab8026659--
+Hallo,
+Test
+End
+
+----==_mimepart_626835f733867_10873fdfa3c2ffd494636--
 ```
 
 Mail inserts the content transfer encoding, the mime version,
-the content-id's and handles the content-type and boundary.
+the content-IDs and handles the content-type and boundary.
 
 Mail assumes that if your text in the body is only us-ascii, that your
 transfer encoding is 7bit and it is text/plain.  You can override this
 by explicitly declaring it.
 
-### Making Multipart/Alternate, without a block
+### Making Multipart/Alternate, Without a Block
 
 You don't have to use a block with the text and html part included, you
 can just do it declaratively.  However, you need to add Mail::Parts to
@@ -483,7 +549,7 @@ mail.html_part = html_part
 
 Results in the same email as done using the block form
 
-### Getting error reports from an email:
+### Getting Error Reports from an Email:
 
 ```ruby
 @mail = Mail.read('/path/to/bounce_message.eml')
@@ -527,7 +593,6 @@ than mail (this should be rarely needed)
 
 ```ruby
 @mail = Mail.new
-file_data = File.read('path/to/myfile.pdf')
 @mail.attachments['myfile.pdf'] = { :mime_type => 'application/x-pdf',
                                     :content => File.read('path/to/myfile.pdf') }
 @mail.parts.first.mime_type #=> 'application/x-pdf'
@@ -560,8 +625,7 @@ end
 ```
 See "Testing and extracting attachments" above for more details.
 
-Using Mail with Testing or Spec'ing Libraries
----------------------------------------------
+## 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.
@@ -597,7 +661,7 @@ Mail.defaults do
   delivery_method :test # in practice you'd do this in spec_helper.rb
 end
 
-describe "sending an email" do
+RSpec.describe "sending an email" do
   include Mail::Matchers
 
   before(:each) do
@@ -611,70 +675,59 @@ describe "sending an email" do
     end
   end
 
-  it { should have_sent_email } # passes if any email at all was sent
+  it { is_expected.to have_sent_email } # passes if any email at all was sent
 
-  it { should have_sent_email.from('you@you.com') }
-  it { should have_sent_email.to('mike1@me.com') }
+  it { is_expected.to have_sent_email.from('you@you.com') }
+  it { is_expected.to have_sent_email.to('mike1@me.com') }
 
   # can specify a list of recipients...
-  it { should have_sent_email.to(['mike1@me.com', 'mike2@me.com']) }
+  it { is_expected.to have_sent_email.to(['mike1@me.com', 'mike2@me.com']) }
 
   # ...or chain recipients together
-  it { should have_sent_email.to('mike1@me.com').to('mike2@me.com') }
+  it { is_expected.to have_sent_email.to('mike1@me.com').to('mike2@me.com') }
 
-  it { should have_sent_email.with_subject('testing') }
+  it { is_expected.to have_sent_email.with_subject('testing') }
 
-  it { should have_sent_email.with_body('hello') }
+  it { is_expected.to have_sent_email.with_body('hello') }
 
   # Can match subject or body with a regex
   # (or anything that responds_to? :match)
 
-  it { should have_sent_email.matching_subject(/test(ing)?/) }
-  it { should have_sent_email.matching_body(/h(a|e)llo/) }
+  it { is_expected.to have_sent_email.matching_subject(/test(ing)?/) }
+  it { is_expected.to have_sent_email.matching_body(/h(a|e)llo/) }
 
   # Can chain together modifiers
   # Note that apart from recipients, repeating a modifier overwrites old value.
 
-  it { should have_sent_email.from('you@you.com').to('mike1@me.com').matching_body(/hell/)
+  it { is_expected.to have_sent_email.from('you@you.com').to('mike1@me.com').matching_body(/hell/)
 
   # test for attachments
 
   # ... by specific attachment
-  it { should_have_sent_email.with_attachments(my_attachment) }
+  it { is_expected.to have_sent_email.with_attachments(my_attachment) }
 
   # ... or any attachment
-  it { should_have_sent_email.with_attachments(any_attachment) }
+  it { is_expected.to have_sent_email.with_attachments(any_attachment) }
+
+  # ... or attachment with filename
+  it { is_expected.to have_sent_email.with_attachments(an_attachment_with_filename('file.txt')) }
+
+  # ... or attachment with mime_type
+  it { is_expected.to have_sent_email.with_attachments(an_attachment_with_mime_type('application/pdf')) }
 
   # ... by array of attachments
-  it { should_have_sent_email.with_attachments([my_attachment1, my_attachment2]) } #note that order is important
+  it { is_expected.to have_sent_email.with_attachments([my_attachment1, my_attachment2]) } #note that order is important
 
   #... by presence
-  it { should_have_sent_email.with_any_attachments }
+  it { is_expected.to have_sent_email.with_any_attachments }
 
   #... or by absence
-  it { should_have_sent_email.with_no_attachments }
+  it { is_expected.to have_sent_email.with_no_attachments }
 
 end
 ```
 
-Core Extensions
----------------
-
-The mail gem adds several constants and methods to Ruby's core objects (similar to the activesupport gem from the Rails project).  For example:
-
-    NilClass::blank?
-    NilClass::to_crlf
-    NilClass::to_lf
-    Object::blank?
-    String::to_crlf
-    String::to_lf
-    String::blank?
-    ...etc...
-
-For all the details, check out lib/mail/core_extensions/.
-
-Excerpts from TREC Spam Corpus 2005
------------------------------------
+## Excerpts from TREC Spam Corpus 2005
 
 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
@@ -692,8 +745,7 @@ They are used as allowed by 'Permitted Uses, Clause 3':
 
      -- http://plg.uwaterloo.ca/~gvcormac/treccorpus/
 
-License
--------
+## License
 
 (The MIT License)
 

data/lib/mail/attachments_list.rb

@@ -6,8 +6,10 @@ module Mail
       @parts_list = parts_list
       @content_disposition_type = 'attachment'
       parts_list.map { |p|
-        if p.content_type == "message/rfc822"
-          Mail.new(p.body).attachments
+        if p.mime_type == 'message/rfc822'
+          parts = []
+          parts << p if p.attachment?
+          parts.concat Mail.new(p.body.encoded).attachments
         elsif p.parts.empty?
           p if p.attachment?
         else
@@ -30,7 +32,7 @@ module Mail
     # mail.attachments['test.png'].filename #=> 'test.png'
     # mail.attachments[1].filename          #=> 'test.jpg'
     def [](index_value)
-      if index_value.is_a?(Fixnum)
+      if index_value.is_a?(Integer)
         self.fetch(index_value)
       else
         self.select { |a| a.filename == index_value }.first
@@ -44,6 +46,9 @@ module Mail
                          :content_disposition => "#{@content_disposition_type}; filename=\"#{encoded_name}\"" }
 
       if value.is_a?(Hash)
+        if path = value.delete(:filename)
+          value[:content] ||= File.open(path, 'rb') { |f| f.read }
+        end
 
         default_values[:body] = value.delete(:content) if value[:content]
 
@@ -60,7 +65,7 @@ module Mail
 
         if value[:mime_type]
           default_values[:content_type] = value.delete(:mime_type)
-          @mime_type = MIME::Types[default_values[:content_type]].first
+          @mime_type = MiniMime.lookup_by_content_type(default_values[:content_type])
           default_values[:content_transfer_encoding] ||= guess_encoding
         end
 
@@ -71,7 +76,7 @@ module Mail
       end
 
       if hash[:body].respond_to? :force_encoding and hash[:body].respond_to? :valid_encoding?
-        if not hash[:body].valid_encoding? and default_values[:content_transfer_encoding].downcase == "binary"
+        if not hash[:body].valid_encoding? and default_values[:content_transfer_encoding].casecmp('binary').zero?
           hash[:body] = hash[:body].dup if hash[:body].frozen?
           hash[:body].force_encoding("BINARY")
         end
@@ -94,12 +99,10 @@ module Mail
     end
 
     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)
-      end
+      filename = filename.encode(Encoding::UTF_8) if filename.respond_to?(:encode)
 
-      @mime_type = MIME::Types.type_for(filename).first
+      @mime_type = MiniMime.lookup_by_filename(filename)
+      @mime_type && @mime_type.content_type
     end
 
   end