mail 2.2.5 → 2.2.19

data/lib/mail/fields/content_type_field.rb

@@ -3,10 +3,10 @@ require 'mail/fields/common/parameter_hash'
 
 module Mail
   class ContentTypeField < StructuredField
-    
+
     FIELD_NAME = 'content-type'
     CAPITALIZED_FIELD = 'Content-Type'
-    
+
     def initialize(value = nil, charset = 'utf-8')
       self.charset = charset
       if value.class == Array
@@ -23,15 +23,15 @@ module Mail
       self.parse
       self
     end
-    
+
     def parse(val = value)
       unless val.blank?
-        self.value = val 
+        self.value = val
         @element = nil
         element
       end
     end
-    
+
     def element
       begin
         @element ||= Mail::ContentTypeElement.new(value)
@@ -39,7 +39,7 @@ module Mail
         attempt_to_clean
       end
     end
-    
+
     def attempt_to_clean
       # Sanitize the value, handle special cases
       @element ||= Mail::ContentTypeElement.new(sanatize(value))
@@ -47,7 +47,7 @@ module Mail
       # All else fails, just get the MIME media type
       @element ||= Mail::ContentTypeElement.new(get_mime_type(value))
     end
-    
+
     def main_type
       @main_type ||= element.main_type
     end
@@ -55,17 +55,17 @@ module Mail
     def sub_type
       @sub_type ||= element.sub_type
     end
-    
+
     def string
       "#{main_type}/#{sub_type}"
     end
-    
+
     def default
       decoded
     end
-    
+
     alias :content_type :string
-    
+
     def parameters
       unless @parameters
         @parameters = ParameterHash.new
@@ -77,7 +77,7 @@ module Mail
     def ContentTypeField.with_boundary(type)
       new("#{type}; boundary=#{generate_boundary}")
     end
-    
+
     def ContentTypeField.generate_boundary
       "--==_mimepart_#{Mail.random_tag}"
     end
@@ -89,7 +89,7 @@ module Mail
         @value
       end
     end
-    
+
     def stringify(params)
       params.map { |k,v| "#{k}=#{Encodings.param_encode(v)}" }.join("; ")
     end
@@ -100,22 +100,22 @@ module Mail
         @filename = parameters['filename']
       when parameters['name']
         @filename = parameters['name']
-      else 
+      else
         @filename = nil
       end
       @filename
     end
-    
+
     # TODO: Fix this up
     def encoded
       if parameters.length > 0
-        p = ";\r\n\s#{parameters.encoded}\r\n"
+        p = ";\r\n\s#{parameters.encoded}"
       else
         p = ""
       end
-      "#{CAPITALIZED_FIELD}: #{content_type}" + p
+      "#{CAPITALIZED_FIELD}: #{content_type}#{p}\r\n"
     end
-    
+
     def decoded
       if parameters.length > 0
         p = "; #{parameters.decoded}"
@@ -126,24 +126,37 @@ module Mail
     end
 
     private
-    
+
     def method_missing(name, *args, &block)
-      if name.to_s =~ /([\w_]+)=/
+      if name.to_s =~ /(\w+)=/
         self.parameters[$1] = args.first
         @value = "#{content_type}; #{stringify(parameters)}"
       else
         super
       end
     end
-    
+
     # Various special cases from random emails found that I am not going to change
     # the parser for
     def sanatize( val )
+
+      # TODO: check if there are cases where whitespace is not a separator
+      val = val.tr(' ',';').
+        squeeze(';').
+        gsub(';', '; '). #use '; ' as a separator (or EOL)
+        gsub(/;\s*$/,'') #remove trailing to keep examples below
+
+      if val =~ /(boundary=(\S*))/i
+        val = "#{$`.downcase}boundary=#{$2}#{$'.downcase}"
+      else
+        val.downcase!
+      end
+
       case
-      when val.chomp =~ /^\s*([\w\d\-_]+)\/([\w\d\-_]+)\s*;;+(.*)$/i
+      when val.chomp =~ /^\s*([\w\-]+)\/([\w\-]+)\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
+      when val.chomp =~ /^\s*([\w\-]+)\/([\w\-]+)\s*;\s?(ISO[\w\-]+)$/i
         # Microsoft helper:
         # Handles 'type/subtype;ISO-8559-1'
         "#{$1}/#{$2}; charset=#{quote_atom($3)}"
@@ -153,10 +166,10 @@ module Mail
       when val.chomp =~ /^(\w+);\s(.*)$/i
         # Handles 'text; <parameters>'
         "text/plain; #{$2}"
-      when val =~ /([\w\d\-_]+\/[\w\d\-_]+);\scharset="charset="(\w+)""/i
+      when val =~ /([\w\-]+\/[\w\-]+);\scharset="charset="(\w+)""/i
         # Handles text/html; charset="charset="GB2312""
         "#{$1}; charset=#{quote_atom($2)}"
-      when val =~ /([\w\d\-_]+\/[\w\d\-_]+);\s+(.*)/i
+      when val =~ /([\w\-]+\/[\w\-]+);\s+(.*)/i
         type = $1
         # Handles misquoted param values
         # e.g: application/octet-stream; name=archiveshelp1[1].htm
@@ -172,12 +185,12 @@ module Mail
         ''
       end
     end
-    
+
     def get_mime_type( val )
       case
-      when val =~ /^([\w\d\-_]+)\/([\w\d\-_]+);.+$/i
+      when val =~ /^([\w\-]+)\/([\w\-]+);.+$/i
         "#{$1}/#{$2}"
-      else 
+      else
         'text/plain'
       end
     end

data/lib/mail/fields/date_field.rb

@@ -34,13 +34,15 @@ module Mail
     def initialize(value = nil, charset = 'utf-8')
       self.charset = charset
       if value.blank?
-        value = Time.now.strftime('%a, %d %b %Y %H:%M:%S %z')
+        value = ::DateTime.now.strftime('%a, %d %b %Y %H:%M:%S %z')
       else
         value = strip_field(FIELD_NAME, value)
         value.to_s.gsub!(/\(.*?\)/, '')
         value = ::DateTime.parse(value.to_s.squeeze(" ")).strftime('%a, %d %b %Y %H:%M:%S %z')
       end
       super(CAPITALIZED_FIELD, value, charset)
+    rescue ArgumentError => e
+      raise e unless "invalid date"==e.message
     end
     
     def encoded

data/lib/mail/fields/received_field.rb

@@ -52,15 +52,23 @@ module Mail
     end
    
     def formatted_date
-        date_time.strftime("%a, %d %b %Y %H:%M:%S ") + date_time.zone.delete(':')
+      date_time.strftime("%a, %d %b %Y %H:%M:%S ") + date_time.zone.delete(':')
     end
  
     def encoded
-      "#{CAPITALIZED_FIELD}: #{info}; #{formatted_date}\r\n"
+      if value.blank?
+        "#{CAPITALIZED_FIELD}: \r\n"
+      else
+        "#{CAPITALIZED_FIELD}: #{info}; #{formatted_date}\r\n"
+      end
     end
     
     def decoded
-      "#{info}; #{formatted_date}" 
+      if value.blank?
+        ""
+      else
+        "#{info}; #{formatted_date}" 
+      end
     end
     
   end

data/lib/mail/fields/resent_date_field.rb

@@ -14,7 +14,7 @@ module Mail
     def initialize(value = nil, charset = 'utf-8')
       self.charset = charset
       if value.blank?
-        value = Time.now.strftime('%a, %d %b %Y %H:%M:%S %z')
+        value = ::DateTime.now.strftime('%a, %d %b %Y %H:%M:%S %z')
       else
         value = strip_field(FIELD_NAME, value)
         value = ::DateTime.parse(value.to_s).strftime('%a, %d %b %Y %H:%M:%S %z')

data/lib/mail/fields/return_path_field.rb

@@ -38,6 +38,7 @@ module Mail
     CAPITALIZED_FIELD = 'Return-Path'
     
     def initialize(value = nil, charset = 'utf-8')
+      value = nil if value == '<>'
       self.charset = charset
       super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
       self.parse

data/lib/mail/fields/unstructured_field.rb

@@ -71,7 +71,9 @@ module Mail
     end
     
     def do_decode
-      value.blank? ? nil : Encodings.decode_encode(value, :decode)
+      result = value.blank? ? nil : Encodings.decode_encode(value, :decode)
+      result.encode!(value.encoding || "UTF-8") if RUBY_VERSION >= '1.9' && !result.blank?
+      result
     end
     
     # 2.2.3. Long Header Fields
@@ -164,6 +166,7 @@ module Mail
     end
         
     def encode(value)
+      value.encode!(charset) if defined?(Encoding) && charset
       (value.not_ascii_only? ? [value].pack("M").gsub("=\n", '') : value).gsub("\r", "=0D").gsub("\n", "=0A")
     end
     

data/lib/mail/header.rb

@@ -73,7 +73,8 @@ module Mail
     #  h.fields = ['From: mikel@me.com', 'To: bob@you.com']
     def fields=(unfolded_fields)
       @fields = Mail::FieldList.new
-      unfolded_fields.each do |field|
+      warn "Warning: more than 1000 header fields only using the first 1000" if unfolded_fields.length > 1000
+      unfolded_fields[0..1000].each do |field|
 
         field = Field.new(field, nil, charset)
         field.errors.each { |error| self.errors << error }
@@ -161,16 +162,18 @@ module Mail
     end
     
     def charset
-      if self[:content_type] && self[:content_type].parameters
-        self[:content_type].parameters[:charset]
+      params = self[:content_type].parameters rescue nil
+      if params
+        params[:charset]
       else
         @charset
       end
     end
     
     def charset=(val)
-      if self[:content_type]
-        self[:content_type].parameters[:charset] = val
+      params = self[:content_type].parameters rescue nil
+      if params
+        params[:charset] = val
       end
       @charset = val
     end

data/lib/mail/mail.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 module Mail
-  
+
   # Allows you to create a new Mail::Message object.
   # 
   # You can make an email via passing a string or passing a block.
@@ -10,11 +10,11 @@ module Mail
   # 
   # Creating via a string:
   # 
-  #  string = 'To: mikel@test.lindsaar.net\r\n'
-  #  string << 'From: bob@test.lindsaar.net\r\n\r\n'
-  #  string << 'Subject: This is an email\r\n'
-  #  string << '\r\n'
-  #  string << 'This is the body'
+  #  string = "To: mikel@test.lindsaar.net\r\n"
+  #  string << "From: bob@test.lindsaar.net\r\n"
+  #  string << "Subject: This is an email\r\n"
+  #  string << "\r\n"
+  #  string << "This is the body"
   #  Mail.new(string)
   # 
   # Or creating via a block:
@@ -30,8 +30,8 @@ module Mail
   # 
   #  message = Mail.new({:to => 'mikel@test.lindsaar.net',
   #                      'from' => 'bob@test.lindsaar.net',
-  #                       :subject 'This is an email',
-  #                       :body 'This is the body' })
+  #                      :subject => 'This is an email',
+  #                      :body => 'This is the body' })
   # 
   # Note, the hash keys can be strings or symbols, the passed in object
   # does not need to be a hash, it just needs to respond to :each_pair
@@ -46,8 +46,8 @@ module Mail
   #  mail[:from] = 'bob@test.lindsaar.net'
   #  mail['subject'] = 'This is an email'
   #  mail.body = 'This is the body'
-  def Mail.new(*args, &block)
-    Mail::Message.new(args, &block)
+  def self.new(*args, &block)
+    Message.new(args, &block)
   end
 
   # Sets the default delivery method and retriever method for all new Mail objects.
@@ -102,22 +102,22 @@ module Mail
   # The passed in hash is just merged against the defaults with +merge!+ and the result
   # assigned the mail object.  So the above example will change only the :address value
   # of the global smtp_settings to be 'some.host', keeping all other values
-  def Mail.defaults(&block)
-    Mail::Configuration.instance.instance_eval(&block)
+  def self.defaults(&block)
+    Configuration.instance.instance_eval(&block)
   end
-  
+
   # Returns the delivery method selected, defaults to an instance of Mail::SMTP
-  def Mail.delivery_method
-    Mail::Configuration.instance.delivery_method
+  def self.delivery_method
+    Configuration.instance.delivery_method
   end
 
   # Returns the retriever method selected, defaults to an instance of Mail::POP3
-  def Mail.retriever_method
-    Mail::Configuration.instance.retriever_method
+  def self.retriever_method
+    Configuration.instance.retriever_method
   end
 
   # Send an email using the default configuration.  You do need to set a default
-  # configuration first before you use Mail.deliver, if you don't, an appropriate
+  # configuration first before you use self.deliver, if you don't, an appropriate
   # error will be raised telling you to.
   # 
   # If you do not specify a delivery type, SMTP will be used.
@@ -135,58 +135,72 @@ module Mail
   #  mail.deliver!
   # 
   # And your email object will be created and sent.
-  def Mail.deliver(*args, &block)
-    mail = Mail.new(args, &block)
+  def self.deliver(*args, &block)
+    mail = self.new(args, &block)
     mail.deliver
     mail
   end
 
-  # Find emails in a POP3 server.
-  # See Mail::POP3 for a complete documentation.
-  def Mail.find(*args, &block)
+  # Find emails from the default retriever
+  # See Mail::Retriever for a complete documentation.
+  def self.find(*args, &block)
     retriever_method.find(*args, &block)
   end
 
-  # Receive the first email(s) from a Pop3 server.
-  # See Mail::POP3 for a complete documentation.
-  def Mail.first(*args, &block)
+  # Finds and then deletes retrieved emails from the default retriever
+  # See Mail::Retriever for a complete documentation.
+  def self.find_and_delete(*args, &block)
+    retriever_method.find_and_delete(*args, &block)
+  end
+
+  # Receive the first email(s) from the default retriever
+  # See Mail::Retriever for a complete documentation.
+  def self.first(*args, &block)
     retriever_method.first(*args, &block)
   end
 
-  # Receive the first email(s) from a Pop3 server.
-  # See Mail::POP3 for a complete documentation.
-  def Mail.last(*args, &block)
+  # Receive the first email(s) from the default retriever
+  # See Mail::Retriever for a complete documentation.
+  def self.last(*args, &block)
     retriever_method.last(*args, &block)
   end
 
-  # Receive all emails from a POP3 server.
-  # See Mail::POP3 for a complete documentation.
-  def Mail.all(*args, &block)
+  # Receive all emails from the default retriever
+  # See Mail::Retriever for a complete documentation.
+  def self.all(*args, &block)
     retriever_method.all(*args, &block)
   end
 
   # Reads in an email message from a path and instantiates it as a new Mail::Message
-  def Mail.read(filename)
-    Mail.new(File.read(filename))
+  def self.read(filename)
+    self.new(File.open(filename, 'rb') { |f| f.read })
   end
-  
-  # Delete all emails from a POP3 server.
-  # See Mail::POP3 for a complete documentation.
-  def Mail.delete_all(*args, &block)
+
+  # Delete all emails from the default retriever
+  # See Mail::Retriever for a complete documentation.
+  def self.delete_all(*args, &block)
     retriever_method.delete_all(*args, &block)
   end
-  
-  
+
+  # Instantiates a new Mail::Message using a string
+  def Mail.read_from_string(mail_as_string)
+    Mail.new(mail_as_string)
+  end
+
+  def Mail.connection(&block)
+    retriever_method.connection(&block)
+  end
+
   # Initialize the observers and interceptors arrays
   @@delivery_notification_observers = []
   @@delivery_interceptors = []
-  
+
   # You can register an object to be informed of every email that is sent through
   # this method.
   # 
   # Your object needs to respond to a single method #delivered_email(mail)
   # which receives the email that is sent.
-  def Mail.register_observer(observer)
+  def self.register_observer(observer)
     unless @@delivery_notification_observers.include?(observer)
       @@delivery_notification_observers << observer
     end
@@ -199,43 +213,43 @@ module Mail
   # Your object needs to respond to a single method #delivering_email(mail)
   # which receives the email that is about to be sent.  Make your modifications
   # directly to this object.
-  def Mail.register_interceptor(interceptor)
+  def self.register_interceptor(interceptor)
     unless @@delivery_interceptors.include?(interceptor)
       @@delivery_interceptors << interceptor
     end
   end
-  
-  def Mail.inform_observers(mail)
+
+  def self.inform_observers(mail)
     @@delivery_notification_observers.each do |observer|
       observer.delivered_email(mail)
     end
   end
-  
-  def Mail.inform_interceptors(mail)
+
+  def self.inform_interceptors(mail)
     @@delivery_interceptors.each do |interceptor|
       interceptor.delivering_email(mail)
     end
   end
 
   protected
-  
-  def Mail.random_tag
+
+  def self.random_tag
     t = Time.now
     sprintf('%x%x_%x%x%d%x',
             t.to_i, t.tv_usec,
-            $$, Thread.current.object_id.abs, Mail.uniq, rand(255))
+            $$, Thread.current.object_id.abs, self.uniq, rand(255))
   end
-  
+
   private
 
-  def Mail.something_random
+  def self.something_random
     (Thread.current.object_id * rand(255) / Time.now.to_f).to_s.slice(-3..-1).to_i
   end
-  
-  def Mail.uniq
+
+  def self.uniq
     @@uniq += 1
   end
-  
-  @@uniq = Mail.something_random
-  
+
+  @@uniq = self.something_random
+
 end