sisimai 5.7.0 → 5.7.1

data/lib/sisimai/lhost/exim.rb

@@ -3,6 +3,7 @@ module Sisimai::Lhost
   # Methods in the module are called from only Sisimai::Message.
   module Exim
     class << self
+      require 'sisimai/eb'
       require 'sisimai/lhost'
       require 'sisimai/rfc1894'
 
@@ -60,12 +61,12 @@ module Sisimai::Lhost
       MessagesOf = {
         # find exim/ -type f -exec grep 'message = US' {} /dev/null \;
         # route.c:1158|  DEBUG(D_uid) debug_printf("getpwnam() returned NULL (user not found)\n");
-        "userunknown" => ["user not found"],
+        Sisimai::Eb::ReUSER => ["user not found"],
         # parser.c:666| *errorptr = string_sprintf("%s (expected word or \"<\")", *errorptr);
         # parser.c:701| if(bracket_count++ > 5) FAILED(US"angle-brackets nested too deep");
         # parser.c:738| FAILED(US"domain missing in source-routed address");
         # parser.c:747| : string_sprintf("malformed address: %.32s may not follow %.*s",
-        "syntaxerror" => [
+        Sisimai::Eb::ReCOMM => [
           "angle-brackets nested too deep",
           'expected word or "<"',
           "domain missing in source-routed address",
@@ -389,8 +390,8 @@ module Sisimai::Lhost
             case e["command"]
               # - HELO | Connected to 192.0.2.135 but my name was rejected.
               # - MAIL | Connected to 192.0.2.135 but sender was rejected.
-              when "HELO", "EHLO" then e["reason"] = "blocked"
-              when "MAIL"         then e["reason"] = "onhold"
+              when Sisimai::Eb::CeHELO, Sisimai::Eb::CeEHLO then e["reason"] = Sisimai::Eb::ReBLOC
+              when Sisimai::Eb::CeMAIL                      then e["reason"] = Sisimai::Eb::Re___1
             else
               # Try to match the error message with each message pattern 
               MessagesOf.each_key do |r|
@@ -401,7 +402,7 @@ module Sisimai::Lhost
               end
 
               if e["reason"].empty?
-                e["reason"] = "expired" if DelayedFor.any? { |a| e["diagnosis"].include?(a) }
+                e["reason"] = Sisimai::Eb::ReTIME if DelayedFor.any? { |a| e["diagnosis"].include?(a) }
               end
             end
           end
@@ -420,7 +421,7 @@ module Sisimai::Lhost
           re = e["reason"]
           cv = ""
 
-          if Sisimai::SMTP::Failure.is_temporary(cr) || re == "expired"
+          if Sisimai::SMTP::Failure.is_temporary(cr) || re == Sisimai::Eb::ReTIME
             # Set the pseudo status code as a temporary error
             cv = Sisimai::SMTP::Status.code(re, true) if Sisimai::Reason.is_explicit(re)
           end

data/lib/sisimai/lhost/ezweb.rb

@@ -3,6 +3,7 @@ module Sisimai::Lhost
   # Methods in the module are called from only Sisimai::Message.
   module EZweb
     class << self
+      require 'sisimai/eb'
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
@@ -100,14 +101,14 @@ module Sisimai::Lhost
           if mhead['x-spasign'].to_s == 'NG'
             # Content-Type: text/plain; ..., X-SPASIGN: NG (spamghetti, au by EZweb)
             # Filtered recipient returns message that include 'X-SPASIGN' header
-            e['reason'] = 'filtered'
+            e['reason'] = Sisimai::Eb::ReFILT
           else
             # There is no X-SPASIGN header or the value of the header is not "NG"
-            e['reason'] = "suspend" if UnpaidUser.any? { |a| e['diagnosis'].include?(a) }
+            e['reason'] = Sisimai::Eb::ReQUIT if UnpaidUser.any? { |a| e['diagnosis'].include?(a) }
           end
           next if e['reason'] != ""
           next if e['recipient'].end_with?('@ezweb.ne.jp', '@au.com')
-          e["reason"] = "userunknown" if e["diagnosis"].start_with?("<")
+          e["reason"] = Sisimai::Eb::ReUSER if e["diagnosis"].start_with?("<")
         end
 
         return {"ds" => dscontents, "rfc822" => emailparts[1]}

data/lib/sisimai/lhost/fml.rb

@@ -3,24 +3,25 @@ module Sisimai::Lhost
   # https://www.fml.org/. Methods in the module are called from only Sisimai::Message.
   module FML
     class << self
+      require 'sisimai/eb'
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
       Boundaries = ['Original mail as follows:'].freeze
       ErrorTitle = {
-        'rejected' => [
+        Sisimai::Eb::ReFROM => [
           ' are not member',
           'NOT MEMBER article from ',
           'reject mail ',
           'Spam mail from a spammer is rejected',
         ],
-        'systemerror' => [
+        Sisimai::Eb::RePROC => [
           'fml system error message',
           'Loop Alert: ',
           'Loop Back Warning: ',
           'WARNING: UNIX FROM Loop',
         ],
-        'securityerror' => ['Security Alert'],
+        Sisimai::Eb::ReSAFE => ['Security Alert'],
       }.freeze
 
       # @abstract Decodes the bounce message from fml mailling list server/manager

data/lib/sisimai/lhost/gmail.rb

@@ -3,6 +3,7 @@ module Sisimai::Lhost
   # Methods in the module are called from only Sisimai::Message.
   module Gmail
     class << self
+      require 'sisimai/eb'
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
@@ -17,7 +18,7 @@ module Sisimai::Lhost
         # We recommend contacting the other email provider for further information about the
         # cause of this error. The error that the other server returned was:
         # 500 Remote server does not support TLS (state 6).
-        '6'  => { 'command' => 'MAIL', 'reason' => 'failedstarttls' },
+        '6'  => { 'command' => Sisimai::Eb::CeMAIL, 'reason' => Sisimai::Eb::ReTTLS },
 
         # https://www.google.td/support/forum/p/gmail/thread?tid=08a60ebf5db24f7b&hl=en
         # Technical details of permanent failure:
@@ -25,7 +26,7 @@ module Sisimai::Lhost
         # We recommend contacting the other email provider for further information about the
         # cause of this error. The error that the other server returned was:
         # 535 SMTP AUTH failed with the remote server. (state 8).
-        '8'  => { 'command' => 'AUTH', 'reason' => 'systemerror' },
+        '8'  => { 'command' => Sisimai::Eb::CeAUTH, 'reason' => Sisimai::Eb::RePROC },
 
         # https://www.google.co.nz/support/forum/p/gmail/thread?tid=45208164dbca9d24&hl=en
         # Technical details of temporary failure:
@@ -33,7 +34,7 @@ module Sisimai::Lhost
         # We recommend contacting the other email provider for further information about the
         # cause of this error. The error that the other server returned was:
         # 454 454 TLS missing certificate: error:0200100D:system library:fopen:Permission denied (#4.3.0) (state 9).
-        '9'  => { 'command' => 'AUTH', 'reason' => 'failedstarttls' },
+        '9'  => { 'command' => Sisimai::Eb::CeAUTH, 'reason' => Sisimai::Eb::ReTTLS },
 
         # https://www.google.com/support/forum/p/gmail/thread?tid=5cfab8c76ec88638&hl=en
         # Technical details of permanent failure:
@@ -41,14 +42,14 @@ module Sisimai::Lhost
         # We recommend contacting the other email provider for further information about the
         # cause of this error. The error that the other server returned was:
         # 500 Remote server does not support SMTP Authenticated Relay (state 12).
-        '12' => { 'command' => 'AUTH', 'reason' => 'norelaying' },
+        '12' => { 'command' => Sisimai::Eb::CeAUTH, 'reason' => Sisimai::Eb::RePASS },
 
         # Technical details of permanent failure:
         # Google tried to deliver your message, but it was rejected by the recipient domain.
         # We recommend contacting the other email provider for further information about the
         # cause of this error. The error that the other server returned was:
         # 550 550 5.7.1 <****@gmail.com>... Access denied (state 13).
-        '13' => { 'command' => 'EHLO', 'reason' => 'blocked' },
+        '13' => { 'command' => Sisimai::Eb::CeEHLO, 'reason' => Sisimai::Eb::ReBLOC },
 
         # Technical details of permanent failure:
         # Google tried to deliver your message, but it was rejected by the recipient domain.
@@ -57,7 +58,7 @@ module Sisimai::Lhost
         # 550 550 5.1.1 <******@*********.**>... User Unknown (state 14).
         # 550 550 5.2.2 <*****@****.**>... Mailbox Full (state 14).
         #
-        '14' => { 'command' => 'RCPT', 'reason' => 'userunknown' },
+        '14' => { 'command' => Sisimai::Eb::CeRCPT, 'reason' => Sisimai::Eb::ReUSER },
 
         # https://www.google.cz/support/forum/p/gmail/thread?tid=7090cbfd111a24f9&hl=en
         # Technical details of permanent failure:
@@ -66,7 +67,7 @@ module Sisimai::Lhost
         # cause of this error. The error that the other server returned was:
         # 550 550 5.7.1 SPF unauthorized mail is prohibited. (state 15).
         # 554 554 Error: no valid recipients (state 15).
-        '15' => { 'command' => 'DATA', 'reason' => 'filtered' },
+        '15' => { 'command' => Sisimai::Eb::CeDATA, 'reason' => Sisimai::Eb::ReFILT },
 
         # https://www.google.com/support/forum/p/Google%20Apps/thread?tid=0aac163bc9c65d8e&hl=en
         # Technical details of permanent failure:
@@ -75,14 +76,14 @@ module Sisimai::Lhost
         # cause of this error. The error that the other server returned was:
         # 550 550 <****@***.**> No such user here (state 17).
         # 550 550 #5.1.0 Address rejected ***@***.*** (state 17).
-        '17' => { 'command' => 'DATA', 'reason' => 'filtered' },
+        '17' => { 'command' => Sisimai::Eb::CeDATA, 'reason' => Sisimai::Eb::ReFILT },
 
         # Technical details of permanent failure:
         # Google tried to deliver your message, but it was rejected by the recipient domain.
         # We recommend contacting the other email provider for further information about the
         # cause of this error. The error that the other server returned was:
         # 550 550 Unknown user *****@***.**.*** (state 18).
-        '18' => { 'command' => 'DATA', 'reason' => 'filtered' },
+        '18' => { 'command' => Sisimai::Eb::CeDATA, 'reason' => Sisimai::Eb::ReFILT },
       }.freeze
 
       # @abstract Decodes the bounce message from Gmail

data/lib/sisimai/lhost/googlegroups.rb

@@ -3,6 +3,7 @@ module Sisimai::Lhost
   # Methods in the module are called from only Sisimai::Message.
   module GoogleGroups
     class << self
+      require 'sisimai/eb'
       require 'sisimai/lhost'
       Boundaries = ['----- Original message -----', 'Content-Type: message/rfc822'].freeze
 
@@ -47,10 +48,10 @@ module Sisimai::Lhost
         receivedby = mhead['received'] || []
         recordwide = {
           'diagnosis' => entiremesg,
-          'reason'    => 'onhold',
+          'reason'    => Sisimai::Eb::Re___1,
           'rhost'     => Sisimai::RFC5322.received(receivedby[0])[1],
         }
-        recordwide['reason'] = 'rejected' if emailparts[0].scan(/^[ ]?[*][ ]?/).size == 4
+        recordwide['reason'] = Sisimai::Eb::ReFROM if emailparts[0].scan(/^[ ]?[*][ ]?/).size == 4
 
         mhead['x-failed-recipients'].split(',').each do |e|
           # X-Failed-Recipients: neko@example.jp, nyaan@example.org, ...

data/lib/sisimai/lhost/googleworkspace.rb

@@ -3,6 +3,7 @@ module Sisimai::Lhost
   # Methods in the module are called only from Sisimai::Message.
   module GoogleWorkspace
     class << self
+      require 'sisimai/eb'
       require 'sisimai/lhost'
       require 'sisimai/string'
       require 'sisimai/address'
@@ -14,7 +15,7 @@ module Sisimai::Lhost
         error:   ["The response was:", "The response from the remote server was:"],
       }.freeze
       MessagesOf = {
-        "userunknown"  => ["because the address couldn't be found. Check for typos or unnecessary spaces and try again."],
+        Sisimai::Eb::ReUSER => ["because the address couldn't be found. Check for typos or unnecessary spaces and try again."],
       }.freeze
 
       # @abstract Decodes the bounce message from Google Workspace

data/lib/sisimai/lhost/imailserver.rb

@@ -4,13 +4,14 @@ module Sisimai::Lhost
   # Methods in the module are called from only Sisimai::Message.
   module IMailServer
     class << self
+      require 'sisimai/eb'
       require 'sisimai/lhost'
 
       Boundaries = ['Original message follows.'].freeze
       StartingOf = {error: ['Body of message generated response:']}.freeze
       MessagesOf = {
-        'userunknown' => ['Unknown user', 'Invalid final delivery userid'],
-        'expired'     => ['Delivery failed '],
+        Sisimai::Eb::ReUSER => ['Unknown user', 'Invalid final delivery userid'],
+        Sisimai::Eb::ReTIME => ['Delivery failed '],
       }.freeze
 
       # @abstract Decodes the bounce message from Progress iMail Server

data/lib/sisimai/lhost/kddi.rb

@@ -3,6 +3,7 @@ module Sisimai::Lhost
   # Methods in the module are called from only Sisimai::Message.
   module KDDI
     class << self
+      require 'sisimai/eb'
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
@@ -72,11 +73,11 @@ module Sisimai::Lhost
           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'
+            e['reason'] = Sisimai::Eb::ReFILT
           else
             # There is no X-SPASIGN: header in the bounce message
-            # set "userunknown" when the remote server rejected after RCPT command.
-            e['reason'] = 'userunknown' if e['command'] == 'RCPT'
+            # set "UserUnknown" when the remote server rejected after RCPT command.
+            e['reason'] = Sisimai::Eb::ReUSER if e['command'] == Sisimai::Eb::CeRCPT
           end
         end
 

data/lib/sisimai/lhost/notes.rb

@@ -3,13 +3,14 @@ module Sisimai::Lhost
   # (formerly Lotus Notes Server)). Methods in the module are called from only Sisimai::Message.
   module Notes
     class << self
+      require 'sisimai/eb'
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
       Boundaries = ['------- Returned Message --------'].freeze
       StartingOf = {message: ['------- Failure Reasons ']}.freeze
       MessagesOf = {
-        'userunknown' => [
+        Sisimai::Eb::ReUSER => [
           'User not listed in public Name & Address Book',
           'ディレクトリのリストにありません',
         ],

data/lib/sisimai/lhost/postfix.rb

@@ -3,6 +3,7 @@ module Sisimai::Lhost
   # Methods in the module are called from only Sisimai::Message.
   module Postfix
     class << self
+      require 'sisimai/eb'
       require 'sisimai/lhost'
       require 'sisimai/rfc1123'
       require 'sisimai/smtp/reply'
@@ -65,12 +66,12 @@ module Sisimai::Lhost
 
             case e["command"]
             # Use the argument of EHLO/HELO command as a value of "lhost"
-            when "HELO", "EHLO" then v['lhost'] = e['argument']
-            when "MAIL"
+            when Sisimai::Eb::CeHELO, Sisimai::Eb::CeEHLO then v['lhost'] = e['argument']
+            when Sisimai::Eb::CeMAIL
               # Set the argument of "MAIL" command to pseudo To: header of the original message
               emailparts[1] += sprintf("To: %s\n", e['argument']) if emailparts[1].size == 0
 
-            when "RCPT"
+            when Sisimai::Eb::CeRCPT
               # RCPT TO: <...>
               if v["recipient"] != ""
                 # There are multiple recipient addresses in the transcript of session
@@ -277,9 +278,9 @@ module Sisimai::Lhost
             end
           end
 
-          e['command']   = commandset.shift || Sisimai::SMTP::Command.find(e['diagnosis'])
-          e['command']   = 'HELO' if e["command"].empty? && e['diagnosis'].include?('refused to talk to me:')
-          e['spec']      = 'SMTP' if e["spec"].empty?    && Sisimai::String.aligned(e['diagnosis'], ['host ', ' said:'])
+          e['command'] = commandset.shift || Sisimai::SMTP::Command.find(e['diagnosis'])
+          e['command'] = Sisimai::Eb::CeHELO if e["command"].empty? && e['diagnosis'].include?('refused to talk to me:')
+          e['spec']    = 'SMTP'              if e["spec"].empty?    && Sisimai::String.aligned(e['diagnosis'], ['host ', ' said:'])
         end
 
         return { 'ds' => dscontents, 'rfc822' => emailparts[1] }

data/lib/sisimai/lhost/qmail.rb

@@ -4,6 +4,7 @@ module Sisimai::Lhost
   # Methods in the module are called from only Sisimai::Message.
   module Qmail
     class << self
+      require 'sisimai/eb'
       require 'sisimai/lhost'
       require 'sisimai/string'
 
@@ -49,27 +50,27 @@ module Sisimai::Lhost
       }.freeze
       CommandSet = {
         # qmail-remote.c:225|  if (smtpcode() != 220) quit("ZConnected to "," but greeting failed");
-        "CONN" => [" but greeting failed."],
+        Sisimai::Eb::CeCONN => [" but greeting failed."],
         # qmail-remote.c:231|  if (smtpcode() != 250) quit("ZConnected to "," but my name was rejected");
-        "EHLO" => [" but my name was rejected."],
+        Sisimai::Eb::CeEHLO => [" but my name was rejected."],
         # qmail-remote.c:238|  if (code >= 500) quit("DConnected to "," but sender was rejected");
         # reason = rejected
-        "MAIL" => [" but sender was rejected."],
+        Sisimai::Eb::CeMAIL => [" 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" => [" does not like recipient."],
+        Sisimai::Eb::CeRCPT => [" 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");
         # qmail-remote.c:272|  if (code >= 400) quit("Z"," failed after I sent the message");
-        "DATA" => [" failed on DATA command", " failed after I sent the message"],
+        Sisimai::Eb::CeDATA => [" failed on DATA command", " failed after I sent the message"],
       }.freeze
 
       MessagesOf = {
         # notqmail 1.08 returns the following error message when the destination MX is NullMX
-        "notaccept"   => ["Sorry, I couldn't find a mail exchanger or IP address"],
-        "userunknown" => ["no mailbox here by that name"],
+        Sisimai::Eb::Re00MX => ["Sorry, I couldn't find a mail exchanger or IP address"],
+        Sisimai::Eb::ReUSER => ["no mailbox here by that name"],
       }.freeze
 
       # @abstract Decodes the bounce message from qmail
@@ -158,9 +159,9 @@ module Sisimai::Lhost
           end
 
           # Detect the reason of bounce
-          if %w[HELO EHLO].index(e["command"])
+          if [Sisimai::Eb::CeHELO, Sisimai::Eb::CeEHLO].index(e["command"])
             # HELO | Connected to 192.0.2.135 but my name was rejected.
-            e["reason"] = "blocked"
+            e["reason"] = Sisimai::Eb::ReBLOC
           else
             # Try to match with each error message in the table
             # Check that the error message includes any of message patterns or not

data/lib/sisimai/lhost/sendmail.rb

@@ -3,6 +3,7 @@ module Sisimai::Lhost
   # Methods in the module are called from only Sisimai::Message.
   module Sendmail
     class << self
+      require 'sisimai/eb'
       require 'sisimai/lhost'
       require 'sisimai/rfc1123'
       require 'sisimai/smtp/reply'
@@ -187,9 +188,9 @@ module Sisimai::Lhost
             break
           end
 
-          e["command"]   = thecommand if e["command"].empty?
-          e["command"]   = Sisimai::SMTP::Command.find(e['diagnosis']) if e["command"].empty?
-          e["command"]   = "EHLO" if e["command"].empty? && esmtpreply.size > 0
+          e["command"] = thecommand if e["command"].empty?
+          e["command"] = Sisimai::SMTP::Command.find(e['diagnosis']) if e["command"].empty?
+          e["command"] = Sisimai::Eb::CeEHLO if e["command"].empty? && esmtpreply.size > 0
 
           while true
             # Check alternative status code and override it

data/lib/sisimai/lhost/trendmicro.rb

@@ -4,6 +4,7 @@ module Sisimai::Lhost
   # Methods in the module are called from only Sisimai::Message.
   module TrendMicro
     class << self
+      require 'sisimai/eb'
       require 'sisimai/lhost'
       Boundaries = ['Content-Type: message/rfc822'].freeze
 
@@ -73,7 +74,7 @@ module Sisimai::Lhost
         return nil if recipients == 0
 
         dscontents.each do |e|
-          e['reason'] = 'userunknown' if e['diagnosis'].include?('Unable to deliver')
+          e['reason'] = Sisimai::Eb::ReUSER if e['diagnosis'].include?('Unable to deliver')
         end
         return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end

data/lib/sisimai/lhost/v5sendmail.rb

@@ -41,6 +41,7 @@ module Sisimai::Lhost
         emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
         return nil if emailparts[1].size == 0
 
+        require 'sisimai/eb'
         require 'sisimai/rfc1123'
         require 'sisimai/smtp/command'
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = nil
@@ -84,7 +85,7 @@ module Sisimai::Lhost
               next
             end
 
-            if cv == v["recipient"] || (curcommand == "MAIL" && e.start_with?("<<< "))
+            if cv == v["recipient"] || (curcommand == Sisimai::Eb::CeMAIL && e.start_with?("<<< "))
               # The recipient address is the same address with the last appeared address
               # like "550 <mikeneko@example.co.jp>... User unknown"
               # Append this line to the string which is keeping error messages

data/lib/sisimai/lhost/verizon.rb

@@ -3,6 +3,7 @@ module Sisimai::Lhost
   # Methods in the module are called from only Sisimai::Message.
   module Verizon
     class << self
+      require 'sisimai/eb'
       require 'sisimai/lhost'
       Indicators = Sisimai::Lhost.INDICATORS
 
@@ -37,7 +38,7 @@ module Sisimai::Lhost
           markingsof = {message: ['Error: ']}
           messagesof = {
             # The attempted recipient address does not exist.
-            'userunknown' => ['550 - Requested action not taken: no such user here'],
+            Sisimai::Eb::ReUSER => ['550 - Requested action not taken: no such user here'],
           }
           boundaries = [Sisimai::RFC2045.boundary(mhead['content-type'], 1)]
           emailparts = Sisimai::RFC5322.part(mbody, boundaries)
@@ -85,7 +86,7 @@ module Sisimai::Lhost
         else
           # vzwpix.com
           startingof = {message: ['Message could not be delivered to mobile']}
-          messagesof = {'userunknown' => ['No valid recipients for this MM']}
+          messagesof = {Sisimai::Eb::ReUSER => ['No valid recipients for this MM']}
           boundaries = [Sisimai::RFC2045.boundary(mhead['content-type'], 1)]
           emailparts = Sisimai::RFC5322.part(mbody, boundaries)
           bodyslices = emailparts[0].split("\n")

data/lib/sisimai/reason/authfailure.rb

@@ -1,6 +1,6 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::AuthFailure checks the bounce reason is "authfailure" or not. This class is
+    # Sisimai::Reason::AuthFailure checks the bounce reason is "AuthFailure" or not. This class is
     # called only Sisimai::Reason class.
     #
     # This is the error that an authenticaion failure related to SPF, DKIM, or DMARC was detected
@@ -12,6 +12,7 @@ module Sisimai
     # Diagnostic-Code: smtp; 550 5.7.1 Email rejected per DMARC policy for example.org
     module AuthFailure
       class << self
+        require 'sisimai/eb'
         Index = [
           "//spf.pobox.com",
           "5322.From address doesn't meet the authentication requirements",
@@ -27,7 +28,7 @@ module Sisimai
           ["is not allowed to send ", " spf "],
         ].freeze
 
-        def text; return 'authfailure'; end
+        def text; return Sisimai::Eb::ReAUTH; end
         def description; return 'Email rejected due to SPF, DKIM, DMARC failure'; end
 
         # Try to match that the given text and regular expressions
@@ -40,14 +41,14 @@ module Sisimai
           return false
         end
 
-        # The bounce reason is "authfailure" or not
+        # The bounce reason is "AuthFailure" or not
         # @param    [Sisimai::Fact] argvs Object to be detected the reason
         # @return   [Boolean]             true: is AuthFailure, false: is not AuthFailure
         # @see      http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
           return false if argvs['deliverystatus'].empty?
-          return true  if argvs['reason'] == 'authfailure'
-          return true  if Sisimai::SMTP::Status.name(argvs['deliverystatus']) == 'authfailure'
+          return true  if argvs['reason'] == Sisimai::Eb::ReAUTH
+          return true  if Sisimai::SMTP::Status.name(argvs['deliverystatus']) == Sisimai::Eb::ReAUTH
           return match(argvs['diagnosticcode'].downcase)
         end
 

data/lib/sisimai/reason/badreputation.rb

@@ -1,6 +1,6 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::BadReputation checks the bounce reason is "badreputation" or not. This class
+    # Sisimai::Reason::BadReputation checks the bounce reason is "BadReputation" or not. This class
     # is called only Sisimai::Reason class.
     #
     # This is the error that an email rejected due to a reputation score of the sender IP address.
@@ -14,6 +14,7 @@ module Sisimai
     #                    visit https://support.google.com/mail/answer/188131 for more information.
     module BadReputation
       class << self
+        require 'sisimai/eb'
         Index = [
           "has been temporarily rate limited due to ip reputation",
           "ip/domain reputation problems",
@@ -23,7 +24,7 @@ module Sisimai
           "sending mta's poor reputation",
           "temporarily deferred due to unexpected volume or user complaints", # Yahoo Inc.
         ].freeze
-        def text; return 'badreputation'; end
+        def text; return Sisimai::Eb::ReFAMA; end
         def description; return 'Email rejected due to an IP address reputation'; end
 
         # Try to match that the given text and regular expressions
@@ -35,12 +36,12 @@ module Sisimai
           return false
         end
 
-        # The bounce reason is "badreputation" or not
+        # The bounce reason is "BadReputation" or not
         # @param    [Sisimai::Fact] argvs Object to be detected the reason
         # @return   [Boolean]             true: is BadReputation, false: is not BadReputation
         # @see      http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return true if argvs['reason'] == 'badreputation'
+          return true if argvs['reason'] == Sisimai::Eb::ReFAMA
           return match(argvs['diagnosticcode'].downcase)
         end
 

data/lib/sisimai/reason/blocked.rb

@@ -1,12 +1,13 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::Blocked checks the bounce reason is "blocked" or not. This class is called
+    # Sisimai::Reason::Blocked checks the bounce reason is "Blocked" or not. This class is called
     # only Sisimai::Reason class.
     #
     # This is the error that SMTP connection was rejected due to a client IP address or a hostname,
     # or the parameter of "HELO/EHLO" command. This reason has added in Sisimai 4.0.0.
     module Blocked
       class << self
+        require 'sisimai/eb'
         Index = [
           "bad sender ip address",
           "banned sending ip", # Office365
@@ -70,7 +71,7 @@ module Sisimai
           ["your sender's ip address is listed at ", ".abuseat.org"],
         ].freeze
 
-        def text; return 'blocked'; end
+        def text; return Sisimai::Eb::ReBLOC; end
         def description; return 'Email rejected due to client IP address or a hostname'; end
 
         # Try to match that the given text and regular expressions
@@ -85,11 +86,11 @@ module Sisimai
 
         # Blocked due to client IP address or hostname
         # @param    [Hash] argvs  Hash to be detected the value of reason
-        # @return   [Boolean]     true: is blocked, false: is not blocked by the client
+        # @return   [Boolean]     true: is Blocked, false: is not Blocked by the client
         # @see      http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return true if argvs['reason'] == 'blocked'
-          return true if Sisimai::SMTP::Status.name(argvs['deliverystatus']) == 'blocked'
+          return true if argvs['reason'] == Sisimai::Eb::ReBLOC
+          return true if Sisimai::SMTP::Status.name(argvs['deliverystatus']) == Sisimai::Eb::ReBLOC
           return match(argvs['diagnosticcode'].downcase)
         end
 

data/lib/sisimai/reason/contenterror.rb

@@ -1,13 +1,14 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::ContentError checks the bounce reason is "contenterror" or not This class is
+    # Sisimai::Reason::ContentError checks the bounce reason is "ContentError" or not This class is
     # called only Sisimai::Reason class.
     #
     # This is the error that a destination mail server has rejected email due to header format of the
-    # email like the following. Sisimai will set "contenterror" to the reason of email bounce if the
+    # email like the following. Sisimai will set "ContentError" to the reason of email bounce if the
     # value of Status: field in a bounce email is "5.6.*".
     module ContentError
       class << self
+        require 'sisimai/eb'
         Index = [
           "charset not supported",
           "executable files are not allowed in compressed files",
@@ -27,7 +28,7 @@ module Sisimai
           "we do not accept messages containing images or other attachments",
         ].freeze
 
-        def text; return 'contenterror'; end
+        def text; return Sisimai::Eb::ReBODY; end
         def description; return 'Email rejected due to a header format of the email'; end
 
         # Try to match that the given text and regular expressions
@@ -46,9 +47,9 @@ module Sisimai
         # @see      http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
           require 'sisimai/reason/spamdetected'
-          return true  if argvs["reason"] == "blocked"
+          return true  if argvs["reason"] == Sisimai::Eb::ReBLOC
           return false if Sisimai::Reason::SpamDetected.true(argvs)
-          return true  if Sisimai::SMTP::Status.name(argvs["deliverystatus"]) == "contenterror"
+          return true  if Sisimai::SMTP::Status.name(argvs["deliverystatus"]) == Sisimai::Eb::ReBODY
           return match(argvs["diagnosticcode"].downcase)
         end