sisimai 5.7.0 → 5.7.1

data/lib/sisimai/reason/requireptr.rb

@@ -1,11 +1,12 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::RequirePTR checks the bounce reason is "requireptr" or not. This class is
+    # Sisimai::Reason::RequirePTR checks the bounce reason is "RequirePTR" or not. This class is
     # called only from Sisimai::Reason class. This is the error that SMTP connection was rejected
     # due to missing PTR record or having invalid PTR record at the source IP address used for the
     # SMTP connection.
     module RequirePTR
       class << self
+        require 'sisimai/eb'
         Index = [
           "cannot find your hostname",
           "cannot resolve your address.",
@@ -25,7 +26,7 @@ module Sisimai
           ["service permits ", " unverifyable sending ips"],
         ].freeze
 
-        def text; return 'requireptr'; end
+        def text; return Sisimai::Eb::ReQPTR; end
         def description; return 'Email rejected due to missing PTR record or having invalid PTR record'; end
 
         # Try to match that the given text and regular expressions
@@ -44,8 +45,8 @@ module Sisimai
         #                         false: is not blocked due to missing PTR record
         # @see      http://www.ietf.org/rfc/rfc5322.txt
         def true(argvs)
-          return true if argvs['reason'] == 'requireptr'
-          return true if Sisimai::SMTP::Status.name(argvs['deliverystatus']) == 'requireptr'
+          return true if argvs['reason'] == Sisimai::Eb::ReQPTR
+          return true if Sisimai::SMTP::Status.name(argvs['deliverystatus']) == Sisimai::Eb::ReQPTR
           return match(argvs['diagnosticcode'].downcase)
         end
 

data/lib/sisimai/reason/securityerror.rb

@@ -1,12 +1,12 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::SecurityError checks the bounce reason is "securityerror" or not. This class
+    # Sisimai::Reason::SecurityError checks the bounce reason is "SecurityError" or not. This class
     # is called only Sisimai::Reason class.
     #
     # This is the error that a security violation was detected on a destination mail server. Depends
     # on the security policy on the server, a sender's email address is camouflaged address.
     #
-    # Sisimai will set "securityerror" to the reason of email bounce if the value of Status: field
+    # Sisimai will set "SecurityError" to the reason of email bounce if the value of Status: field
     # in a bounce email is "5.7.*".
     #
     #   Action: failed
@@ -17,6 +17,7 @@ module Sisimai
     #
     module SecurityError
       class << self
+        require 'sisimai/eb'
         Index = [
           "account not subscribed to ses",
           "authentication credentials invalid",
@@ -36,7 +37,7 @@ module Sisimai
           ["user ", " is not authorized to perform ses:sendrawemail on resource"],
         ].freeze
 
-        def text; return 'securityerror'; end
+        def text; return Sisimai::Eb::ReSAFE; end
         def description; return 'Email rejected due to security violation was detected on a destination host'; end
 
         # Try to match that the given text and regular expressions

data/lib/sisimai/reason/spamdetected.rb

@@ -1,6 +1,6 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::SpamDetected checks the bounce reason is "spamdetected" due to Spam content
+    # Sisimai::Reason::SpamDetected checks the bounce reason is "SpamDetected" due to Spam content
     # in the message or not. This class is called only Sisimai::Reason class. This is the error that
     # the message you sent was rejected by "spam filter" which is running on the remote host.
     #
@@ -10,6 +10,7 @@ module Sisimai
     #    Last-Attempt-Date: Thu, 9 Apr 2008 23:34:45 +0900 (JST)
     module SpamDetected
       class << self
+        require 'sisimai/eb'
         Index = [
           "blacklisted url in message",
           "block for spam",
@@ -65,7 +66,7 @@ module Sisimai
           ["spam ", "score"],
         ].freeze
 
-        def text; return 'spamdetected'; end
+        def text; return Sisimai::Eb::ReSPAM; end
         def description; return 'Email rejected by spam filter running on the remote host'; end
 
         # Try to match that the given text and regular expressions
@@ -85,10 +86,10 @@ module Sisimai
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
           return false if argvs['deliverystatus'].empty?
-          return true  if argvs['reason'] == 'spamdetected'
-          return true  if Sisimai::SMTP::Status.name(argvs['deliverystatus']) == 'spamdetected'
+          return true  if argvs['reason'] == Sisimai::Eb::ReSPAM
+          return true  if Sisimai::SMTP::Status.name(argvs['deliverystatus']) == Sisimai::Eb::ReSPAM
 
-          # The value of "reason" isn't "spamdetected" when the value of "command" is an SMTP command
+          # The value of "reason" isn't "SpamDetected" when the value of "command" is an SMTP command
           # to be sent before the SMTP DATA command because all the MTAs read the headers and the
           # entire message body after the DATA command.
           return false if Sisimai::SMTP::Command::ExceptDATA.include?(argvs['command'])

data/lib/sisimai/reason/suppressed.rb

@@ -1,13 +1,14 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::Suppressed checks the bounce reason is "suppressed" or not. This class is called
+    # Sisimai::Reason::Suppressed checks the bounce reason is "Suppressed" or not. This class is called
     # only Sisimai::Reason class.
     #
     # This is the error that the recipient adddress is listed in the suppression list of the relay
     # server, and was not delivered.
     module Suppressed
       class << self
-        def text; return 'suppressed'; end
+        require 'sisimai/eb'
+        def text; return Sisimai::Eb::ReSTOP; end
         def description; return "Email was not delivered due to being listed in the suppression list of MTA"; end
 
         # Try to match that the given text and regular expressions
@@ -21,7 +22,7 @@ module Sisimai
         #                                   false: is not listed in the suppression list
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return true if argvs['reason'] == 'suppressed'
+          return true if argvs['reason'] == Sisimai::Eb::ReSTOP
           return match(argvs['diagnosticcode'].downcase)
         end
 

data/lib/sisimai/reason/suspend.rb

@@ -1,10 +1,11 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::Suspend checks the bounce reason is "suspend" or not. This class is called
+    # Sisimai::Reason::Suspend checks the bounce reason is "Suspend" or not. This class is called
     # only Sisimai::Reason class.  This is the error that a recipient account is being suspended
     # due to unpaid or other reasons.
     module Suspend
       class << self
+        require 'sisimai/eb'
         Index = [
           " currently suspended",
           " temporary locked",
@@ -37,7 +38,7 @@ module Sisimai
           ["not ", "active"],
         ].freeze
 
-        def text; return 'suspend'; end
+        def text; return Sisimai::Eb::ReQUIT; end
         def description; return 'Email rejected due to a recipient account is being suspended'; end
 
         # Try to match that the given text and regular expressions
@@ -56,7 +57,7 @@ module Sisimai
         #                                   false: is not suspended
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return true if argvs['reason'] == 'suspend' || argvs['replycode'].to_i == 525
+          return true if argvs['reason'] == Sisimai::Eb::ReQUIT || argvs['replycode'].to_i == 525
           return match(argvs['diagnosticcode'].downcase)
         end
 

data/lib/sisimai/reason/syntaxerror.rb

@@ -1,10 +1,10 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::SyntaxError checks the bounce reason is "syntaxerror" or not. This class is
+    # Sisimai::Reason::SyntaxError checks the bounce reason is "SyntaxError" or not. This class is
     # called only Sisimai::Reason class.
     #
     # This is the error that a destination mail server could not recognize SMTP command which is
-    # sent from a sender's MTA. Sisimai will set "syntaxerror" to the reason if the value of
+    # sent from a sender's MTA. Sisimai will set "SyntaxError" to the reason if the value of
     # "replycode" begins with "50" such as 502, or 503.
     #   Action: failed
     #   Status: 5.5.0
@@ -12,7 +12,8 @@ module Sisimai
     #
     module SyntaxError
       class << self
-        def text; return 'syntaxerror'; end
+        require 'sisimai/eb'
+        def text; return Sisimai::Eb::ReCOMM; end
         def description; return 'Email rejected due to syntax error at sent commands in SMTP session'; end
         def match(*); return false; end
 

data/lib/sisimai/reason/systemerror.rb

@@ -1,6 +1,6 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::SystemError checks the bounce reason is "systemerror" or not. This class is
+    # Sisimai::Reason::SystemError checks the bounce reason is "SystemError" or not. This class is
     # called only Sisimai::Reason class. This is the error that an email has bounced due to system
     # error on the remote host such as LDAP connection failure or other internal system error.
     #
@@ -9,6 +9,7 @@ module Sisimai
     #   message has been in the queue too long.
     module SystemError
       class << self
+        require 'sisimai/eb'
         Index = [
           "aliasing/forwarding loop broken",
           "automatic homedir creator crashed", # qmail-ldap-1.03-20040101.patch:19817 - 19866
@@ -52,7 +53,7 @@ module Sisimai
           ["unable to connect ", "daemon"],
         ].freeze
 
-        def text; return 'systemerror'; end
+        def text; return Sisimai::Eb::RePROC; end
         def description; return 'Email returned due to system error on the remote host'; end
 
         # Try to match that the given text and regular expressions

data/lib/sisimai/reason/systemfull.rb

@@ -1,19 +1,20 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::SystemFull checks the bounce reason is "systemfull" or not. This class is called
+    # Sisimai::Reason::SystemFull checks the bounce reason is "SystemFull" or not. This class is called
     # only Sisimai::Reason class.
     #
     # This is the error that a destination mail server's disk (or spool) is full. Sisimai will set
-    # systemfull to the reason of email bounce if the value of Status: field in a bounce email is
+    # "SystemFull" to the reason of email bounce if the value of Status: field in a bounce email is
     # "4.3.1" or "5.3.1".
     module SystemFull
       class << self
+        require 'sisimai/eb'
         Index = [
           'exceeded storage allocation',   # MS Exchange
           'mail system full',
         ].freeze
 
-        def text; return 'systemfull'; end
+        def text; return Sisimai::Eb::ReDISK; end
         def description; return "Email rejected due to a destination mail server's disk is full"; end
 
         # Try to match that the given text and regular expressions

data/lib/sisimai/reason/undefined.rb

@@ -3,8 +3,9 @@ module Sisimai
     # Sisimai::Reason::Undefined is for only returning text and description. This class is called only
     # from Sisimai.reason method.
     module Undefined
+      require 'sisimai/eb'
       class << self
-        def text; return 'undefined'; end
+        def text; return Sisimai::Eb::Re___0; end
         def description; return 'Sisimai could not detect an error reason'; end
         def match;   return false; end
         def true(*); return false; end

data/lib/sisimai/reason/userunknown.rb

@@ -1,11 +1,11 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::UserUnknown checks the bounce reason is "userunknown" or not. This class is
+    # Sisimai::Reason::UserUnknown checks the bounce reason is "UserUnknown" or not. This class is
     # called only Sisimai::Reason class.
     #
     # This is the error that a local part (Left hand side of @ sign) of a recipient's email address
     # does not exist. In many case, a user has changed internet service provider, or has quit company,
-    # or the local part is misspelled. Sisimai will set "userunknown" to the reason of email bounce
+    # or the local part is misspelled. Sisimai will set "UserUnknown" to the reason of email bounce
     # if the value of Status: field in a bounce email is "5.1.1", or connection was refused at SMTP
     # RCPT command, or the contents of Diagnostic-Code: field represents that it is unknown user.
     #
@@ -14,7 +14,11 @@ module Sisimai
     #   RCPT TO command)
     module UserUnknown
       class << self
-        PreMatches = %w[NoRelaying Blocked MailboxFull HasMoved Rejected NotAccept]
+        require 'sisimai/eb'
+        PreMatches = [
+          Sisimai::Eb::RePASS, Sisimai::Eb::ReBLOC, Sisimai::Eb::ReFULL,
+          Sisimai::Eb::ReMOVE, Sisimai::Eb::ReFROM, Sisimai::Eb::Re00MX,
+        ]
         ModulePath = {
           'Sisimai::Reason::NoRelaying'  => 'sisimai/reason/norelaying',
           'Sisimai::Reason::Blocked'     => 'sisimai/reason/blocked',
@@ -109,7 +113,7 @@ module Sisimai
           ["user <", "> unknown"],
         ].freeze
 
-        def text; return 'userunknown'; end
+        def text; return Sisimai::Eb::ReUSER; end
         def description; return "Email rejected due to a local part of a recipient's email address does not exist"; end
 
         # Try to match that the given text and regular expressions
@@ -122,20 +126,20 @@ module Sisimai
           return false
         end
 
-        # Whether the address is "userunknown" or not
+        # Whether the address is "UserUnknown" or not
         # @param    [Sisimai::Fact] argvs   Object to be detected the reason
         # @return   [Boolean]               true:  is unknown user
         #                                   false: is not unknown user.
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return true  if argvs['reason'] == 'userunknown'
+          return true  if argvs['reason'] == Sisimai::Eb::ReUSER
           return false if Sisimai::SMTP::Command::BeforeRCPT.include?(argvs['command'])
 
           tempreason = Sisimai::SMTP::Status.name(argvs['deliverystatus'])
-          return false if tempreason == 'suspend'
+          return false if tempreason == Sisimai::Eb::ReQUIT
 
           issuedcode = argvs['diagnosticcode'].downcase
-          if tempreason == 'userunknown'
+          if tempreason == Sisimai::Eb::ReUSER
             # *.1.1 = 'Bad destination mailbox address'
             #   Status: 5.1.1
             #   Diagnostic-Code: SMTP; 550 5.1.1 <***@example.jp>:
@@ -160,7 +164,7 @@ module Sisimai
             end
             return true if matchother == false  # Did not match with other message patterns
 
-          elsif argvs['command'] == 'RCPT'
+          elsif argvs['command'] == Sisimai::Eb::CeRCPT
             # When the SMTP command is not "RCPT", the session rejected by other
             # reason, maybe.
             return true if match(issuedcode)

data/lib/sisimai/reason/vacation.rb

@@ -4,6 +4,7 @@ module Sisimai
     # from Sisimai.reason method.
     module Vacation
       class << self
+        require 'sisimai/eb'
         Index = [
           'i am away on vacation',
           'i am away until',
@@ -11,7 +12,7 @@ module Sisimai
           'i will be traveling for work on',
         ].freeze
 
-        def text; return 'vacation'; end
+        def text; return Sisimai::Eb::ReAWAY; end
         def description; return 'Email replied automatically due to a recipient is out of office'; end
 
         # Try to match that the given text and regular expressions

data/lib/sisimai/reason/virusdetected.rb

@@ -1,10 +1,10 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::VirusDetected checks the bounce reason is "virusdetected" or not. This class
+    # Sisimai::Reason::VirusDetected checks the bounce reason is "VirusDetected" or not. This class
     # is called only Sisimai::Reason class.
     #
     # This is an error that any virus or trojan horse detected in the message by a virus scanner program
-    # at a destination mail server. This reason has been divided from "securityerror" at Sisimai 4.22.0.
+    # at a destination mail server. This reason has been divided from "SecurityError" at Sisimai 4.22.0.
     #
     #   Your message was infected with a virus. You should download a virus
     #   scanner and check your computer for viruses.
@@ -14,13 +14,14 @@ module Sisimai
     #
     module VirusDetected
       class << self
+        require 'sisimai/eb'
         Index = ["it has a potentially executable attachment"].freeze
         Pairs = [
           ["message was ", "ected", " virus"],
           ["virus", " detected"],
         ].freeze
 
-        def text; return 'virusdetected'; end
+        def text; return Sisimai::Eb::ReEXEC; end
         def description; return 'Email rejected due to a virus scanner on a destination host'; end
 
         # Try to match that the given text and regular expressions
@@ -34,7 +35,7 @@ module Sisimai
           return false
         end
 
-        # The bounce reason is "virusdetected" or not
+        # The bounce reason is "VirusDetected" or not
         # @param    [Sisimai::Fact] argvs   Object to be detected the reason
         # @return   [Boolean]               true:  virus detected
         #                                   false: virus was not detected
@@ -44,7 +45,7 @@ module Sisimai
           # The value of "reason" isn't "visusdetected" when the value of "command" is an SMTP command
           # to be sent before the SMTP DATA command because all the MTAs read the headers and the
           # entire message body after the DATA command.
-          return true  if argvs['reason'] == 'virusdetected'
+          return true  if argvs['reason'] == Sisimai::Eb::ReEXEC
           return false if Sisimai::SMTP::Command::ExceptDATA.include?(argvs['command'])
           return match(argvs['diagnosticcode'].downcase)
         end

data/lib/sisimai/reason.rb

@@ -3,24 +3,28 @@ module Sisimai
   # Sisimai::Fact object as an argument of find() method. This class is called only Sisimai::Fact.
   module Reason
     class << self
+      require 'sisimai/eb'
+
       # All the error reason list Sisimai support
       # @return   [Array] Reason list
       def index
-        return %w[
-          AuthFailure BadReputation Blocked ContentError EmailTooLarge Expired FailedSTARTTLS Filtered
-          HasMoved HostUnknown MailboxFull MailerError NetworkError NotAccept NotCompliantRFC RateLimited
-          OnHold Rejected NoRelaying SpamDetected VirusDetected PolicyViolation SecurityError Suspend
-          RequirePTR SystemError SystemFull Suppressed UserUnknown SyntaxError
+        return [
+          Sisimai::Eb::ReAUTH, Sisimai::Eb::ReFAMA, Sisimai::Eb::ReBLOC, Sisimai::Eb::ReBODY, Sisimai::Eb::ReSIZE,
+          Sisimai::Eb::ReTIME, Sisimai::Eb::ReTTLS, Sisimai::Eb::ReFILT, Sisimai::Eb::ReMOVE, Sisimai::Eb::ReHOST,
+          Sisimai::Eb::ReFULL, Sisimai::Eb::ReUNIX, Sisimai::Eb::ReINET, Sisimai::Eb::Re00MX, Sisimai::Eb::ReNRFC,
+          Sisimai::Eb::ReRATE, Sisimai::Eb::Re___1, Sisimai::Eb::ReFROM, Sisimai::Eb::RePASS, Sisimai::Eb::ReSPAM,
+          Sisimai::Eb::ReEXEC, Sisimai::Eb::ReWONT, Sisimai::Eb::ReSAFE, Sisimai::Eb::ReQUIT, Sisimai::Eb::ReQPTR,
+          Sisimai::Eb::RePROC, Sisimai::Eb::ReDISK, Sisimai::Eb::ReSTOP, Sisimai::Eb::ReUSER, Sisimai::Eb::ReCOMM,
         ]
       end
 
-      # @abstract is_explicit() returns 0 when the argument is empty or is "undefined" or is "onhold"
+      # @abstract is_explicit() returns 0 when the argument is empty or is "Undefined" or is "OnHold"
       # @param    string argv1  Reason name
       # @return   bool          false: The reaosn is not explicit
       def is_explicit(argv1 = '')
         return false if argv1.nil?
         return false if argv1.empty?
-        return false if argv1 == "undefined" || argv1 == "onhold" || argv1.empty?
+        return false if argv1 == Sisimai::Eb::Re___0 || argv1 == Sisimai::Eb::Re___1 || argv1.empty?
         return true
       end
 
@@ -38,29 +42,30 @@ module Sisimai
       # @return   [Hash] Reason list
       def retry
         return {
-          'undefined' => true, 'onhold' => true, 'systemerror' => true, 'securityerror' => true,
-          'expired' => true, 'networkerror' => true, 'hostunknown' => true, 'userunknown' => true
+          Sisimai::Eb::Re___0 => true, Sisimai::Eb::Re___1 => true, Sisimai::Eb::RePROC => true,
+          Sisimai::Eb::ReSAFE => true, Sisimai::Eb::ReTIME => true, Sisimai::Eb::ReINET => true,
+          Sisimai::Eb::ReHOST => true, Sisimai::Eb::ReUSER => true, 
         }.freeze
       end
       ModulePath = Sisimai::Reason.path
       GetRetried = Sisimai::Reason.retry
       ClassOrder = [
         # 0. true() meethod in the following reasons are called from Reason->find()
-        %w[MailboxFull EmailTooLarge Suspend HasMoved NoRelaying AuthFailure UserUnknown Filtered RequirePTR
-           NotCompliantRFC BadReputation ContentError Rejected HostUnknown SpamDetected RateLimited Blocked
-           FailedSTARTTLS NotAccept VirusDetected PolicyViolation
-        ],
+        [Sisimai::Eb::ReFULL, Sisimai::Eb::ReSIZE, Sisimai::Eb::ReQUIT, Sisimai::Eb::ReMOVE, Sisimai::Eb::RePASS,
+         Sisimai::Eb::ReAUTH, Sisimai::Eb::ReUSER, Sisimai::Eb::ReFILT, Sisimai::Eb::ReQPTR, Sisimai::Eb::ReNRFC,
+         Sisimai::Eb::ReFAMA, Sisimai::Eb::ReBODY, Sisimai::Eb::ReFROM, Sisimai::Eb::ReHOST, Sisimai::Eb::ReSPAM, 
+         Sisimai::Eb::ReRATE, Sisimai::Eb::ReBLOC, Sisimai::Eb::ReTTLS, Sisimai::Eb::Re00MX, Sisimai::Eb::ReEXEC,
+         Sisimai::Eb::ReWONT],
+
         # 1. match() method in the following reasons are called from Reason->find()
-        %w[
-          MailboxFull SpamDetected VirusDetected NoRelaying SystemError NetworkError Suspend SystemFull
-          Suppressed MailerError SecurityError PolicyViolation SyntaxError Expired
-        ],
-        %w[
-          MailboxFull EmailTooLarge Suspend UserUnknown Filtered Rejected HostUnknown SpamDetected
-          RateLimited Blocked SpamDetected AuthFailure FailedSTARTTLS SecurityError SystemError
-          NetworkError Suspend Expired ContentError HasMoved SystemFull NotAccept MailerError
-          NoRelaying Suppressed SyntaxError OnHold
-        ]
+        [Sisimai::Eb::ReFULL, Sisimai::Eb::ReSPAM, Sisimai::Eb::ReEXEC, Sisimai::Eb::RePASS, Sisimai::Eb::RePROC,
+         Sisimai::Eb::ReINET, Sisimai::Eb::ReQUIT, Sisimai::Eb::ReDISK, Sisimai::Eb::ReSTOP, Sisimai::Eb::ReUNIX,
+         Sisimai::Eb::ReSAFE, Sisimai::Eb::ReWONT, Sisimai::Eb::ReCOMM, Sisimai::Eb::ReTIME],
+        [Sisimai::Eb::ReFULL, Sisimai::Eb::ReSIZE, Sisimai::Eb::ReQUIT, Sisimai::Eb::ReUSER, Sisimai::Eb::ReFILT,
+         Sisimai::Eb::ReFROM, Sisimai::Eb::ReHOST, Sisimai::Eb::ReSPAM, Sisimai::Eb::ReRATE, Sisimai::Eb::ReBLOC,
+         Sisimai::Eb::ReAUTH, Sisimai::Eb::ReTTLS, Sisimai::Eb::ReSAFE, Sisimai::Eb::RePROC, Sisimai::Eb::ReINET,
+         Sisimai::Eb::ReTIME, Sisimai::Eb::ReBODY, Sisimai::Eb::ReMOVE, Sisimai::Eb::ReDISK, Sisimai::Eb::Re00MX,
+         Sisimai::Eb::ReUNIX, Sisimai::Eb::RePASS, Sisimai::Eb::ReSTOP, Sisimai::Eb::ReCOMM, Sisimai::Eb::Re___1],
       ]
 
       # Detect the bounce reason
@@ -74,7 +79,7 @@ module Sisimai
           # retry() method.
           return argvs['reason'] if argvs['reason'].empty? == false
         end
-        return 'delivered' if argvs['deliverystatus'].start_with?('2.')
+        return Sisimai::Eb::ReSENT if argvs['deliverystatus'].start_with?('2.')
 
         reasontext = ''
         issuedcode = argvs['diagnosticcode'] || ''
@@ -100,21 +105,21 @@ module Sisimai
           end
         end
 
-        if reasontext.empty? || reasontext == 'undefined'
+        if reasontext.empty? || reasontext == Sisimai::Eb::Re___0
           # Bounce reason is not detected yet.
           reasontext = self.anotherone(argvs)
 
-          if reasontext == 'undefined' || reasontext.empty?
+          if reasontext == Sisimai::Eb::Re___0 || reasontext.empty?
             # Action: delayed => "expired"
             reasontext   = nil
-            reasontext ||= 'expired' if argvs['action'] == 'delayed'
+            reasontext ||= Sisimai::Eb::ReTIME if argvs['action'] == Sisimai::Eb::AeSTAY
             return reasontext if reasontext
 
             # Try to match with message patterns in Sisimai::Reason::Vacation
             require 'sisimai/reason/vacation'
-            reasontext   = 'vacation' if Sisimai::Reason::Vacation.match(issuedcode.downcase)
-            reasontext ||= 'onhold'   if issuedcode.empty? == false
-            reasontext ||= 'undefined'
+            reasontext   = Sisimai::Eb::ReAWAY if Sisimai::Reason::Vacation.match(issuedcode.downcase)
+            reasontext ||= Sisimai::Eb::Re___1 if issuedcode.empty? == false
+            reasontext ||= Sisimai::Eb::Re___0
           end
         end
         return reasontext
@@ -151,7 +156,7 @@ module Sisimai
             end
 
             next if r.match(issuedcode) == false
-            reasontext = e.downcase
+            reasontext = e
             break
           end
           break if reasontext.empty? == false
@@ -160,31 +165,31 @@ module Sisimai
           code2digit = statuscode[0, 3] || ''
           if code2digit == '5.6' || code2digit == '4.6'
             #  X.6.0   Other or undefined media error
-            reasontext = 'contenterror'
+            reasontext = Sisimai::Eb::ReBODY
 
           elsif code2digit == '5.7' || code2digit == '4.7'
             #  X.7.0   Other or undefined security status
-            reasontext = 'securityerror'
+            reasontext = Sisimai::Eb::ReSAFE
 
           elsif codeformat.start_with?('X-UNIX')
             # Diagnostic-Code: X-UNIX; ...
-            reasontext = 'mailererror'
+            reasontext = Sisimai::Eb::ReUNIX
 
           else
             # 50X Syntax Error?
             require 'sisimai/reason/syntaxerror'
-            reasontext = 'syntaxerror' if Sisimai::Reason::SyntaxError.true(argvs)
+            reasontext = Sisimai::Eb::ReCOMM if Sisimai::Reason::SyntaxError.true(argvs)
           end
           break if reasontext.empty? == false
 
           # Check the value of Action: field, first
-          if actiontext.start_with?('delayed', 'expired')
+          if actiontext.start_with?(Sisimai::Eb::AeSTAY, 'expired')
             # Action: delayed, expired
-            reasontext = 'expired'
+            reasontext = Sisimai::Eb::ReTIME
           else
             # Rejected at connection or after EHLO|HELO
             thecommand = argvs['command'] || ''
-            reasontext = 'blocked' if %w[HELO EHLO].index(thecommand)
+            reasontext = Sisimai::Eb::ReBLOC if %w[HELO EHLO].index(thecommand)
           end
           break
         end
@@ -222,12 +227,12 @@ module Sisimai
 
         if issuedcode.upcase.include?('X-UNIX; ')
           # X-Unix; ...
-          reasontext = 'mailererror'
+          reasontext = Sisimai::Eb::ReUNIX
         else
           # Detect the bounce reason from "Status:" code
           require 'sisimai/smtp/status'
           reasontext = Sisimai::SMTP::Status.name(Sisimai::SMTP::Status.find(argv1))
-          reasontext = "undefined" if reasontext.empty?
+          reasontext = Sisimai::Eb::Re___0 if reasontext.empty?
         end
         return reasontext
       end

data/lib/sisimai/rfc1894.rb

@@ -2,6 +2,7 @@ module Sisimai
   # Sisimai::RFC1894 DSN field defined in RFC3464 (obsoletes RFC1894)
   module RFC1894
     class << self
+      require 'sisimai/eb'
       require 'sisimai/string'
       FieldNames = [
         # https://tools.ietf.org/html/rfc3464#section-2.2
@@ -58,8 +59,13 @@ module Sisimai
       }.freeze
 
       SubtypeSet = {"addr" => "RFC822", "cdoe" => "SMTP", "host" => "DNS"}.freeze
-      ActionList = ["failed", "delayed", "delivered", "relayed", "expanded"].freeze
-      Correction = {'deliverable' => 'delivered', 'expired' => 'failed', 'failure' => 'failed'}
+      ActionList = [Sisimai::Eb::AeFAIL, Sisimai::Eb::AeSTAY, Sisimai::Eb::AeSENT,
+                    Sisimai::Eb::AePASS, Sisimai::Eb::AeEXPN].freeze
+      Correction = {
+        'deliverable' => Sisimai::Eb::AeSENT,
+        'expired'     => Sisimai::Eb::AeFAIL,
+        'failure'     => Sisimai::Eb::AeFAIL,
+      }
       FieldGroup = {
         'original-recipient'    => 'addr',
         'final-recipient'       => 'addr',

data/lib/sisimai/rfc2045.rb

@@ -213,14 +213,17 @@ module Sisimai
       # Split argv1: multipart/* blocks by a boundary string in argv0
       # @param    [String] argv0  The value of Content-Type header
       # @param    [String] argv1  A pointer to multipart/* message blocks
+      # @param    [String] depth  Depth of MIME parts
       # @return   [Array]         List of each part of multipart/*
       # @since v5.0.0
-      def levelout(argv0 = '', argv1 = '')
+      def levelout(argv0 = '', argv1 = '', depth = 0)
         return [] if argv0.empty?
         return [] if argv1.empty?
+        return [] if depth > 100
 
         boundary01 = boundary(argv0, 0); return [] if boundary01.empty?
         multiparts = argv1.split(Regexp.new(Regexp.escape(boundary01) + "\n"))
+        partsdepth = depth + 1
         partstable = []
 
         # Remove empty or useless preamble and epilogue of multipart/* block
@@ -237,7 +240,7 @@ module Sisimai
             bodyinside = f[-1].split("\n\n", 2)[-1]
             next if bodyinside.size < 9 || bodyinside.index(boundary02).nil?
 
-            v = levelout(f[0], bodyinside)
+            v = levelout(f[0], bodyinside, partsdepth)
             partstable += v if v.size > 0
           else
             # The part is not a multipart/* block
@@ -271,7 +274,7 @@ module Sisimai
         #   - CHARSET=, BOUNDARY=                          => charset-, boundary=
         #   - message/xdelivery-status                     => message/delivery-status
         iso2022set = %r/charset=["']?(iso-2022-[-a-z0-9]+)['"]?\b/
-        multiparts = levelout(argv0, argv1)
+        multiparts = levelout(argv0, argv1, 0)
         flattenout = ''
         delimiters = ["/delivery-status", "/rfc822", "/feedback-report", "/partial"]