mail 2.6.1 → 2.8.1

data/lib/mail/fields/date_field.rb

@@ -1,57 +1,29 @@
 # encoding: utf-8
-#
-# = Date Field
-#
-# The Date field inherits from StructuredField and handles the Date: header
-# field in the email.
-#
-# Sending date to a mail message will instantiate a Mail::Field object that
-# has a DateField as its field type.  This includes all Mail::CommonAddress
-# module instance methods.
-#
-# There must be excatly one Date field in an RFC2822 email.
-#
-# == Examples:
-#
-#  mail = Mail.new
-#  mail.date = 'Mon, 24 Nov 1997 14:22:01 -0800'
-#  mail.date       #=> #<DateTime: 211747170121/86400,-1/3,2299161>
-#  mail.date.to_s  #=> 'Mon, 24 Nov 1997 14:22:01 -0800'
-#  mail[:date]     #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::DateField:0x180e1c4
-#  mail['date']    #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::DateField:0x180e1c4
-#  mail['Date']    #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::DateField:0x180e1c4
-#
-require 'mail/fields/common/common_date'
+# frozen_string_literal: true
+require 'mail/fields/common_date_field'
 
 module Mail
-  class DateField < StructuredField
-
-    include Mail::CommonDate
-
-    FIELD_NAME = 'date'
-    CAPITALIZED_FIELD = "Date"
-
-    def initialize(value = nil, charset = 'utf-8')
-      self.charset = charset
-      if value.blank?
-        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
-      do_encode(CAPITALIZED_FIELD)
-    end
-
-    def decoded
-      do_decode
-    end
-
+  # = Date Field
+  #
+  # The Date field inherits from StructuredField and handles the Date: header
+  # field in the email.
+  #
+  # Sending date to a mail message will instantiate a Mail::Field object that
+  # has a DateField as its field type.  This includes all Mail::CommonAddress
+  # module instance methods.
+  #
+  # There must be excatly one Date field in an RFC2822 email.
+  #
+  # == Examples:
+  #
+  #  mail = Mail.new
+  #  mail.date = 'Mon, 24 Nov 1997 14:22:01 -0800'
+  #  mail.date       #=> #<DateTime: 211747170121/86400,-1/3,2299161>
+  #  mail.date.to_s  #=> 'Mon, 24 Nov 1997 14:22:01 -0800'
+  #  mail[:date]     #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::DateField:0x180e1c4
+  #  mail['date']    #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::DateField:0x180e1c4
+  #  mail['Date']    #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::DateField:0x180e1c4
+  class DateField < CommonDateField #:nodoc:
+    NAME = 'Date'
   end
 end

data/lib/mail/fields/from_field.rb

@@ -1,55 +1,34 @@
 # encoding: utf-8
-# 
-# = From Field
-# 
-# The From field inherits from StructuredField and handles the From: header
-# field in the email.
-# 
-# Sending from to a mail message will instantiate a Mail::Field object that
-# has a FromField as its field type.  This includes all Mail::CommonAddress
-# module instance metods.
-# 
-# Only one From field can appear in a header, though it can have multiple
-# addresses and groups of addresses.
-# 
-# == Examples:
-# 
-#  mail = Mail.new
-#  mail.from = 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail.from    #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
-#  mail[:from]  #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::FromField:0x180e1c4
-#  mail['from'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::FromField:0x180e1c4
-#  mail['From'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::FromField:0x180e1c4
-# 
-#  mail[:from].encoded   #=> 'from: Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net\r\n'
-#  mail[:from].decoded   #=> 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
-#  mail[:from].addresses #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
-#  mail[:from].formatted #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
-# 
-require 'mail/fields/common/common_address'
+# frozen_string_literal: true
+require 'mail/fields/common_address_field'
 
 module Mail
-  class FromField < StructuredField
-    
-    include Mail::CommonAddress
-    
-    FIELD_NAME = 'from'
-    CAPITALIZED_FIELD = 'From'
-    
-    def initialize(value = nil, charset = 'utf-8')
-      self.charset = charset
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
-      self.parse
-      self
-    end
-    
-    def encoded
-      do_encode(CAPITALIZED_FIELD)
-    end
-    
-    def decoded
-      do_decode
-    end
-
+  # = From Field
+  #
+  # The From field inherits from StructuredField and handles the From: header
+  # field in the email.
+  #
+  # Sending from to a mail message will instantiate a Mail::Field object that
+  # has a FromField as its field type.  This includes all Mail::CommonAddress
+  # module instance metods.
+  #
+  # Only one From field can appear in a header, though it can have multiple
+  # addresses and groups of addresses.
+  #
+  # == Examples:
+  #
+  #  mail = Mail.new
+  #  mail.from = 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
+  #  mail.from    #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
+  #  mail[:from]  #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::FromField:0x180e1c4
+  #  mail['from'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::FromField:0x180e1c4
+  #  mail['From'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::FromField:0x180e1c4
+  #
+  #  mail[:from].encoded   #=> 'from: Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net\r\n'
+  #  mail[:from].decoded   #=> 'Mikel Lindsaar <mikel@test.lindsaar.net>, ada@test.lindsaar.net'
+  #  mail[:from].addresses #=> ['mikel@test.lindsaar.net', 'ada@test.lindsaar.net']
+  #  mail[:from].formatted #=> ['Mikel Lindsaar <mikel@test.lindsaar.net>', 'ada@test.lindsaar.net']
+  class FromField < CommonAddressField #:nodoc:
+    NAME = 'From'
   end
 end

data/lib/mail/fields/in_reply_to_field.rb

@@ -1,56 +1,46 @@
 # encoding: utf-8
-# 
-# = In-Reply-To Field
-# 
-# The In-Reply-To field inherits from StructuredField and handles the 
-# In-Reply-To: header field in the email.
-# 
-# Sending in_reply_to to a mail message will instantiate a Mail::Field object that
-# has a InReplyToField as its field type.  This includes all Mail::CommonMessageId
-# module instance metods.
-# 
-# Note that, the #message_ids method will return an array of message IDs without the
-# enclosing angle brackets which per RFC are not syntactically part of the message id.
-# 
-# Only one InReplyTo field can appear in a header, though it can have multiple
-# Message IDs.
-# 
-# == Examples:
-# 
-#  mail = Mail.new
-#  mail.in_reply_to = '<F6E2D0B4-CC35-4A91-BA4C-C7C712B10C13@test.me.dom>'
-#  mail.in_reply_to    #=> '<F6E2D0B4-CC35-4A91-BA4C-C7C712B10C13@test.me.dom>'
-#  mail[:in_reply_to]  #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::InReplyToField:0x180e1c4
-#  mail['in_reply_to'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::InReplyToField:0x180e1c4
-#  mail['In-Reply-To'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::InReplyToField:0x180e1c4
-# 
-#  mail[:in_reply_to].message_ids #=> ['F6E2D0B4-CC35-4A91-BA4C-C7C712B10C13@test.me.dom']
-# 
-require 'mail/fields/common/common_message_id'
+# frozen_string_literal: true
+require 'mail/fields/common_message_id_field'
 
 module Mail
-  class InReplyToField < StructuredField
-    
-    include Mail::CommonMessageId
-    
-    FIELD_NAME = 'in-reply-to'
-    CAPITALIZED_FIELD = 'In-Reply-To'
-    
-    def initialize(value = nil, charset = 'utf-8')
-      self.charset = charset
-      value = value.join("\r\n\s") if value.is_a?(Array)
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
-      self.parse
-      self
-    end
-    
-    def encoded
-      do_encode(CAPITALIZED_FIELD)
+  # = In-Reply-To Field
+  #
+  # The In-Reply-To field inherits from StructuredField and handles the
+  # In-Reply-To: header field in the email.
+  #
+  # Sending in_reply_to to a mail message will instantiate a Mail::Field object that
+  # has a InReplyToField as its field type.  This includes all Mail::CommonMessageId
+  # module instance metods.
+  #
+  # Note that, the #message_ids method will return an array of message IDs without the
+  # enclosing angle brackets which per RFC are not syntactically part of the message id.
+  #
+  # Only one InReplyTo field can appear in a header, though it can have multiple
+  # Message IDs.
+  #
+  # == Examples:
+  #
+  #  mail = Mail.new
+  #  mail.in_reply_to = '<F6E2D0B4-CC35-4A91-BA4C-C7C712B10C13@test.me.dom>'
+  #  mail.in_reply_to    #=> '<F6E2D0B4-CC35-4A91-BA4C-C7C712B10C13@test.me.dom>'
+  #  mail[:in_reply_to]  #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::InReplyToField:0x180e1c4
+  #  mail['in_reply_to'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::InReplyToField:0x180e1c4
+  #  mail['In-Reply-To'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::InReplyToField:0x180e1c4
+  #
+  #  mail[:in_reply_to].message_ids #=> ['F6E2D0B4-CC35-4A91-BA4C-C7C712B10C13@test.me.dom']
+  class InReplyToField < CommonMessageIdField #:nodoc:
+    NAME = 'In-Reply-To'
+
+    def self.singular?
+      true
     end
-    
-    def decoded
-      do_decode
+
+    def initialize(value = nil, charset = nil)
+      if value.is_a?(Array)
+        super value.join("\r\n\s"), charset
+      else
+        super
+      end
     end
-    
   end
 end

data/lib/mail/fields/keywords_field.rb

@@ -1,44 +1,31 @@
 # encoding: utf-8
-# 
-# keywords        =       "Keywords:" phrase *("," phrase) CRLF
+# frozen_string_literal: true
+require 'mail/fields/named_structured_field'
+
 module Mail
-  class KeywordsField < StructuredField
-    
-    FIELD_NAME = 'keywords'
-    CAPITALIZED_FIELD = 'Keywords'
-    
-    def initialize(value = nil, charset = 'utf-8')
-      self.charset = charset
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
-      self.parse
-      self
-    end
+  # keywords        =       "Keywords:" phrase *("," phrase) CRLF
+  class KeywordsField < NamedStructuredField #:nodoc:
+    NAME = 'Keywords'
 
-    def parse(val = value)
-      unless val.blank?
-        @phrase_list ||= PhraseList.new(value)
-      end
+    def element
+      @element ||= PhraseList.new(value)
     end
-    
-    def phrase_list
-      @phrase_list ||= PhraseList.new(value)
-    end
-      
+
     def keywords
-      phrase_list.phrases
-    end
-    
-    def encoded
-      "#{CAPITALIZED_FIELD}: #{keywords.join(",\r\n ")}\r\n"
-    end
-    
-    def decoded
-      keywords.join(', ')
+      element.phrases
     end
 
     def default
       keywords
     end
-    
+
+    private
+      def do_decode
+        keywords.join(', ')
+      end
+
+      def do_encode
+        "#{name}: #{keywords.join(",\r\n ")}\r\n"
+      end
   end
 end

data/lib/mail/fields/message_id_field.rb

@@ -1,82 +1,37 @@
 # encoding: utf-8
-# 
-# = Message-ID Field
-# 
-# The Message-ID field inherits from StructuredField and handles the 
-# Message-ID: header field in the email.
-# 
-# Sending message_id to a mail message will instantiate a Mail::Field object that
-# has a MessageIdField as its field type.  This includes all Mail::CommonMessageId
-# module instance metods.
-# 
-# Only one MessageId field can appear in a header, and syntactically it can only have
-# one Message ID.  The message_ids method call has been left in however as it will only
-# return the one message id, ie, an array of length 1.
-# 
-# Note that, the #message_ids method will return an array of message IDs without the
-# enclosing angle brackets which per RFC are not syntactically part of the message id.
-# 
-# == Examples:
-# 
-#  mail = Mail.new
-#  mail.message_id = '<F6E2D0B4-CC35-4A91-BA4C-C7C712B10C13@test.me.dom>'
-#  mail.message_id    #=> '<F6E2D0B4-CC35-4A91-BA4C-C7C712B10C13@test.me.dom>'
-#  mail[:message_id]  #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::MessageIdField:0x180e1c4
-#  mail['message_id'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::MessageIdField:0x180e1c4
-#  mail['Message-ID'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::MessageIdField:0x180e1c4
-# 
-#  mail[:message_id].message_id   #=> 'F6E2D0B4-CC35-4A91-BA4C-C7C712B10C13@test.me.dom'
-#  mail[:message_id].message_ids  #=> ['F6E2D0B4-CC35-4A91-BA4C-C7C712B10C13@test.me.dom']
-# 
-require 'mail/fields/common/common_message_id'
+# frozen_string_literal: true
+require 'mail/fields/common_message_id_field'
+require 'mail/utilities'
 
 module Mail
-  class MessageIdField < StructuredField
-    
-    include Mail::CommonMessageId
-    
-    FIELD_NAME = 'message-id'
-    CAPITALIZED_FIELD = 'Message-ID'
-    
-    def initialize(value = nil, charset = 'utf-8')
-      self.charset = charset
-      @uniq = 1
-      if value.blank?
-        self.name = CAPITALIZED_FIELD
-        self.value = generate_message_id
-      else
-        super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
-      end
-      self.parse
-      self
+  # Only one Message-ID field may appear in a header.
+  #
+  # Note that parsed Message IDs do not contain their enclosing angle
+  # brackets which, per RFC, are not part of the ID.
+  #
+  #  mail = Mail.new
+  #  mail.message_id = '<F6E2D0B4-CC35-4A91-BA4C-C7C712B10C13@test.me.dom>'
+  #  mail.message_id    #=> '<F6E2D0B4-CC35-4A91-BA4C-C7C712B10C13@test.me.dom>'
+  #  mail[:message_id]  #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::MessageIdField:0x180e1c4
+  #  mail['message_id'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::MessageIdField:0x180e1c4
+  #  mail['Message-ID'] #=> '#<Mail::Field:0x180e5e8 @field=#<Mail::MessageIdField:0x180e1c4
+  #
+  #  mail[:message_id].message_id   #=> 'F6E2D0B4-CC35-4A91-BA4C-C7C712B10C13@test.me.dom'
+  #  mail[:message_id].message_ids  #=> ['F6E2D0B4-CC35-4A91-BA4C-C7C712B10C13@test.me.dom']
+  class MessageIdField < CommonMessageIdField #:nodoc:
+    NAME = 'Message-ID'
 
+    def self.singular?
+      true
     end
-    
-    def name
-      'Message-ID'
+
+    def initialize(value = nil, charset = nil)
+      value = Mail::Utilities.generate_message_id if Utilities.blank?(value)
+      super value, charset
     end
-    
+
     def message_ids
       [message_id]
     end
-    
-    def to_s
-      "<#{message_id}>"
-    end
-    
-    def encoded
-      do_encode(CAPITALIZED_FIELD)
-    end
-    
-    def decoded
-      do_decode
-    end
-    
-    private
-    
-    def generate_message_id
-      "<#{Mail.random_tag}@#{::Socket.gethostname}.mail>"
-    end
-    
   end
 end

data/lib/mail/fields/mime_version_field.rb

@@ -1,34 +1,25 @@
 # encoding: utf-8
-# 
-# 
-# 
+# frozen_string_literal: true
+require 'mail/fields/named_structured_field'
+require 'mail/utilities'
+
 module Mail
-  class MimeVersionField < StructuredField
-    
-    FIELD_NAME = 'mime-version'
-    CAPITALIZED_FIELD = 'Mime-Version'
-
-    def initialize(value = nil, charset = 'utf-8')
-      self.charset = charset
-      if value.blank?
-        value = '1.0'
-      end
-      super(CAPITALIZED_FIELD, strip_field(FIELD_NAME, value), charset)
-      self.parse
-      self
-
-    end
-    
-    def parse(val = value)
-      unless val.blank?
-        @element = Mail::MimeVersionElement.new(val)
-      end
-    end
-    
+  class MimeVersionField < NamedStructuredField #:nodoc:
+    NAME = 'Mime-Version'
+
+    def self.singular?
+      true
+    end
+
+    def initialize(value = nil, charset = nil)
+      value = '1.0' if Utilities.blank?(value)
+      super value, charset
+    end
+
     def element
       @element ||= Mail::MimeVersionElement.new(value)
     end
-    
+
     def version
       "#{element.major}.#{element.minor}"
     end
@@ -40,14 +31,13 @@ module Mail
     def minor
       element.minor.to_i
     end
-    
+
     def encoded
-      "#{CAPITALIZED_FIELD}: #{version}\r\n"
+      "#{name}: #{version}\r\n"
     end
-    
+
     def decoded
       version
     end
-    
   end
 end

data/lib/mail/fields/named_structured_field.rb

@@ -0,0 +1,11 @@
+# encoding: utf-8
+# frozen_string_literal: true
+require 'mail/fields/structured_field'
+
+module Mail
+  class NamedStructuredField < StructuredField #:nodoc:
+    def initialize(value = nil, charset = nil)
+      super self.class::NAME, value, charset
+    end
+  end
+end

data/lib/mail/fields/named_unstructured_field.rb

@@ -0,0 +1,11 @@
+# encoding: utf-8
+# frozen_string_literal: true
+require 'mail/fields/unstructured_field'
+
+module Mail
+  class NamedUnstructuredField < UnstructuredField #:nodoc:
+    def initialize(value = nil, charset = nil)
+      super self.class::NAME, value, charset
+    end
+  end
+end

data/lib/mail/fields/optional_field.rb

@@ -1,13 +1,16 @@
 # encoding: utf-8
-# 
-#    The field names of any optional-field MUST NOT be identical to any
-#    field name specified elsewhere in this standard.
-# 
-# optional-field  =       field-name ":" unstructured CRLF
+# frozen_string_literal: true
 require 'mail/fields/unstructured_field'
 
 module Mail
-  class OptionalField < UnstructuredField
-    
+  # The field names of any optional-field MUST NOT be identical to any
+  # field name specified elsewhere in this standard.
+  #
+  # optional-field  =       field-name ":" unstructured CRLF
+  class OptionalField < UnstructuredField #:nodoc:
+    private
+      def do_encode
+        "#{wrapped_value}\r\n"
+      end
   end
 end

data/lib/mail/fields/{common/parameter_hash.rb → parameter_hash.rb}

@@ -1,35 +1,38 @@
 # encoding: utf-8
-module Mail
+# frozen_string_literal: true
+require 'mail/constants'
+require 'mail/indifferent_hash'
+require 'mail/encodings'
 
+module Mail
   # ParameterHash is an intelligent Hash that allows you to add
   # parameter values including the MIME extension paramaters that
   # have the name*0="blah", name*1="bleh" keys, and will just return
   # a single key called name="blahbleh" and do any required un-encoding
   # to make that happen
-  # Parameters are defined in RFC2045, split keys are in RFC2231
-
-  class ParameterHash < IndifferentHash
-
-    include Mail::Utilities
-
+  #
+  # Parameters are defined in RFC2045. Split keys are in RFC2231.
+  class ParameterHash < IndifferentHash #:nodoc:
     def [](key_name)
       key_pattern = Regexp.escape(key_name.to_s)
       pairs = []
       exact = nil
+
       each do |k,v|
         if k =~ /^#{key_pattern}(\*|$)/i
-          if $1 == '*'
+          if $1 == Constants::ASTERISK
             pairs << [k, v]
           else
             exact = k
           end
         end
       end
+
       if pairs.empty? # Just dealing with a single value pair
         super(exact || key_name)
       else # Dealing with a multiple value pair or a single encoded value pair
         string = pairs.sort { |a,b| a.first.to_s <=> b.first.to_s }.map { |v| v.last }.join('')
-        if mt = string.match(/([\w\-]+)'(\w\w)'(.*)/)
+        if mt = string.match(/([\w\-]+)?'(\w\w)?'(.*)/)
           string = mt[3]
           encoding = mt[1]
         else
@@ -40,18 +43,18 @@ module Mail
     end
 
     def encoded
-      map.sort { |a,b| a.first.to_s <=> b.first.to_s }.map do |key_name, value|
+      map.sort_by { |a| a.first.to_s }.map! do |key_name, value|
         unless value.ascii_only?
           value = Mail::Encodings.param_encode(value)
           key_name = "#{key_name}*"
         end
-        %Q{#{key_name}=#{quote_token(value)}}
+        %Q{#{key_name}=#{Utilities.quote_token(value)}}
       end.join(";\r\n\s")
     end
 
     def decoded
-      map.sort { |a,b| a.first.to_s <=> b.first.to_s }.map do |key_name, value|
-        %Q{#{key_name}=#{quote_token(value)}}
+      map.sort_by { |a| a.first.to_s }.map! do |key_name, value|
+        %Q{#{key_name}=#{Utilities.quote_token(value)}}
       end.join("; ")
     end
   end