sisimai 4.22.3 → 4.22.4

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

@@ -7,28 +7,15 @@ module Sisimai::Bite::Email
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/InterScanMSS.pm
       require 'sisimai/bite/email'
 
-      Re0 = {
-        :from     => %r/InterScan MSS/,
-        :received => %r/[ ][(]InterScanMSS[)][ ]with[ ]/,
-        :subject  => [
-          'Mail could not be delivered',
-          # メッセージを配信できません。
-          '=?iso-2022-jp?B?GyRCJWElQyU7ITwlOCRyR1s/LiRHJC0kXiQ7JHMhIxsoQg==?=',
-          # メール配信に失敗しました
-          '=?iso-2022-jp?B?GyRCJWEhPCVrR1s/LiRLPDpHVCQ3JF4kNyQ/GyhCDQo=?=',
-        ],
-      }.freeze
-      Re1 = {
-        :begin  => %r|\AContent-type: text/plain|,
-        :rfc822 => %r|\AContent-type: message/rfc822|,
-        :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = {
+        message: ['Content-type: text/plain'],
+        rfc822:  ['Content-type: message/rfc822'],
+      }.freeze
 
       def description; return 'Trend Micro InterScan Messaging Security Suite'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
       def headerlist;  return []; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from InterScanMSS
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -45,9 +32,17 @@ module Sisimai::Bite::Email
         return nil unless mhead
         return nil unless mbody
 
-        match  = 0
-        match += 1 if mhead['from'] =~ Re0[:from]
-        match += 1 if Re0[:subject].find { |a| mhead['subject'] == a }
+        # :received => %r/[ ][(]InterScanMSS[)][ ]with[ ]/,
+        match = 0
+        tryto = [
+          'Mail could not be delivered',
+          # メッセージを配信できません。
+          '=?iso-2022-jp?B?GyRCJWElQyU7ITwlOCRyR1s/LiRHJC0kXiQ7JHMhIxsoQg==?=',
+          # メール配信に失敗しました
+          '=?iso-2022-jp?B?GyRCJWEhPCVrR1s/LiRLPDpHVCQ3JF4kNyQ/GyhCDQo=?=',
+        ]
+        match += 1 if mhead['from'].include?('InterScan MSS')
+        match += 1 if tryto.find { |a| mhead['subject'] == a }
         return nil if match.zero?
 
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
@@ -58,10 +53,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
@@ -69,7 +64,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
@@ -83,7 +78,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -113,7 +107,6 @@ module Sisimai::Bite::Email
             elsif cv = e.match(/\AReceived[ ]+[>]{3}[ ]+(\d{3}[ ]+.+)\z/)
               # Received >>> 550 5.1.1 <kijitora@example.co.jp>... user unknown
               v['diagnosis'] = cv[1]
-
             else
               # Error message in non-English
               if cv = e.match(/[ ][>]{3}[ ]([A-Z]{4})/)
@@ -128,8 +121,8 @@ module Sisimai::Bite::Email
           end
         end
         return nil if recipients.zero?
-        require 'sisimai/string'
 
+        require 'sisimai/string'
         dscontents.map do |e|
           e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])

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

@@ -6,33 +6,24 @@ module Sisimai::Bite::Email
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/KDDI.pm
       require 'sisimai/bite/email'
 
-      Re0 = {
-        :'from'       => %r/no-reply[@].+[.]dion[.]ne[.]jp/,
-        :'reply-to'   => %r/\Afrom[ \t]+\w+[.]auone[-]net[.]jp[ \t]/,
-        :'received'   => %r/\Afrom[ ](?:.+[.])?ezweb[.]ne[.]jp[ ]/,
-        :'message-id' => %r/[@].+[.]ezweb[.]ne[.]jp[>]\z/,
-      }.freeze
-      Re1 = {
-        :begin => %r/\AYour[ ]mail[ ](?:
+      Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = { rfc822: ['Content-Type: message/rfc822'] }.freeze
+      MarkingsOf = {
+        message: %r/\AYour[ ]mail[ ](?:
              sent[ ]on:?[ ][A-Z][a-z]{2}[,]
             |attempted[ ]to[ ]be[ ]delivered[ ]on:?[ ][A-Z][a-z]{2}[,]
             )
         /x,
-        :rfc822 => %r|\AContent-Type: message/rfc822\z|,
-        :error  => %r/Could not be delivered to:? /,
-        :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
       }.freeze
-      ReFailure = {
-        mailboxfull: %r/As[ ]their[ ]mailbox[ ]is[ ]full/x,
-        norelaying:  %r/Due[ ]to[ ]the[ ]following[ ]SMTP[ ]relay[ ]error/x,
-        hostunknown: %r/As[ ]the[ ]remote[ ]domain[ ]doesnt[ ]exist/x,
+      ReFailures = {
+        mailboxfull: %r/As their mailbox is full/,
+        norelaying:  %r/Due to the following SMTP relay error/,
+        hostunknown: %r/As the remote domain doesnt exist/,
       }.freeze
-      Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'au by KDDI: http://www.au.kddi.com'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
       def headerlist;  return []; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from au by KDDI
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -49,15 +40,15 @@ module Sisimai::Bite::Email
         return nil unless mhead
         return nil unless mbody
 
+        # :'message-id' => %r/[@].+[.]ezweb[.]ne[.]jp[>]\z/,
         match  = 0
-        match += 1 if mhead['from']    =~ Re0[:from]
-        match += 1 if mhead['reply-to'] && mhead['reply-to'] =~ Re0[:'reply-to']
-        match += 1 if mhead['received'].find { |a| a =~ Re0[:received] }
+        match += 1 if mhead['from'] =~ /no-reply[@].+[.]dion[.]ne[.]jp/
+        match += 1 if mhead['reply-to'].to_s == 'no-reply@app.auone-net.jp'
+        match += 1 if mhead['received'].find { |a| a.include?('ezweb.ne.jp (') }
         return nil if match.zero?
 
         require 'sisimai/string'
         require 'sisimai/address'
-
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
         hasdivided = mbody.split("\n")
         rfc822list = []     # (Array) Each line in message/rfc822 part string
@@ -66,10 +57,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 =~ MarkingsOf[:message]
               readcursor |= Indicators[:deliverystatus]
               next
             end
@@ -77,7 +68,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 +82,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -117,27 +107,24 @@ module Sisimai::Bite::Email
             elsif cv = e.match(/Your mail sent on: (.+)\z/)
               # Your mail sent on: Thu, 29 Apr 2010 11:04:47 +0900
               v['date'] = cv[1]
-
             else
               #     As their mailbox is full.
               v['diagnosis'] ||= ''
-              v['diagnosis']  += e + ' ' if e =~ /\A[ \t]+/
+              v['diagnosis'] << e + ' ' if e.start_with?(' ', "\t")
             end
           end
         end
-
         return nil if recipients.zero?
-        require 'sisimai/smtp/status'
 
+        require 'sisimai/smtp/status'
         dscontents.map do |e|
           e['agent']     = self.smtpagent
           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 KDDI)
             # 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
@@ -145,9 +132,9 @@ module Sisimai::Bite::Email
               e['reason'] = 'userunknown'
             else
               # SMTP command is not RCPT
-              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/mailfoundry.rb

@@ -6,22 +6,16 @@ module Sisimai::Bite::Email
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/MailFoundry.pm
       require 'sisimai/bite/email'
 
-      Re0 = {
-        :subject  => %r/\AMessage delivery has failed\z/,
-        :received => %r/[(]MAILFOUNDRY[)] id /,
-      }.freeze
-      Re1 = {
-        :begin  => %r/\AThis is a MIME encoded message\z/,
-        :error  => %r/\ADelivery failed for the following reason:\z/,
-        :rfc822 => %r|\AContent-Type: message/rfc822\z|,
-        :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = {
+        message: ['This is a MIME encoded message'],
+        rfc822:  ['Content-Type: message/rfc822'],
+        error:   ['Delivery failed for the following reason:'],
+      }.freeze
 
       def description; return 'MailFoundry'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
       def headerlist;  return []; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from MailFoundry
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -37,8 +31,8 @@ module Sisimai::Bite::Email
       def scan(mhead, mbody)
         return nil unless mhead
         return nil unless mbody
-        return nil unless mhead['subject'] =~ Re0[:subject]
-        return nil unless mhead['received'].find { |a| a =~ Re0[:received] }
+        return nil unless mhead['subject'] == 'Message delivery has failed'
+        return nil unless mhead['received'].find { |a| a.include?('(MAILFOUNDRY) id ') }
 
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
         hasdivided = mbody.split("\n")
@@ -48,10 +42,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 +53,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 +67,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -95,29 +88,26 @@ module Sisimai::Bite::Email
               end
               v['recipient'] = cv[1]
               recipients += 1
-
             else
               # Error message
-              if e =~ Re1[:error]
+              if e == StartingOf[:error][0]
                 # Delivery failed for the following reason:
                 v['diagnosis'] = e
-
               else
                 # Detect error message
                 next if e.empty?
                 next if v['diagnosis'].nil? || v['diagnosis'].empty?
-                next if e =~ /\A[-]+/
+                next if e.start_with?('-')
 
                 # Server mx22.example.org[192.0.2.222] failed with: 550 <kijitora@example.org> No such user here
-                v['diagnosis'] ||= ''
-                v['diagnosis']  += ' ' + e
+                v['diagnosis'] << ' ' << e
               end
             end
           end
         end
         return nil if recipients.zero?
-        require 'sisimai/string'
 
+        require 'sisimai/string'
         dscontents.map do |e|
           e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])

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

@@ -7,22 +7,16 @@ module Sisimai::Bite::Email
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/MailMarshalSMTP.pm
       require 'sisimai/bite/email'
 
-      Re0 = {
-        :subject  => %r/\AUndeliverable Mail: ["]/,
-      }.freeze
-      Re1 = {
-        :begin  => %r/\AYour message:\z/,
-        :rfc822 => nil,
-        :error  => %r/\ACould not be delivered because of\z/,
-        :rcpts  => %r/\AThe following recipients were affected:/,
-        :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = {
+        message: ['Your message:'],
+        error:   ['Could not be delivered because of'],
+        rcpts:   ['The following recipients were affected:'],
+      }.freeze
 
       def description; return 'Trustwave Secure Email Gateway'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
       def headerlist;  return ['X-Mailer']; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from MailMarshalSMTP
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -38,7 +32,7 @@ module Sisimai::Bite::Email
       def scan(mhead, mbody)
         return nil unless mhead
         return nil unless mbody
-        return nil unless mhead['subject'] =~ Re0[:subject]
+        return nil unless mhead['subject'].start_with?('Undeliverable Mail: "')
 
         require 'sisimai/mime'
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
@@ -54,15 +48,15 @@ module Sisimai::Bite::Email
         boundary00 = Sisimai::MIME.boundary(mhead['content-type']) || ''
         regularexp = if boundary00.size > 0
                        # Convert to regular expression
-                       Regexp.new('\A' + Regexp.escape('--' + boundary00 + '--') + '\z')
+                       Regexp.new('\A' << Regexp.escape('--' << boundary00 << '--') << '\z')
                      else
                        regularexp = %r/\A[ \t]*[+]+[ \t]*\z/
                      end
 
-        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
@@ -84,7 +78,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -112,21 +105,19 @@ module Sisimai::Bite::Email
               end
               v['recipient'] = cv[1]
               recipients += 1
-
             else
               # Get error message lines
-              if e =~ Re1[:error]
+              if e == StartingOf[:error][0]
                 # Could not be delivered because of
                 #
                 # 550 5.1.1 User unknown
                 v['diagnosis'] = e
 
-              elsif v['diagnosis'] && v['diagnosis'].size > 0 && endoferror == false
+              elsif v['diagnosis'].to_s.size > 0 && endoferror == false
                 # Append error messages
-                endoferror = true if e =~ Re1[:rcpts]
+                endoferror = true if e.start_with?(StartingOf[:rcpts][0])
                 next if endoferror
-                v['diagnosis']  += ' ' + e
-
+                v['diagnosis'] << ' ' << e
               else
                 # Additional Information
                 # ======================
@@ -140,7 +131,7 @@ module Sisimai::Bite::Email
                   # Original Sender:    <originalsender@example.com>
                   # Use this line instead of "From" header of the original
                   # message.
-                  rfc822list << sprintf('From: %s', cv[1])
+                  rfc822list << ('From: ' << cv[1])
 
                 elsif cv = e.match(/\ASender-MTA:[ \t]+[<](.+)[>]\z/)
                   # Sender-MTA:         <10.11.12.13>
@@ -155,8 +146,8 @@ module Sisimai::Bite::Email
           end
         end
         return nil if recipients.zero?
-        require 'sisimai/string'
 
+        require 'sisimai/string'
         dscontents.map do |e|
           e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])

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

@@ -7,36 +7,19 @@ module Sisimai::Bite::Email
       # Based on Sisimai::Bite::Email::Exim
       require 'sisimai/bite/email'
 
-      Re0 = {
-        # Message-Id: <E1P1YNN-0003AD-Ga@*.mail.ru>
-        :'message-id' => %r/\A[<]\w+[-]\w+[-]\w+[@].*mail[.]ru[>]\z/,
-        :'from'       => %r/[<]?mailer-daemon[@].*mail[.]ru[>]?/i,
-        :'subject'    => %r{(?:
-           Mail[ ]delivery[ ]failed(:[ ]returning[ ]message[ ]to[ ]sender)?
-          |Warning:[ ]message[ ].+[ ]delayed[ ]+
-          |Delivery[ ]Status[ ]Notification
-          |Mail[ ]failure
-          |Message[ ]frozen
-          |error[(]s[)][ ]in[ ]forwarding[ ]or[ ]filtering
-          )
-        }x,
-      }.freeze
-      Re1 = {
-        :rfc822 => %r/\A------ This is a copy of the message.+headers[.] ------\z/,
-        :begin  => %r/\AThis message was created automatically by mail delivery software[.]/,
-        :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
+      Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = {
+        message: ['This message was created automatically by mail delivery software.'],
+        rfc822:  ['------ This is a copy of the message, including all the headers. ------'],
       }.freeze
-      ReCommand = [
+
+      ReCommands = [
         %r/SMTP error from remote (?:mail server|mailer) after ([A-Za-z]{4})/,
         %r/SMTP error from remote (?:mail server|mailer) after end of ([A-Za-z]{4})/,
       ].freeze
-      ReFailure = {
-        expired: %r{(?:
-             retry[ ]timeout[ ]exceeded
-            |No[ ]action[ ]is[ ]required[ ]on[ ]your[ ]part
-            )
-        }x,
-        userunknown: %r/user[ ]not[ ]found/x,
+      ReFailures = {
+        expired:     %r/(?:retry timeout exceeded|No action is required on your part)/,
+        userunknown: %r/user not found/,
         hostunknown: %r{(?>
              all[ ](?:
                  host[ ]address[ ]lookups[ ]failed[ ]permanently
@@ -45,25 +28,19 @@ module Sisimai::Bite::Email
             |Unrouteable[ ]address
             )
         }x,
-        mailboxfull: %r/(?:mailbox[ ]is[ ]full:?|error:[ ]quota[ ]exceed)/x,
-        notaccept: %r{(?:
+        mailboxfull: %r/(?:mailbox is full:?|error: quota exceed)/,
+        notaccept:   %r{(?:
              an[ ]MX[ ]or[ ]SRV[ ]record[ ]indicated[ ]no[ ]SMTP[ ]service
             |no[ ]host[ ]found[ ]for[ ]existing[ ]SMTP[ ]connection
             )
         }x,
-        systemerror: %r{(?:
-             delivery[ ]to[ ](?:file|pipe)[ ]forbidden
-            |local[ ]delivery[ ]failed
-            )
-        }x,
-        contenterror: %r/Too[ ]many[ ]["]Received["][ ]headers[ ]/x,
+        systemerror:  %r/(?:delivery to (?:file|pipe) forbidden|local delivery failed)/,
+        contenterror: %r/Too many ["]Received["] headers /,
       }.freeze
-      Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return '@mail.ru: https://mail.ru'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
       def headerlist;  return ['X-Failed-Recipients']; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from @mail.ru
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -79,9 +56,18 @@ 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['message-id'] =~ Re0[:'message-id']
+
+        return nil unless mhead['from'] =~ /[<]?mailer-daemon[@].*mail[.]ru[>]?/i
+        return nil unless mhead['message-id'].end_with?('.mail.ru>')
+        return nil unless mhead['subject'] =~ %r{(?:
+           Mail[ ]delivery[ ]failed(:[ ]returning[ ]message[ ]to[ ]sender)?
+          |Warning:[ ]message[ ].+[ ]delayed[ ]+
+          |Delivery[ ]Status[ ]Notification
+          |Mail[ ]failure
+          |Message[ ]frozen
+          |error[(]s[)][ ]in[ ]forwarding[ ]or[ ]filtering
+          )
+        }x
 
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
         hasdivided = mbody.split("\n")
@@ -92,10 +78,10 @@ module Sisimai::Bite::Email
         localhost0 = ''     # (String) Local MTA
         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
@@ -103,7 +89,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
@@ -118,7 +104,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -158,14 +143,13 @@ module Sisimai::Bite::Email
               # Error message
               next if e.empty?
               v['diagnosis'] ||= ''
-              v['diagnosis']  += e + ' '
-
+              v['diagnosis'] << e + ' '
             else
               # Error message when email address above does not include '@'
               # and domain part.
-              next unless e =~ /\A[ \t]{4}/
+              next unless e.start_with?('    ', "\t")
               v['alterrors'] ||= ''
-              v['alterrors']  += e + ' '
+              v['alterrors'] << e + ' '
             end
           end
         end
@@ -178,7 +162,7 @@ module Sisimai::Bite::Email
             rcptinhead.each { |a| a.delete(' ') }
             recipients = rcptinhead.size
 
-            rcptinhead.each do |e|
+            while e = rcptinhead.shift do
               # Insert each recipient address into dscontents
               dscontents[-1]['recipient'] = e
               next if dscontents.size == recipients
@@ -201,10 +185,10 @@ module Sisimai::Bite::Email
           # Set default values if each value is empty.
           e['lhost'] ||= localhost0
 
-          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
@@ -221,16 +205,14 @@ module Sisimai::Bite::Email
             end
 
             unless e['rhost']
-              if mhead['received'].size > 0
-                # Get localhost and remote host name from Received header.
-                e['rhost'] = Sisimai::RFC5322.received(mhead['received'][-1]).pop
-              end
+              # Get localhost and remote host name from Received header.
+              e['rhost'] = Sisimai::RFC5322.received(mhead['received'][-1]).pop if mhead['received'].size > 0
             end
           end
 
           unless e['command']
             # Get the SMTP command name for the session
-            ReCommand.each do |r|
+            ReCommands.each do |r|
               # Verify each regular expression of SMTP commands
               if cv = e['diagnosis'].match(r)
                 e['command'] = cv[1].upcase
@@ -239,19 +221,18 @@ module Sisimai::Bite::Email
             end
 
             # Detect the reason of bounce
-            if e['command'] =~ /\A(?:HELO|EHLO)\z/
+            if %w[HELO EHLO].index(e['command'])
               # HELO | Connected to 192.0.2.135 but my name was rejected.
               e['reason'] = 'blocked'
 
             elsif e['command'] == 'MAIL'
               # MAIL | Connected to 192.0.2.135 but sender was rejected.
               e['reason'] = 'rejected'
-
             else
               # Verify each regular expression of session errors
-              ReFailure.each_key do |r|
+              ReFailures.each_key do |r|
                 # Check each regular expression
-                next unless e['diagnosis'] =~ ReFailure[r]
+                next unless e['diagnosis'] =~ ReFailures[r]
                 e['reason'] = r.to_s
                 break
               end