actionmailer 1.1.5 → 1.2.0

data/CHANGELOG

@@ -1,3 +1,18 @@
+*1.2.0* (March 27th, 2005)
+
+* Nil charset caused subject line to be improperly quoted in implicitly multipart messages #2662 [ehalvorsen+rails@runbox.com]
+
+* Parse content-type apart before using it so that sub-parts of the header can be set correctly #2918 [Jamis Buck]
+
+* Make custom headers work in subparts #4034 [elan@bluemandrill.com]
+
+* Template paths with dot chars in them no longer mess up implicit template selection for multipart messages #3332 [Chad Fowler]
+
+* Make sure anything with content-disposition of "attachment" is passed to the attachment presenter when parsing an email body [Jamis Buck]
+
+* Make sure TMail#attachments includes anything with content-disposition of "attachment", regardless of content-type [Jamis Buck]
+
+
 *1.1.5* (December 13th, 2005)
 
 * Become part of Rails 1.0
@@ -7,6 +22,8 @@
 
 * Rename Version constant to VERSION. #2802 [Marcel Molina Jr.]
 
+* Stricter matching for implicitly multipart filenames excludes files ending in unsupported extensions (such as foo.rhtml.bak) and without a two-part content type (such as foo.text.rhtml or foo.text.really.plain.rhtml).  #2398 [Dave Burt <dave@burt.id.au>, Jeremy Kemper]
+
 
 *1.1.3* (November 7th, 2005)
 

data/lib/action_mailer/adv_attr_accessor.rb

@@ -8,16 +8,20 @@ module ActionMailer
     module ClassMethods #:nodoc:
       def adv_attr_accessor(*names)
         names.each do |name|
+          ivar = "@#{name}"
+
           define_method("#{name}=") do |value|
-            instance_variable_set("@#{name}", value)
+            instance_variable_set(ivar, value)
           end
 
           define_method(name) do |*parameters|
             raise ArgumentError, "expected 0 or 1 parameters" unless parameters.length <= 1
             if parameters.empty?
-              instance_variable_get("@#{name}")
+              if instance_variables.include?(ivar)
+                instance_variable_get(ivar)
+              end
             else
-              instance_variable_set("@#{name}", parameters.first)
+              instance_variable_set(ivar, parameters.first)
             end
           end
         end

data/lib/action_mailer/base.rb

@@ -4,7 +4,7 @@ require 'action_mailer/part_container'
 require 'action_mailer/utils'
 require 'tmail/net'
 
-module ActionMailer
+module ActionMailer #:nodoc:
   # Usage:
   #
   #   class ApplicationMailer < ActionMailer::Base
@@ -121,6 +121,10 @@ module ActionMailer
   class Base
     include AdvAttrAccessor, PartContainer
 
+    # Action Mailer subclasses should be reloaded by the dispatcher in Rails
+    # when Dependencies.mechanism = :load.
+    include Reloadable::Subclasses
+    
     private_class_method :new #:nodoc:
 
     cattr_accessor :template_root
@@ -278,15 +282,17 @@ module ActionMailer
         if @parts.empty?
           templates = Dir.glob("#{template_path}/#{@template}.*")
           templates.each do |path|
-            type = (File.basename(path).split(".")[1..-2] || []).join("/")
-            next if type.empty?
-            @parts << Part.new(:content_type => type,
+            # TODO: don't hardcode rhtml|rxml
+            basename = File.basename(path)
+            next unless md = /^([^\.]+)\.([^\.]+\.[^\+]+)\.(rhtml|rxml)$/.match(basename)
+            template_name = basename
+            content_type = md.captures[1].gsub('.', '/')
+            @parts << Part.new(:content_type => content_type,
               :disposition => "inline", :charset => charset,
-              :body => render_message(File.basename(path).split(".")[0..-2].join('.'), @body))
+              :body => render_message(template_name, @body))
           end
           unless @parts.empty?
             @content_type = "multipart/alternative"
-            @charset = nil
             @parts = sort_parts(@parts, @implicit_parts_order)
           end
         end
@@ -296,7 +302,7 @@ module ActionMailer
         # normal template exists (or if there were no implicit parts) we render
         # it.
         template_exists = @parts.empty?
-        template_exists ||= Dir.glob("#{template_path}/#{@template}.*").any? { |i| i.split(".").length == 2 }
+        template_exists ||= Dir.glob("#{template_path}/#{@template}.*").any? { |i| File.basename(i).split(".").length == 2 }
         @body = render_message(@template, @body) if template_exists
 
         # Finally, if there are other message parts and a textual body exists,
@@ -406,14 +412,16 @@ module ActionMailer
         m.date = sent_on.to_time rescue sent_on if sent_on
         headers.each { |k, v| m[k] = v }
 
+        real_content_type, ctype_attrs = parse_content_type
+
         if @parts.empty?
-          m.set_content_type content_type, nil, { "charset" => charset }
+          m.set_content_type(real_content_type, nil, ctype_attrs)
           m.body = Utils.normalize_new_lines(body)
         else
           if String === body
             part = TMail::Mail.new
             part.body = Utils.normalize_new_lines(body)
-            part.set_content_type content_type, nil, { "charset" => charset }
+            part.set_content_type(real_content_type, nil, ctype_attrs)
             part.set_content_disposition "inline"
             m.parts << part
           end
@@ -423,7 +431,10 @@ module ActionMailer
             m.parts << part
           end
           
-          m.set_content_type(content_type, nil, { "charset" => charset }) if content_type =~ /multipart/
+          if real_content_type =~ /multipart/
+            ctype_attrs.delete "charset"
+            m.set_content_type(real_content_type, nil, ctype_attrs)
+          end
         end
 
         @mail = m

data/lib/action_mailer/part.rb

@@ -56,6 +56,8 @@ module ActionMailer
     def to_mail(defaults)
       part = TMail::Mail.new
 
+      real_content_type, ctype_attrs = parse_content_type(defaults)
+
       if @parts.empty?
         part.content_transfer_encoding = transfer_encoding || "quoted-printable"
         case (transfer_encoding || "").downcase
@@ -71,20 +73,20 @@ module ActionMailer
         # Also don't set filename and name when there is none (like in
         # non-attachment parts)
         if content_disposition == "attachment"
-          part.set_content_type(content_type || defaults.content_type, nil,
-            squish("charset" => nil, "name" => filename))
+          ctype_attrs.delete "charset"
+          part.set_content_type(real_content_type, nil,
+            squish("name" => filename).merge(ctype_attrs))
           part.set_content_disposition(content_disposition,
-            squish("filename" => filename))
+            squish("filename" => filename).merge(ctype_attrs))
         else
-          part.set_content_type(content_type || defaults.content_type, nil,
-            "charset" => (charset || defaults.charset))      
+          part.set_content_type(real_content_type, nil, ctype_attrs)
           part.set_content_disposition(content_disposition) 
         end        
       else
         if String === body
           part = TMail::Mail.new
           part.body = body
-          part.set_content_type content_type, nil, { "charset" => charset }
+          part.set_content_type(real_content_type, nil, ctype_attrs)
           part.set_content_disposition "inline"
           m.parts << part
         end
@@ -94,13 +96,16 @@ module ActionMailer
           part.parts << prt
         end
         
-        part.set_content_type(content_type, nil, { "charset" => charset }) if content_type =~ /multipart/
+        part.set_content_type(real_content_type, nil, ctype_attrs) if real_content_type =~ /multipart/
       end
-    
+
+      headers.each { |k,v| part[k] = v }
+
       part
     end
 
     private
+
       def squish(values={})
         values.delete_if { |k,v| v.nil? }
       end

data/lib/action_mailer/part_container.rb

@@ -38,5 +38,14 @@ module ActionMailer
       part(params, &block)
     end
 
+    private
+    
+      def parse_content_type(defaults=nil)
+        return [defaults && defaults.content_type, {}] if content_type.blank?
+        ctype, *attrs = content_type.split(/;\s*/)
+        attrs = attrs.inject({}) { |h,s| k,v = s.split(/=/, 2); h[k] = v; h }
+        [ctype, {"charset" => charset || defaults && defaults.charset}.merge(attrs)]
+      end
+
   end
 end

data/lib/action_mailer/vendor/tmail/attachments.rb

@@ -7,13 +7,18 @@ module TMail
 
   class Mail
     def has_attachments?
-      multipart? && parts.any? { |part| part.header["content-type"].main_type != "text" }
+      multipart? && parts.any? { |part| attachment?(part) }
+    end
+
+    def attachment?(part)
+      (part['content-disposition'] && part['content-disposition'].disposition == "attachment") ||
+      part.header['content-type'].main_type != "text"
     end
 
     def attachments
       if multipart?
         parts.collect { |part| 
-          if part.header["content-type"].main_type != "text"
+          if attachment?(part)
             content   = part.body # unquoted automatically by TMail#body
             file_name = (part['content-location'] &&
                           part['content-location'].body) ||

data/lib/action_mailer/vendor/tmail/quoting.rb

@@ -33,7 +33,7 @@ module TMail
             part.body(to_charset, &attachment_presenter)
           elsif header.nil?
             ""
-          elsif header.main_type == "text"
+          elsif !attachment?(part)
             part.unquoted_body(to_charset)
           else
             attachment_presenter.call(header["name"] || "(unnamed)")

data/lib/action_mailer/version.rb

@@ -1,8 +1,8 @@
 module ActionMailer
   module VERSION #:nodoc:
     MAJOR = 1
-    MINOR = 1
-    TINY  = 5
+    MINOR = 2
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/rakefile

@@ -25,6 +25,7 @@ Rake::TestTask.new { |t|
   t.libs << "test"
   t.pattern = 'test/*_test.rb'
   t.verbose = true
+  t.warning = false
 }
 
 
@@ -32,7 +33,7 @@ Rake::TestTask.new { |t|
 Rake::RDocTask.new { |rdoc|
   rdoc.rdoc_dir = 'doc'
   rdoc.title    = "Action Mailer -- Easy email delivery and testing"
-  rdoc.options << '--line-numbers --inline-source --main README --accessor adv_attr_accessor=M'
+  rdoc.options << '--line-numbers' << '--inline-source' << '-A cattr_accessor=object'
   rdoc.template = "#{ENV['template']}.rb" if ENV['template']
   rdoc.rdoc_files.include('README', 'CHANGELOG')
   rdoc.rdoc_files.include('lib/action_mailer.rb')
@@ -53,7 +54,7 @@ spec = Gem::Specification.new do |s|
   s.rubyforge_project = "actionmailer"
   s.homepage = "http://www.rubyonrails.org"
 
-  s.add_dependency('actionpack', '= 1.11.2' + PKG_BUILD)
+  s.add_dependency('actionpack', '= 1.12.0' + PKG_BUILD)
 
   s.has_rdoc = true
   s.requirements << 'none'

data/test/fixtures/path.with.dots/multipart_with_template_path_with_dots.rhtml

@@ -0,0 +1 @@
+Have a lovely picture, from me. Enjoy!

data/test/fixtures/raw_email13

@@ -0,0 +1,29 @@
+Mime-Version: 1.0 (Apple Message framework v730)
+Content-Type: multipart/mixed; boundary=Apple-Mail-13-196941151
+Message-Id: <9169D984-4E0B-45EF-82D4-8F5E53AD7012@example.com>
+From: foo@example.com
+Subject: testing
+Date: Mon, 6 Jun 2005 22:21:22 +0200
+To: blah@example.com
+
+
+--Apple-Mail-13-196941151
+Content-Transfer-Encoding: quoted-printable
+Content-Type: text/plain;
+	charset=ISO-8859-1;
+	delsp=yes;
+	format=flowed
+
+This is the first part.
+
+--Apple-Mail-13-196941151
+Content-Type: text/x-ruby-script; name="hello.rb"
+Content-Transfer-Encoding: 7bit
+Content-Disposition: attachment;
+	filename="api.rb"
+
+puts "Hello, world!"
+gets
+
+--Apple-Mail-13-196941151--
+

data/test/fixtures/raw_email7

@@ -21,6 +21,16 @@ Content-Type: text/plain;
 
 This is the first part.
 
+--Apple-Mail-12-196940926
+Content-Transfer-Encoding: 7bit
+Content-Type: text/x-ruby-script;
+	x-unix-mode=0666;
+	name="test.rb"
+Content-Disposition: attachment;
+	filename=test.rb
+
+puts "testing, testing"
+
 --Apple-Mail-12-196940926
 Content-Transfer-Encoding: base64
 Content-Type: application/pdf;

data/test/fixtures/test_mailer/implicitly_multipart_example.ignored.rhtml

@@ -0,0 +1 @@
+Ignored when searching for implicitly multipart parts.

data/test/fixtures/test_mailer/implicitly_multipart_example.rhtml.bak

@@ -0,0 +1 @@
+Ignored when searching for implicitly multipart parts.

data/test/mail_service_test.rb

@@ -23,6 +23,20 @@ class Net::SMTP
   end
 end
 
+class FunkyPathMailer < ActionMailer::Base
+  def multipart_with_template_path_with_dots(recipient)
+    recipients recipient
+    subject    "Have a lovely picture"
+    from       "Chad Fowler <chad@chadfowler.com>"
+    attachment :content_type => "image/jpeg",
+      :body => "not really a jpeg, we're only testing, after all"
+  end
+
+  def template_path
+    "#{File.dirname(__FILE__)}/fixtures/path.with.dots"
+  end
+end
+
 class TestMailer < ActionMailer::Base
 
   def signed_up(recipient)
@@ -153,6 +167,14 @@ class TestMailer < ActionMailer::Base
     @implicit_parts_order = order if order
   end
 
+  def implicitly_multipart_with_utf8
+    recipients "no.one@nowhere.test"
+    subject    "Foo áëô îü"
+    from       "some.one@somewhere.test"
+    template   "implicitly_multipart_example"
+    body       ({ "recipient" => "no.one@nowhere.test" })
+  end
+
   def html_mail(recipient)
     recipients   recipient
     subject      "html mail"
@@ -204,6 +226,15 @@ class TestMailer < ActionMailer::Base
     end
     attachment :content_type => "application/octet-stream",:filename => "test.txt", :body => "test abcdefghijklmnopqstuvwxyz"
   end
+  
+  def attachment_with_custom_header(recipient)
+    recipients   recipient
+    subject      "custom header in attachment"
+    from         "test@example.com"
+    content_type "multipart/related"
+    part :content_type => "text/html", :body => 'yo'
+    attachment :content_type => "image/jpeg",:filename => "test.jpeg", :body => "i am not a real picture", :headers => { 'Content-ID' => '<test@test.com>' }
+  end
 
   def unnamed_attachment(recipient)
     recipients   recipient
@@ -223,6 +254,14 @@ class TestMailer < ActionMailer::Base
     body         "testing"
   end
 
+  def custom_content_type_attributes
+    recipients   "no.one@nowhere.test"
+    subject      "custom content types"
+    from         "some.one@somewhere.test"
+    content_type "text/plain; format=flowed"
+    body         "testing"
+  end
+
   class <<self
     attr_accessor :received_body
   end
@@ -270,6 +309,12 @@ class ActionMailerTest < Test::Unit::TestCase
     assert_equal "application/octet-stream", created.parts[1].content_type
   end
 
+  def test_attachment_with_custom_header
+    created = nil
+    assert_nothing_raised { created = TestMailer.create_attachment_with_custom_header(@recipient)}
+    assert_equal "<test@test.com>", created.parts[1].header['content-id'].to_s
+  end
+
   def test_signed_up
     expected = new_mail
     expected.to      = @recipient
@@ -573,6 +618,14 @@ EOF
     assert_equal "Photo25.jpg", mail.attachments.first.original_filename
   end
 
+  def test_attachment_with_text_type
+    fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email13")
+    mail = TMail::Mail.parse(fixture)
+    assert mail.has_attachments?
+    assert_equal 1, mail.attachments.length
+    assert_equal "hello.rb", mail.attachments.first.original_filename
+  end
+
   def test_decode_part_without_content_type
     fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email4")
     mail = TMail::Mail.parse(fixture)
@@ -601,6 +654,11 @@ EOF
     assert_match(/\nSubject: =\?utf-8\?Q\?Foo_.*?\?=/, mail.encoded)
   end
 
+  def test_implicitly_multipart_with_utf8
+    mail = TestMailer.create_implicitly_multipart_with_utf8
+    assert_match(/\nSubject: =\?utf-8\?Q\?Foo_.*?\?=/, mail.encoded)
+  end
+
   def test_explicitly_multipart_messages
     mail = TestMailer.create_explicitly_multipart_example(@recipient)
     assert_equal 3, mail.parts.length
@@ -697,7 +755,7 @@ EOF
   def test_recursive_multipart_processing
     fixture = File.read(File.dirname(__FILE__) + "/fixtures/raw_email7")
     mail = TMail::Mail.parse(fixture)
-    assert_equal "This is the first part.\n\nAttachment: test.pdf\n\n\nAttachment: smime.p7s\n", mail.body
+    assert_equal "This is the first part.\n\nAttachment: test.rb\nAttachment: test.pdf\n\n\nAttachment: smime.p7s\n", mail.body
   end
 
   def test_decode_encoded_attachment_filename
@@ -741,9 +799,20 @@ EOF
   end
 
   def test_deliver_with_mail_object
-    mail = TestMailer::create_headers_with_nonalpha_chars(@recipient)
+    mail = TestMailer.create_headers_with_nonalpha_chars(@recipient)
     assert_nothing_raised { TestMailer.deliver(mail) }
     assert_equal 1, TestMailer.deliveries.length
   end
+
+  def test_multipart_with_template_path_with_dots
+    mail = FunkyPathMailer.create_multipart_with_template_path_with_dots(@recipient)
+    assert_equal 2, mail.parts.length
+  end
+
+  def test_custom_content_type_attributes
+    mail = TestMailer.create_custom_content_type_attributes
+    assert_match %r{format=flowed}, mail['content-type'].to_s
+    assert_match %r{charset=utf-8}, mail['content-type'].to_s
+  end
 end
 

metadata

@@ -3,11 +3,11 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: actionmailer
 version: !ruby/object:Gem::Version 
-  version: 1.1.5
-date: 2005-12-13 00:00:00 -06:00
+  version: 1.2.0
+date: 2006-03-27 00:00:00 -06:00
 summary: Service layer for easy email delivery and testing.
 require_paths: 
-  - lib
+- lib
 email: david@loudthinking.com
 homepage: http://www.rubyonrails.org
 rubyforge_project: actionmailer
@@ -18,107 +18,115 @@ bindir: bin
 has_rdoc: true
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
-    - 
-      - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 0.0.0
   version: 
 platform: ruby
 signing_key: 
 cert_chain: 
 authors: 
-  - David Heinemeier Hansson
+- David Heinemeier Hansson
 files: 
-  - rakefile
-  - install.rb
-  - README
-  - CHANGELOG
-  - MIT-LICENSE
-  - lib/action_mailer
-  - lib/action_mailer.rb
-  - lib/action_mailer/adv_attr_accessor.rb
-  - lib/action_mailer/base.rb
-  - lib/action_mailer/helpers.rb
-  - lib/action_mailer/mail_helper.rb
-  - lib/action_mailer/part.rb
-  - lib/action_mailer/part_container.rb
-  - lib/action_mailer/quoting.rb
-  - lib/action_mailer/utils.rb
-  - lib/action_mailer/vendor
-  - lib/action_mailer/version.rb
-  - lib/action_mailer/vendor/text
-  - lib/action_mailer/vendor/tmail
-  - lib/action_mailer/vendor/tmail.rb
-  - lib/action_mailer/vendor/text/format.rb
-  - lib/action_mailer/vendor/tmail/address.rb
-  - lib/action_mailer/vendor/tmail/attachments.rb
-  - lib/action_mailer/vendor/tmail/base64.rb
-  - lib/action_mailer/vendor/tmail/config.rb
-  - lib/action_mailer/vendor/tmail/encode.rb
-  - lib/action_mailer/vendor/tmail/facade.rb
-  - lib/action_mailer/vendor/tmail/header.rb
-  - lib/action_mailer/vendor/tmail/info.rb
-  - lib/action_mailer/vendor/tmail/loader.rb
-  - lib/action_mailer/vendor/tmail/mail.rb
-  - lib/action_mailer/vendor/tmail/mailbox.rb
-  - lib/action_mailer/vendor/tmail/mbox.rb
-  - lib/action_mailer/vendor/tmail/net.rb
-  - lib/action_mailer/vendor/tmail/obsolete.rb
-  - lib/action_mailer/vendor/tmail/parser.rb
-  - lib/action_mailer/vendor/tmail/port.rb
-  - lib/action_mailer/vendor/tmail/quoting.rb
-  - lib/action_mailer/vendor/tmail/scanner.rb
-  - lib/action_mailer/vendor/tmail/scanner_r.rb
-  - lib/action_mailer/vendor/tmail/stringio.rb
-  - lib/action_mailer/vendor/tmail/tmail.rb
-  - lib/action_mailer/vendor/tmail/utils.rb
-  - test/fixtures
-  - test/mail_helper_test.rb
-  - test/mail_render_test.rb
-  - test/mail_service_test.rb
-  - test/quoting_test.rb
-  - test/tmail_test.rb
-  - test/fixtures/helper_mailer
-  - test/fixtures/helpers
-  - test/fixtures/raw_email
-  - test/fixtures/raw_email10
-  - test/fixtures/raw_email11
-  - test/fixtures/raw_email12
-  - test/fixtures/raw_email2
-  - test/fixtures/raw_email3
-  - test/fixtures/raw_email4
-  - test/fixtures/raw_email5
-  - test/fixtures/raw_email6
-  - test/fixtures/raw_email7
-  - test/fixtures/raw_email8
-  - test/fixtures/raw_email9
-  - test/fixtures/templates
-  - test/fixtures/test_mailer
-  - test/fixtures/helper_mailer/use_helper.rhtml
-  - test/fixtures/helper_mailer/use_helper_method.rhtml
-  - test/fixtures/helper_mailer/use_mail_helper.rhtml
-  - test/fixtures/helper_mailer/use_test_helper.rhtml
-  - test/fixtures/helpers/test_helper.rb
-  - test/fixtures/templates/signed_up.rhtml
-  - test/fixtures/test_mailer/implicitly_multipart_example.text.html.rhtml
-  - test/fixtures/test_mailer/implicitly_multipart_example.text.plain.rhtml
-  - test/fixtures/test_mailer/implicitly_multipart_example.text.yaml.rhtml
-  - test/fixtures/test_mailer/signed_up.rhtml
+- rakefile
+- install.rb
+- README
+- CHANGELOG
+- MIT-LICENSE
+- lib/action_mailer
+- lib/action_mailer.rb
+- lib/action_mailer/adv_attr_accessor.rb
+- lib/action_mailer/base.rb
+- lib/action_mailer/helpers.rb
+- lib/action_mailer/mail_helper.rb
+- lib/action_mailer/part.rb
+- lib/action_mailer/part_container.rb
+- lib/action_mailer/quoting.rb
+- lib/action_mailer/utils.rb
+- lib/action_mailer/vendor
+- lib/action_mailer/version.rb
+- lib/action_mailer/vendor/text
+- lib/action_mailer/vendor/tmail
+- lib/action_mailer/vendor/tmail.rb
+- lib/action_mailer/vendor/text/format.rb
+- lib/action_mailer/vendor/tmail/address.rb
+- lib/action_mailer/vendor/tmail/attachments.rb
+- lib/action_mailer/vendor/tmail/base64.rb
+- lib/action_mailer/vendor/tmail/config.rb
+- lib/action_mailer/vendor/tmail/encode.rb
+- lib/action_mailer/vendor/tmail/facade.rb
+- lib/action_mailer/vendor/tmail/header.rb
+- lib/action_mailer/vendor/tmail/info.rb
+- lib/action_mailer/vendor/tmail/loader.rb
+- lib/action_mailer/vendor/tmail/mail.rb
+- lib/action_mailer/vendor/tmail/mailbox.rb
+- lib/action_mailer/vendor/tmail/mbox.rb
+- lib/action_mailer/vendor/tmail/net.rb
+- lib/action_mailer/vendor/tmail/obsolete.rb
+- lib/action_mailer/vendor/tmail/parser.rb
+- lib/action_mailer/vendor/tmail/port.rb
+- lib/action_mailer/vendor/tmail/quoting.rb
+- lib/action_mailer/vendor/tmail/scanner.rb
+- lib/action_mailer/vendor/tmail/scanner_r.rb
+- lib/action_mailer/vendor/tmail/stringio.rb
+- lib/action_mailer/vendor/tmail/tmail.rb
+- lib/action_mailer/vendor/tmail/utils.rb
+- test/fixtures
+- test/mail_helper_test.rb
+- test/mail_render_test.rb
+- test/mail_service_test.rb
+- test/quoting_test.rb
+- test/tmail_test.rb
+- test/fixtures/helper_mailer
+- test/fixtures/helpers
+- test/fixtures/path.with.dots
+- test/fixtures/raw_email
+- test/fixtures/raw_email10
+- test/fixtures/raw_email11
+- test/fixtures/raw_email12
+- test/fixtures/raw_email13
+- test/fixtures/raw_email2
+- test/fixtures/raw_email3
+- test/fixtures/raw_email4
+- test/fixtures/raw_email5
+- test/fixtures/raw_email6
+- test/fixtures/raw_email7
+- test/fixtures/raw_email8
+- test/fixtures/raw_email9
+- test/fixtures/templates
+- test/fixtures/test_mailer
+- test/fixtures/helper_mailer/use_helper.rhtml
+- test/fixtures/helper_mailer/use_helper_method.rhtml
+- test/fixtures/helper_mailer/use_mail_helper.rhtml
+- test/fixtures/helper_mailer/use_test_helper.rhtml
+- test/fixtures/helpers/test_helper.rb
+- test/fixtures/path.with.dots/multipart_with_template_path_with_dots.rhtml
+- test/fixtures/templates/signed_up.rhtml
+- test/fixtures/test_mailer/implicitly_multipart_example.ignored.rhtml
+- test/fixtures/test_mailer/implicitly_multipart_example.rhtml.bak
+- test/fixtures/test_mailer/implicitly_multipart_example.text.html.rhtml
+- test/fixtures/test_mailer/implicitly_multipart_example.text.plain.rhtml
+- test/fixtures/test_mailer/implicitly_multipart_example.text.yaml.rhtml
+- test/fixtures/test_mailer/signed_up.rhtml
 test_files: []
+
 rdoc_options: []
+
 extra_rdoc_files: []
+
 executables: []
+
 extensions: []
+
 requirements: 
-  - none
+- none
 dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: actionpack
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Version::Requirement 
-      requirements: 
-        - 
-          - "="
-          - !ruby/object:Gem::Version 
-            version: 1.11.2
-      version: 
+- !ruby/object:Gem::Dependency 
+  name: actionpack
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 1.12.0
+    version: