sisimai 4.22.3 → 4.22.4

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

@@ -6,26 +6,19 @@ module Sisimai::Bite::Email
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/ApacheJames.pm
       require 'sisimai/bite/email'
 
-      Re0 = {
-        :'subject'    => %r/\A\[BOUNCE\]\z/,
-        :'received'   => %r/JAMES SMTP Server/,
-        :'message-id' => %r/\d+[.]JavaMail[.].+[@]/,
-      }.freeze
-      Re1 = {
+      Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = {
         # apache-james-2.3.2/src/java/org/apache/james/transport/mailets/
         #   AbstractNotify.java|124:  out.println("Error message below:");
         #   AbstractNotify.java|128:  out.println("Message details:");
-        :begin  => %r/\AContent-Disposition:[ ]inline/,
-        :error  => %r/\AError message below:\z/,
-        :rfc822 => %r|\AContent-Type: message/rfc822|,
-        :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
+        message: ['Content-Disposition: inline'],
+        rfc822:  ['Content-Type: message/rfc822'],
+        error:   ['Error message below:'],
       }.freeze
-      Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'Java Apache Mail Enterprise Server'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
       def headerlist;  return []; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from Apache James
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -43,9 +36,9 @@ module Sisimai::Bite::Email
         return nil unless mbody
 
         match  = 0
-        match += 1 if mhead['subject'] =~ Re0[:subject]
-        match += 1 if mhead['message-id'] && mhead['message-id'] =~ Re0[:'message-id']
-        match += 1 if mhead['received'].find { |a| a =~ Re0[:received] }
+        match += 1 if mhead['subject'] == '[BOUNCE]'
+        match += 1 if mhead['message-id'].to_s.include?('.JavaMail.')
+        match += 1 if mhead['received'].find { |a| a.include?('JAMES SMTP Server') }
         return if match.zero?
 
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
@@ -59,10 +52,10 @@ module Sisimai::Bite::Email
         gotmessage = -1     # (Integer) Flag for error message
         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
@@ -70,7 +63,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
@@ -84,7 +77,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -118,12 +110,11 @@ module Sisimai::Bite::Email
             elsif cv = e.match(/\A[ ][ ]Subject:[ ](.+)\z/)
               #   Subject: Nyaaan
               subjecttxt = cv[1]
-
             else
               next if gotmessage == 1
               if v['diagnosis']
                 # Get an error message text
-                if e =~ /\AMessage[ ]details:\z/
+                if e.start_with?('Message details:')
                   # Message details:
                   #   Subject: nyaan
                   #   ...
@@ -132,27 +123,25 @@ module Sisimai::Bite::Email
                   # Append error message text like the followng:
                   #   Error message below:
                   #   550 - Requested action not taken: no such user here
-                  v['diagnosis'] ||= ''
-                  v['diagnosis']  += ' ' + e
+                  v['diagnosis'] << ' ' << e
                 end
-
               else
                 # Error message below:
                 # 550 - Requested action not taken: no such user here
-                v['diagnosis'] = e if e =~ Re1[:error]
+                v['diagnosis'] = e if e == StartingOf[:error][0]
               end
             end
           end
         end
         return nil if recipients.zero?
-        require 'sisimai/string'
 
-        unless rfc822list.find { |a| a =~ /^Subject:/ }
+        unless rfc822list.find { |a| a.start_with?('Subject:') }
           # Set the value of subjecttxt as a Subject if there is no original
           # message in the bounce mail.
-          rfc822list << sprintf('Subject: %s', subjecttxt)
+          rfc822list << ('Subject: ' << subjecttxt)
         end
 
+        require 'sisimai/string'
         dscontents.map do |e|
           e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'] || diagnostic)

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

@@ -6,22 +6,13 @@ module Sisimai::Bite::Email
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/Bigfoot.pm
       require 'sisimai/bite/email'
 
-      Re0 = {
-        :from     => %r/[@]bigfoot[.]com[>]/,
-        :subject  => %r/\AReturned mail: /,
-        :received => %r/\w+[.]bigfoot[.]com\b/,
-      }.freeze
-      Re1 = {
-        :begin  => %r/\A[ \t]+[-]+[ \t]*Transcript of session follows/,
-        :rfc822 => %r|\AContent-Type: message/partial|,
-        :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = { rfc822: ['Content-Type: message/partial'] }.freeze
+      MarkingsOf = { message: %r/\A[ \t]+[-]+[ \t]*Transcript of session follows/ }.freeze
 
       def description; return 'Bigfoot: http://www.bigfoot.com'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
       def headerlist;  return []; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from Bigfoot
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -37,10 +28,11 @@ module Sisimai::Bite::Email
       def scan(mhead, mbody)
         return nil unless mhead
         return nil unless mbody
-
+        
+        # :subject  => %r/\AReturned mail: /,
         match  = 0
-        match += 1 if mhead['from'] =~ Re0[:from]
-        match += 1 if mhead['received'].find { |a| a =~ Re0[:received] }
+        match += 1 if mhead['from'].include?('@bigfoot.com>')
+        match += 1 if mhead['received'].find { |a| a.include?('.bigfoot.com') }
         return nil if match.zero?
 
         require 'sisimai/address'
@@ -60,14 +52,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 =~ MarkingsOf[:message]
               readcursor |= Indicators[:deliverystatus]
               next
             end
@@ -75,7 +67,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
@@ -89,7 +81,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -104,7 +95,7 @@ module Sisimai::Bite::Email
               # Last-Attempt-Date: Sun, 28 Dec 2014 18:17:16 -0800
               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; <destinaion@example.net>
                 if v['recipient']
                   # There are multiple recipient addresses in the message body.
@@ -114,33 +105,30 @@ module Sisimai::Bite::Email
                 v['recipient'] = Sisimai::Address.s3s4(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.7.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; p01c11m075.mx.example.net
                 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
               #    ----- Transcript of session follows -----
               # >>> RCPT TO:<destinaion@example.net>
@@ -152,18 +140,17 @@ module Sisimai::Bite::Email
               # Reporting-MTA: dns; litemail57.bigfoot.com
               # Arrival-Date: Sun, 28 Dec 2014 18:17:16 -0800
               #
-              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]
                 connvalues += 1
-
               else
                 #    ----- Transcript of session follows -----
                 # >>> RCPT TO:<destinaion@example.net>
@@ -183,8 +170,8 @@ module Sisimai::Bite::Email
           end
         end
         return nil if recipients.zero?
-        require 'sisimai/string'
 
+        require 'sisimai/string'
         dscontents.map do |e|
           # Set default values if each value is empty.
           connheader.each_key { |a| e[a] ||= connheader[a] || '' }

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

@@ -6,26 +6,20 @@ module Sisimai::Bite::Email
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/Biglobe.pm
       require 'sisimai/bite/email'
 
-      Re0 = {
-        :subject => %r/\AReturned mail:/,
-        :from    => %r/postmaster[@](?:biglobe|inacatv|tmtv|ttv)[.]ne[.]jp/,
-      }.freeze
-      Re1 = {
-        :begin  => %r/\A   ----- The following addresses had delivery problems -----\z/,
-        :error  => %r/\A   ----- Non-delivered information -----\z/,
-        :rfc822 => %r|\AContent-Type: message/rfc822\z|,
-        :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
+      Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = {
+        message: ['   ----- The following addresses had delivery problems -----'],
+        error:   ['   ----- Non-delivered information -----'],
+        rfc822:  ['Content-Type: message/rfc822'],
       }.freeze
-      ReFailure = {
+      ReFailures = {
         filtered:    %r/Mail Delivery Failed[.]+ User unknown/,
         mailboxfull: %r/The number of messages in recipient's mailbox exceeded the local limit[.]/,
       }.freeze
-      Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'BIGLOBE: http://www.biglobe.ne.jp'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
       def headerlist;  return []; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from Biglobe
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -41,8 +35,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'] =~ /postmaster[@](?:biglobe|inacatv|tmtv|ttv)[.]ne[.]jp/
+        return nil unless mhead['subject'].start_with?('Returned mail:')
 
         require 'sisimai/address'
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
@@ -53,10 +47,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
@@ -64,7 +58,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
@@ -78,7 +72,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -114,25 +107,23 @@ module Sisimai::Bite::Email
                 v['recipient'] = r
                 recipients += 1
               end
-
             else
               next if e =~ /\A[^\w]/
               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['agent']     = self.smtpagent
           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

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

@@ -7,46 +7,28 @@ module Sisimai::Bite::Email
       require 'sisimai/bite/email'
 
       # http://www.courier-mta.org/courierdsn.html
-      # courier/module.dsn/dsn*.txt
-      Re0 = {
-        :'from'       => %r/Courier mail server at /,
-        :'subject'    => %r{(?:
-           NOTICE:[ ]mail[ ]delivery[ ]status[.]
-          |WARNING:[ ]delayed[ ]mail[.]
-          )
-        }x,
-        :'message-id' => %r/\A[<]courier[.][0-9A-F]+[.]/,
-      }.freeze
-      Re1 = {
-        :begin  => %r{(?:
-           DELAYS[ ]IN[ ]DELIVERING[ ]YOUR[ ]MESSAGE
-          |UNDELIVERABLE[ ]MAIL
-          )
-        }x,
-        :rfc822 => %r{\AContent-Type:[ ]*(?:
-           message/rfc822
-          |text/rfc822-headers
-          )\z
-        }x,
-        :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
+      Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = {
+        # courier/module.dsn/dsn*.txt
+        message: ['DELAYS IN DELIVERING YOUR MESSAGE', 'UNDELIVERABLE MAIL'],
+        rfc822:  ['Content-Type: message/rfc822', 'Content-Type: text/rfc822-headers'],
       }.freeze
-      ReFailure = {
+
+      ReFailures = {
         # courier/module.esmtp/esmtpclient.c:526| hard_error(del, ctf, "No such domain.");
-        hostunknown: %r/\ANo[ ]such[ ]domain[.]\z/x,
+        hostunknown: %r/\ANo such domain[.]\z/,
         # courier/module.esmtp/esmtpclient.c:531| hard_error(del, ctf,
         # courier/module.esmtp/esmtpclient.c:532|  "This domain's DNS violates RFC 1035.");
-        systemerror: %r/\AThis[ ]domain's[ ]DNS[ ]violates[ ]RFC[ ]1035[.]\z/x,
+        systemerror: %r/\AThis domain's DNS violates RFC 1035[.]\z/,
       }.freeze
-      ReDelayed = {
+      ReDelaying = {
         # courier/module.esmtp/esmtpclient.c:535| soft_error(del, ctf, "DNS lookup failed.");
-        networkerror: %r/\ADNS[ ]lookup[ ]failed[.]\z/x,
+        networkerror: %r/\ADNS lookup failed[.]\z/,
       }.freeze
-      Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'Courier MTA'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
       def headerlist;  return []; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from Courier MTA
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -64,11 +46,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['from'].include?('Courier mail server at ')
+        match += 1 if mhead['subject'] =~ /(?:NOTICE: mail delivery status[.]|WARNING: delayed mail[.])/
         if mhead['message-id']
           # Message-ID: <courier.4D025E3A.00001792@5jo.example.org>
-          match += 1 if mhead['message-id'] =~ Re0[:'message-id']
+          match += 1 if mhead['message-id'] =~ /\A[<]courier[.][0-9A-F]+[.]/
         end
         return nil if match.zero?
 
@@ -88,14 +70,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.include?(StartingOf[:message][0]) || e.include?(StartingOf[:message][1])
               readcursor |= Indicators[:deliverystatus]
               next
             end
@@ -103,7 +85,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], StartingOf[:rfc822][1])
               readcursor |= Indicators[:'message-rfc822']
               next
             end
@@ -117,7 +99,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -131,7 +112,7 @@ module Sisimai::Bite::Email
               # Diagnostic-Code: smtp; 550 5.1.1 <kijitora@example.co.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; kijitora@example.co.jp
                 if v['recipient']
                   # There are multiple recipient addresses in the message body.
@@ -141,46 +122,41 @@ 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
+                # Get the first element
                 v['rhost'] = cv[1].downcase
-                if v['rhost'] =~ / /
-                  # Get the first element
-                  v['rhost'] = v['rhost'].split(' ').shift
-                end
+                v['rhost'] = v['rhost'].split(' ').shift if v['rhost'].include?(' ')
 
-              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
               # This is a delivery status notification from marutamachi.example.org,
               # running the Courier mail server, version 0.65.2.
@@ -205,19 +181,19 @@ module Sisimai::Bite::Email
                 next if commandtxt.size > 0
                 commandtxt = cv[1]
 
-              elsif cv = e.match(/\A[Rr]eporting-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
+              elsif cv = e.match(/\AReporting-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
                 # Reporting-MTA: dns; mx.example.jp
                 next if connheader['rhost'].size > 0
                 connheader['rhost'] = cv[1].downcase
                 connvalues += 1
 
-              elsif cv = e.match(/\A[Rr]eceived-[Ff]rom-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
+              elsif cv = e.match(/\AReceived-From-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
                 # Received-From-MTA: DNS; x1x2x3x4.dhcp.example.ne.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]
@@ -227,24 +203,24 @@ module Sisimai::Bite::Email
           end
         end
         return nil if recipients.zero?
-        require 'sisimai/string'
 
+        require 'sisimai/string'
         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'])
 
-          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
 
           unless e['reason']
-            ReDelayed.each_key do |r|
+            ReDelaying.each_key do |r|
               # Verify each regular expression of session errors
-              next unless e['diagnosis'] =~ ReDelayed[r]
+              next unless e['diagnosis'] =~ ReDelaying[r]
               e['reason'] = r.to_s
               break
             end