mail 2.4.4 → 2.5.2

data/CHANGELOG.rdoc

@@ -1,5 +1,65 @@
 == HEAD
 
+== Version 2.5.2 - Sun Nov 18 15:01:00 +1100 2012 Mikel Lindsaar <mikel@reinteractive.net>
+
+* Removing double loading of treetop parsers to remove warnings
+* Making parsers auto compile on spec suite and load in production code to avoid error that caused yank of 2.5.0
+* Reapply pull request 443 - CC fields with semicolon are now parsed right (paulwittmann)
+
+== Version 2.5.1 - Sun Nov 18 14:01:00 +1100 2012 Mikel Lindsaar <mikel@reinteractive.net>
+
+* Yanked 2.5.0
+* Reverted pull request 443 - CC fields with semicolon are now parsed right (paulwittmann)
+
+== Version 2.5.0 - Sun Nov 18 12:20:00 +1100 2012 Mikel Lindsaar <mikel@reinteractive.net>
+
+Features:
+* Close pull request 406 - Add Mail#eager_autoload! to load all autoloaded files on demand (bpot)
+* Close pull request 461 - Allow string as delivery_method (skyeagle, radar)
+* Close pull request 407 - Do not require Net::IMAP or Net::POP if they're already loaded (bpot)
+* Close pull request 400 - Raise exception if delivery values or from values are missing completely from an email that is getting delivered (dmathieu)
+* Close pull request 397 - Support dots in local part of the addresses (eac)
+* Close pull request 477 - Fixed handling content_type with superfluous spaces (ledermann)
+* Close pull request 451 - Ignore nil in addresses so things do not blow up when e.g. a user had no email (grosser)
+* Close pull request 362 - Enable TLS in Ruby 1.8 (kingargyle)
+* Close pull request 358 - Fix Mail::CommonAddress#value=, Mail::CommonAddress#<< and Mail::Encodings.encode_non_usascii (mrkn)
+* Close pull request 350 - Makes mail Header object ennumerable (ged)
+
+Performance:
+* Close pull request 369 - Mail::Header#charset is called pretty often during header parser work (bogdan)
+* Close pull request 368 - Improve existing code by moving some objects to contstant instead of constructing them over and over again. (bogdan)
+* Close pull request 366 - Headers parsing performance optimization (bogdan)
+* Close pull request 365 - Add maximum_amount of parsed headers configuration parameter (bogdan)
+
+Bugs:
+* Close pull request 444 - Fix typo in spec (cczona)
+* Close pull request 439 - Fix Ruby 1.9 behaviour to match 1.8.7 behaviour on ignoring invalid or undefined characters (ochko)
+* Close pull request 430 - Unstructured field converts to string before calling encoding on it (brupm mikel)
+* Close pull request 424 - Use String#to_crlf instead of String#gsub (okkez)
+* Close pull request 429 - Fix an obvious bug in exim delivery_method (dskim)
+* Close pull request 425 - Remove Gemfile.lock from generated gem (kbackowski)
+* Close pull request 414 - Fix typo on "ignoring" (derwiki)
+* Close pull request 405 - Fix stack overflow (RegexpError) triggered by large emails with an envelope (bpot)
+* Close pull request 402 - Prevent InReplyTo, Keyword, References or ResentMessageId fields from  generating lines longer than 998 chars (pplr)
+* Close pull request 391 - Fixed failed attachment parsing when file name in headers contains spaces and is not wrapped in quotes (danieltreacy)
+* Close pull request 385 - Fix Multibyte::Chars#upcase/downcase (technoweenie)
+* Close pull request 384 - copy dat unicode over from active support (technoweenie)
+* Close pull request 380 - Split strictly on MIME boundary lines (ConradIrwin)
+* Close pull request 277 - Fix specific email decoding failure example (yalab)
+* Close pull request 361 - Support 8bit encoding for ruby 1.9 (bogdan)
+* Close pull request 346 - Fix two bugs of TestRetriever (ermaker)
+* Close pull request 337 - Make the behavior of value_decode the same between Ruby 1.8 and Ruby 1.9. (kennyj)
+* Close pull request 336 - Fix more warning: possibly useless use of == in void context (kennyj)
+* Close pull request 293 - make charset and mime type more resliant to bad header values (kmeehl)
+* Fix failing spec Issue 453 on Ruby 1.9.3
+* Fix mail reading: don't raise invalid byte sequence in UTF-8 when reading non-UTF-8 emails (mreinsch)
+* Close pull request 353 - define NilClass#blank? only if not defined yet (amatsuda)
+* Close pull request 357 - Fixes #349 an inverted condition on imap open read_only (felixroeser)
+* Remove duplicated line feed from regexp
+* Remove unused variable
+* Updated IMAP documentation
+* Tweak publisher
+
 == Version 2.4.4 - Wed Mar 14 22:44:00 +1100 2012 Mikel Lindsaar <mikel@reinteractive.net>
 
 * Fix security vulnerability allowing command line exploit when using file delivery method

data/Gemfile

@@ -12,7 +12,7 @@ end
 
 group :test do
   gem "rake",       "> 0.8.7"
-  gem "rspec",      "~> 2.8.0"
+  gem "rspec",      "~> 2.12.0"
   case
   when defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
     # Skip it

data/README.md

@@ -29,7 +29,7 @@ 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 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
@@ -42,14 +42,15 @@ me a nice email :)
 Compatibility
 -------------
 
-Mail is tested by Travis (![Travis Build Status](https://secure.travis-ci.org/mikel/mail.png "Build Status")) and works on the following platforms:
+Mail is tested by Travis ([![Travis Build Status](https://travis-ci.org/mikel/mail.png "Build Status")](https://travis-ci.org/mikel/mail)) and works on the [following platforms](https://github.com/mikel/mail/blob/master/.travis.yml)
 
-* jruby-1.6.5.1 [ x86_64 ]
-* rbx-head-d18 [ x86_64 ]
-* ree-1.8.7-2011.03 [ i686 ]
-* ruby-1.8.7-p357 [ i686 ]
+* ruby-1.8.7-p370 [ i686 ]
 * ruby-1.9.2-p290 [ x86_64 ]
-* ruby-1.9.3-p0 [ x86_64 ]
+* ruby-1.9.3-p327 [ x86_64 ]
+* jruby-1.6.8 [ x86_64 ]
+* jruby-1.7.0 [ x86_64 ]
+* rbx-d18 [ x86_64 ]
+* rbx-d19 [ x86_64 ]
 
 Discussion
 ----------
@@ -104,7 +105,7 @@ It also means you can be sure Mail will behave correctly.
 API Policy
 ----------
 
-No API removals within a single point release.  All removals to be depreciated with
+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.
@@ -294,7 +295,7 @@ The most recent email:
 ```ruby
 Mail.all    #=> Returns an array of all emails
 Mail.first  #=> Returns the first unread email
-Mail.last   #=> Returns the first unread email
+Mail.last   #=> Returns the last unread email
 ```
 
 The first 10 emails sorted by date in ascending order:
@@ -641,7 +642,7 @@ License
 
 (The MIT License)
 
-Copyright (c) 2009, 2010, 2011, 2012
+Copyright (c) 2009, 2010, 2011, 2012 Mikel Lindsaar
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/VERSION

@@ -1,4 +1,4 @@
 major:2
-minor:4
-patch:4
+minor:5
+patch:2
 build:

data/lib/load_parsers.rb

@@ -0,0 +1,41 @@
+# encoding: utf-8
+# This file loads up the parsers for mail to use.  It also will attempt to compile parsers
+# if they don't exist.
+#
+# It also only uses the compiler if we are running the SPEC suite
+module Mail # :doc:
+  require 'treetop/runtime'
+
+  def self.compile_parser(parser)
+    require 'treetop/compiler'
+    STDOUT.puts "Compiling parser #{parser} from treetop source"
+    Treetop.load(File.join(File.dirname(__FILE__)) + "/mail/parsers/#{parser}")
+  end
+
+  parsers = %w[ rfc2822_obsolete rfc2822 address_lists phrase_lists
+                date_time received message_ids envelope_from rfc2045
+                mime_version content_type content_disposition
+                content_transfer_encoding content_location ]
+
+  if defined?(MAIL_SPEC_SUITE_RUNNING)
+    STDOUT.puts "Compiling all parsers from treetop source"
+
+    parsers.each do |parser|
+      compile_parser(parser)
+    end
+
+  else
+    STDOUT.puts "Loading precompiled parsers from ruby source"
+
+    parsers.each do |parser|
+      begin
+        require "mail/parsers/#{parser}"
+      rescue LoadError
+        STDOUT.puts "Couldn't load parser #{parser} from ruby source"
+        compile_parser(parser)
+      end
+    end
+
+  end
+
+end

data/lib/mail.rb

@@ -46,6 +46,23 @@ module Mail # :doc:
   require 'mail/utilities'
   require 'mail/configuration'
 
+  @@autoloads = {}
+  def self.register_autoload(name, path)
+    @@autoloads[name] = path
+    autoload(name, path)
+  end
+
+  # This runs through the autoload list and explictly requires them for you.
+  # Useful when running mail in a threaded process.
+  #
+  # Usage:
+  #
+  #   require 'mail'
+  #   Mail.eager_autoload!
+  def self.eager_autoload!
+    @@autoloads.each { |_,path| require(path) }
+  end
+
   # Autoload mail send and receive classes.
   require 'mail/network'
 
@@ -60,23 +77,7 @@ module Mail # :doc:
 
   require 'mail/envelope'
 
-  parsers = %w[ rfc2822_obsolete rfc2822 address_lists phrase_lists
-                date_time received message_ids envelope_from rfc2045
-                mime_version content_type content_disposition
-                content_transfer_encoding content_location ]
-
-  parsers.each do |parser|
-    begin
-      # Try requiring the pre-compiled ruby version first
-      require 'treetop/runtime'
-      require "mail/parsers/#{parser}"
-    rescue LoadError
-      # Otherwise, get treetop to compile and load it
-      require 'treetop/runtime'
-      require 'treetop/compiler'
-      Treetop.load(File.join(File.dirname(__FILE__)) + "/mail/parsers/#{parser}")
-    end
-  end
+  require 'load_parsers'
 
   # Autoload header field elements and transfer encodings.
   require 'mail/elements'

data/lib/mail/body.rb

@@ -6,7 +6,7 @@ module Mail
   # The body is where the text of the email is stored.  Mail treats the body
   # as a single object.  The body itself has no information about boundaries
   # used in the MIME standard, it just looks at it's content as either a single
-  # block of text, or (if it is a multipart message) as an array of blocks o text.
+  # block of text, or (if it is a multipart message) as an array of blocks of text.
   # 
   # A body has to be told to split itself up into a multipart message by calling
   # #split with the correct boundary.  This is because the body object has no way
@@ -257,7 +257,7 @@ module Mail
     
     def split!(boundary)
       self.boundary = boundary
-      parts = raw_source.split("--#{boundary}")
+      parts = raw_source.split(/--#{Regexp.escape(boundary)}(?=(?:--)?\s*$)/)
       # Make the preamble equal to the preamble (if any)
       self.preamble = parts[0].to_s.strip
       # Make the epilogue equal to the epilogue (if any)

data/lib/mail/check_delivery_params.rb

@@ -0,0 +1,30 @@
+module Mail
+
+  module CheckDeliveryParams
+
+    def self.included(klass)
+      klass.class_eval do
+
+        def check_params(mail)
+          envelope_from = mail.return_path || mail.sender || mail.from_addrs.first
+          if envelope_from.blank?
+            raise ArgumentError.new('A sender (Return-Path, Sender or From) required to send a message')
+          end
+
+          destinations ||= mail.destinations if mail.respond_to?(:destinations) && mail.destinations
+          if destinations.blank?
+            raise ArgumentError.new('At least one recipient (To, Cc or Bcc) is required to send a message')
+          end
+
+          message ||= mail.encoded if mail.respond_to?(:encoded)
+          if message.blank?
+            raise ArgumentError.new('A encoded content is required to send a message')
+          end
+
+          [envelope_from, destinations, message]
+        end
+
+      end
+    end
+  end
+end

data/lib/mail/configuration.rb

@@ -26,7 +26,7 @@ module Mail
     end
 
     def lookup_delivery_method(method)
-      case method
+      case method.is_a?(String) ? method.to_sym : method
       when nil
         Mail::SMTP
       when :smtp

data/lib/mail/core_extensions/nil.rb

@@ -3,8 +3,10 @@
 # This is not loaded if ActiveSupport is already loaded
 
 class NilClass #:nodoc:
-  def blank?
-    true
+  unless nil.respond_to? :blank?
+    def blank?
+      true
+    end
   end
 
   def to_crlf

data/lib/mail/core_extensions/shell_escape.rb

@@ -30,7 +30,7 @@ module Mail
 
       # Process as a single byte sequence because not all shell
       # implementations are multibyte aware.
-      str.gsub!(/([^A-Za-z0-9_\s\+\-.,:\/@\n])/n, "\\\\\\1")
+      str.gsub!(/([^A-Za-z0-9_\s\+\-.,:\/@])/n, "\\\\\\1")
 
       # A LF cannot be escaped with a backslash because a backslash + LF
       # combo is regarded as line continuation and simply ignored.

data/lib/mail/elements.rb

@@ -1,14 +1,14 @@
 module Mail
-  autoload :Address, 'mail/elements/address'
-  autoload :AddressList, 'mail/elements/address_list'
-  autoload :ContentDispositionElement, 'mail/elements/content_disposition_element'
-  autoload :ContentLocationElement, 'mail/elements/content_location_element'
-  autoload :ContentTransferEncodingElement, 'mail/elements/content_transfer_encoding_element'
-  autoload :ContentTypeElement, 'mail/elements/content_type_element'
-  autoload :DateTimeElement, 'mail/elements/date_time_element'
-  autoload :EnvelopeFromElement, 'mail/elements/envelope_from_element'
-  autoload :MessageIdsElement, 'mail/elements/message_ids_element'
-  autoload :MimeVersionElement, 'mail/elements/mime_version_element'
-  autoload :PhraseList, 'mail/elements/phrase_list'
-  autoload :ReceivedElement, 'mail/elements/received_element'
+  register_autoload :Address, 'mail/elements/address'
+  register_autoload :AddressList, 'mail/elements/address_list'
+  register_autoload :ContentDispositionElement, 'mail/elements/content_disposition_element'
+  register_autoload :ContentLocationElement, 'mail/elements/content_location_element'
+  register_autoload :ContentTransferEncodingElement, 'mail/elements/content_transfer_encoding_element'
+  register_autoload :ContentTypeElement, 'mail/elements/content_type_element'
+  register_autoload :DateTimeElement, 'mail/elements/date_time_element'
+  register_autoload :EnvelopeFromElement, 'mail/elements/envelope_from_element'
+  register_autoload :MessageIdsElement, 'mail/elements/message_ids_element'
+  register_autoload :MimeVersionElement, 'mail/elements/mime_version_element'
+  register_autoload :PhraseList, 'mail/elements/phrase_list'
+  register_autoload :ReceivedElement, 'mail/elements/received_element'
 end

data/lib/mail/encodings.rb

@@ -147,19 +147,17 @@ module Mail
 
     # Takes an encoded string of the format =?<encoding>?[QB]?<string>?=
     def Encodings.unquote_and_convert_to(str, to_encoding)
-      original_encoding = split_encoding_from_string( str )
-
-      output = value_decode( str ).to_s
-
-      if original_encoding.to_s.downcase.gsub("-", "") == to_encoding.to_s.downcase.gsub("-", "")
+      output = value_decode( str ).to_s # output is already converted to UTF-8
+      
+      if 'utf8' == to_encoding.to_s.downcase.gsub("-", "")
         output
-      elsif original_encoding && to_encoding
+      elsif to_encoding
         begin
           if RUBY_VERSION >= '1.9'
             output.encode(to_encoding)
           else
             require 'iconv'
-            Iconv.iconv(to_encoding, original_encoding, output).first
+            Iconv.iconv(to_encoding, 'UTF-8', output).first 
           end
         rescue Iconv::IllegalSequence, Iconv::InvalidEncoding, Errno::EINVAL
           # the 'from' parameter specifies a charset other than what the text
@@ -178,10 +176,10 @@ module Mail
     def Encodings.address_encode(address, charset = 'utf-8')
       if address.is_a?(Array)
         # loop back through for each element
-        address.map { |a| Encodings.address_encode(a, charset) }.join(", ")
+        address.compact.map { |a| Encodings.address_encode(a, charset) }.join(", ")
       else
         # find any word boundary that is not ascii and encode it
-        encode_non_usascii(address, charset)
+        encode_non_usascii(address, charset) if address
       end
     end
 
@@ -189,7 +187,7 @@ module Mail
       return address if address.ascii_only? or charset.nil?
       us_ascii = %Q{\x00-\x7f}
       # Encode any non usascii strings embedded inside of quotes
-      address.gsub!(/(".*?[^#{us_ascii}].*?")/) { |s| Encodings.b_value_encode(unquote(s), charset) }
+      address = address.gsub(/(".*?[^#{us_ascii}].*?")/) { |s| Encodings.b_value_encode(unquote(s), charset) }
       # Then loop through all remaining items and encode as needed
       tokens = address.split(/\s/)
       map_with_index(tokens) do |word, i|

data/lib/mail/encodings/quoted_printable.rb

@@ -18,7 +18,7 @@ module Mail
       end
 
       def self.encode(str)
-        [str].pack("M").gsub(/\n/, "\r\n")
+        [str].pack("M").to_crlf
       end
 
       def self.cost(str)

data/lib/mail/field.rb

@@ -5,11 +5,11 @@ module Mail
   # Provides a single class to call to create a new structured or unstructured
   # field.  Works out per RFC what field of field it is being given and returns
   # the correct field of class back on new.
-  # 
+  #
   # ===Per RFC 2822
-  #  
+  #
   #  2.2. Header Fields
-  #  
+  #
   #     Header fields are lines composed of a field name, followed by a colon
   #     (":"), followed by a field body, and terminated by CRLF.  A field
   #     name MUST be composed of printable US-ASCII characters (i.e.,
@@ -19,12 +19,12 @@ module Mail
   #     used in header "folding" and  "unfolding" as described in section
   #     2.2.3.  All field bodies MUST conform to the syntax described in
   #     sections 3 and 4 of this standard.
-  #  
+  #
   class Field
-    
+
     include Patterns
     include Comparable
-    
+
     STRUCTURED_FIELDS = %w[ bcc cc content-description content-disposition
                             content-id content-location content-transfer-encoding
                             content-type date from in-reply-to keywords message-id
@@ -34,7 +34,39 @@ module Mail
                             return-path sender to ]
 
     KNOWN_FIELDS = STRUCTURED_FIELDS + ['comments', 'subject']
-    
+
+    FIELDS_MAP = {
+      "to" => ToField,
+      "cc" => CcField,
+      "bcc" => BccField,
+      "message-id" => MessageIdField,
+      "in-reply-to" => InReplyToField,
+      "references" => ReferencesField,
+      "subject" => SubjectField,
+      "comments" => CommentsField,
+      "keywords" => KeywordsField,
+      "date" => DateField,
+      "from" => FromField,
+      "sender" => SenderField,
+      "reply-to" => ReplyToField,
+      "resent-date" => ResentDateField,
+      "resent-from" => ResentFromField,
+      "resent-sender" =>  ResentSenderField,
+      "resent-to" => ResentToField,
+      "resent-cc" => ResentCcField,
+      "resent-bcc" => ResentBccField,
+      "resent-message-id" => ResentMessageIdField,
+      "return-path" => ReturnPathField,
+      "received" => ReceivedField,
+      "mime-version" => MimeVersionField,
+      "content-transfer-encoding" => ContentTransferEncodingField,
+      "content-description" => ContentDescriptionField,
+      "content-disposition" => ContentDispositionField,
+      "content-type" => ContentTypeField,
+      "content-id" => ContentIdField,
+      "content-location" => ContentLocationField,
+    }
+
     # Generic Field Exception
     class FieldError < StandardError
     end
@@ -55,25 +87,25 @@ module Mail
     # Raised when attempting to set a structured field's contents to an invalid syntax
     class SyntaxError < FieldError #:nodoc:
     end
-    
+
     # Accepts a string:
-    # 
+    #
     #  Field.new("field-name: field data")
-    # 
+    #
     # Or name, value pair:
-    # 
+    #
     #  Field.new("field-name", "value")
-    # 
+    #
     # Or a name by itself:
-    # 
+    #
     #  Field.new("field-name")
-    # 
+    #
     # Note, does not want a terminating carriage return.  Returns
     # self appropriately parsed.  If value is not a string, then
     # it will be passed through as is, for example, content-type
-    # field can accept an array with the type and a hash of 
+    # field can accept an array with the type and a hash of
     # parameters:
-    # 
+    #
     #  Field.new('content-type', ['text', 'plain', {:charset => 'UTF-8'}])
     def initialize(name, value = nil, charset = 'utf-8')
       case
@@ -92,47 +124,47 @@ module Mail
     def field=(value)
       @field = value
     end
-    
+
     def field
       @field
     end
-    
+
     def name
       field.name
     end
-    
+
     def value
       field.value
     end
-    
+
     def value=(val)
       create_field(name, val, charset)
     end
-    
+
     def to_s
       field.to_s
     end
-    
+
     def update(name, value)
       create_field(name, value, charset)
     end
-    
+
     def same( other )
       match_to_s(other.name, field.name)
     end
-    
+
     alias_method :==, :same
-    
+
     def <=>( other )
       self_order = FIELD_ORDER.rindex(self.name.to_s.downcase) || 100
       other_order = FIELD_ORDER.rindex(other.name.to_s.downcase) || 100
       self_order <=> other_order
     end
-    
+
     def method_missing(name, *args, &block)
       field.send(name, *args, &block)
     end
-    
+
     FIELD_ORDER = %w[ return-path received
                       resent-date resent-from resent-sender resent-to
                       resent-cc resent-bcc resent-message-id
@@ -141,16 +173,16 @@ module Mail
                       subject comments keywords
                       mime-version content-type content-transfer-encoding
                       content-location content-disposition content-description ]
-    
+
     private
-    
+
     def split(raw_field)
       match_data = raw_field.mb_chars.match(/^(#{FIELD_NAME})\s*:\s*(#{FIELD_BODY})?$/)
       [match_data[1].to_s.mb_chars.strip, match_data[2].to_s.mb_chars.strip]
     rescue
-      STDERR.puts "WARNING: Could not parse (and so ignorning) '#{raw_field}'"
+      STDERR.puts "WARNING: Could not parse (and so ignoring) '#{raw_field}'"
     end
-    
+
     def create_field(name, value, charset)
       begin
         self.field = new_field(name, value, charset)
@@ -162,73 +194,19 @@ module Mail
     end
 
     def new_field(name, value, charset)
-      # Could do this with constantize and make it "as DRY as", but a simple case 
-      # statement is, well, simpler... 
-      case name.to_s.downcase
-      when /^to$/i
-        ToField.new(value, charset)
-      when /^cc$/i
-        CcField.new(value, charset)
-      when /^bcc$/i
-        BccField.new(value, charset)
-      when /^message-id$/i
-        MessageIdField.new(value, charset)
-      when /^in-reply-to$/i
-        InReplyToField.new(value, charset)
-      when /^references$/i
-        ReferencesField.new(value, charset)
-      when /^subject$/i
-        SubjectField.new(value, charset)
-      when /^comments$/i
-        CommentsField.new(value, charset)
-      when /^keywords$/i
-        KeywordsField.new(value, charset)
-      when /^date$/i
-        DateField.new(value, charset)
-      when /^from$/i
-        FromField.new(value, charset)
-      when /^sender$/i
-        SenderField.new(value, charset)
-      when /^reply-to$/i
-        ReplyToField.new(value, charset)
-      when /^resent-date$/i
-        ResentDateField.new(value, charset)
-      when /^resent-from$/i
-        ResentFromField.new(value, charset)
-      when /^resent-sender$/i 
-        ResentSenderField.new(value, charset)
-      when /^resent-to$/i
-        ResentToField.new(value, charset)
-      when /^resent-cc$/i
-        ResentCcField.new(value, charset)
-      when /^resent-bcc$/i
-        ResentBccField.new(value, charset)
-      when /^resent-message-id$/i
-        ResentMessageIdField.new(value, charset)
-      when /^return-path$/i
-        ReturnPathField.new(value, charset)
-      when /^received$/i
-        ReceivedField.new(value, charset)
-      when /^mime-version$/i
-        MimeVersionField.new(value, charset)
-      when /^content-transfer-encoding$/i
-        ContentTransferEncodingField.new(value, charset)
-      when /^content-description$/i
-        ContentDescriptionField.new(value, charset)
-      when /^content-disposition$/i
-        ContentDispositionField.new(value, charset)
-      when /^content-type$/i
-        ContentTypeField.new(value, charset)
-      when /^content-id$/i
-        ContentIdField.new(value, charset)
-      when /^content-location$/i
-        ContentLocationField.new(value, charset)
-      else 
+      lower_case_name = name.to_s.downcase
+      header_name = nil
+      FIELDS_MAP.each do |field_name, _|
+        header_name = field_name if lower_case_name == field_name
+      end
+      if header_name
+        FIELDS_MAP[header_name].new(value, charset)
+      else
         OptionalField.new(name, value, charset)
       end
-      
+
     end
 
   end
-  
+
 end