mail 1.5.1 → 1.5.2

data/CHANGELOG.rdoc

@@ -1,3 +1,28 @@
+== Fri  8 Jan 2010 00:00:08 UTC Mikel Lindsaar <raasdnil@gmail.com>
+
+* Version bump to 1.5.2
+
+== Fri  8 Jan 8:55:49 2010 +1100 Mikel Lindsaar <raasdnil@gmail.com>
+
+* Updated Sendmail and SMTP delivery methods to use return-path if present
+* Fix up a lot of content-type parsing problems
+* Updating compat listing
+* Moving error emails into one directory
+* Moving error emails into one directory
+* Initializing @tls variable to remove warnings
+* Moved default corpus directory
+* Fixed up git ignore file
+
+== Thu  6 Jan 2010 23:59:29 UTC Mikel Lindsaar <raasdnil@gmail.com>
+
+* Added compatibility list to Readme.rdoc
+* Fixing encoding of return path to be per RFC 2822, adding angle brackets around the addr_spec
+* Specs covering return path setting and preserving
+
+== Thu  5 Jan 2010 23:59:48 UTC Mikel Lindsaar <raasdnil@gmail.com>
+
+* Moving the require for tlsmail for Ruby 1.8.6 into mail.rb
+
 == Sun Jan  3 00:08:06 UTC 2010 Mikel Lindsaar <raasdnil@gmail.com>
 
 * Version bump to 1.5.0

data/README.rdoc

@@ -23,6 +23,22 @@ 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.
 
+== Compatibility
+
+Mail is tested and works on the following platforms:
+
+* ree-1.8.7-2009.10 [ x86_64 ]
+* ruby-1.8.6-p383 [ x86_64 ]
+* ruby-1.8.7-p248 [ x86_64 ]
+* ruby-1.9.1-head [ x86_64 ]
+* ruby-1.9.1-p376 [ x86_64 ]
+
+Mail seems to work fine on JRuby as well, however, the Base64 and Quoted-Printable
+encoding methods are implemented differently and return different values so 6 
+specs fail.  This needs to be triple checked if all OK.
+
+* jruby-1.4.0 [x86_64-java]
+
 == Discussion
 
 If you want to discuss mail with like minded individuals, please subscribe to

data/Rakefile

@@ -12,7 +12,7 @@ require 'bundler'
 
 spec = Gem::Specification.new do |s|
   s.name        = "mail"
-  s.version     = "1.5.1"
+  s.version     = "1.5.2"
   s.author      = "Mike Lindsaar"
   s.email       = "raasdnil@gmail.com"
   s.homepage    = "http://github.com/mikel/mail"
@@ -23,7 +23,6 @@ spec = Gem::Specification.new do |s|
   s.has_rdoc = true
   s.extra_rdoc_files = ["README.rdoc", "CHANGELOG.rdoc", "TODO.rdoc"]
 
-  s.add_dependency('tlsmail') if RUBY_VERSION <= '1.8.6'
   s.add_dependency('activesupport', ">= 2.3.4")
   s.add_dependency('mime-types')
 

data/lib/mail.rb

@@ -15,7 +15,14 @@ module Mail # :doc:
   require 'uri'
   require 'net/smtp'
   require 'mime/types'
-  require 'tlsmail' if RUBY_VERSION <= '1.8.6'
+
+  if RUBY_VERSION <= '1.8.6'
+    begin
+      require 'tlsmail'
+    rescue LoadError
+      raise "You need to install tlsmail if you are using ruby <= 1.8.6"
+    end
+  end
 
   if RUBY_VERSION >= "1.9.1"
     require 'mail/version_specific/ruby_1_9.rb'

data/lib/mail/fields/content_type_field.rb

@@ -28,9 +28,19 @@ module Mail
     end
     
     def element
-      @element ||= Mail::ContentTypeElement.new(value)
-    rescue
+      begin
+        @element ||= Mail::ContentTypeElement.new(value)
+      rescue
+        attempt_to_clean
+      end
+    end
+    
+    def attempt_to_clean
+      # Sanitize the value, handle special cases
       @element ||= Mail::ContentTypeElement.new(sanatize(value))
+    rescue
+      # All else fails, just get the mime type
+      @element ||= Mail::ContentTypeElement.new(get_mime_type(value))
     end
     
     def main_type
@@ -111,14 +121,50 @@ module Mail
       end
     end
     
+    # Various special cases from random emails found that I am not going to change
+    # the parser for
     def sanatize( val )
       case
-      when val.chomp =~ /^text$/
+      when val.chomp =~ /^\s*([\w\d\-_]+)\/([\w\d\-_]+)\s*;;+(.*)$/i
+        # Handles 'text/plain;; format="flowed"' (double semi colon)
+        "#{$1}/#{$2}; #{$3}"
+      when val.chomp =~ /^\s*([\w\d\-_]+)\/([\w\d\-_]+)\s*;(ISO[\w\d\-_]+)$/i
+        # Microsoft helper:
+        # Handles 'mime/type;ISO-8559-1'
+        "#{$1}/#{$2}; charset=#{quote_atom($3)}"
+      when val.chomp =~ /^text;?$/i
+        # Handles 'text;' and 'text'
+        "text/plain;"
+      when val.chomp =~ /^(\w+);\s(.*)$/i
+        # Handles 'text; <parameters>'
+        "text/plain; #{$2}"
+      when val =~ /([\w\d\-_]+\/[\w\d\-_]+);\scharset="charset="(\w+)""/i
+        # Handles text/html; charset="charset="GB2312""
+        "#{$1}; charset=#{quote_atom($2)}"
+      when val =~ /([\w\d\-_]+\/[\w\d\-_]+);\s+(.*)/i
+        type = $1
+        # Handles misquoted param values
+        # e.g: application/octet-stream; name=archiveshelp1[1].htm
+        # and: audio/x-midi;\r\n\tname=Part .exe
+        params = $2.to_s.split(/\s+/)
+        params = params.map { |i| i.to_s.chomp.strip }
+        params = params.map { |i| i.split(/\s*\=\s*/) }
+        params = params.map { |i| "#{i[0]}=#{dquote(i[1].to_s)}" }.join('; ')
+        "#{type}; #{params}"
+      when val =~ /^\s*$/
+        'text/plain'
+      else
+        ''
+      end
+    end
+    
+    def get_mime_type( val )
+      case
+      when val =~ /^([\w\d\-_]+)\/([\w\d\-_]+);.+$/i
+        "#{$1}/#{$2}"
+      else 
         'text/plain'
-      when val =~ /([\w\d_]+\/[\w\d_]+)\s(.*)/
-        "#{$1}; #{$2}"
       end
     end
-
   end
 end

data/lib/mail/fields/return_path_field.rb

@@ -1,5 +1,13 @@
 # encoding: utf-8
 # 
+# 4.4.3.  REPLY-TO / RESENT-REPLY-TO
+# 
+#    Note:  The "Return-Path" field is added by the mail  transport
+#           service,  at the time of final deliver.  It is intended
+#           to identify a path back to the orginator  of  the  mes-
+#           sage.   The  "Reply-To"  field  is added by the message
+#           originator and is intended to direct replies.
+# 
 # trace           =       [return]
 #                         1*received
 # 
@@ -32,7 +40,7 @@ module Mail
     end
     
     def encoded
-      do_encode(CAPITALIZED_FIELD)
+      "#{CAPITALIZED_FIELD}: <#{address}>\r\n"
     end
     
     def decoded

data/lib/mail/message.rb

@@ -1032,7 +1032,7 @@ module Mail
     end
 
     def has_content_type?
-      !!content_type
+      !!header[:content_type]
     end
     
     def has_charset?
@@ -1169,7 +1169,7 @@ module Mail
     
     # Returns true if the message is multipart
     def multipart?
-      !!(main_type =~ /^multipart$/i)
+      has_content_type? ? !!(main_type =~ /^multipart$/i) : false
     end
     
     # Returns true if the message is a multipart/report

data/lib/mail/network/delivery_methods/sendmail.rb

@@ -14,8 +14,10 @@ module Mail
     end
 
     def Sendmail.deliver!(mail)
-      IO.popen("#{Mail.defaults.sendmail.path} #{mail.destinations.join(" ")}", "w+") do |io|
+      mail.return_path ? return_path = "-f \"#{mail.return_path}\"" : reply_to = ''
+      IO.popen("#{Mail.defaults.sendmail.path} #{return_path} #{mail.destinations.join(" ")}", "w+") do |io|
         io.puts mail.to_s
+        io.flush
       end
     end
   end

data/lib/mail/network/delivery_methods/smtp.rb

@@ -5,6 +5,7 @@ module Mail
     def initialize
       @user = nil
       @pass = nil
+      @tls  = false
     end
     
     def settings(&block)
@@ -61,13 +62,13 @@ module Mail
       
       config = Mail.defaults
 
-      # TODO: use the "return-path" field by default instead of the "from" field ? (see ActionMailer)
-      from = mail.from_addrs.first
-      raise ArgumentError.new('An author -from- is required to send a message') if from.blank?
-      to ||= mail.destinations if mail.respond_to?(:destinations) && mail.destinations
-      raise ArgumentError.new('At least one recipient -to, cc, bcc- is required to send a message') if to.blank?
-      msg_str ||= mail.encoded if mail.respond_to?(:encoded)
-      raise ArgumentError.new('A encoded content is required to send a message') if msg_str.blank?
+      # Set the envelope from to be either the return-path, the sender or the first from address
+      envelope_from = mail.return_path || mail.sender || mail.from_addrs.first
+      raise ArgumentError.new('An sender (Return-Path, Sender or From) required to send a message') if envelope_from.blank?
+      destinations ||= mail.destinations if mail.respond_to?(:destinations) && mail.destinations
+      raise ArgumentError.new('At least one recipient (To, Cc or Bcc) is required to send a message') if destinations.blank?
+      message ||= mail.encoded if mail.respond_to?(:encoded)
+      raise ArgumentError.new('A encoded content is required to send a message') if message.blank?
       
       smtp = Net::SMTP.new(config.smtp.host, config.smtp.port)
       if config.smtp.tls?
@@ -81,7 +82,7 @@ module Mail
       end
       
       smtp.start(config.smtp.helo, config.smtp.user, config.smtp.pass, authentication = :plain) do |smtp|
-        smtp.sendmail(msg_str, from, to)
+        smtp.sendmail(message, envelope_from, destinations)
       end
       
       self

data/lib/mail/network/retriever_methods/pop3.rb

@@ -14,6 +14,7 @@ module Mail
     def initialize
       @user = nil
       @pass = nil
+      @tls  = false
     end
     
     require 'net/pop'

data/lib/mail/version.rb

@@ -3,7 +3,7 @@ module Mail
   module VERSION
     MAJOR = 1
     MINOR = 5
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/tasks/corpus.rake

@@ -10,7 +10,7 @@ namespace :corpus do
   desc "Provide a LOCATION=/some/dir to verify parsing in bulk, otherwise defaults"
   task :verify_all => :load_mail do
 
-    root_of_corpus    = ENV['LOCATION'] || 'spec/fixtures/corpus/spam'
+    root_of_corpus    = ENV['LOCATION'] || 'corpus/spam'
     @save_failures_to = ENV['SAVE_TO']  || 'spec/fixtures/emails/failed_emails'
     @failed_emails    = []
     @checked_count    = 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mail
 version: !ruby/object:Gem::Version 
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors: 
 - Mike Lindsaar
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-04 00:00:00 +11:00
+date: 2010-01-08 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency