sisimai 5.3.0 → 5.4.0

data/lib/sisimai/message.rb

@@ -37,7 +37,7 @@ module Sisimai
       def rise(**argvs)
         return nil unless argvs
         email = argvs[:data].scrub('?').gsub("\r\n", "\n")
-        thing = { 'from' => '','header' => {}, 'rfc822' => '', 'ds' => [], 'catch' => nil }
+        thing = {'from' => '','header' => {}, 'rfc822' => '', 'ds' => [], 'catch' => nil}
         param = {}
 
         aftersplit = nil
@@ -98,8 +98,6 @@ module Sisimai
         return thing
       end
 
-      def load(argvs); ' ***warning: Sisimai::Message.load will be removed at v5.3.0'; return []; end
-
       # Divide email data up headers and a body part.
       # @param         [String] email  Email data
       # @return        [Array]         Email data after split
@@ -121,7 +119,7 @@ module Sisimai
           # Set pseudo UNIX From line
           parts[0] = 'MAILER-DAEMON Tue Feb 11 00:00:00 2014'
         end
-        parts[1] << "\n" unless parts[1].end_with?("\n")
+        parts[1] += "\n" unless parts[1].end_with?("\n")
 
         %w[image/ application/ text/html].each do |e|
           # https://github.com/sisimai/p5-sisimai/issues/492, Reduce email size
@@ -130,12 +128,12 @@ module Sisimai
           ep = e == 'text/html' ? '</html>' : "--\n"
           while true
             # Remove each part from "Content-Type: image/..." to "--\n" (the end of each boundary)
-            p0 = parts[2].index('Content-Type: ' + e, p0); break unless p0
+            p0 = parts[2].index("Content-Type: #{e}", p0); break unless p0
             p1 = parts[2].index(ep, p0 + 32);              break unless p1
             parts[2][p0, p1 - p0] = ''
           end
         end
-        parts[2] << "\n"
+        parts[2] += "\n"
         return parts
       end
 
@@ -150,11 +148,11 @@ module Sisimai
 
         # Select and convert all the headers in $argv0. The following regular expression is based on
         # https://gist.github.com/xtetsuji/b080e1f5551d17242f6415aba8a00239
-        headermaps = { 'subject' => '' }
+        headermaps = {'subject' => ''}
         receivedby = []
         argv0.scan(/^([\w-]+):[ ]*(.*?)\n(?!\s)/m) { |e| headermaps[e[0].downcase] = e[1] }
         headermaps.delete('received')
-        headermaps.each_key { |e| headermaps[e].gsub!(/\n\s+/, ' ') }
+        headermaps.each_key { |e| headermaps[e] = headermaps[e].gsub(/\n\s+/, ' ') }
 
         if argv0.include?('Received:')
           # Capture values of each Received: header
@@ -217,7 +215,7 @@ module Sisimai
           index += 1
           if fn == ''
             # There is neither ":" character nor the field listed in $FieldTable
-            email << e + "\n"
+            email += "#{e}\n"
             next
           end
 
@@ -295,10 +293,10 @@ module Sisimai
 
           # 4. Remove redundant space characters
           bf = bf.squeeze(' ').strip
-          email << sprintf("%s: %s\n", fn, bf)
+          email += sprintf("%s: %s\n", fn, bf)
         end
 
-        email << "\n" unless email.end_with?("\n\n")
+        email += "\n" unless email.end_with?("\n\n")
         return email
       end
 
@@ -363,10 +361,10 @@ module Sisimai
         if hookmethod.is_a? Proc
           # Call the hook method
           begin
-            p = { 'headers' => mailheader, 'message' => bodystring }
+            p = {'headers' => mailheader, 'message' => bodystring}
             havecaught = hookmethod.call(p)
           rescue StandardError => ce
-            warn ' ***warning: Something is wrong in hook method ":hook":' << ce.to_s
+            warn ' ***warning: Something is wrong in hook method ":hook":' + ce.to_s
           end
         end
 

data/lib/sisimai/reason/authfailure.rb

@@ -18,11 +18,13 @@ module Sisimai
           '//spf.pobox.com',
           'bad spf records for',
           'dmarc policy',
+          "doesn't meet the required authentication level",
           'please inspect your spf settings',
           'sender policy framework (spf) fail',
           'sender policy framework violation',
           'spf (sender policy framework) domain authentication fail',
           'spf check: fail',
+          "the 5322.From address doesn't meet the authentication requirements defined for the sender",
         ].freeze
         Pairs = [
           [' is not allowed to send mail.', '_401'],
@@ -34,24 +36,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
 
         # The bounce reason is "authfailure" or not
         # @param    [Sisimai::Fact] argvs Object to be detected the reason
-        # @return   [True,False]          true:  is AuthFailure
-        #                                 false: is not AuthFailure
+        # @return   [Boolean]             true: is AuthFailure, false: is not AuthFailure
         # @see      http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return nil  if argvs['deliverystatus'].empty?
-          return true if argvs['reason'] == 'authfailure'
-          return true if Sisimai::SMTP::Status.name(argvs['deliverystatus']).to_s == 'authfailure'
+          return false if argvs['deliverystatus'].empty?
+          return true  if argvs['reason'] == 'authfailure'
+          return true  if Sisimai::SMTP::Status.name(argvs['deliverystatus']) == 'authfailure'
           return match(argvs['diagnosticcode'].downcase)
         end
 

data/lib/sisimai/reason/badreputation.rb

@@ -28,18 +28,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
 
         # The bounce reason is "badreputation" or not
         # @param    [Sisimai::Fact] argvs Object to be detected the reason
-        # @return   [True,False]          true:  is BadReputation
-        #                                 false: is not BadReputation
+        # @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'

data/lib/sisimai/reason/blocked.rb

@@ -100,23 +100,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 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
 
         # Blocked due to client IP address or hostname
         # @param    [Hash] argvs  Hash to be detected the value of reason
-        # @return   [true,false]  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']).to_s == 'blocked'
+          return true if Sisimai::SMTP::Status.name(argvs['deliverystatus']) == 'blocked'
           return match(argvs['diagnosticcode'].downcase)
         end
 

data/lib/sisimai/reason/contenterror.rb

@@ -25,24 +25,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
 
         # Rejected email due to header format of the email
         # @param    [Sisimai::Fact] argvs   Object to be detected the reason
-        # @return   [True,False]            true: rejected due to content error
+        # @return   [Boolean]               true:  rejected due to content error
         #                                   false: is not content error
         # @see      http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
           require 'sisimai/reason/spamdetected'
           return true  if argvs["reason"] == "blocked"
           return false if Sisimai::Reason::SpamDetected.true(argvs)
-          return true  if Sisimai::SMTP::Status.name(argvs["deliverystatus"]).to_s == "contenterror"
+          return true  if Sisimai::SMTP::Status.name(argvs["deliverystatus"]) == "contenterror"
           return match(argvs["diagnosticcode"].downcase)
         end
 

data/lib/sisimai/reason/delivered.rb

@@ -14,8 +14,8 @@ module Sisimai
       class << self
         def text; return 'delivered'; end
         def description; return 'Email delivered successfully'; end
-        def match;   return nil; end
-        def true(*); return nil; end
+        def match;   return false; end
+        def true(*); return false; end
       end
     end
   end

data/lib/sisimai/reason/exceedlimit.rb

@@ -17,27 +17,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
 
         # Exceed limit or not
         # @param    [Sisimai::Fact] argvs Object to be detected the reason
-        # @return   [True,False]          true: Exceeds the limit
+        # @return   [Boolean]             true:  Exceeds the limit
         #                                 false: Did not exceed the limit
         # @see      http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return nil  if argvs['deliverystatus'].empty?
-          return true if argvs['reason'] == 'exceedlimit'
+          return false if argvs['deliverystatus'].empty?
+          return true  if argvs['reason'] == 'exceedlimit'
 
           # Delivery status code points exceedlimit.
           # Status: 5.2.3
           # Diagnostic-Code: SMTP; 552 5.2.3 Message size exceeds fixed maximum message size
-          return true if Sisimai::SMTP::Status.name(argvs['deliverystatus']).to_s == 'exceedlimit'
+          return true if Sisimai::SMTP::Status.name(argvs['deliverystatus']) == 'exceedlimit'
           return match(argvs['diagnosticcode'].downcase)
         end
 

data/lib/sisimai/reason/expired.rb

@@ -40,21 +40,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
 
         # Delivery expired due to connection failure or network error
         # @param    [Sisimai::Fact] argvs   Object to be detected the reason
-        # @return   [True,False]            true: is expired
+        # @return   [Boolean]               true:  is expired
         #                                   false: is not expired
         # @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/failedstarttls.rb

@@ -15,22 +15,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
 
         # Email delivery failed due to STARTTLS related problem
         # @param    [Sisimai::Fact] argvs   Object to be detected the reason
-        # @return   [True,False]            true: FailedSTARTTLS
+        # @return   [Boolean]               true:  FailedSTARTTLS
         #                                   false: Not FailedSTARTTLS
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return true if argvs["reason"] == "failedstarttls"
-          return true if argvs["command"] == "STARTTLS"
+          return true if argvs["reason"] == "failedstarttls" || argvs["command"] == "STARTTLS"
           return true if [523, 524, 538].index(argvs["replycode"].to_i)
           return match(argvs["diagnosticcode"].downcase)
         end

data/lib/sisimai/reason/feedback.rb

@@ -6,8 +6,8 @@ module Sisimai
       class << self
         def text; return 'feedback'; end
         def description; return 'Email forwarded to the sender as a complaint message from your mailbox provider'; end
-        def match;   return nil; end
-        def true(*); return nil; end
+        def match;   return false; end
+        def true(*); return false; end
       end
     end
   end

data/lib/sisimai/reason/filtered.rb

@@ -33,39 +33,36 @@ 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 a sender domain or a sender address by a 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'] == 'filtered'
 
           require 'sisimai/reason/userunknown'
-          tempreason = Sisimai::SMTP::Status.name(argvs['deliverystatus']) || ''
+          tempreason = Sisimai::SMTP::Status.name(argvs['deliverystatus'])
           return false if tempreason == 'suspend'
 
           issuedcode = argvs['diagnosticcode'].downcase || ''
           thecommand = argvs['command']                 || ''
           if tempreason == 'filtered'
             # Delivery status code points "filtered".
-            return true if Sisimai::Reason::UserUnknown.match(issuedcode)
-            return true if match(issuedcode)
+            return true if Sisimai::Reason::UserUnknown.match(issuedcode) || match(issuedcode)
           else
             # The value of "reason" isn't "filtered" 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 %w[CONN EHLO HELO MAIL RCPT].include?(thecommand)
-            return true  if match(issuedcode)
-            return true  if Sisimai::Reason::UserUnknown.match(issuedcode)
+            return true  if match(issuedcode) || Sisimai::Reason::UserUnknown.match(issuedcode)
           end
           return false
         end

data/lib/sisimai/reason/hasmoved.rb

@@ -15,17 +15,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 address has moved or not
         # @param    [Sisimai::Fact] argvs   Object to be detected the reason
-        # @return   [True,False]            true: The address has moved
+        # @return   [Boolean]               true:  The address has moved
         #                                   false: Has not moved
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)

data/lib/sisimai/reason/hostunknown.rb

@@ -32,19 +32,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
+        # @return   [Boolean]       false: Did not match, true: Matched
         # @since v4.0.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
 
         # Whether the host is unknown or not
         # @param    [Sisimai::Fact] argvs   Object to be detected the reason
-        # @return   [True,False]            true: is unknown host
+        # @return   [Boolean]               true:  is unknown host
         #                                   false: is not unknown host.
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
@@ -53,7 +52,7 @@ module Sisimai
           issuedcode = argvs['diagnosticcode'].downcase || ''
           statuscode = argvs['deliverystatus'] || ''
 
-          if Sisimai::SMTP::Status.name(statuscode).to_s == 'hostunknown'
+          if Sisimai::SMTP::Status.name(statuscode) == 'hostunknown'
             # To prevent classifying DNS errors as "HostUnknown"
             require 'sisimai/reason/networkerror'
             return true unless Sisimai::Reason::NetworkError.match(issuedcode)

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, 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