sisimai 4.22.3-java → 4.22.4-java

data/lib/sisimai/bite/email.rb

@@ -16,20 +16,18 @@ module Sisimai
           }
         end
         def headerlist; return []; end
-        def pattern;    return []; end
 
         # @abstract MTA list
         # @return   [Array] MTA list with order
         def index
-          return %w|
+          return %w[
             Sendmail Postfix Qmail Exim Courier OpenSMTPD Exchange2007 Exchange2003
             Google Yahoo GSuite Aol Outlook Office365 SendGrid AmazonSES MailRu
             Yandex MessagingServer Domino Notes ReceivingSES AmazonWorkMail Verizon
             GMX Bigfoot Facebook Zoho EinsUndEins MessageLabs EZweb KDDI Biglobe
             ApacheJames McAfee MXLogic MailFoundry IMailServer
             MFILTER Activehunter InterScanMSS SurfControl MailMarshalSMTP
-            X1 X2 X3 X4 X5 V5sendmail FML
-          |
+            X1 X2 X3 X4 X5 V5sendmail FML]
         end
 
         # @abstract Parse bounce messages

data/lib/sisimai/bite/email/activehunter.rb

@@ -7,22 +7,15 @@ module Sisimai::Bite::Email
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/Activehunter.pm
       require 'sisimai/bite/email'
 
-      Re0 = {
-        :from    => %r/\A"MAILER-DAEMON"/,
-        :subject => %r/FAILURE NOTICE :/,
-      }.freeze
-      Re1 = {
-        :begin   => %r/\A  ----- The following addresses had permanent fatal errors -----\z/,
-        :error   => %r/\A  ----- Transcript of session follows -----\z/,
-        :rfc822  => %r|\AContent-type: message/rfc822\z|,
-        :endof   => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = {
+        message: ['  ----- The following addresses had permanent fatal errors -----'],
+        rfc822:  ['Content-type: message/rfc822'],
+      }.freeze
 
       def description; return 'TransWARE Active!hunter'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
       def headerlist;  return ['X-AHMAILID']; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from TransWARE Active!hunter
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -38,6 +31,9 @@ module Sisimai::Bite::Email
       def scan(mhead, mbody)
         return nil unless mhead
         return nil unless mbody
+
+        # :from    => %r/\A"MAILER-DAEMON"/,
+        # :subject => %r/FAILURE NOTICE :/,
         return nil unless mhead['x-ahmailid']
 
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
@@ -48,10 +44,10 @@ module Sisimai::Bite::Email
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         v = nil
 
-        hasdivided.each do |e|
+        while e = hasdivided.shift do
           if readcursor.zero?
             # Beginning of the bounce message or delivery status part
-            if e =~ Re1[:begin]
+            if e == StartingOf[:message][0]
               readcursor |= Indicators[:deliverystatus]
               next
             end
@@ -59,7 +55,7 @@ module Sisimai::Bite::Email
 
           if (readcursor & Indicators[:'message-rfc822']).zero?
             # Beginning of the original message part
-            if e =~ Re1[:rfc822]
+            if e == StartingOf[:rfc822][0]
               readcursor |= Indicators[:'message-rfc822']
               next
             end
@@ -73,7 +69,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -95,8 +90,8 @@ module Sisimai::Bite::Email
                 v = dscontents[-1]
               end
               v['recipient'] = cv[1]
+              v['diagnosis'] = ''
               recipients += 1
-
             else
               #  ----- Transcript of session follows -----
               # 550 sorry, no mailbox here by that name (#5.1.1 - chkusr)
@@ -106,8 +101,8 @@ module Sisimai::Bite::Email
           end
         end
         return nil if recipients.zero?
-        require 'sisimai/string'
 
+        require 'sisimai/string'
         dscontents.map do |e|
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
           e['agent']     = self.smtpagent

data/lib/sisimai/bite/email/amazonses.rb

@@ -8,24 +8,12 @@ module Sisimai::Bite::Email
       require 'sisimai/bite/email'
 
       # http://aws.amazon.com/ses/
-      ReE = { :'x-mailer' => %r/Amazon[ ]WorkMail/ }.freeze
-      Re0 = {
-        :from    => %r/\AMAILER-DAEMON[@]email[-]bounces[.]amazonses[.]com\z/,
-        :subject => %r/\ADelivery Status Notification [(]Failure[)]\z/,
-      }.freeze
-      Re1 = {
-        :begin   => %r/\A(?:
-             The[ ]following[ ]message[ ]to[ ][<]
-            |An[ ]error[ ]occurred[ ]while[ ]trying[ ]to[ ]deliver[ ]the[ ]mail[ ]
-            )
-        /x,
-        :rfc822  => %r|\Acontent-type: message/rfc822\z|,
-        :endof   => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }.freeze
-      ReFailure = {
-        expired: %r/Delivery[ ]expired/x,
-      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = {
+        message: ['The following message to <', 'An error occurred while trying to deliver the mail'],
+        rfc822:  ['content-type: message/rfc822'],
+      }.freeze
+      ReFailures = { expired: %r/Delivery expired/ }.freeze
 
       def description; return 'Amazon SES(Sending): http://aws.amazon.com/ses/'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
@@ -35,7 +23,6 @@ module Sisimai::Bite::Email
       # X-AWS-Outgoing: 199.255.192.156
       # X-SES-Outgoing: 2016.10.12-54.240.27.6
       def headerlist;  return ['X-AWS-Outgoing', 'X-SES-Outgoing', 'x-amz-sns-message-id']; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from Amazon SES
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -52,9 +39,11 @@ module Sisimai::Bite::Email
         return nil unless mhead
         return nil unless mbody
 
-        match = 0
-        return nil if mhead['x-mailer'] =~ ReE[:'x-mailer']
+        # :from    => %r/\AMAILER-DAEMON[@]email[-]bounces[.]amazonses[.]com\z/,
+        # :subject => %r/\ADelivery Status Notification [(]Failure[)]\z/,
+        return nil if mhead['x-mailer'].to_s.include?('Amazon WorkMail')
 
+        match  = 0
         match += 1 if mhead['x-aws-outgoing']
         match += 1 if mhead['x-ses-outgoing']
         return nil if match.zero?
@@ -72,14 +61,14 @@ module Sisimai::Bite::Email
         }
         v = nil
 
-        hasdivided.each do |e|
+        while e = hasdivided.shift do
           # Save the current line for the next loop
           havepassed << e
           p = havepassed[-2]
 
           if readcursor.zero?
             # Beginning of the bounce message or delivery status part
-            if e =~ Re1[:begin]
+            if e.start_with?(StartingOf[:message][0], StartingOf[:message][1])
               readcursor |= Indicators[:deliverystatus]
               next
             end
@@ -87,7 +76,7 @@ module Sisimai::Bite::Email
 
           if (readcursor & Indicators[:'message-rfc822']).zero?
             # Beginning of the original message part
-            if e =~ Re1[:rfc822]
+            if e == StartingOf[:rfc822][0]
               readcursor |= Indicators[:'message-rfc822']
               next
             end
@@ -102,7 +91,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -121,7 +109,7 @@ module Sisimai::Bite::Email
               # content-type: message/rfc822
               v = dscontents[-1]
 
-              if cv = e.match(/\A[Ff]inal-[Rr]ecipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/)
+              if cv = e.match(/\AFinal-Recipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/)
                 # Final-Recipient: RFC822; userunknown@example.jp
                 if v['recipient']
                   # There are multiple recipient addresses in the message body.
@@ -131,42 +119,39 @@ module Sisimai::Bite::Email
                 v['recipient'] = cv[1]
                 recipients += 1
 
-              elsif cv = e.match(/\A[Xx]-[Aa]ctual-[Rr]ecipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/)
+              elsif cv = e.match(/\AX-Actual-Recipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/)
                 # X-Actual-Recipient: RFC822; kijitora@example.co.jp
                 v['alias'] = cv[1]
 
-              elsif cv = e.match(/\A[Aa]ction:[ ]*(.+)\z/)
+              elsif cv = e.match(/\AAction:[ ]*(.+)\z/)
                 # Action: failed
                 v['action'] = cv[1].downcase
 
-              elsif cv = e.match(/\A[Ss]tatus:[ ]*(\d[.]\d+[.]\d+)/)
+              elsif cv = e.match(/\AStatus:[ ]*(\d[.]\d+[.]\d+)/)
                 # Status: 5.1.1
                 # Status:5.2.0
                 # Status: 5.1.0 (permanent failure)
                 v['status'] = cv[1]
 
-              elsif cv = e.match(/\A[Rr]emote-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
+              elsif cv = e.match(/\ARemote-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
                 # Remote-MTA: DNS; mx.example.jp
                 v['rhost'] = cv[1].downcase
 
-              elsif cv = e.match(/\A[Ll]ast-[Aa]ttempt-[Dd]ate:[ ]*(.+)\z/)
+              elsif cv = e.match(/\ALast-Attempt-Date:[ ]*(.+)\z/)
                 # Last-Attempt-Date: Fri, 14 Feb 2014 12:30:08 -0500
                 v['date'] = cv[1]
-
               else
-                if cv = e.match(/\A[Dd]iagnostic-[Cc]ode:[ ]*(.+?);[ ]*(.+)\z/)
+                if cv = e.match(/\ADiagnostic-Code:[ ]*(.+?);[ ]*(.+)\z/)
                   # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
                   v['spec'] = cv[1].upcase
                   v['diagnosis'] = cv[2]
 
-                elsif p =~ /\A[Dd]iagnostic-[Cc]ode:[ ]*/ && cv = e.match(/\A[ \t]+(.+)\z/)
+                elsif p.start_with?('Diagnostic-Code:') && cv = e.match(/\A[ \t]+(.+)\z/)
                   # Continued line of the value of Diagnostic-Code header
-                  v['diagnosis'] ||= ''
-                  v['diagnosis']  += ' ' + cv[1]
-                  havepassed[-1] = 'Diagnostic-Code: ' + e
+                  v['diagnosis'] << ' ' << cv[1]
+                  havepassed[-1] = 'Diagnostic-Code: ' << e
                 end
               end
-
             else
               # The following message to <kijitora@example.jp> was undeliverable.
               # The reason for the problem:
@@ -178,7 +163,7 @@ module Sisimai::Bite::Email
               #
               # Reporting-MTA: dns; a192-79.smtp-out.amazonses.com
               #
-              if cv = e.match(/\A[Rr]eporting-MTA:[ ]*[DNSdns]+;[ ]*(.+)\z/)
+              if cv = e.match(/\AReporting-MTA:[ ]*[DNSdns]+;[ ]*(.+)\z/)
                 # Reporting-MTA: dns; mx.example.jp
                 next if connheader['lhost'].size > 0
                 connheader['lhost'] = cv[1].downcase
@@ -200,21 +185,19 @@ module Sisimai::Bite::Email
             recipients = j['ds'].size
           end
         end
-
         return nil if recipients.zero?
+
         require 'sisimai/string'
         require 'sisimai/smtp/status'
-
         dscontents.map do |e|
           # Set default values if each value is empty.
           connheader.each_key { |a| e[a] ||= connheader[a] || '' }
 
-          e['agent']       = self.smtpagent
-          e['diagnosis'] ||= ''
-          e['diagnosis']   = e['diagnosis'].gsub(/\\n/, ' ')
-          e['diagnosis']   = Sisimai::String.sweep(e['diagnosis'])
+          e['agent']     = self.smtpagent
+          e['diagnosis'] = e['diagnosis'].to_s.gsub(/\\n/, ' ')
+          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
-          if e['status'] =~ /\A[45][.][01][.]0\z/
+          if e['status'].to_s.start_with?('5.0.0', '5.1.0', '4.0.0', '4.1.0')
             # Get other D.S.N. value from the error message
             errormessage = e['diagnosis']
 
@@ -222,14 +205,13 @@ module Sisimai::Bite::Email
               # 5.1.0 - Unknown address error 550-'5.7.1 ...
               errormessage = cv[1]
             end
-
             pseudostatus = Sisimai::SMTP::Status.find(errormessage)
             e['status'] = pseudostatus if pseudostatus.size > 0
           end
 
-          ReFailure.each_key do |r|
+          ReFailures.each_key do |r|
             # Verify each regular expression of session errors
-            next unless e['diagnosis'] =~ ReFailure[r]
+            next unless e['diagnosis'] =~ ReFailures[r]
             e['reason'] = r.to_s
             break
           end

data/lib/sisimai/bite/email/amazonworkmail.rb

@@ -7,17 +7,11 @@ module Sisimai::Bite::Email
       require 'sisimai/bite/email'
 
       # https://aws.amazon.com/workmail/
-      Re0 = {
-        :'subject'  => %r/Delivery[_ ]Status[_ ]Notification[_ ].+Failure/,
-        :'received' => %r/.+[.]smtp-out[.].+[.]amazonses[.]com\b/,
-        :'x-mailer' => %r/\AAmazon WorkMail\z/,
-      }.freeze
-      Re1 = {
-        :begin  => %r/\ATechnical report:\z/,
-        :rfc822 => %r|\Acontent-type: message/rfc822\z|,
-        :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = {
+        message: ['Technical report:'],
+        rfc822:  ['content-type: message/rfc822'],
+      }.freeze
 
       def description; return 'Amazon WorkMail: https://aws.amazon.com/workmail/'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
@@ -26,7 +20,6 @@ module Sisimai::Bite::Email
       # X-Original-Mailer: Amazon WorkMail
       # X-Ses-Outgoing: 2016.01.14-54.240.27.159
       def headerlist;  return ['X-SES-Outgoing', 'X-Original-Mailer']; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from Amazon WorkMail
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -43,6 +36,9 @@ module Sisimai::Bite::Email
         return nil unless mhead
         return nil unless mbody
 
+        # :'subject'  => %r/Delivery[_ ]Status[_ ]Notification[_ ].+Failure/,
+        # :'received' => %r/.+[.]smtp-out[.].+[.]amazonses[.]com\b/,
+        # :'x-mailer' => %r/\AAmazon WorkMail\z/,
         match = 0
         xmail = mhead['x-original-mailer'] || mhead['x-mailer'] || ''
 
@@ -50,7 +46,7 @@ module Sisimai::Bite::Email
         unless xmail.empty?
           # X-Mailer: Amazon WorkMail
           # X-Original-Mailer: Amazon WorkMail
-          match += 1 if xmail =~ Re0[:'x-mailer']
+          match += 1 if xmail == 'Amazon WorkMail'
         end
         return nil if match < 2
 
@@ -66,10 +62,10 @@ module Sisimai::Bite::Email
         }
         v = nil
 
-        hasdivided.each do |e|
+        while e = hasdivided.shift do
           if readcursor.zero?
             # Beginning of the bounce message or delivery status part
-            if e =~ Re1[:begin]
+            if e == StartingOf[:message][0]
               readcursor |= Indicators[:deliverystatus]
               next
             end
@@ -77,7 +73,7 @@ module Sisimai::Bite::Email
 
           if (readcursor & Indicators[:'message-rfc822']).zero?
             # Beginning of the original message part
-            if e =~ Re1[:rfc822]
+            if e == StartingOf[:rfc822][0]
               readcursor |= Indicators[:'message-rfc822']
               next
             end
@@ -91,7 +87,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -104,7 +99,7 @@ module Sisimai::Bite::Email
               # Status: 4.4.7
               v = dscontents[-1]
 
-              if cv = e.match(/\A[Ff]inal-[Rr]ecipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/)
+              if cv = e.match(/\AFinal-Recipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/)
                 # Final-Recipient: RFC822; kijitora@example.jp
                 if v['recipient']
                   # There are multiple recipient addresses in the message body.
@@ -114,16 +109,15 @@ module Sisimai::Bite::Email
                 v['recipient'] = cv[1]
                 recipients += 1
 
-              elsif cv = e.match(/\A[Aa]ction:[ ]*(.+)\z/)
+              elsif cv = e.match(/\AAction:[ ]*(.+)\z/)
                 # Action: failed
                 v['action'] = cv[1].downcase
 
-              elsif cv = e.match(/\A[Ss]tatus:[ ]*(\d[.]\d+[.]\d+)/)
+              elsif cv = e.match(/\AStatus:[ ]*(\d[.]\d+[.]\d+)/)
                 # Status: 5.1.1
                 v['status'] = cv[1]
-
               else
-                if cv = e.match(/\A[Dd]iagnostic-[Cc]ode:[ ]*(.+?);[ ]*(.+)\z/)
+                if cv = e.match(/\ADiagnostic-Code:[ ]*(.+?);[ ]*(.+)\z/)
                   # Diagnostic-Code: SMTP; 550 5.1.1 <kijitora@example.jp>... User Unknown
                   v['spec'] = cv[1].upcase
                   v['diagnosis'] = cv[2]
@@ -134,7 +128,7 @@ module Sisimai::Bite::Email
               #
               # Reporting-MTA: dsn; a27-85.smtp-out.us-west-2.amazonses.com
               #
-              if cv = e.match(/\A[Rr]eporting-MTA:[ ]*[DNSdns]+;[ ]*(.+)\z/)
+              if cv = e.match(/\AReporting-MTA:[ ]*[DNSdns]+;[ ]*(.+)\z/)
                 # Reporting-MTA: dns; mx.example.jp
                 next if connheader['lhost'].size > 0
                 connheader['lhost'] = cv[1].downcase
@@ -146,21 +140,19 @@ module Sisimai::Bite::Email
             # <head>
             # <meta name="Generator" content="Amazon WorkMail v3.0-2023.77">
             # <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-            break if e =~ /\A[<]!DOCTYPE HTML[>][<]html[>]\z/
+            break if e.start_with?('<!DOCTYPE HTML><html>')
           end
         end
-
         return nil if recipients.zero?
+
         require 'sisimai/string'
         require 'sisimai/smtp/status'
-
         dscontents.map do |e|
           # Set default values if each value is empty.
           connheader.each_key { |a| e[a] ||= connheader[a] || '' }
 
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-
-          if e['status'] =~ /\A[45][.][01][.]0\z/
+          if e['status'].to_s.start_with?('5.0.0', '5.1.0', '4.0.0', '4.1.0')
             # Get other D.S.N. value from the error message
             errormessage = e['diagnosis']
 
@@ -168,6 +160,7 @@ module Sisimai::Bite::Email
               # 5.1.0 - Unknown address error 550-'5.7.1 ...
               errormessage = cv[1]
             end
+
             pseudostatus = Sisimai::SMTP::Status.find(errormessage)
             e['status'] = pseudostatus if pseudostatus.size > 0
           end

data/lib/sisimai/bite/email/aol.rb

@@ -6,20 +6,15 @@ module Sisimai::Bite::Email
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/Aol.pm
       require 'sisimai/bite/email'
 
-      Re0 = {
-        :from    => %r/\APostmaster [<]Postmaster[@]AOL[.]com[>]\z/,
-        :subject => %r/\AUndeliverable: /,
-      }.freeze
-      Re1 = {
-        :begin   => %r|\AContent-Type: message/delivery-status|,
-        :rfc822  => %r|\AContent-Type: message/rfc822|,
-        :endof   => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
+      Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = {
+        message: ['Content-Type: message/delivery-status'],
+        rfc822:  ['Content-Type: message/rfc822'],
       }.freeze
-      ReFailure = {
-        hostunknown: %r/Host[ ]or[ ]domain[ ]name[ ]not[ ]found/,
-        notaccept:   %r/type=MX:[ ]Malformed[ ]or[ ]unexpected[ ]name[ ]server[ ]reply/,
+      ReFailures = {
+        hostunknown: %r/Host or domain name not found/,
+        notaccept:   %r/type=MX: Malformed or unexpected name server reply/,
       }.freeze
-      Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'Aol Mail: http://www.aol.com'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
@@ -35,7 +30,6 @@ module Sisimai::Bite::Email
       # X-Outbound-Mail-Relay-Queue-ID: 07391702BF4DC
       # X-Outbound-Mail-Relay-Sender: rfc822; shironeko@aol.example.jp
       def headerlist;  return ['X-AOL-IP']; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from Aol Mail
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -51,6 +45,9 @@ module Sisimai::Bite::Email
       def scan(mhead, mbody)
         return nil unless mhead
         return nil unless mbody
+
+        # :from    => %r/\APostmaster [<]Postmaster[@]AOL[.]com[>]\z/,
+        # :subject => %r/\AUndeliverable: /,
         return nil unless mhead['x-aol-ip']
 
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
@@ -67,14 +64,14 @@ module Sisimai::Bite::Email
         }
         v = nil
 
-        hasdivided.each do |e|
+        while e = hasdivided.shift do
           # Save the current line for the next loop
           havepassed << e
           p = havepassed[-2]
 
           if readcursor.zero?
             # Beginning of the bounce message or delivery status part
-            if e =~ Re1[:begin]
+            if e.start_with?(StartingOf[:message][0])
               readcursor |= Indicators[:deliverystatus]
               next
             end
@@ -82,7 +79,7 @@ module Sisimai::Bite::Email
 
           if (readcursor & Indicators[:'message-rfc822']).zero?
             # Beginning of the original message part
-            if e =~ Re1[:rfc822]
+            if e.start_with?(StartingOf[:rfc822][0])
               readcursor |= Indicators[:'message-rfc822']
               next
             end
@@ -96,7 +93,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -111,7 +107,7 @@ module Sisimai::Bite::Email
               # Diagnostic-Code: smtp; 550 5.2.2 <kijitora@example.co.jp>... Mailbox Full
               v = dscontents[-1]
 
-              if cv = e.match(/\A[Ff]inal-[Rr]ecipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/)
+              if cv = e.match(/\AFinal-Recipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/)
                 # Final-Recipient: RFC822; userunknown@example.jp
                 if v['recipient']
                   # There are multiple recipient addresses in the message body.
@@ -121,33 +117,30 @@ module Sisimai::Bite::Email
                 v['recipient'] = cv[1]
                 recipients += 1
 
-              elsif cv = e.match(/\A[Aa]ction:[ ]*(.+)\z/)
+              elsif cv = e.match(/\AAction:[ ]*(.+)\z/)
                 # Action: failed
                 v['action'] = cv[1].downcase
 
-              elsif cv = e.match(/\A[Ss]tatus:[ ]*(\d[.]\d+[.]\d+)/)
+              elsif cv = e.match(/\AStatus:[ ]*(\d[.]\d+[.]\d+)/)
                 # Status:5.2.0
                 v['status'] = cv[1]
 
-              elsif cv = e.match(/\A[Rr]emote-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
+              elsif cv = e.match(/\ARemote-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
                 # Remote-MTA: DNS; mx.example.jp
                 v['rhost'] = cv[1].downcase
-
               else
                 # Get error message
-                if cv = e.match(/\A[Dd]iagnostic-[Cc]ode:[ ]*(.+?);[ ]*(.+)\z/)
+                if cv = e.match(/\ADiagnostic-Code:[ ]*(.+?);[ ]*(.+)\z/)
                   # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
                   v['spec'] = cv[1].upcase
                   v['diagnosis'] = cv[2]
 
-                elsif p =~ /\A[Dd]iagnostic-[Cc]ode:[ ]*/ && cv = e.match(/\A[ \t]+(.+)\z/)
+                elsif p.start_with?('Diagnostic-Code:') && cv = e.match(/\A[ \t]+(.+)\z/)
                   # Continued line of the value of Diagnostic-Code header
-                  v['diagnosis'] ||= ''
-                  v['diagnosis']  += ' ' + cv[1]
-                  havepassed[-1] = 'Diagnostic-Code: ' + e
+                  v['diagnosis'] << ' ' << cv[1]
+                  havepassed[-1] = 'Diagnostic-Code: ' << e
                 end
               end
-
             else
               # Content-Type: message/delivery-status
               # Content-Transfer-Encoding: 7bit
@@ -156,13 +149,13 @@ module Sisimai::Bite::Email
               # X-Outbound-Mail-Relay-Queue-ID: CCBA43800007F
               # X-Outbound-Mail-Relay-Sender: rfc822; shironeko@aol.example.jp
               # Arrival-Date: Fri, 21 Nov 2014 17:14:34 -0500 (EST)
-              if cv = e.match(/\A[Rr]eporting-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
+              if cv = e.match(/\AReporting-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
                 # Reporting-MTA: dns; mx.example.jp
                 next if connheader['lhost'].size > 0
                 connheader['lhost'] = cv[1].downcase
                 connvalues += 1
 
-              elsif cv = e.match(/\A[Aa]rrival-[Dd]ate:[ ]*(.+)\z/)
+              elsif cv = e.match(/\AArrival-Date:[ ]*(.+)\z/)
                 # Arrival-Date: Wed, 29 Apr 2009 16:03:18 +0900
                 next if connheader['date'].size > 0
                 connheader['date'] = cv[1]
@@ -172,11 +165,10 @@ module Sisimai::Bite::Email
             end
           end
         end
-
         return nil if recipients.zero?
+
         require 'sisimai/string'
         require 'sisimai/smtp/status'
-
         dscontents.map do |e|
           # Set default values if each value is empty.
           connheader.each_key { |a| e[a] ||= connheader[a] || '' }
@@ -185,14 +177,14 @@ module Sisimai::Bite::Email
           e['diagnosis'] = e['diagnosis'].gsub(/\\n/, ' ')
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
-          ReFailure.each_key do |r|
+          ReFailures.each_key do |r|
             # Verify each regular expression of session errors
-            next unless e['diagnosis'] =~ ReFailure[r]
+            next unless e['diagnosis'] =~ ReFailures[r]
             e['reason'] = r.to_s
             break
           end
 
-          if e['status'].empty? || e['status'] =~ /\A\d[.]0[.]0\z/
+          if e['status'].empty? || e['status'].end_with?('.0.0')
             # There is no value of Status header or the value is 5.0.0, 4.0.0
             pseudostatus = Sisimai::SMTP::Status.find(e['diagnosis'])
             e['status'] = pseudostatus if pseudostatus.size > 0