sisimai 5.7.0-java → 5.7.2-java

data/lib/sisimai/reason/ratelimited.rb

@@ -1,6 +1,6 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::RateLimited checks the bounce reason is "ratelimited" or not. This class is
+    # Sisimai::Reason::RateLimited checks the bounce reason is "RateLimited" or not. This class is
     # called only Sisimai::Reason class.
     #
     # This is the error that SMTP connection was rejected temporarily due to too many recipients or
@@ -10,6 +10,7 @@ module Sisimai
     #     452 4.3.2 Connection rate limit exceeded. (in reply to MAIL FROM command)
     module RateLimited
       class << self
+        require 'sisimai/eb'
         Index = [
           "has exceeded the max emails per hour ",
           "please try again slower",
@@ -29,7 +30,7 @@ module Sisimai
           ["too many con", "s"],
         ].freeze
 
-        def text; return 'ratelimited'; end
+        def text; return Sisimai::Eb::ReRATE; end
         def description; return 'SMTP connection rejected temporarily due to too many concurrency connections to the remote host'; end
 
         # Try to match that the given text and regular expressions
@@ -48,8 +49,8 @@ module Sisimai
         #                                   false: is not rate limited
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return true if argvs['reason'] == 'ratelimited'
-          return true if Sisimai::SMTP::Status.name(argvs['deliverystatus']) == 'ratelimited'
+          return true if argvs['reason'] == Sisimai::Eb::ReRATE
+          return true if Sisimai::SMTP::Status.name(argvs['deliverystatus']) == Sisimai::Eb::ReRATE
           return match(argvs['diagnosticcode'].downcase)
         end
 

data/lib/sisimai/reason/rejected.rb

@@ -1,10 +1,10 @@
 module Sisimai
   module Reason
-    # Sisimai::Reason::Rejected checks the bounce reason is "rejected" or not. This class is called
+    # Sisimai::Reason::Rejected checks the bounce reason is "Rejected" or not. This class is called
     # only Sisimai::Reason class.
     #
     # This is the error that a connection to destination server was rejected by a sender's email
-    # address (envelope from). Sisimai set "rejected" to the reason of email bounce if the value of
+    # address (envelope from). Sisimai set "Rejected" to the reason of email bounce if the value of
     # Status: field in a bounce email is "5.1.8" or the connection has been rejected due to the
     # argument of SMTP MAIL command.
     #
@@ -13,6 +13,7 @@ module Sisimai
     #   Remote host said: 550 5.7.1 <root@nijo.example.jp>... Access denied
     module Rejected
       class << self
+        require 'sisimai/eb'
         IsNot = [
           "5.1.0 address rejected",
           "ip address ",
@@ -69,7 +70,7 @@ module Sisimai
           ["sender is", " list"],
         ].freeze
 
-        def text; return 'rejected'; end
+        def text; return Sisimai::Eb::ReFROM; end
         def description; return "Email rejected due to a sender's email address (envelope from)"; end
 
         # Try to match that the given text and regular expressions
@@ -89,28 +90,31 @@ module Sisimai
         #                                   false: is not rejected by the sender
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return true if argvs['reason'] == 'rejected'
+          return true if argvs['reason'] == Sisimai::Eb::ReFROM
           tempreason = Sisimai::SMTP::Status.name(argvs['deliverystatus'])
-          return true if tempreason == 'rejected' # Delivery status code points "rejected".
+          return true if tempreason == Sisimai::Eb::ReFROM # Delivery status code points "Rejected".
 
           # Check the value of Diagnosic-Code: header with patterns
           issuedcode = argvs['diagnosticcode'].downcase
           thecommand = argvs['command'] || ''
-          if thecommand == 'MAIL'
+          if thecommand == Sisimai::Eb::CeMAIL
             # The session was rejected at 'MAIL FROM' command
             return true if match(issuedcode)
 
-          elsif thecommand == 'DATA'
+          elsif thecommand == Sisimai::Eb::CeDATA
             # The session was rejected at 'DATA' command
-            if tempreason != 'userunknown'
-              # Except "userunknown"
+            if tempreason != Sisimai::Eb::ReUSER
+              # Except "UserUnknown"
               return true if match(issuedcode)
             end
-          elsif %w[onhold undefined securityerror systemerror].include?(tempreason) || tempreason == ""
-            # Try to match with message patterns when the temporary reason is "onhold", "undefined",
-            # "securityerror", or "systemerror"
-            return true if match(issuedcode)
-          end
+          else
+            tryto = [Sisimai::Eb::Re___1, Sisimai::Eb::Re___0, Sisimai::Eb::ReSAFE, Sisimai::Eb::RePROC]
+            if tryto.include?(tempreason) || tempreason == ""
+              # Try to match with message patterns when the temporary reason is "OnHold", "Undefined",
+              # "SecurityError", or "SystemError"
+              return true if match(issuedcode)
+            end
+          end 
           return false
         end
 

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