sisimai 5.4.1-java → 5.6.0-java

data/lib/sisimai/lhost/v5sendmail.rb

@@ -36,10 +36,10 @@ module Sisimai::Lhost
       # @return [Nil]           it failed to decode or the arguments are missing
       def inquire(mhead, mbody)
         # :from => %r/\AMail Delivery Subsystem/,
-        return nil unless mhead['subject'].start_with?('Returned mail: ')
+        return nil if mhead['subject'].start_with?('Returned mail: ') == false
 
         emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
-        return nil unless emailparts[1].size > 0
+        return nil if emailparts[1].size == 0
 
         require 'sisimai/rfc1123'
         require 'sisimai/smtp/command'
@@ -133,7 +133,7 @@ module Sisimai::Lhost
           # There is no recipient address in the error message
           anotherone.each_key do |e|
             # Try to pick an recipient address, a reply code, and error messages
-            cv = Sisimai::Address.s3s4(anotherone[e]); next unless Sisimai::Address.is_emailaddress(cv)
+            cv = Sisimai::Address.s3s4(anotherone[e]); next if Sisimai::Address.is_emailaddress(cv) == false
             cr = Sisimai::SMTP::Reply.find(anotherone[e])
 
             dscontents[e]["recipient"] = cv
@@ -150,13 +150,13 @@ module Sisimai::Lhost
             if p1 > 0
               # Get the recipient address from "To:" header at the original message
               cv = Sisimai::Address.s3s4(emailparts[1][p1, p2 - p1 - 5])
-              return nil unless Sisimai::Address.is_emailaddress(cv)
+              return nil if Sisimai::Address.is_emailaddress(cv) == false
               dscontents[0]["recipient"] = cv
               recipients += 1
             end
           end
         end
-        return nil unless recipients > 0
+        return nil if recipients == 0
 
         j = 0; dscontents.each do |e|
           # Tidy up the error message in e.Diagnosis
@@ -169,8 +169,8 @@ module Sisimai::Lhost
           # @example.jp, no local part
           # Get email address from the value of Diagnostic-Code header
           next if e['recipient'].include?('@')
-          p1 = e['diagnosis'].index('<'); next unless p1
-          p2 = e['diagnosis'].index('>'); next unless p2
+          p1 = e['diagnosis'].index('<'); next if p1.nil?
+          p2 = e['diagnosis'].index('>'); next if p2.nil?
           e['recipient'] = Sisimai::Address.s3s4(e[p1, p2 - p1])
         end
 

data/lib/sisimai/lhost/verizon.rb

@@ -16,7 +16,7 @@ module Sisimai::Lhost
         while true
           # Check the value of "From" header
           # :'subject' => %r/Undeliverable Message/,
-          break unless mhead['received'].any? { |a| a.include?('.vtext.com (') }
+          break if mhead['received'].none? { |a| a.include?('.vtext.com (') }
           match = 1 if mhead['from'] == 'post_master@vtext.com'
           match = 0 if Sisimai::String.aligned(mhead['from'], ['sysadmin@', '.vzwpix.com'])
           break
@@ -130,7 +130,7 @@ module Sisimai::Lhost
             end
           end
         end
-        return nil unless recipients > 0
+        return nil if recipients == 0
 
         # Set the value of "MAIL FROM:" and "From:"
         emailparts[1] += "From: #{senderaddr}\n"    if emailparts[1].include?("\nFrom: ")    == false
@@ -140,7 +140,7 @@ module Sisimai::Lhost
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
           messagesof.each_key do |r|
             # Verify each regular expression of session errors
-            next unless messagesof[r].any? { |a| e['diagnosis'].include?(a) }
+            next if messagesof[r].none? { |a| e['diagnosis'].include?(a) }
             e['reason'] = r
             break
           end

data/lib/sisimai/lhost/x1.rb

@@ -6,7 +6,7 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      Boundaries = ['Received: from '].freeze
+      Boundaries = ['Content-Type: message/rfc822', 'Received: from '].freeze
       MarkingsOf = {message: ['The original message was received at ']}.freeze
 
       # @abstract Decodes the bounce message from Unknown MTA #1
@@ -15,8 +15,11 @@ module Sisimai::Lhost
       # @return [Hash]          Bounce data list and message/rfc822 part
       # @return [Nil]           it failed to decode or the arguments are missing
       def inquire(mhead, mbody)
-        return nil unless mhead['subject'].start_with?('Returned Mail: ')
-        return nil unless mhead['from'].start_with?('"Mail Deliver System" ')
+        proceedsto = false
+        proceedsto = true if mhead['subject'].start_with?('Returned Mail: ')
+        proceedsto = true if mhead['subject'].start_with?('Mail Delivery Failure')
+        proceedsto = true if Sisimai::String.aligned(mhead['from'], ['"Mail Deliver', 'System" '])
+        return nil if proceedsto == false
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = nil
         emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
@@ -61,7 +64,7 @@ module Sisimai::Lhost
             datestring = e[MarkingsOf[:message][0].size, e.size]
           end
         end
-        return nil unless recipients > 0
+        return nil if recipients == 0
 
         dscontents.each do |e|
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])

data/lib/sisimai/lhost/x2.rb

@@ -7,7 +7,11 @@ module Sisimai::Lhost
 
       Indicators = Sisimai::Lhost.INDICATORS
       Boundaries = ['--- Original message follows.'].freeze
-      StartingOf = {message: ['Unable to deliver message to the following address']}.freeze
+      StartingOf = {
+        message: [
+          "Unable to deliver message to the following address",
+          "This Delivery Status Notification is sent from MTA",
+        ]}.freeze
 
       # @abstract Decodes the bounce message from Unknown MTA #2
       # @param  [Hash] mhead    Message headers of a bounce email
@@ -15,12 +19,12 @@ module Sisimai::Lhost
       # @return [Hash]          Bounce data list and message/rfc822 part
       # @return [Nil]           it failed to decode or the arguments are missing
       def inquire(mhead, mbody)
-        match   = nil
-        match ||= 1 if mhead['from'].include?('MAILER-DAEMON@')
-        match ||= 1 if mhead['subject'].start_with?('Delivery failure')
-        match ||= 1 if mhead['subject'].start_with?('failure delivery')
-        match ||= 1 if mhead['subject'].start_with?('failed delivery')
-        return nil unless match
+        match   = false
+        match ||= true if mhead['from'].include?('MAILER-DAEMON@')
+        match ||= true if mhead['subject'].start_with?('Delivery failure')
+        match ||= true if mhead['subject'].start_with?('failure delivery')
+        match ||= true if mhead['subject'].start_with?('failed delivery')
+        return nil if match == false
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = nil
         emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
@@ -33,7 +37,7 @@ module Sisimai::Lhost
           # line of the beginning of the original message.
           if readcursor == 0
             # Beginning of the bounce message or delivery status part
-            readcursor |= Indicators[:deliverystatus] if e.start_with?(StartingOf[:message][0])
+            readcursor |= Indicators[:deliverystatus] if StartingOf[:message].any? { |a| e.start_with?(a) }
             next
           end
           next if (readcursor & Indicators[:deliverystatus]) == 0 || e.empty?
@@ -43,23 +47,47 @@ module Sisimai::Lhost
           #
           # <kijitora@example.com>:
           # This user doesn't have a example.com account (kijitora@example.com) [0]
+          # 
+          # --- OR ---
+          # 
+          # This Delivery Status Notification is sent from MTA...
+          # 
+          # Your delivery to the following address has been failed.
+          # Please refer to the below for details.
+          # ------------------------------------------------------
+          # 
+          # Delivery failed: kijitora@example.co.jp
+          # 192.0.2.25 does not like recipient.
+          # Remote host said[Response Message]: 550 5.1.1 <kijitora@example.co.jp>:
+          #   Recipient address rejected: User unknown in local recipient table
+          # Giving up on 192.0.2.25.
+          # STEP: RCPT TO
           v = dscontents[-1]
 
-          if e.start_with?('<') && Sisimai::String.aligned(e, ['<', '@', '>', ':'])
+          if e.start_with?('<')                 && Sisimai::String.aligned(e, ['<', '@', '>:']) ||
+             e.start_with?('Delivery failed: ') && Sisimai::String.aligned(e, ['failed: ', '@'])
             # <kijitora@example.com>:
+            # Delivery failed: kijitora@example.co.jp
             if v["recipient"] != ""
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
             end
-            v['recipient'] = e[1, e.size - 3]
+            v['recipient'] = e[1, e.size - 3] if e.start_with?('<')
+            v['recipient'] = e[e.index(': ') + 2, e.size - 1] if v['recipient'].empty?
             recipients += 1
-          else
+
+          elsif e.start_with?('STEP: ')
+            # STEP: RCPT TO
+            # STEP: DATA SEND
+            v['command'] = Sisimai::SMTP::Command.find(e)
+
+          elsif e.start_with?('-----') == false
             # This user doesn't have a example.com account (kijitora@example.com) [0]
             v['diagnosis'] += " #{e}"
           end
         end
-        return nil unless recipients > 0
+        return nil if recipients == 0
 
         dscontents.each { |e| e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) }
         return {"ds" => dscontents, "rfc822" => emailparts[1]}

data/lib/sisimai/lhost/x3.rb

@@ -15,8 +15,8 @@ module Sisimai::Lhost
       # @return [Hash]          Bounce data list and message/rfc822 part
       # @return [Nil]           it failed to decode or the arguments are missing
       def inquire(mhead, mbody)
-        return nil unless mhead['subject'].start_with?('Delivery status notification')
-        return nil unless mhead['from'].start_with?('Mail Delivery System')
+        return nil if mhead['subject'].start_with?('Delivery status notification') == false
+        return nil if mhead['from'].start_with?('Mail Delivery System') == false
 
         require 'sisimai/smtp/command'
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
@@ -79,7 +79,7 @@ module Sisimai::Lhost
             end
           end
         end
-        return nil unless recipients > 0
+        return nil if recipients == 0
 
         dscontents.each do |e|
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])

data/lib/sisimai/lhost/x6.rb

@@ -16,7 +16,7 @@ module Sisimai::Lhost
       # @return [Nil]           it failed to decode or the arguments are missing
       # @since v4.25.6
       def inquire(mhead, mbody)
-        return nil unless mhead['subject'].start_with?('There was an error sending your mail')
+        return nil if mhead['subject'].start_with?('There was an error sending your mail') == false
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = nil
         emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
@@ -76,7 +76,7 @@ module Sisimai::Lhost
             recipients += 1
           end
         end
-        return nil unless recipients > 0
+        return nil if recipients == 0
 
         require 'sisimai/smtp/command'
         dscontents.each do |e|

data/lib/sisimai/lhost/zoho.rb

@@ -19,7 +19,7 @@ module Sisimai::Lhost
         # X-ZohoMail: Si CHF_MF_NL SS_10 UW48 UB48 FMWL UW48 UB48 SGR3_1_09124_42
         # X-Zoho-Virus-Status: 2
         # X-Mailer: Zoho Mail
-        return nil unless mhead['x-zohomail']
+        return nil if mhead['x-zohomail'].nil?
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = nil
         emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
@@ -68,7 +68,7 @@ module Sisimai::Lhost
             end
             recipients += 1
 
-          elsif e.start_with?('[Status: ')
+          elsif e.start_with?('[Status: ') && e.include?('<') && e.include?('>')
             # Expired
             # [Status: Error, Address: <kijitora@6kaku.example.co.jp>, ResponseCode 421, , Host not reachable.]
             if v["recipient"] != ""
@@ -83,17 +83,17 @@ module Sisimai::Lhost
             recipients += 1
           else
             # Continued line
-            next unless qprintable
+            next if qprintable == false
             v['diagnosis'] += e
           end
         end
-        return nil unless recipients > 0
+        return nil if recipients == 0
 
         dscontents.each do |e|
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'].tr("\n", ' '))
           MessagesOf.each_key do |r|
             # Verify each regular expression of session errors
-            next unless MessagesOf[r].any? { |a| e['diagnosis'].include?(a) }
+            next if MessagesOf[r].none? { |a| e['diagnosis'].include?(a) }
             e['reason'] = r
             break
           end

data/lib/sisimai/lhost.rb

@@ -9,20 +9,21 @@ module Sisimai
       # @private
       def DELIVERYSTATUS
         return {
-          'spec'         => "",  # Protocl specification
-          'date'         => "",  # The value of Last-Attempt-Date header
-          'rhost'        => "",  # The value of Remote-MTA header
-          'lhost'        => "",  # The value of Received-From-MTA header
-          'alias'        => "",  # The value of alias entry(RHS)
-          'agent'        => "",  # MTA module name
-          'action'       => "",  # The value of Action header
-          'status'       => "",  # The value of Status header
-          'reason'       => "",  # Temporary reason of bounce
-          'command'      => "",  # SMTP command in the message body
-          'replycode'    => "",  # SMTP Reply code
-          'diagnosis'    => "",  # The value of Diagnostic-Code header
-          'recipient'    => "",  # The value of Final-Recipient header
-          'feedbacktype' => "",  # Feedback Type
+          'spec'         => "",     # Protocl specification
+          'date'         => "",     # The value of Last-Attempt-Date header
+          'rhost'        => "",     # The value of Remote-MTA header
+          'lhost'        => "",     # The value of Received-From-MTA header
+          'alias'        => "",     # The value of alias entry(RHS)
+          'agent'        => "",     # MTA module name
+          'action'       => "",     # The value of Action header
+          'status'       => "",     # The value of Status header
+          'reason'       => "",     # Temporary reason of bounce
+          'command'      => "",     # SMTP command in the message body
+          'replycode'    => "",     # SMTP Reply code
+          'diagnosis'    => "",     # The value of Diagnostic-Code header
+          'recipient'    => "",     # The value of Final-Recipient header
+          'feedbacktype' => "",     # Feedback Type
+          'toxic'        => false,  # EXPERIMENTAL
         }
       end
 
@@ -41,9 +42,9 @@ module Sisimai
       def index
         return %w[
           Activehunter AmazonSES ApacheJames Biglobe Courier Domino DragonFly EZweb EinsUndEins Exchange2003
-          Exchange2007 Exim FML GMX GoogleWorkspace GoogleGroups Gmail IMailServer InterScanMSS KDDI
-          MailFoundry MailMarshalSMTP MessagingServer Notes OpenSMTPD Postfix Sendmail V5sendmail
-          Verizon X1 X2 X3 X6 Zoho MFILTER Qmail
+          Exchange2007 Exim FML GMX GoogleWorkspace GoogleGroups Gmail IMailServer KDDI MailFoundry Mimecast
+          MailMarshal MessagingServer Notes OpenSMTPD Postfix Sendmail TrendMicro V5sendmail Verizon
+          X1 X2 X3 X6 Zoho MFILTER Qmail
         ]
       end
 

data/lib/sisimai/mail/maildir.rb

@@ -16,8 +16,8 @@ module Sisimai
       # @return   [Sisimai::Mail::Maildir]  Object
       #           [Nil]                     is not a directory or does not exist
       def initialize(argv1)
-        raise Errno::ENOENT  unless File.exist?(argv1)
-        raise Errno::ENOTDIR unless File.ftype(argv1) == 'directory'
+        raise Errno::ENOENT  if File.exist?(argv1) == false
+        raise Errno::ENOTDIR if File.ftype(argv1)  != 'directory'
 
         @path   = nil
         @size   = Dir.entries(argv1).size
@@ -30,7 +30,7 @@ module Sisimai
       # Maildir reader, works as an iterator.
       # @return       [String] Contents of file in Maildir/
       def read
-        return nil unless self.offset < self.size
+        return nil if self.offset >= self.size
         seekhandle = self.handle
         readbuffer = ''
 
@@ -61,7 +61,7 @@ module Sisimai
             self.file    = r
             break
           end
-          seekhandle.close unless self.offset < self.size
+          seekhandle.close if self.offset >= self.size
         end
 
         return readbuffer

data/lib/sisimai/mail/mbox.rb

@@ -16,8 +16,8 @@ module Sisimai
       # @return   [Sisimai::Mail::Mbox]   Object
       #           [Nil]                   is not specified or does not exist
       def initialize(argv1)
-        raise Errno::ENOENT   unless File.exist?(argv1)
-        raise 'is not a file' unless File.ftype(argv1) == 'file'
+        raise Errno::ENOENT   if File.exist?(argv1) == false
+        raise 'is not a file' if File.ftype(argv1)  != 'file'
 
         @path   = argv1
         @dir    = File.dirname(argv1)
@@ -30,7 +30,7 @@ module Sisimai
       # Mbox reader, works as an iterator.
       # @return   [String] Contents of mbox
       def read
-        return nil unless self.offset < self.size
+        return nil if self.offset >= self.size
 
         seekoffset = self.offset || 0
         filehandle = self.handle
@@ -53,7 +53,7 @@ module Sisimai
           seekoffset = filehandle.pos - frombuffer.bytesize
           frombuffer = ''
           self.offset = seekoffset
-          filehandle.close unless self.offset < self.size
+          filehandle.close if self.offset >= self.size
         end
 
         return readbuffer.to_s

data/lib/sisimai/mail/memory.rb

@@ -14,7 +14,7 @@ module Sisimai
       # @return   [Sisimai::Mail::Memory] Object
       #           [Nil]                   is not specified or does not exist
       def initialize(argv1)
-        raise 'is not a String' unless argv1.is_a? ::String
+        raise 'is not a String' if argv1.is_a?(::String) == false
         raise 'is empty'        if argv1.empty?
 
         @path    = '<MEMORY>'

data/lib/sisimai/mail/stdin.rb

@@ -13,7 +13,7 @@ module Sisimai
       # @param    [IO::STDIN] stdin      Standard-In
       # @return   [Sisimai::Mail::STDIN] Object
       def initialize(stdin = $stdin)
-        raise 'is not an IO object' unless stdin.is_a?(IO)
+        raise 'is not an IO object' if stdin.is_a?(IO) == false
 
         @path   = '<STDIN>'
         @size   = nil
@@ -32,7 +32,7 @@ module Sisimai
         end
 
         begin
-          readhandle = STDIN unless readhandle
+          readhandle = STDIN if readhandle.nil?
           while r = readhandle.gets
             break if readbuffer.size > 0 && r.start_with?('From ')
             readbuffer << r

data/lib/sisimai/message.rb

@@ -21,12 +21,15 @@ module Sisimai
       FieldIndex = [Fields1894.flatten, Fields5322.flatten, Fields5965.flatten].flatten.freeze
       FieldTable = FieldIndex.map { |e| [e.downcase, e] }.to_h.freeze
       Boundaries = ['Content-Type: message/rfc822', 'Content-Type: text/rfc822-headers'].freeze
-      ReplacesAs = {
-        "Content-Type" => [
-          %w[message/xdelivery-status message/delivery-status],
-          %w[message/disposition-notification message/delivery-status],
-        ]
-      }.freeze
+      MediaTypes = [
+        %w[message/xdelivery-status message/delivery-status],
+        %w[message/disposition-notification message/delivery-status],
+        %w[message/global-delivery-status message/delivery-status],
+        %w[message/global-disposition-notification  message/delivery-status],
+        %w[message/global-delivery-status message/delivery-status],
+        %w[message/global-headers text/rfc822-headers],
+        %w[message/global message/rfc822],
+      ].freeze
 
       # Read an email message and convert to structured format
       # @param         [Hash] argvs       Module to be loaded
@@ -35,7 +38,7 @@ module Sisimai
       # @return        [Sisimai::Message] Structured email data or nil if each
       #                                   value of the arguments are missing
       def rise(**argvs)
-        return nil unless argvs
+        return nil if argvs.nil?
         email = argvs[:data].scrub('?').gsub("\r\n", "\n")
         thing = {'from' => '','header' => {}, 'rfc822' => '', 'ds' => [], 'catch' => nil}
         param = {}
@@ -53,12 +56,12 @@ module Sisimai
           thing['header'] = Sisimai::Message.makemap(aftersplit[1])
 
           # 3. Decode and rewrite the "Subject:" header
-          unless thing['header']['subject'].empty?
+          if thing['header']['subject'].empty? == false
             # Decode MIME-Encoded "Subject:" header
             cv = thing['header']['subject']
             cq = Sisimai::RFC2045.is_encoded(cv) ? Sisimai::RFC2045.decodeH(cv.split(/[ ]/)) : cv
             cl = cq.downcase
-            p1 = cl.index('fwd:'); p1 = cl.index('fw:') unless p1
+            p1 = cl.index('fwd:'); p1 = cl.index('fw:') if p1.nil?
 
             # Remove "Fwd:" string from the Subject: header
             if p1
@@ -77,17 +80,16 @@ module Sisimai
             'tryonfirst' => Sisimai::Order.make(thing['header']['subject'])
           }
           break if beforefact = Sisimai::Message.sift(param)
-          break unless Boundaries.any? { |a| aftersplit[2].include?(a) }
+          break if Boundaries.none? { |a| aftersplit[2].include?(a) }
 
           # 5. Try to sift again
           #    There is a bounce message inside of mutipart/*, try to sift the first message/rfc822
           #    part as a entire message body again.
           parseagain += 1
           email = Sisimai::RFC5322.part(aftersplit[2], Boundaries, true).pop.sub(/\A\s+/, '')
-          break unless email.size > 128
+          break if email.size < 128
         end
-        return nil unless beforefact
-        return nil if beforefact.empty?
+        return nil if beforefact.nil? || beforefact.empty?
 
         # 6. Rewrite headers of the original message in the body part
         %w|ds catch rfc822|.each { |e| thing[e] = beforefact[e] }
@@ -109,8 +111,7 @@ module Sisimai
         email.gsub!(/\r\n/, "\n") if email.include?("\r\n")
 
         (parts[1], parts[2]) = email.split(/\n\n/, 2)
-        return nil unless parts[1]
-        return nil unless parts[2]
+        return nil if parts[1].nil? || parts[2].nil?
 
         if parts[1].start_with?('From ')
           # From MAILER-DAEMON Tue Feb 11 00:00:00 2014
@@ -119,7 +120,7 @@ module Sisimai
           # Set pseudo UNIX From line
           parts[0] = 'MAILER-DAEMON Tue Feb 11 00:00:00 2014'
         end
-        parts[1] += "\n" unless parts[1].end_with?("\n")
+        parts[1] += "\n" if parts[1].end_with?("\n") == false
 
         %w[image/ application/ text/html].each do |e|
           # https://github.com/sisimai/p5-sisimai/issues/492, Reduce email size
@@ -128,8 +129,8 @@ module Sisimai
           ep = e == 'text/html' ? '</html>' : "--\n"
           while true
             # Remove each part from "Content-Type: image/..." to "--\n" (the end of each boundary)
-            p0 = parts[2].index("Content-Type: #{e}", p0); break unless p0
-            p1 = parts[2].index(ep, p0 + 32);              break unless p1
+            p0 = parts[2].index("Content-Type: #{e}", p0); break if p0.nil?
+            p1 = parts[2].index(ep, p0 + 32);              break if p1.nil?
             parts[2][p0, p1 - p0] = ''
           end
         end
@@ -170,8 +171,7 @@ module Sisimai
         end
         headermaps['received'] = receivedby
 
-        return headermaps unless argv1
-        return headermaps if headermaps['subject'].empty?
+        return headermaps if argv1.nil? || headermaps['subject'].empty?
 
         # Convert MIME-Encoded subject
         if Sisimai::String.is_8bit(headermaps['subject'])
@@ -209,7 +209,7 @@ module Sisimai
           # Find and tidy up fields defined in RFC5322, RFC1894, and RFC5965
           # 1. Find a field label defined in RFC5322, RFC1894, or RFC5965 from this line
           p0 = e.index(':') || -1
-          cf = e.downcase[0, p0]
+          cf = e.downcase[0, p0].to_s.rstrip
           fn = FieldTable[cf] || ''
 
           index += 1
@@ -227,7 +227,7 @@ module Sisimai
             # Such as Diagnostic-Code, Remote-MTA, and so on
             # - Before: Diagnostic-Code: SMTP;550 User unknown
             # - After:  Diagnostic-Code: smtp; 550 User unknown
-            break unless ['Content-Type'].concat(Fields1894).any? { |a| a == fn }
+            break if ['Content-Type'].concat(Fields1894).none? { |a| a == fn }
 
             if p1
               # The field including one or more ";"
@@ -251,7 +251,8 @@ module Sisimai
                     ps = f[0, p2].downcase
                     f[0, p2] = ps
                   end
-                  f.downcase! unless ps == 'boundary'
+                  f.downcase! if ps != 'boundary'
+                  f = 'rfc822' if f == 'rfc/822'
                   break
                 end
                 ab << f
@@ -261,9 +262,9 @@ module Sisimai
                 # Diagnostic-Code: x-unix;
                 #   /var/email/kijitora/Maildir/tmp/1000000000.A000000B00000.neko22:
                 #   Disk quota exceeded
-                break unless fn == 'Diagnostic-Code'
-                break unless ab.size == 1
-                break unless lines[index + 1].start_with?(' ')
+                break if fn != 'Diagnostic-Code'
+                break if ab.size != 1
+                break if lines[index + 1].start_with?(' ') == false
 
                 ab << ''
                 break
@@ -281,9 +282,9 @@ module Sisimai
           end
 
           # 3. Tidy up a value, and a parameter of Content-Type: field
-          if ReplacesAs.has_key?(fn)
+          if fn == "Content-Type"
             # Replace the value of "Content-Type" field
-            ReplacesAs[fn].each do |f|
+            MediaTypes.each do |f|
               # - Before: Content-Type: message/xdelivery-status; ...
               # - After:  Content-Type: message/delivery-status; ...
               p1 = bf.index(f[0]) || next
@@ -296,7 +297,9 @@ module Sisimai
           email += sprintf("%s: %s\n", fn, bf)
         end
 
-        email += "\n" unless email.end_with?("\n\n")
+        # 5. Convert the lower-cased SMTP command to the upper-cased.
+        email  = email.gsub("after end of data:", "after end of DATA:")
+        email += "\n" if email.end_with?("\n\n") == false
         return email
       end
 
@@ -311,14 +314,13 @@ module Sisimai
       # @param options argvs [Array] tryonfirst  MTA module list to load on first
       # @return              [Hash]          Decoded and structured bounce mails
       def sift(argvs)
-        return nil unless argvs['mail']
-        return nil unless argvs['body']
+        return nil if argvs['mail'].nil? || argvs['body'].nil?
 
         mailheader = argvs['mail']['header']
         bodystring = argvs['body']
         hookmethod = argvs['hook'] || nil
         havecaught = nil
-        return nil unless mailheader
+        return nil if mailheader.nil?
 
         # PRECHECK_EACH_HEADER:
         # Set empty string if the value is nil
@@ -351,7 +353,7 @@ module Sisimai
           # NOT text/plain
           # In case of Content-Type: multipart/*
           p = Sisimai::RFC2045.makeflat(mailheader['content-type'], bodystring)
-          bodystring = p unless p.empty?
+          bodystring = p if p.empty? == false
         end
         bodystring = bodystring.scrub('?').delete("\r").gsub("\t", " ")
 
@@ -412,7 +414,7 @@ module Sisimai
             break # as of now, we have no sample email for coding this block
           end
         end
-        return nil unless havesifted
+        return nil if havesifted.nil?
 
         havesifted['catch'] = havecaught
         modulename = modulename.sub(/\A.+::/, '')