mail 2.6.4 → 2.8.0

data/lib/mail/elements/content_disposition_element.rb

@@ -1,27 +1,20 @@
 # encoding: utf-8
 # frozen_string_literal: true
+require 'mail/parsers/content_disposition_parser'
+
 module Mail
-  class ContentDispositionElement # :nodoc:
-    
-    include Mail::Utilities
-    
-    def initialize( string )
-      content_disposition = Mail::Parsers::ContentDispositionParser.new.parse(cleaned(string))
+  class ContentDispositionElement #:nodoc:
+    attr_reader :disposition_type, :parameters
+
+    def initialize(string)
+      content_disposition = Mail::Parsers::ContentDispositionParser.parse(cleaned(string))
       @disposition_type = content_disposition.disposition_type
       @parameters = content_disposition.parameters
     end
-    
-    def disposition_type
-      @disposition_type
-    end
-    
-    def parameters
-      @parameters
-    end
-    
+
+    private
     def cleaned(string)
       string =~ /(.+);\s*$/ ? $1 : string
     end
-    
   end
 end

data/lib/mail/elements/content_location_element.rb

@@ -1,22 +1,17 @@
 # encoding: utf-8
 # frozen_string_literal: true
-module Mail
-  class ContentLocationElement # :nodoc:
-
-    include Mail::Utilities
+require 'mail/parsers/content_location_parser'
 
-    def initialize( string )
-      content_location = Mail::Parsers::ContentLocationParser.new.parse(string)
-      @location = content_location.location
-    end
+module Mail
+  class ContentLocationElement #:nodoc:
+    attr_reader :location
 
-    def location
-      @location
+    def initialize(string)
+      @location = Mail::Parsers::ContentLocationParser.parse(string).location
     end
 
     def to_s(*args)
       location.to_s
     end
-
   end
 end

data/lib/mail/elements/content_transfer_encoding_element.rb

@@ -1,18 +1,13 @@
 # encoding: utf-8
 # frozen_string_literal: true
+require 'mail/parsers/content_transfer_encoding_parser'
+
 module Mail
-  class ContentTransferEncodingElement
-    
-    include Mail::Utilities
-    
+  class ContentTransferEncodingElement #:nodoc:
+    attr_reader :encoding
+
     def initialize(string)
-      content_transfer_encoding = Mail::Parsers::ContentTransferEncodingParser.new.parse(string)
-      @encoding = content_transfer_encoding.encoding
+      @encoding = Mail::Parsers::ContentTransferEncodingParser.parse(string).encoding
     end
-    
-    def encoding
-      @encoding
-    end
-    
   end
 end

data/lib/mail/elements/content_type_element.rb

@@ -1,32 +1,25 @@
 # encoding: utf-8
 # frozen_string_literal: true
+require 'mail/parsers/content_type_parser'
+
 module Mail
-  class ContentTypeElement # :nodoc:
-    
-    include Mail::Utilities
-    
-    def initialize( string )
-      content_type = Mail::Parsers::ContentTypeParser.new.parse(cleaned(string))
+  class ContentTypeElement #:nodoc:
+    attr_reader :main_type, :sub_type, :parameters
+
+    def initialize(string)
+      content_type = Mail::Parsers::ContentTypeParser.parse(cleaned(string))
       @main_type = content_type.main_type
       @sub_type = content_type.sub_type
       @parameters = content_type.parameters
     end
-    
-    def main_type
-      @main_type
-    end
-    
-    def sub_type
-      @sub_type
-    end
-    
-    def parameters
-      @parameters
-    end
-    
-    def cleaned(string)
-      string =~ /(.+);\s*$/ ? $1 : string
-    end
-    
+
+    private
+      def cleaned(string)
+        if string =~ /;\s*$/
+          $`
+        else
+          string
+        end
+      end
   end
 end

data/lib/mail/elements/date_time_element.rb

@@ -1,23 +1,15 @@
 # encoding: utf-8
 # frozen_string_literal: true
+require 'mail/parsers/date_time_parser'
+
 module Mail
-  class DateTimeElement # :nodoc:
-    
-    include Mail::Utilities
-    
-    def initialize( string )
-      date_time = Mail::Parsers::DateTimeParser.new.parse(string)
+  class DateTimeElement #:nodoc:
+    attr_reader :date_string, :time_string
+
+    def initialize(string)
+      date_time = Mail::Parsers::DateTimeParser.parse(string)
       @date_string = date_time.date_string
       @time_string = date_time.time_string
     end
-    
-    def date_string
-      @date_string
-    end
-    
-    def time_string
-      @time_string
-    end
-    
   end
 end

data/lib/mail/elements/envelope_from_element.rb

@@ -1,40 +1,39 @@
 # encoding: utf-8
 # frozen_string_literal: true
+require 'mail/parsers/envelope_from_parser'
+require 'date'
+
 module Mail
-  class EnvelopeFromElement
-    
-    include Mail::Utilities
-    
-    def initialize( string )
-      @envelope_from = Mail::Parsers::EnvelopeFromParser.new.parse(string)
-      @address = @envelope_from.address
-      @date_time = ::DateTime.parse(@envelope_from.ctime_date)
-    end
-    
-    def date_time
-      @date_time
-    end
-    
-    def address
-      @address
+  class EnvelopeFromElement #:nodoc:
+    attr_reader :date_time, :address
+
+    def initialize(string)
+      envelope_from = Mail::Parsers::EnvelopeFromParser.parse(string)
+      @address = envelope_from.address
+      @date_time = ::DateTime.parse(envelope_from.ctime_date) if envelope_from.ctime_date
     end
-    
+
     # RFC 4155:
     #   a timestamp indicating the UTC date and time when the message
     #   was originally received, conformant with the syntax of the
     #   traditional UNIX 'ctime' output sans timezone (note that the
     #   use of UTC precludes the need for a timezone indicator);
     def formatted_date_time
-      if @date_time.respond_to?(:ctime)
-        @date_time.ctime
-      else
-        @date_time.strftime '%a %b %e %T %Y'
+      if date_time
+        if date_time.respond_to?(:ctime)
+          date_time.ctime
+        else
+          date_time.strftime '%a %b %e %T %Y'
+        end
       end
     end
 
     def to_s
-      "#{@address} #{formatted_date_time}"
+      if date_time
+        "#{address} #{formatted_date_time}"
+      else
+        address
+      end
     end
-    
   end
 end

data/lib/mail/elements/message_ids_element.rb

@@ -1,26 +1,31 @@
 # encoding: utf-8
 # frozen_string_literal: true
+require 'mail/parsers/message_ids_parser'
+require 'mail/utilities'
+
 module Mail
-  class MessageIdsElement
+  class MessageIdsElement #:nodoc:
+    def self.parse(string)
+      new(string).tap(&:message_ids)
+    end
 
-    include Mail::Utilities
+    attr_reader :message_ids
 
     def initialize(string)
-      raise Mail::Field::ParseError.new(Mail::MessageIdsElement, string, 'nil is invalid') if string.nil?
-      @message_ids = Mail::Parsers::MessageIdsParser.new.parse(string).message_ids.map { |msg_id| clean_msg_id(msg_id) }
-    end
-
-    def message_ids
-      @message_ids
+      @message_ids = parse(string)
     end
 
     def message_id
-      @message_ids.first
-    end
-
-    def clean_msg_id( val )
-      val =~ /.*<(.*)>.*/ ; $1
+      message_ids.first
     end
 
+    private
+      def parse(string)
+        if Utilities.blank? string
+          []
+        else
+          Mail::Parsers::MessageIdsParser.parse(string).message_ids
+        end
+      end
   end
 end

data/lib/mail/elements/mime_version_element.rb

@@ -1,23 +1,15 @@
 # encoding: utf-8
 # frozen_string_literal: true
+require 'mail/parsers/mime_version_parser'
+
 module Mail
-  class MimeVersionElement
-    
-    include Mail::Utilities
-    
-    def initialize( string )
-      mime_version = Mail::Parsers::MimeVersionParser.new.parse(string)
+  class MimeVersionElement #:nodoc:
+    attr_reader :major, :minor
+
+    def initialize(string)
+      mime_version = Mail::Parsers::MimeVersionParser.parse(string)
       @major = mime_version.major
       @minor = mime_version.minor
     end
-    
-    def major
-      @major
-    end
-    
-    def minor
-      @minor
-    end
-    
   end
 end

data/lib/mail/elements/phrase_list.rb

@@ -1,17 +1,19 @@
 # encoding: utf-8
 # frozen_string_literal: true
+require 'mail/parsers/phrase_lists_parser'
+require 'mail/utilities'
+
 module Mail
-  class PhraseList
-    
-    include Mail::Utilities
-    
+  class PhraseList #:nodoc:
+    attr_reader :phrases
+
     def initialize(string)
-      @phrase_lists = Mail::Parsers::PhraseListsParser.new.parse(string)
+      @phrases =
+        if Utilities.blank? string
+          []
+        else
+          Mail::Parsers::PhraseListsParser.parse(string).phrases.map { |p| Mail::Utilities.unquote(p) }
+        end
     end
-    
-    def phrases
-      @phrase_lists.phrases.map { |p| unquote(p) }
-    end
-
   end
 end

data/lib/mail/elements/received_element.rb

@@ -1,27 +1,35 @@
 # encoding: utf-8
 # frozen_string_literal: true
+require 'mail/parsers/received_parser'
+require 'mail/utilities'
+require 'date'
+
 module Mail
-  class ReceivedElement
-    
-    include Mail::Utilities
-    
-    def initialize( string )
-      received = Mail::Parsers::ReceivedParser.new.parse(string)
-      @date_time = ::DateTime.parse("#{received.date} #{received.time}")
-      @info = received.info
+  class ReceivedElement #:nodoc:
+    attr_reader :info, :date_time
+
+    def initialize(string)
+      if Utilities.blank? string
+        @date_time = nil
+        @info = nil
+      else
+        received = Mail::Parsers::ReceivedParser.parse(string)
+        @date_time = datetime_for(received)
+        @info = received.info
+      end
     end
-    
-    def date_time
-      @date_time
-    end
-    
-    def info
-      @info
-    end
-    
+
     def to_s(*args)
-      "#{@info}; #{@date_time.to_s(*args)}"
+      "#{info}; #{date_time.to_s(*args)}"
     end
-    
+
+    private
+      def datetime_for(received)
+        ::DateTime.parse("#{received.date} #{received.time}")
+      rescue ArgumentError => e
+        raise e unless e.message == 'invalid date'
+        warn "WARNING: Invalid date field for received element (#{received.date} #{received.time}): #{e.class}: #{e.message}"
+        nil
+      end
   end
 end

data/lib/mail/encodings/7bit.rb

@@ -4,29 +4,24 @@ require 'mail/encodings/8bit'
 
 module Mail
   module Encodings
+    # 7bit and 8bit are equivalent. 7bit encoding is for text only.
     class SevenBit < EightBit
       NAME = '7bit'
-    
       PRIORITY = 1
+      Encodings.register(NAME, self)
 
-      # 7bit and 8bit operate the same
-      
-      # Decode the string
       def self.decode(str)
-        super
+        ::Mail::Utilities.binary_unsafe_to_lf str
       end
-    
-      # Encode the string
+
       def self.encode(str)
-        super
-      end
-     
-      # Idenity encodings have a fixed cost, 1 byte out per 1 byte in
-      def self.cost(str)
-        super 
+        ::Mail::Utilities.binary_unsafe_to_crlf str
       end
 
-      Encodings.register(NAME, self) 
+      # Per RFC 2045 2.7. 7bit Data, No octets with decimal values greater than 127 are allowed.
+      def self.compatible_input?(str)
+        str.ascii_only? && super
+      end
     end
   end
 end

data/lib/mail/encodings/8bit.rb

@@ -6,32 +6,13 @@ module Mail
   module Encodings
     class EightBit < Binary
       NAME = '8bit'
-
       PRIORITY = 4
-
-      # 8bit is an identiy encoding, meaning nothing to do
-      
-      # Decode the string
-      def self.decode(str)
-        ::Mail::Utilities.to_lf str
-      end
-    
-      # Encode the string
-      def self.encode(str)
-        ::Mail::Utilities.to_crlf str
-      end
-     
-      # Idenity encodings have a fixed cost, 1 byte out per 1 byte in
-      def self.cost(str)
-        1.0
-      end
+      Encodings.register(NAME, self)
 
       # Per RFC 2821 4.5.3.1, SMTP lines may not be longer than 1000 octets including the <CRLF>.
       def self.compatible_input?(str)
-        !str.lines.find { |line| line.length > 998 }
+        !str.lines.find { |line| line.bytesize > 998 }
       end
-
-      Encodings.register(NAME, self) 
     end
   end
 end

data/lib/mail/encodings/base64.rb

@@ -4,36 +4,35 @@ require 'mail/encodings/7bit'
 
 module Mail
   module Encodings
+    # Base64 encoding handles binary content at the cost of 4 output bytes
+    # per input byte.
     class Base64 < SevenBit
       NAME = 'base64'
-     
       PRIORITY = 3
- 
+      Encodings.register(NAME, self)
+
       def self.can_encode?(enc)
         true
       end
 
-      # Decode the string from Base64
       def self.decode(str)
-        RubyVer.decode_base64( str )
+        Utilities.decode_base64(str)
       end
-    
-      # Encode the string to Base64
+
       def self.encode(str)
-        ::Mail::Utilities.to_crlf(RubyVer.encode_base64( str ))
+        ::Mail::Utilities.binary_unsafe_to_crlf(Utilities.encode_base64(str))
       end
 
-      # Base64 has a fixed cost, 4 bytes out per 3 bytes in
+      # 3 bytes in -> 4 bytes out
       def self.cost(str)
-        4.0/3
+        4.0 / 3
       end
 
-      # Base64 inserts newlines automatically and cannot violate the SMTP spec.
+      # Ruby Base64 inserts newlines automatically, so it doesn't exceed
+      # SMTP line length limits.
       def self.compatible_input?(str)
         true
       end
-
-      Encodings.register(NAME, self)      
     end
   end
 end

data/lib/mail/encodings/binary.rb

@@ -1,32 +1,13 @@
 # encoding: utf-8
 # frozen_string_literal: true
-require 'mail/encodings/transfer_encoding'
+require 'mail/encodings/identity'
 
 module Mail
   module Encodings
-    class Binary < TransferEncoding
+    class Binary < Identity
       NAME = 'binary'
-
       PRIORITY = 5
-
-      # Binary is an identiy encoding, meaning nothing to do
-      
-      # Decode the string
-      def self.decode(str)
-        str
-      end
-    
-      # Encode the string
-      def self.encode(str)
-        str
-      end
-     
-      # Idenity encodings have a fixed cost, 1 byte out per 1 byte in
-      def self.cost(str)
-        1.0
-      end
-
-      Encodings.register(NAME, self) 
+      Encodings.register(NAME, self)
     end
   end
 end

data/lib/mail/encodings/identity.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+# frozen_string_literal: true
+require 'mail/encodings/transfer_encoding'
+
+module Mail
+  module Encodings
+    # Identity encodings do no encoding/decoding and have a fixed cost:
+    # 1 byte in -> 1 byte out.
+    class Identity < TransferEncoding #:nodoc:
+      def self.decode(str)
+        str
+      end
+
+      def self.encode(str)
+        str
+      end
+
+      # 1 output byte per input byte.
+      def self.cost(str)
+        1.0
+      end
+    end
+  end
+end

data/lib/mail/encodings/quoted_printable.rb

@@ -6,27 +6,27 @@ module Mail
   module Encodings
     class QuotedPrintable < SevenBit
       NAME='quoted-printable'
-   
+
       PRIORITY = 2
 
-      def self.can_encode?(str)
-        EightBit.can_encode? str
+      def self.can_encode?(enc)
+        EightBit.can_encode? enc
       end
 
       # Decode the string from Quoted-Printable. Cope with hard line breaks
       # that were incorrectly encoded as hex instead of literal CRLF.
       def self.decode(str)
-        ::Mail::Utilities.to_lf str.gsub(/(?:=0D=0A|=0D|=0A)\r\n/, "\r\n").unpack("M*").first
+        ::Mail::Utilities.to_lf ::Mail::Utilities.to_crlf(str).gsub(/(?:=0D=0A|=0D|=0A)\r\n/, "\r\n").unpack("M*").first
       end
 
       def self.encode(str)
-        ::Mail::Utilities.to_crlf([::Mail::Utilities.to_lf(str)].pack("M"))
+        ::Mail::Utilities.to_crlf [::Mail::Utilities.to_lf(str)].pack("M")
       end
 
       def self.cost(str)
         # These bytes probably do not need encoding
         c = str.count("\x9\xA\xD\x20-\x3C\x3E-\x7E")
-        # Everything else turns into =XX where XX is a 
+        # Everything else turns into =XX where XX is a
         # two digit hex number (taking 3 bytes)
         total = (str.bytesize - c)*3 + c
         total.to_f/str.bytesize