sisimai 4.22.3 → 4.22.4

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

@@ -6,37 +6,33 @@ module Sisimai::Bite::Email
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/qmail.pm
       require 'sisimai/bite/email'
 
-      Re0 = {
-        :subject  => %r/\Afailure notice/i,
-        :received => %r/\A[(]qmail[ ]+\d+[ ]+invoked[ ]+(?:for[ ]+bounce|from[ ]+network)[)]/,
-      }.freeze
-      #  qmail-remote.c:248|    if (code >= 500) {
-      #  qmail-remote.c:249|      out("h"); outhost(); out(" does not like recipient.\n");
-      #  qmail-remote.c:265|  if (code >= 500) quit("D"," failed on DATA command");
-      #  qmail-remote.c:271|  if (code >= 500) quit("D"," failed after I sent the message");
-      #
-      # Characters: K,Z,D in qmail-qmqpc.c, qmail-send.c, qmail-rspawn.c
-      #  K = success, Z = temporary error, D = permanent error
-      Re1 = {
-        :begin  => %r/\AHi[.] This is the qmail/,
-        :rfc822 => %r/\A--- Below this line is a copy of the message[.]\z/,
-        :error  => %r/\ARemote host said:/,
-        :sorry  => %r/\A[Ss]orry[,.][ ]/,
-        :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
+      Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = {
+        #  qmail-remote.c:248|    if (code >= 500) {
+        #  qmail-remote.c:249|      out("h"); outhost(); out(" does not like recipient.\n");
+        #  qmail-remote.c:265|  if (code >= 500) quit("D"," failed on DATA command");
+        #  qmail-remote.c:271|  if (code >= 500) quit("D"," failed after I sent the message");
+        #
+        # Characters: K,Z,D in qmail-qmqpc.c, qmail-send.c, qmail-rspawn.c
+        #  K = success, Z = temporary error, D = permanent error
+        message: ['Hi. This is the qmail'],
+        rfc822:  ['--- Below this line is a copy of the message.'],
+        error:   ['Remote host said:'],
       }.freeze
+
       ReSMTP = {
         # Error text regular expressions which defined in qmail-remote.c
         # qmail-remote.c:225|  if (smtpcode() != 220) quit("ZConnected to "," but greeting failed");
-        conn: %r/(?:Error:)?Connected[ ]to[ ].+[ ]but[ ]greeting[ ]failed[.]/x,
+        conn: %r/(?:Error:)?Connected to .+ but greeting failed[.]/,
         # qmail-remote.c:231|  if (smtpcode() != 250) quit("ZConnected to "," but my name was rejected");
-        ehlo: %r/(?:Error:)?Connected[ ]to[ ].+[ ]but[ ]my[ ]name[ ]was[ ]rejected[.]/x,
+        ehlo: %r/(?:Error:)?Connected to .+ but my name was rejected[.]/,
         # qmail-remote.c:238|  if (code >= 500) quit("DConnected to "," but sender was rejected");
         # reason = rejected
-        mail: %r/(?:Error:)?Connected[ ]to[ ].+[ ]but[ ]sender[ ]was[ ]rejected[.]/x,
+        mail: %r/(?:Error:)?Connected to .+ but sender was rejected[.]/,
         # qmail-remote.c:249|  out("h"); outhost(); out(" does not like recipient.\n");
         # qmail-remote.c:253|  out("s"); outhost(); out(" does not like recipient.\n");
         # reason = userunknown
-        rcpt: %r/(?:Error:)?.+[ ]does[ ]not[ ]like[ ]recipient[.]/x,
+        rcpt: %r/(?:Error:)?.+ does not like recipient[.]/,
         # qmail-remote.c:265|  if (code >= 500) quit("D"," failed on DATA command");
         # qmail-remote.c:266|  if (code >= 400) quit("Z"," failed on DATA command");
         # qmail-remote.c:271|  if (code >= 500) quit("D"," failed after I sent the message");
@@ -80,26 +76,24 @@ module Sisimai::Bite::Email
           )
         }x,
       }.freeze
-      # userunknown + expired
-      ReOnHold  = %r/\A[^ ]+ does not like recipient[.][ ]+.+this message has been in the queue too long[.]\z/
-      # qmail-remote-fallback.patch
-      ReCommand = %r/Sorry,[ ]no[ ]SMTP[ ]connection[ ]got[ ]far[ ]enough;[ ]most[ ]progress[ ]was[ ]([A-Z]{4})[ ]/x
-      ReFailure = {
+
+      # qmail-send.c:922| ... (&dline[c],"I'm not going to try again; this message has been in the queue too long.\n")) nomem();
+      ReDelaying = %r/this message has been in the queue too long[.]\z/
+      ReCommands = %r/Sorry, no SMTP connection got far enough; most progress was ([A-Z]{4}) /
+      ReIsOnHold = %r/\A[^ ]+ does not like recipient[.][ ]+.+this message has been in the queue too long[.]\z/
+      ReFailures = {
         # qmail-local.c:589|  strerr_die1x(100,"Sorry, no mailbox here by that name. (#5.1.1)");
         # qmail-remote.c:253|  out("s"); outhost(); out(" does not like recipient.\n");
-        userunknown: %r{(?:
-           no[ ]mailbox[ ]here[ ]by[ ]that[ ]name
-          |[ ]does[ ]not[ ]like[ ]recipient[.]
-          )
-        }x,
+        userunknown: %r/(?:no mailbox here by that name| does not like recipient[.])/,
         # error_str.c:192|  X(EDQUOT,"disk quota exceeded")
-        mailboxfull: %r/disk[ ]quota[ ]exceeded/x,
+        mailboxfull: %r/disk quota exceeded/,
         # qmail-qmtpd.c:233| ... result = "Dsorry, that message size exceeds my databytes limit (#5.3.4)";
         # qmail-smtpd.c:391| ... out("552 sorry, that message size exceeds my databytes limit (#5.3.4)\r\n"); return;
-        mesgtoobig: %r/Message[ ]size[ ]exceeds[ ]fixed[ ]maximum[ ]message[ ]size:/x,
+        mesgtoobig: %r/Message size exceeds fixed maximum message size:/,
         # qmail-remote.c:68|  Sorry, I couldn't find any host by that name. (#4.1.2)\n"); zerodie();
         # qmail-remote.c:78|  Sorry, I couldn't find any host named ");
-        hostunknown: %r/\ASorry[,][ ]I[ ]couldn[']t[ ]find[ ]any[ ]host[ ]/x,
+        hostunknown: %r/\ASorry, I couldn't find any host /,
+        systemfull:  %r/Requested action not taken: mailbox unavailable [(]not enough free space[)]/,
         systemerror: %r{(?>
            bad[ ]interpreter:[ ]No[ ]such[ ]file[ ]or[ ]directory
           |system[ ]error
@@ -109,20 +103,14 @@ module Sisimai::Bite::Email
         networkerror: %r{Sorry(?:
            [,][ ]I[ ]wasn[']t[ ]able[ ]to[ ]establish[ ]an[ ]SMTP[ ]connection
           |[,][ ]I[ ]couldn[']t[ ]find[ ]a[ ]mail[ ]exchanger[ ]or[ ]IP[ ]address
-          |[.][ ]Although[ ]I[']m[ ]listed[ ]as[ ]a[ ]best[-]preference[ ]MX[ ]
-              or[ ]A[ ]for[ ]that[ ]host
+          |[.][ ]Although[ ]I[']m[ ]listed[ ]as[ ]a[ ]best[-]preference[ ]MX[ ]or[ ]A[ ]for[ ]that[ ]host
           )
         }x,
-        systemfull: %r/Requested action not taken: mailbox unavailable [(]not enough free space[)]/,
       }.freeze
-      # qmail-send.c:922| ... (&dline[c],"I'm not going to try again; this message has been in the queue too long.\n")) nomem();
-      ReDelayed  = %r/this[ ]message[ ]has[ ]been[ ]in[ ]the[ ]queue[ ]too[ ]long[.]\z/x
-      Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'qmail'; end
       def smtpagent;   return 'Email::qmail'; end
       def headerlist;  return []; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from qmail
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -143,9 +131,10 @@ module Sisimai::Bite::Email
         # by qmail, see http://cr.yp.to/qmail.html
         #   e.g.) Received: (qmail 12345 invoked for bounce); 29 Apr 2009 12:34:56 -0000
         #         Subject: failure notice
+        tryto  = /\A[(]qmail[ ]+\d+[ ]+invoked[ ]+(?:for[ ]+bounce|from[ ]+network)[)]/
         match  = 0
-        match += 1 if mhead['subject'] =~ Re0[:subject]
-        match += 1 if mhead['received'].find { |a| a =~ Re0[:received] }
+        match += 1 if mhead['subject'] == 'failure notice'
+        match += 1 if mhead['received'].find { |a| a =~ tryto }
         return nil if match.zero?
 
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
@@ -156,10 +145,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
@@ -167,7 +156,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
@@ -181,7 +170,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -207,8 +195,8 @@ module Sisimai::Bite::Email
               # Append error message
               next if e.empty?
               v['diagnosis'] ||= ''
-              v['diagnosis']  += e + ' '
-              v['alterrors']   = e if e =~ Re1[:error]
+              v['diagnosis'] << e + ' '
+              v['alterrors'] = e if e.start_with?(StartingOf[:error][0])
 
               next if v['rhost']
               if cv = e.match(ReHost)
@@ -221,7 +209,6 @@ module Sisimai::Bite::Email
 
         require 'sisimai/string'
         require 'sisimai/smtp/status'
-
         dscontents.map do |e|
           e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) || ''
@@ -237,7 +224,7 @@ module Sisimai::Bite::Email
 
             unless e['command']
               # Verify each regular expression of patches
-              if cv = e['diagnosis'].match(ReCommand)
+              if cv = e['diagnosis'].match(ReCommands)
                 e['command'] = cv[1].upcase
               end
               e['command'] ||= ''
@@ -249,28 +236,26 @@ module Sisimai::Bite::Email
             # MAIL | Connected to 192.0.2.135 but sender was rejected.
             e['reason'] = 'rejected'
 
-          elsif e['command'] =~ /\A(?:HELO|EHLO)\z/
+          elsif %w[HELO EHLO].index(e['command'])
             # HELO | Connected to 192.0.2.135 but my name was rejected.
             e['reason'] = 'blocked'
-
           else
             # Try to match with each error message in the table
-            if e['diagnosis'] =~ ReOnHold
+            if e['diagnosis'] =~ ReIsOnHold
               # To decide the reason require pattern match with
               # Sisimai::Reason::* modules
               e['reason'] = 'onhold'
-
             else
-              ReFailure.each_key do |r|
+              ReFailures.each_key do |r|
                 # Verify each regular expression of session errors
                 if e['alterrors']
                   # Check the value of "alterrors"
-                  next unless e['alterrors'] =~ ReFailure[r]
+                  next unless e['alterrors'] =~ ReFailures[r]
                   e['reason'] = r.to_s
                 end
                 break if e['reason']
 
-                next unless e['diagnosis'] =~ ReFailure[r]
+                next unless e['diagnosis'] =~ ReFailures[r]
                 e['reason'] = r.to_s
                 break
               end
@@ -285,7 +270,7 @@ module Sisimai::Bite::Email
               end
 
               unless e['reason']
-                e['reason'] = 'expired' if e['diagnosis'] =~ ReDelayed
+                e['reason'] = 'expired' if e['diagnosis'] =~ ReDelaying
               end
             end
           end

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

@@ -8,23 +8,18 @@ module Sisimai::Bite::Email
       require 'sisimai/bite/email'
 
       # http://aws.amazon.com/ses/
-      Re0 = {
-        :subject  => %r/\ADelivery Status Notification [(]Failure[)]\z/,
-        :received => %r/.+[.]smtp-out[.].+[.]amazonses[.]com\b/,
-      }.freeze
-      Re1 = {
-        :begin  => %r/\AThis message could not be delivered[.]\z/,
-        :rfc822 => %r|\Acontent-type: text/rfc822-headers\z|,
-        :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
+      Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = {
+        message: ['This message could not be delivered.'],
+        rfc822:  ['content-type: text/rfc822-headers'],
       }.freeze
-      ReFailure = {
+      ReFailures = {
         # The followings are error messages in Rule sets/*/Actions/Template
         filtered:     %r/Mailbox does not exist/,
         mesgtoobig:   %r/Message too large/,
         mailboxfull:  %r/Mailbox full/,
         contenterror: %r/Message content rejected/,
       }.freeze
-      Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'Amazon SES(Receiving): http://aws.amazon.com/ses/'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
@@ -32,7 +27,6 @@ module Sisimai::Bite::Email
       # X-SES-Outgoing: 2015.10.01-54.240.27.7
       # Feedback-ID: 1.us-west-2.HX6/J9OVlHTadQhEu1+wdF9DBj6n6Pa9sW5Y/0pSOi8=:AmazonSES
       def headerlist;  return ['X-SES-Outgoing']; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from Amazon SES/Receiving
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -48,6 +42,9 @@ module Sisimai::Bite::Email
       def scan(mhead, mbody)
         return nil unless mhead
         return nil unless mbody
+
+        # :subject  => %r/\ADelivery Status Notification [(]Failure[)]\z/,
+        # :received => %r/.+[.]smtp-out[.].+[.]amazonses[.]com\b/,
         return nil unless mhead['x-ses-outgoing']
 
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
@@ -64,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 == StartingOf[:message][0]
               readcursor |= Indicators[:deliverystatus]
               next
             end
@@ -79,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
@@ -93,7 +90,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -107,7 +103,7 @@ module Sisimai::Bite::Email
               # Status: 5.1.1
               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.
@@ -117,41 +113,38 @@ module Sisimai::Bite::Email
                 v['recipient'] = cv[1]
                 recipients += 1
 
-              elsif cv = e.match(/\A[Xx]-[Aa]ctual-[Rr]ecipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/) ||
-                         e.match(/\A[Oo]riginal-[Rr]ecipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/)
+              elsif cv = e.match(/\AX-Actual-Recipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/) ||
+                         e.match(/\AOriginal-Recipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/)
                 # X-Actual-Recipient: RFC822; kijitora@example.co.jp
                 # Original-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
                 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 <kijitora@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
               # This message could not be delivered.
@@ -161,13 +154,13 @@ module Sisimai::Bite::Email
               # Content-Description: Delivery Status Notification
               #
               # Reporting-MTA: dns; inbound-smtp.us-west-2.amazonaws.com
-              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]
@@ -176,11 +169,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] || '' }
@@ -188,7 +180,7 @@ module Sisimai::Bite::Email
           e['diagnosis'] = e['diagnosis'].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']
 
@@ -200,9 +192,9 @@ module Sisimai::Bite::Email
             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/sendgrid.rb

@@ -6,18 +6,11 @@ module Sisimai::Bite::Email
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/SendGrid.pm
       require 'sisimai/bite/email'
 
-      Re0 = {
-        :'from'        => %r/\AMAILER-DAEMON\z/,
-        :'return-path' => %r/\A[<]apps[@]sendgrid[.]net[>]\z/,
-        :'subject'     => %r/\AUndelivered Mail Returned to Sender\z/,
-      }.freeze
-      Re1 = {
-        :begin  => %r/\AThis is an automatically generated message from SendGrid[.]\z/,
-        :error  => %r/\AIf you require assistance with this, please contact SendGrid support[.]\z/,
-        :rfc822 => %r|\AContent-Type: message/rfc822|,
-        :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = {
+        message: ['This is an automatically generated message from SendGrid.'],
+        rfc822:  ['Content-Type: message/rfc822'],
+      }.freeze
 
       def description; return 'SendGrid: http://sendgrid.com/'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
@@ -25,7 +18,6 @@ module Sisimai::Bite::Email
       # Return-Path: <apps@sendgrid.net>
       # X-Mailer: MIME-tools 5.502 (Entity 5.502)
       def headerlist;  return ['Return-Path', 'X-Mailer']; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from SendGrid
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -41,9 +33,11 @@ module Sisimai::Bite::Email
       def scan(mhead, mbody)
         return nil unless mhead
         return nil unless mbody
+
+        # :'from'        => %r/\AMAILER-DAEMON\z/,
         return nil unless mhead['return-path']
-        return nil unless mhead['return-path'] =~ Re0[:'return-path']
-        return nil unless mhead['subject']     =~ Re0[:'subject']
+        return nil unless mhead['return-path'] == '<apps@sendgrid.net>'
+        return nil unless mhead['subject'] == 'Undelivered Mail Returned to Sender'
 
         require 'sisimai/datetime'
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
@@ -60,14 +54,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
@@ -75,7 +69,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
@@ -89,7 +83,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -103,7 +96,7 @@ module Sisimai::Bite::Email
               # Diagnostic-Code: 550 5.1.1 <kijitora@example.jp>... User Unknown
               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.
@@ -113,26 +106,25 @@ 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
                 # Status:5.2.0
                 # Status: 5.1.0 (permanent failure)
                 v['status'] = cv[1]
 
               else
-                if cv = e.match(/\A[Dd]iagnostic-[Cc]ode:[ ]*(.+)\z/)
+                if cv = e.match(/\ADiagnostic-Code:[ ]*(.+)\z/)
                   # Diagnostic-Code: 550 5.1.1 <userunknown@example.jp>... User Unknown
                   v['diagnosis'] = cv[1]
 
-                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
@@ -159,17 +151,17 @@ module Sisimai::Bite::Email
                 # in RCPT TO, in MAIL FROM, end of DATA
                 commandtxt = cv[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
                 arrivaldate = cv[1]
 
-                if cv = e.match(/\A[Aa]rrival-[Dd]ate: (\d{4})[-](\d{2})[-](\d{2}) (\d{2})[-](\d{2})[-](\d{2})\z/)
+                if cv = e.match(/\AArrival-Date: (\d{4})[-](\d{2})[-](\d{2}) (\d{2})[-](\d{2})[-](\d{2})\z/)
                   # Arrival-Date: 2011-08-12 01-05-05
-                  arrivaldate += 'Thu, ' + cv[3] + ' '
-                  arrivaldate += Sisimai::DateTime.monthname(0)[cv[2].to_i - 1]
-                  arrivaldate += ' ' + cv[1] + ' ' + [cv[4], cv[5], cv[6]].join(':')
-                  arrivaldate += ' ' + Sisimai::DateTime.abbr2tz('CDT')
+                  arrivaldate << 'Thu, ' << cv[3] + ' '
+                  arrivaldate << Sisimai::DateTime.monthname(0)[cv[2].to_i - 1]
+                  arrivaldate << ' ' << cv[1] + ' ' << [cv[4], cv[5], cv[6]].join(':')
+                  arrivaldate << ' ' << Sisimai::DateTime.abbr2tz('CDT')
                 end
                 connheader['date'] = arrivaldate
                 connvalues += 1
@@ -177,21 +169,20 @@ module Sisimai::Bite::Email
             end
           end
         end
-
         return nil if recipients.zero?
+
         require 'sisimai/string'
         require 'sisimai/smtp/status'
-
         dscontents.map do |e|
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
           # Get the value of SMTP status code as a pseudo D.S.N.
           if cv = e['diagnosis'].match(/\b([45])\d\d[ \t]*/)
             # 4xx or 5xx
-            e['status'] = sprintf('%d.0.0', cv[1])
+            e['status'] = cv[1] + '.0.0'
           end
 
-          if e['status'] =~ /[45][.]0[.]0/
+          if e['status'] == '5.0.0' || e['status'] == '4.0.0'
             # Get the value of D.S.N. from the error message or the value of
             # Diagnostic-Code header.
             pseudostatus = Sisimai::SMTP::Status.find(e['diagnosis'])
@@ -201,7 +192,7 @@ module Sisimai::Bite::Email
           if e['action'] == 'expired'
             # Action: expired
             e['reason'] = 'expired'
-            if !e['status'] || e['status'] =~ /[45][.]0[.]0/
+            if !e['status'] || e['status'].end_with?('.0.0')
               # Set pseudo Status code value if the value of Status is not
               # defined or 4.0.0 or 5.0.0.
               pseudostatus = Sisimai::SMTP::Status.code('expired')