sisimai 5.2.1-java → 5.4.0-java

data/lib/sisimai/reason/mailboxfull.rb

@@ -64,27 +64,26 @@ module Sisimai
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
-        # @return   [True,False]    false: Did not match
-        #                           true: Matched
+        # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return nil unless argv1
-          return true if Index.any? { |a| argv1.include?(a) }
+          return false unless argv1
+          return true  if Index.any? { |a| argv1.include?(a) }
           return false
         end
 
         # The envelope recipient's mailbox is full or not
         # @param    [Sisimai::Fact] argvs   Object to be detected the reason
-        # @return   [True,False]            true: is mailbox full
+        # @return   [Boolean]               true:  is mailbox full
         #                                   false: is not mailbox full
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return nil  if argvs['deliverystatus'].empty?
-          return true if argvs['reason'] == 'mailboxfull'
+          return false if argvs['deliverystatus'].empty?
+          return true  if argvs['reason'] == 'mailboxfull'
 
           # Delivery status code points "mailboxfull".
           # Status: 4.2.2
           # Diagnostic-Code: SMTP; 450 4.2.2 <***@example.jp>... Mailbox Full
-          return true if Sisimai::SMTP::Status.name(argvs['deliverystatus']).to_s == 'mailboxfull'
+          return true if Sisimai::SMTP::Status.name(argvs['deliverystatus']) == 'mailboxfull'
           return match(argvs['diagnosticcode'].downcase)
         end
 

data/lib/sisimai/reason/mailererror.rb

@@ -28,22 +28,19 @@ module Sisimai
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
-        # @return   [True,False]    false: Did not match
-        #                           true: Matched
+        # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return nil unless argv1
-          return true if Index.any? { |a| argv1.include?(a) }
+          return false unless argv1
+          return true  if Index.any? { |a| argv1.include?(a) }
           return false
         end
 
         # The bounce reason is mailer error or not
         # @param    [Sisimai::Fact] argvs   Object to be detected the reason
-        # @return   [True,False]            true: is mailer error
+        # @return   [Boolean]               true:  is mailer error
         #                                   false: is not mailer error
         # @see http://www.ietf.org/rfc/rfc2822.txt
-        def true(_argvs)
-          return nil
-        end
+        def true(_argvs); return false; end
 
       end
     end

data/lib/sisimai/reason/mesgtoobig.rb

@@ -27,24 +27,23 @@ module Sisimai
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
-        # @return   [True,False]    false: Did not match
-        #                           true: Matched
+        # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return nil unless argv1
-          return true if Index.any? { |a| argv1.include?(a) }
+          return false unless argv1
+          return true  if Index.any? { |a| argv1.include?(a) }
           return false
         end
 
         # The message size is too big for the remote host
         # @param    [Sisimai::Fact] argvs   Object to be detected the reason
-        # @return   [True,False]            true: is too big message size
+        # @return   [Boolean]               true:  is too big message size
         #                                   false: is not big
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
           return true if argvs['reason'] == 'mesgtoobig'
 
           statuscode = argvs['deliverystatus'] || ''
-          tempreason = Sisimai::SMTP::Status.name(statuscode) || ''
+          tempreason = Sisimai::SMTP::Status.name(statuscode)
 
           # Delivery status code points "mesgtoobig".
           # Status: 5.3.4

data/lib/sisimai/reason/networkerror.rb

@@ -34,22 +34,19 @@ module Sisimai
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
-        # @return   [True,False]    false: Did not match
-        #                           true: Matched
+        # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return nil unless argv1
-          return true if Index.any? { |a| argv1.include?(a) }
+          return false unless argv1
+          return true  if Index.any? { |a| argv1.include?(a) }
           return false
         end
 
         # The bounce reason is network error or not
         # @param    [Sisimai::Fact] argvs   Object to be detected the reason
-        # @return   [True,False]            true: is network error
+        # @return   [Boolean]               true:  is network error
         #                                   false: is not network error
         # @see http://www.ietf.org/rfc/rfc2822.txt
-        def true(_argvs)
-          return nil
-        end
+        def true(_argvs); return false; end
 
       end
     end

data/lib/sisimai/reason/norelaying.rb

@@ -37,17 +37,16 @@ module Sisimai
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
-        # @return   [True,False]    false: Did not match
-        #                           true: Matched
+        # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return nil unless argv1
-          return true if Index.any? { |a| argv1.include?(a) }
+          return false unless argv1
+          return true  if Index.any? { |a| argv1.include?(a) }
           return false
         end
 
         # Whether the message is rejected by 'Relaying denied'
         # @param    [Sisimai::Fact] argvs   Object to be detected the reason
-        # @return   [True,False]            true: Rejected for "relaying denied"
+        # @return   [Boolean]               true:  Rejected for "relaying denied"
         #                                   false: is not
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)

data/lib/sisimai/reason/notaccept.rb

@@ -26,11 +26,10 @@ module Sisimai
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
-        # @return   [True,False]    false: Did not match
-        #                           true: Matched
+        # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return nil unless argv1
-          return true if Index.any? { |a| argv1.include?(a) }
+          return false unless argv1
+          return true  if Index.any? { |a| argv1.include?(a) }
           return false
         end
 
@@ -40,10 +39,8 @@ module Sisimai
         #                                   false: Accept
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return true if argvs['reason'] == 'notaccept'
-
-          # SMTP Reply Code is 554 or 556
-          return true  if [521, 554, 556].index(argvs['replycode'].to_i)
+          return true  if argvs['reason'] == 'notaccept'
+          return true  if [521, 556].index(argvs['replycode'].to_i) # SMTP Reply Code is 554 or 556
           return false if argvs['command'] != 'MAIL'
           return match(argvs['diagnosticcode'].downcase)
         end

data/lib/sisimai/reason/notcompliantrfc.rb

@@ -23,18 +23,17 @@ module Sisimai
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
-        # @return   [True,False]    false: Did not match
-        #                           true: Matched
+        # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return nil unless argv1
-          return true if Index.any? { |a| argv1.include?(a) }
-          return true if Pairs.any? { |a| Sisimai::String.aligned(argv1, a) }
+          return false unless argv1
+          return true  if Index.any? { |a| argv1.include?(a) }
+          return true  if Pairs.any? { |a| Sisimai::String.aligned(argv1, a) }
           return false
         end
 
         # Whether the email is RFC compliant or not
         # @param    [Sisimai::Fact] argvs   Object to be detected the reason
-        # @return   [True,False]            true: RFC comliant
+        # @return   [Boolean]               true:   RFC comliant
         #                                   false: Is not RFC compliant
         # @see http://www.ietf.org/rfc/rfc5322.txt
         def true(argvs)

data/lib/sisimai/reason/onhold.rb

@@ -10,21 +10,18 @@ module Sisimai
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
-        # @return   [True,False]    false: Did not match
-        #                           true: Matched
-        def match(_argv1)
-          return false
-        end
+        # @return   [Boolean]       false: Did not match, true: Matched
+        def match(_argv1); return false; end
 
         # On hold, Could not decide the bounce reason...
         # @param    [Sisimai::Fact] argvs   Object to be detected the reason
-        # @return   [True,False]            true: Status code is "onhold"
+        # @return   [Boolean]               true:  Status code is "onhold"
         #                                   false: is not "onhold"
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return nil  if argvs['deliverystatus'].empty?
-          return true if argvs['reason'] == 'onhold'
-          return true if Sisimai::SMTP::Status.name(argvs['deliverystatus']).to_s == 'onhold'
+          return false if argvs['deliverystatus'].empty?
+          return true  if argvs['reason'] == 'onhold'
+          return true  if Sisimai::SMTP::Status.name(argvs['deliverystatus']) == 'onhold'
           return false
         end
       end

data/lib/sisimai/reason/policyviolation.rb

@@ -50,25 +50,22 @@ module Sisimai
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
-        # @return   [True,False]    false: Did not match
-        #                           true: Matched
+        # @return   [Boolean]       false: Did not match, true: Matched
         # @since 4.22.0
         def match(argv1)
-          return nil unless argv1
-          return true if Index.any? { |a| argv1.include?(a) }
-          return true if Pairs.any? { |a| Sisimai::String.aligned(argv1, a) }
+          return false unless argv1
+          return true  if Index.any? { |a| argv1.include?(a) }
+          return true  if Pairs.any? { |a| Sisimai::String.aligned(argv1, a) }
           return false
         end
 
         # The bounce reason is "policyviolation" or not
         # @param    [Sisimai::Fact] argvs   Object to be detected the reason
-        # @return   [True,False]            true: is policy violation
+        # @return   [Boolean]               true:  is policy violation
         #                                   false: is not policy violation
         # @since 4.22.0
         # @see http://www.ietf.org/rfc/rfc2822.txt
-        def true(_argvs)
-          return nil
-        end
+        def true(_argvs); return false; end
 
       end
     end

data/lib/sisimai/reason/rejected.rb

@@ -81,10 +81,9 @@ module Sisimai
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
-        # @return   [True,False]    false: Did not match
-        #                           true: Matched
+        # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return nil unless argv1
+          return false unless argv1
           return false if IsNot.any? { |a| argv1.include?(a) }
           return true  if Index.any? { |a| argv1.include?(a) }
           return false
@@ -92,12 +91,12 @@ module Sisimai
 
         # Rejected by the envelope sender address or not
         # @param    [Sisimai::Fact] argvs   Object to be detected the reason
-        # @return   [True,False]            true: is rejected
+        # @return   [Boolean]               true:  is rejected
         #                                   false: is not rejected by the sender
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
           return true if argvs['reason'] == 'rejected'
-          tempreason = Sisimai::SMTP::Status.name(argvs['deliverystatus']) || 'undefined'
+          tempreason = Sisimai::SMTP::Status.name(argvs['deliverystatus'])
           return true if tempreason == 'rejected' # Delivery status code points "rejected".
 
           # Check the value of Diagnosic-Code: header with patterns
@@ -113,7 +112,7 @@ module Sisimai
               # Except "userunknown"
               return true if match(issuedcode)
             end
-          elsif %w[onhold undefined securityerror systemerror].include?(tempreason)
+          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)

data/lib/sisimai/reason/requireptr.rb

@@ -42,23 +42,22 @@ module Sisimai
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
-        # @return   [True,False]    false: Did not match
-        #                           true: Matched
+        # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return nil unless argv1
-          return true if Index.any? { |a| argv1.include?(a) }
-          return true if Pairs.any? { |a| Sisimai::String.aligned(argv1, a) }
+          return false unless argv1
+          return true  if Index.any? { |a| argv1.include?(a) }
+          return true  if Pairs.any? { |a| Sisimai::String.aligned(argv1, a) }
           return false
         end
 
         # Check the email rejected due to missing PTR record or having invalid PTR record OR not
         # @param    [Hash] argvs  Hash to be detected the value of reason
-        # @return   [true,false]  true: is missing PTR or invalid PTR
+        # @return   [Boolean]     true:  is missing PTR or invalid PTR
         #                         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']).to_s == 'requireptr'
+          return true if Sisimai::SMTP::Status.name(argvs['deliverystatus']) == 'requireptr'
           return match(argvs['diagnosticcode'].downcase)
         end
 

data/lib/sisimai/reason/securityerror.rb

@@ -46,23 +46,20 @@ module Sisimai
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
-        # @return   [True,False]    false: Did not match
-        #                           true: Matched
+        # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return nil unless argv1
-          return true if Index.any? { |a| argv1.include?(a) }
-          return true if Pairs.any? { |a| Sisimai::String.aligned(argv1, a) }
+          return false unless argv1
+          return true  if Index.any? { |a| argv1.include?(a) }
+          return true  if Pairs.any? { |a| Sisimai::String.aligned(argv1, a) }
           return false
         end
 
         # The bounce reason is SecurityError or not
         # @param    [Sisimai::Fact] argvs   Object to be detected the reason
-        # @return   [True,False]            true: is security error
+        # @return   [Boolean]               true:  is security error
         #                                   false: is not security error
         # @see http://www.ietf.org/rfc/rfc2822.txt
-        def true(_argvs)
-          return nil
-        end
+        def true(_argvs); return false; end
 
       end
     end

data/lib/sisimai/reason/spamdetected.rb

@@ -120,24 +120,23 @@ module Sisimai
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
-        # @return   [True,False]    false: Did not match
-        #                           true: Matched
+        # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return nil unless argv1
-          return true if Index.any? { |a| argv1.include?(a) }
-          return true if Pairs.any? { |a| Sisimai::String.aligned(argv1, a) }
+          return false unless argv1
+          return true  if Index.any? { |a| argv1.include?(a) }
+          return true  if Pairs.any? { |a| Sisimai::String.aligned(argv1, a) }
           return false
         end
 
         # Rejected due to spam content in the message
         # @param    [Sisimai::Fact] argvs   Object to be detected the reason
-        # @return   [True,False]            true: rejected due to spam
+        # @return   [Boolean]               true: rejected due to spam
         #                                   false: is not rejected due to spam
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return nil  if argvs['deliverystatus'].empty?
-          return true if argvs['reason'] == 'spamdetected'
-          return true if Sisimai::SMTP::Status.name(argvs['deliverystatus']).to_s == 'spamdetected'
+          return false if argvs['deliverystatus'].empty?
+          return true  if argvs['reason'] == 'spamdetected'
+          return true  if Sisimai::SMTP::Status.name(argvs['deliverystatus']) == 'spamdetected'
 
           # 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

data/lib/sisimai/reason/speeding.rb

@@ -16,22 +16,21 @@ module Sisimai
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
-        # @return   [True,False]    false: Did not match
-        #                           true: Matched
+        # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return nil unless argv1
-          return true if Index.any? { |a| argv1.include?(a) }
+          return false unless argv1
+          return true  if Index.any? { |a| argv1.include?(a) }
           return false
         end
 
         # Speeding or not
         # @param    [Sisimai::Fact] argvs Object to be detected the reason
-        # @return   [True,False]          true: is speeding
+        # @return   [Boolean]             true:  is speeding
         #                                 false: is not speeding
         # @see      http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return nil  if argvs['deliverystatus'].empty?
-          return true if argvs['reason'] == 'speeding'
+          return false if argvs['deliverystatus'].empty?
+          return true  if argvs['reason'] == 'speeding'
 
           # Action: failed
           # Status: 4.7.1

data/lib/sisimai/reason/suppressed.rb

@@ -12,16 +12,12 @@ module Sisimai
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
-        # @return   [True,False]    false: Did not match
-        #                           true: Matched
-        def match(argv1)
-          return nil unless argv1
-          return false
-        end
+        # @return   [Boolean]       false: Did not match, true: Matched
+        def match(argv1); return false; end
 
         # Whether the address is listed in the suppression list
         # @param    [Sisimai::Fact] argvs   Object to be detected the reason
-        # @return   [True,False]            true: The address is listed in the suppression list
+        # @return   [Boolean]               true:  The address is listed in the suppression list
         #                                   false: is not listed in the suppression list
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)

data/lib/sisimai/reason/suspend.rb

@@ -36,22 +36,20 @@ module Sisimai
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
-        # @return   [True,False]    false: Did not match
-        #                           true: Matched
+        # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return nil unless argv1
-          return true if Index.any? { |a| argv1.include?(a) }
+          return false unless argv1
+          return true  if Index.any? { |a| argv1.include?(a) }
           return false
         end
 
         # The envelope recipient's mailbox is suspended or not
         # @param    [Sisimai::Fact] argvs   Object to be detected the reason
-        # @return   [True,False]            true: is mailbox suspended
+        # @return   [Boolean]               true:  is mailbox suspended
         #                                   false: is not suspended
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return true if argvs['reason'] == 'suspend'
-          return true if argvs['replycode'].to_i == 525
+          return true if argvs['reason'] == 'suspend' || argvs['replycode'].to_i == 525
           return match(argvs['diagnosticcode'].downcase)
         end
 

data/lib/sisimai/reason/syntaxerror.rb

@@ -14,12 +14,11 @@ module Sisimai
       class << self
         def text; return 'syntaxerror'; end
         def description; return 'Email rejected due to syntax error at sent commands in SMTP session'; end
-        def match(*); return nil; end
+        def match(*); return false; end
 
         # Connection rejected due to syntax error or not
         # @param    [Sisimai::Fact] argvs   Object to be detected the reason
-        # @return   [True,False]            true: Connection rejected due to
-        #                                         syntax error
+        # @return   [Boolean]               true:  Connection rejected due to syntax error
         #                                   false: is not syntax error
         # @since 4.1.25
         # @see http://www.ietf.org/rfc/rfc2822.txt
@@ -27,8 +26,7 @@ module Sisimai
           return true if argvs['reason'] == 'syntaxerror'
 
           reply = argvs['replycode'].to_i
-          return true if reply > 400 && reply < 408
-          return true if reply > 500 && reply < 508
+          return true if reply > 400 && reply < 408 || reply > 500 && reply < 508
           return false
         end
 

data/lib/sisimai/reason/systemerror.rb

@@ -43,23 +43,20 @@ module Sisimai
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
-        # @return   [True,False]    false: Did not match
-        #                           true: Matched
+        # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return nil unless argv1
-          return true if Index.any? { |a| argv1.include?(a) }
-          return true if Pairs.any? { |a| Sisimai::String.aligned(argv1, a) }
+          return false unless argv1
+          return true  if Index.any? { |a| argv1.include?(a) }
+          return true  if Pairs.any? { |a| Sisimai::String.aligned(argv1, a) }
           return false
         end
 
         # The bounce reason is system error or not
         # @param    [Sisimai::Fact] argvs   Object to be detected the reason
-        # @return   [True,False]            true: is system error
+        # @return   [Boolean]               true:  is system error
         #                                   false: is not system error
         # @see http://www.ietf.org/rfc/rfc2822.txt
-        def true(_argvs)
-          return nil
-        end
+        def true(_argvs); return false; end
 
       end
     end

data/lib/sisimai/reason/systemfull.rb

@@ -18,22 +18,19 @@ module Sisimai
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
-        # @return   [True,False]    false: Did not match
-        #                           true: Matched
+        # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return nil unless argv1
-          return true if Index.any? { |a| argv1.include?(a) }
+          return false unless argv1
+          return true  if Index.any? { |a| argv1.include?(a) }
           return false
         end
 
         # The bounce reason is system full or not
         # @param    [Sisimai::Fact] argvs   Object to be detected the reason
-        # @return   [True,False]            true: is system full
+        # @return   [Boolean]               true:  is system full
         #                                   false: is not system full
         # @see http://www.ietf.org/rfc/rfc2822.txt
-        def true(_argvs)
-          return nil
-        end
+        def true(_argvs); return false; end
 
       end
     end

data/lib/sisimai/reason/toomanyconn.rb

@@ -32,22 +32,21 @@ module Sisimai
 
         # Try to match that the given text and regular expressions
         # @param    [String] argv1  String to be matched with regular expressions
-        # @return   [True,False]    false: Did not match
-        #                           true: Matched
+        # @return   [Boolean]       false: Did not match, true: Matched
         def match(argv1)
-          return nil unless argv1
-          return true if Index.any? { |a| argv1.include?(a) }
+          return false unless argv1
+          return true  if Index.any? { |a| argv1.include?(a) }
           return false
         end
 
         # Rejected by domain or address filter ?
         # @param    [Sisimai::Fact] argvs   Object to be detected the reason
-        # @return   [True,False]            true: is filtered
+        # @return   [Boolean]               true:  is filtered
         #                                   false: is not filtered
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
           return true if argvs['reason'] == 'toomanyconn'
-          return true if Sisimai::SMTP::Status.name(argvs['deliverystatus']).to_s == 'toomanyconn'
+          return true if Sisimai::SMTP::Status.name(argvs['deliverystatus']) == 'toomanyconn'
           return match(argvs['diagnosticcode'].downcase)
         end
 

data/lib/sisimai/reason/undefined.rb

@@ -6,8 +6,8 @@ module Sisimai
       class << self
         def text; return 'undefined'; end
         def description; return 'Sisimai could not detect an error reason'; end
-        def match;   return nil; end
-        def true(*); return nil; end
+        def match;   return false; end
+        def true(*); return false; end
       end
     end
   end