sisimai 4.22.3 → 4.22.4

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

@@ -6,25 +6,18 @@ module Sisimai::Bite::Email
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/EZweb.pm
       require 'sisimai/bite/email'
 
-      Re0 = {
-        :'from'       => %r/[<]?(?>postmaster[@]ezweb[.]ne[.]jp)[>]?/i,
-        :'subject'    => %r/\AMail System Error - Returned Mail\z/,
-        :'received'   => %r/\Afrom[ ](?:.+[.])?ezweb[.]ne[.]jp[ ]/,
-        :'message-id' => %r/[@].+[.]ezweb[.]ne[.]jp[>]\z/,
-      }.freeze
-      Re1 = {
-        :begin  => %r{\A(?:
+      Indicators = Sisimai::Bite::Email.INDICATORS
+      MarkingsOf = {
+        message: %r{\A(?:
              The[ ]user[(]s[)][ ]
             |Your[ ]message[ ]
             |Each[ ]of[ ]the[ ]following
             |[<][^ ]+[@][^ ]+[>]\z
             )
         }x,
-        :rfc822   => %r#\A(?:[-]{50}|Content-Type:[ ]*message/rfc822)#,
-        :boundary => %r/\A__SISIMAI_PSEUDO_BOUNDARY__\z/,
-        :endof    => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
+        rfc822: %r#\A(?:[-]{50}|Content-Type:[ ]*message/rfc822)#,
       }.freeze
-      ReFailure = {
+      ReFailures = {
         # notaccept: [ %r/The following recipients did not receive this message:/ ],
         mailboxfull: [
           %r/The user[(]s[)] account is temporarily over quota/,
@@ -44,12 +37,10 @@ module Sisimai::Bite::Email
           %r/Each of the following recipients was rejected by a remote mail server/,
         ],
       }.freeze
-      Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'au EZweb: http://www.au.kddi.com/mobile/'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
       def headerlist;  return ['X-SPASIGN']; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from au EZweb
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -67,11 +58,11 @@ module Sisimai::Bite::Email
         return nil unless mbody
 
         match  = 0
-        match += 1 if mhead['from']    =~ Re0[:from]
-        match += 1 if mhead['subject'] =~ Re0[:subject]
-        match += 1 if mhead['received'].find { |a| a =~ Re0[:received] }
+        match += 1 if mhead['from'].include?('Postmaster@ezweb.ne.jp')
+        match += 1 if mhead['subject'] == 'Mail System Error - Returned Mail'
+        match += 1 if mhead['received'].find { |a| a.include?('ezweb.ne.jp (EZweb Mail) with') }
         if mhead['message-id']
-          match += 1 if mhead['message-id'] =~ Re0[:'message-id']
+          match += 1 if mhead['message-id'].end_with?('.ezweb.ne.jp>')
         end
         return nil if match < 2
 
@@ -93,21 +84,21 @@ module Sisimai::Bite::Email
           b0 = Sisimai::MIME.boundary(mhead['content-type'], 1)
           if b0.size > 0
             # Convert to regular expression
-            rxboundary = Regexp.new('\A' + Regexp.escape(b0) + '\z')
+            rxboundary = Regexp.new('\A' << Regexp.escape(b0) << '\z')
           end
         end
         rxmessages = []
-        ReFailure.each_key { |a| rxmessages.concat(ReFailure[a]) }
+        ReFailures.each_key { |a| rxmessages.concat(ReFailures[a]) }
 
-        hasdivided.each do |e|
+        while e = hasdivided.shift do
           if readcursor.zero?
             # Beginning of the bounce message or delivery status part
-            readcursor |= Indicators[:deliverystatus] if e =~ Re1[:begin]
+            readcursor |= Indicators[:deliverystatus] if e =~ MarkingsOf[:message]
           end
 
           if (readcursor & Indicators[:'message-rfc822']).zero?
             # Beginning of the original message part
-            if e =~ Re1[:rfc822] || e =~ rxboundary
+            if e =~ MarkingsOf[:rfc822] || e =~ rxboundary
               readcursor |= Indicators[:'message-rfc822']
               next
             end
@@ -121,7 +112,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -156,41 +146,38 @@ module Sisimai::Bite::Email
                 recipients += 1
               end
 
-            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[Aa]ction:[ ]*(.+)\z/)
+            elsif cv = e.match(/\AAction:[ ]*(.+)\z/)
               # Action: failed
               v['action'] = cv[1].downcase
 
-            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
               next if Sisimai::String.is_8bit(e)
               if cv = e.match(/\A[ \t]+[>]{3}[ \t]+([A-Z]{4})/)
                 #    >>> RCPT TO:<******@ezweb.ne.jp>
                 v['command'] = cv[1]
-
               else
                 # Check error message
                 if rxmessages.find { |a| e =~ a }
                   # Check with regular expressions of each error
                   v['diagnosis'] ||= ''
-                  v['diagnosis']  += ' ' + e
-
+                  v['diagnosis'] << ' ' << e
                 else
                   # >>> 550
                   v['alterrors'] ||= ''
-                  v['alterrors']  += ' ' + e
+                  v['alterrors'] << ' ' << e
                 end
               end
             end
@@ -199,10 +186,10 @@ module Sisimai::Bite::Email
         return nil if recipients.zero?
 
         dscontents.map do |e|
-          if e['alterrors'] && e['alterrors'].size > 0
+          if e['alterrors'].to_s.size > 0
             # Copy alternative error message
             e['diagnosis'] ||= e['alterrors']
-            if e['diagnosis'] =~ /\A[-]+/ || e['diagnosis'].end_with?('__')
+            if e['diagnosis'].start_with?('-') || e['diagnosis'].end_with?('__')
               # Override the value of diagnostic code message
               e['diagnosis'] = e['alterrors'] if e['alterrors'].size > 0
             end
@@ -210,11 +197,10 @@ module Sisimai::Bite::Email
           end
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
-          if mhead['x-spasign'] && mhead['x-spasign'] == 'NG'
+          if mhead['x-spasign'].to_s == 'NG'
             # Content-Type: text/plain; ..., X-SPASIGN: NG (spamghetti, au by EZweb)
             # Filtered recipient returns message that include 'X-SPASIGN' header
             e['reason'] = 'filtered'
-
           else
             if e['command'] == 'RCPT'
               # set "userunknown" when the remote server rejected after RCPT
@@ -223,9 +209,9 @@ module Sisimai::Bite::Email
             else
               # SMTP command is not RCPT
               catch :SESSION do
-                ReFailure.each_key do |r|
+                ReFailures.each_key do |r|
                   # Verify each regular expression of session errors
-                  ReFailure[r].each do |rr|
+                  ReFailures[r].each do |rr|
                     # Check each regular expression
                     next unless e['diagnosis'] =~ rr
                     e['reason'] = r.to_s
@@ -239,11 +225,9 @@ module Sisimai::Bite::Email
 
           unless e['reason']
             # The value of "reason" is not set yet.
-            unless e['recipient'] =~ /[@]ezweb[.]ne[.]jp\z/
-              # Deal as "userunknown" when the domain part of the recipient
-              # is "ezweb.ne.jp".
-              e['reason'] = 'userunknown'
-            end
+            # Deal as "userunknown" when the domain part of the recipient
+            # is "ezweb.ne.jp".
+            e['reason'] = 'userunknown' unless e['recipient'].end_with?('@ezweb.ne.jp')
           end
           e['agent'] = self.smtpagent
         end

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

@@ -6,19 +6,14 @@ module Sisimai::Bite::Email
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/Facebook.pm
       require 'sisimai/bite/email'
 
-      Re0 = {
-        :from    => %r/\AFacebook [<]mailer-daemon[@]mx[.]facebook[.]com[>]\z/,
-        :subject => %r/\ASorry, your message could not be delivered\z/,
-      }.freeze
-      Re1 = {
-        :begin   => %r/\AThis message was created automatically by Facebook[.]\z/,
-        :rfc822  => %r/\AContent-Disposition: inline\z/,
-        :endof   => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
+      Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = {
+        message: ['This message was created automatically by Facebook.'],
+        rfc822:  ['Content-Disposition: inline'],
       }.freeze
-
-      # http://postmaster.facebook.com/response_codes
-      # NOT TESTD EXCEPT RCP-P2
-      ReFailure = {
+      ReFailures = {
+        # http://postmaster.facebook.com/response_codes
+        # NOT TESTD EXCEPT RCP-P2
         userunknown: [
           'RCP-P1', # The attempted recipient address does not exist.
           'INT-P1', # The attempted recipient address does not exist.
@@ -75,12 +70,10 @@ module Sisimai::Bite::Email
           'CON-T4', # Your mail server has exceeded the maximum number of recipients for its current connection.
         ],
       }.freeze
-      Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'Facebook: https://www.facebook.com'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
       def headerlist;  return []; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from Facebook
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -96,8 +89,8 @@ module Sisimai::Bite::Email
       def scan(mhead, mbody)
         return nil unless mhead
         return nil unless mbody
-        return nil unless mhead['from']    =~ Re0[:from]
-        return nil unless mhead['subject'] =~ Re0[:subject]
+        return nil unless mhead['from'] == 'Facebook <mailer-daemon@mx.facebook.com>'
+        return nil unless mhead['subject'] == 'Sorry, your message could not be delivered'
 
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
         hasdivided = mbody.split("\n")
@@ -114,14 +107,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 == StartingOf[:message][0]
               readcursor |= Indicators[:deliverystatus]
               next
             end
@@ -129,7 +122,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
@@ -143,7 +136,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -154,7 +146,7 @@ module Sisimai::Bite::Email
               # Arrival-Date: Thu, 23 Jun 2011 02:29:43 -0700
               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.
@@ -164,51 +156,48 @@ 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 RCP-P2
                   #     http://postmaster.facebook.com/response_codes?ip=192.0.2.135#rcp Refused due to recipient preferences
                   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
-              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]
@@ -236,9 +225,9 @@ module Sisimai::Bite::Email
           end
 
           catch :SESSION do
-            ReFailure.each_key do |r|
+            ReFailures.each_key do |r|
               # Verify each regular expression of session errors
-              ReFailure[r].each do |rr|
+              ReFailures[r].each do |rr|
                 # Check each regular expression
                 next unless fbresponse == rr
                 e['reason'] = r.to_s

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

@@ -6,14 +6,8 @@ module Sisimai::Bite::Email
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/FML.pm
       require 'sisimai/bite/email'
 
-      Re0 = {
-        :'from'       => %r/.+[-]admin[@].+/, 
-        :'message-id' => %r/\A[<]\d+[.]FML.+[@].+[>]\z/,
-      }.freeze
-      Re1 = {
-        :rfc822  => %r/\AOriginal[ ]mail[ ]as[ ]follows:\z/,
-        :endof   => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }.freeze
+      Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = { rfc822: ['Original mail as follows:'] }.freeze
       ErrorTitle = {
         :rejected => %r{(?>
            (?:Ignored[ ])*NOT[ ]MEMBER[ ]article[ ]from[ ]
@@ -29,7 +23,7 @@ module Sisimai::Bite::Email
           |WARNING:[ ]UNIX[ ]FROM[ ]Loop
           )
         }x,
-        :securityerror => %r/Security[ ]Alert/,
+        :securityerror => %r/Security Alert/,
       }.freeze
       ErrorTable = {
         :rejected => %r{(?>
@@ -48,14 +42,12 @@ module Sisimai::Bite::Email
           |Loop[ ]Back[ ]Warning:
           )
         }x,
-        :securityerror => %r/Security[ ]alert:/,
+        :securityerror => %r/Security alert:/,
       }.freeze
-      Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'fml mailing list server/manager'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
       def headerlist;  return ['X-MLServer']; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from fml mailling list server/manager
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -72,8 +64,8 @@ module Sisimai::Bite::Email
         return nil unless mhead
         return nil unless mbody
         return nil unless mhead['x-mlserver']
-        return nil unless mhead['from'] =~ Re0[:from]
-        return nil unless mhead['message-id'] =~ Re0[:'message-id']
+        return nil unless mhead['from'] =~ /.+[-]admin[@].+/
+        return nil unless mhead['message-id'] =~ /\A[<]\d+[.]FML.+[@].+[>]\z/
 
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
         hasdivided = mbody.split("\n")
@@ -84,10 +76,10 @@ module Sisimai::Bite::Email
         v = nil
 
         readcursor |= Indicators[:deliverystatus]
-        hasdivided.each do |e|
+        while e = hasdivided.shift do
           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
@@ -105,8 +97,7 @@ module Sisimai::Bite::Email
               break if blanklines > 1
               next
             end
-            e = e.sub(/\A[ ]{3}/, '')
-            rfc822list << e
+            rfc822list << e.lstrip
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -130,13 +121,13 @@ module Sisimai::Bite::Email
               # If you know the general guide of this list, please send mail with
               # the mail body 
               v['diagnosis'] ||= ''
-              v['diagnosis']  += e
+              v['diagnosis'] << e
             end
           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/gmx.rb

@@ -6,19 +6,12 @@ module Sisimai::Bite::Email
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/GMX.pm
       require 'sisimai/bite/email'
 
-      Re0 = {
-        :from    => %r/\AMAILER-DAEMON[@]/,
-        :subject => %r/\AMail delivery failed: returning message to sender\z/,
-      }.freeze
-      Re1 = {
-        :begin   => %r/\AThis message was created automatically by mail delivery software/,
-        :rfc822  => %r/\A--- The header of the original message is following/,
-        :endof   => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }.freeze
-      ReFailure = {
-        expired: %r/delivery[ ]retry[ ]timeout[ ]exceeded/x,
-      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = {
+        message: ['This message was created automatically by mail delivery software'],
+        rfc822:  ['--- The header of the original message is following'],
+      }.freeze
+      ReFailures = { expired: %r/delivery retry timeout exceeded/ }.freeze
 
       def description; return 'GMX: http://www.gmx.net'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
@@ -28,7 +21,6 @@ module Sisimai::Bite::Email
       # X-GMX-Antivirus: 0 (no virus found)
       # X-UI-Out-Filterresults: unknown:0;
       def headerlist;  return ['X-GMX-Antispam']; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from GMX
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -44,6 +36,9 @@ module Sisimai::Bite::Email
       def scan(mhead, mbody)
         return nil unless mhead
         return nil unless mbody
+
+        # :from    => %r/\AMAILER-DAEMON[@]/,
+        # :subject => %r/\AMail delivery failed: returning message to sender\z/,
         return nil unless mhead['x-gmx-antispam']
 
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
@@ -54,10 +49,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.start_with?(StartingOf[:message][0])
               readcursor |= Indicators[:deliverystatus]
               next
             end
@@ -65,7 +60,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
@@ -79,7 +74,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -119,39 +113,35 @@ module Sisimai::Bite::Email
             elsif cv = e.match(/\Ahost:[ \t]*(.+)\z/)
               # host: mx.example.jp
               v['rhost'] = cv[1]
-
             else
               # Get error message
               if e =~ /\b[45][.]\d[.]\d\b/ || e =~ /[<][^ ]+[@][^ ]+[>]/ || e =~ /\b[45]\d{2}\b/
                 v['diagnosis'] ||= e
-
               else
-                next if e =~ /\A\z/
-                if e =~ /\AReason:\z/
+                next if e.empty?
+                if e.start_with?('Reason:')
                   # Reason:
                   # delivery retry timeout exceeded
                   v['diagnosis'] = e
 
-                elsif v['diagnosis'] =~ /\AReason:\z/
+                elsif v['diagnosis'] == 'Reason:'
                   v['diagnosis'] = e
                 end
               end
             end
           end
         end
-
         return nil if recipients.zero?
-        require 'sisimai/string'
-        require 'sisimai/smtp/status'
 
+        require 'sisimai/string'
         dscontents.map do |e|
           e['agent']     = self.smtpagent
           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