sisimai 5.4.1 → 5.5.0

data/lib/sisimai/rhost/nttdocomo.rb

@@ -16,106 +16,86 @@ module Sisimai
         # @param    [Sisimai::Fact] argvs   Decoded email object
         # @return   [String]                The bounce reason for docomo.ne.jp
         def find(argvs)
-          return argvs['reason'] unless argvs['reason'].empty?
+          return argvs['reason'] if argvs['reason'].empty? == false
           statuscode = argvs['deliverystatus']          || ''
           thecommand = argvs['command']                 || ''
           esmtperror = argvs['diagnosticcode'].downcase || ''
-          reasontext = ''
 
           # Check the value of Status: field, an SMTP Reply Code, and the SMTP Command
-          if statuscode == '5.1.1' || statuscode == '5.0.911'
-            #    ----- Transcript of session follows -----
-            # ... while talking to mfsmax.docomo.ne.jp.:
-            # >>> RCPT To:<***@docomo.ne.jp>
-            # <<< 550 Unknown user ***@docomo.ne.jp
-            # 550 5.1.1 <***@docomo.ne.jp>... User unknown
-            # >>> DATA
-            # <<< 503 Bad sequence of commands
-            reasontext = 'userunknown'
-
-          elsif statuscode == '5.2.0'
-            #    ----- The following addresses had permanent fatal errors -----
-            # <***@docomo.ne.jp>
-            # (reason: 550 Unknown user ***@docomo.ne.jp)
-            # 
-            #    ----- Transcript of session follows -----
-            # ... while talking to mfsmax.docomo.ne.jp.:
-            # >>> DATA
-            # <<< 550 Unknown user ***@docomo.ne.jp
-            # 554 5.0.0 Service unavailable
-            # ...
-            # Final-Recipient: RFC822; ***@docomo.ne.jp
-            # Action: failed
-            # Status: 5.2.0
-            reasontext = 'filtered'
+          #
+          #    ----- Transcript of session follows -----
+          # ... while talking to mfsmax.docomo.ne.jp.:
+          # >>> RCPT To:<***@docomo.ne.jp>
+          # <<< 550 Unknown user ***@docomo.ne.jp
+          # 550 5.1.1 <***@docomo.ne.jp>... User unknown
+          # >>> DATA
+          # <<< 503 Bad sequence of commands
+          # ---------------------------------------------------------------------------------------
+          #    ----- The following addresses had permanent fatal errors -----
+          # <***@docomo.ne.jp>
+          # (reason: 550 Unknown user ***@docomo.ne.jp)
+          # 
+          #    ----- Transcript of session follows -----
+          # ... while talking to mfsmax.docomo.ne.jp.:
+          # >>> DATA
+          # <<< 550 Unknown user ***@docomo.ne.jp
+          # 554 5.0.0 Service unavailable
+          # ...
+          # Final-Recipient: RFC822; ***@docomo.ne.jp
+          # Action: failed
+          # Status: 5.2.0
+          return 'userunknown' if statuscode == '5.1.1' || statuscode == '5.0.911'
+          return 'filtered'    if statuscode == '5.2.0'
 
-          else
+          MessagesOf.each_key do |e|
             # The value of "Diagnostic-Code:" field is not empty
-            MessagesOf.each_key do |e|
-              # - The key name is a bounce reason name
-              # - https://github.com/sisimai/go-sisimai/issues/64
-              # - After March 12, 2025, if an error message contains "550 Unknown user", the
-              #   bounce reason will be definitively "userunknown". This is because NTT DOCOMO
-              #   no longer rejects emails via SMTP for domain-specific rejection or specified
-              #   reception filters.
-              next unless MessagesOf[e].any? { |a| esmtperror.include?(a) }
-              reasontext = e
-              break
-            end
+            # - The key name is a bounce reason name
+            # - https://github.com/sisimai/go-sisimai/issues/64
+            # - After March 12, 2025, if an error message contains "550 Unknown user", the
+            #   bounce reason will be definitively "userunknown". This is because NTT DOCOMO
+            #   no longer rejects emails via SMTP for domain-specific rejection or specified
+            #   reception filters.
+            return e if MessagesOf[e].any? { |a| esmtperror.include?(a) }
           end
 
-          if reasontext.empty?
-            # A bounce reason did not decide from a status code, an error message.
-            if statuscode == '5.0.0'
-              # Status: 5.0.0
-              if thecommand == 'RCPT'
-                # Your message to the following recipients cannot be delivered:
-                #
-                # <***@docomo.ne.jp>:
-                # mfsmax.docomo.ne.jp [203.138.181.112]:
-                # >>> RCPT TO:<***@docomo.ne.jp>
-                # <<< 550 Unknown user ***@docomo.ne.jp
-                # ...
-                #
-                # Final-Recipient: rfc822; ***@docomo.ne.jp
-                # Action: failed
-                # Status: 5.0.0
-                # Remote-MTA: dns; mfsmax.docomo.ne.jp [203.138.181.112]
-                # Diagnostic-Code: smtp; 550 Unknown user ***@docomo.ne.jp
-                reasontext = 'userunknown'
-
-              elsif thecommand == 'DATA'
-                # <***@docomo.ne.jp>: host mfsmax.docomo.ne.jp[203.138.181.240] said:
-                # 550 Unknown user ***@docomo.ne.jp (in reply to end of DATA
-                # command)
-                # ...
-                # Final-Recipient: rfc822; ***@docomo.ne.jp
-                # Original-Recipient: rfc822;***@docomo.ne.jp
-                # Action: failed
-                # Status: 5.0.0
-                # Remote-MTA: dns; mfsmax.docomo.ne.jp
-                # Diagnostic-Code: smtp; 550 Unknown user ***@docomo.ne.jp
-                reasontext = 'rejected'
-
-              else
-                # Rejected by other SMTP commands: AUTH, MAIL,
-                #   もしもこのブロックを通過するNTTドコモからのエラーメッセージを見つけたら
-                #   https://github.com/sisimai/rb-sisimai/issues からご連絡ねがいます。
-                #
-                #   If you found a error message from mfsmax.docomo.ne.jp which passes this block,
-                #   please open an issue at https://github.com/sisimai/rb-sisimai/issues .
-              end
-            else
-              # Status: field is neither 5.0.0 nor values defined in code above
-              #   もしもこのブロックを通過するNTTドコモからのエラーメッセージを見つけたら
-              #   https://github.com/sisimai/rb-sisimai/issues からご連絡ねがいます。
-              #
-              #   If you found a error message from mfsmax.docomo.ne.jp which passes this block,
-              #
-            end
+          # A bounce reason did not decide from a status code, an error message.
+          if statuscode == '5.0.0'
+            # Your message to the following recipients cannot be delivered:
+            #
+            # <***@docomo.ne.jp>:
+            # mfsmax.docomo.ne.jp [203.138.181.112]:
+            # >>> RCPT TO:<***@docomo.ne.jp>
+            # <<< 550 Unknown user ***@docomo.ne.jp
+            # ...
+            #
+            # Final-Recipient: rfc822; ***@docomo.ne.jp
+            # Action: failed
+            # Status: 5.0.0
+            # Remote-MTA: dns; mfsmax.docomo.ne.jp [203.138.181.112]
+            # Diagnostic-Code: smtp; 550 Unknown user ***@docomo.ne.jp
+            # -------------------------------------------------------------------------------------
+            # <***@docomo.ne.jp>: host mfsmax.docomo.ne.jp[203.138.181.240] said:
+            # 550 Unknown user ***@docomo.ne.jp (in reply to end of DATA
+            # command)
+            # ...
+            # Final-Recipient: rfc822; ***@docomo.ne.jp
+            # Original-Recipient: rfc822;***@docomo.ne.jp
+            # Action: failed
+            # Status: 5.0.0
+            # Remote-MTA: dns; mfsmax.docomo.ne.jp
+            # Diagnostic-Code: smtp; 550 Unknown user ***@docomo.ne.jp
+            return 'userunknown' if thecommand == 'RCPT'
+            return 'rejected'    if thecommand == 'DATA'
           end
 
-          return reasontext
+          # 1. Rejected by other SMTP commands: AUTH, MAIL,
+          # 2. Status: field is neither 5.0.0 nor values defined in code above
+          #   もしもこのブロックを通過するNTTドコモからのエラーメッセージを見つけたら
+          #   https://github.com/sisimai/rb-sisimai/issues からご連絡ねがいます。
+          #
+          #   If you found a error message from mfsmax.docomo.ne.jp which passes this block,
+          #   please open an issue at https://github.com/sisimai/rb-sisimai/issues .
+          return ""
         end
 
       end

data/lib/sisimai/rhost/outlook.rb

@@ -21,7 +21,7 @@ module Sisimai
 
           MessagesOf.each_key do |e|
             # Try to match the error message with message patterns defined in $MessagesOf
-            next unless MessagesOf[e].any? { |a| issuedcode.include?(a) }
+            next if MessagesOf[e].none? { |a| issuedcode.include?(a) }
             reasontext = e
             break
           end

data/lib/sisimai/rhost/spectrum.rb

@@ -101,7 +101,7 @@ module Sisimai
         # @return   [String, Nil]           The bounce reason at Spectrum
         # @since v4.25.8
         def find(argvs)
-          return argvs['reason'] unless argvs['reason'].empty?
+          return argvs['reason'] if argvs['reason'].empty? == false
           issuedcode = argvs['diagnosticcode']
           reasontext = ''
           codenumber = if cv = issuedcode.match(/AUP#[-A-Za-z]*(\d{4})/) then cv[1].to_i else 0 end

data/lib/sisimai/rhost/tencent.rb

@@ -22,12 +22,13 @@ module Sisimai
             'suspected spam',                   # https://service.mail.qq.com/detail/122/71
             'mail is rejected by recipients',   # https://service.mail.qq.com/detail/122/92
           ],
-          'spandetected' => [
+          'spamdetected' => [
             'spam is embedded in the email',    # https://service.mail.qq.com/detail/122/59
             'mail content denied',              # https://service.mail.qq.com/detail/122/171
           ],
           'speeding' => [
-            'mailbox unavailable or access denined', # https://service.mail.qq.com/detail/122/166
+            'mailbox unavailable or access denined',      # https://service.mail.qq.com/detail/122/166
+            "frequency of receiving messages is limited", # https://service.mail.qq.com/detail/122/1011
           ],
           'suspend' => [
             'is a deactivated mailbox', # http://service.mail.qq.com/cgi-bin/help?subtype=1&&id=20022&&no=1000742
@@ -50,13 +51,13 @@ module Sisimai
         # @param    [Sisimai::Fact] argvs   Decoded email object
         # @return   [String]                The bounce reason at Tencent QQ
         def find(argvs)
-          return argvs['reason'] unless argvs['reason'].empty?
+          return argvs['reason'] if argvs['reason'].empty? == false
           issuedcode = argvs['diagnosticcode'].downcase
           reasontext = ''
 
           MessagesOf.each_key do |e|
             MessagesOf[e].each do |f|
-              next unless issuedcode.include?(f)
+              next if issuedcode.include?(f) == false
               reasontext = e
               break
             end

data/lib/sisimai/rhost/yahooinc.rb

@@ -88,13 +88,13 @@ module Sisimai
         #           https://www.postmastery.com/yahoo-postmaster/
         # @since v5.1.0
         def find(argvs)
-          return argvs['reason'] unless argvs['reason'].empty?
+          return argvs['reason'] if argvs['reason'].empty? == false
           issuedcode = argvs['diagnosticcode'].downcase
           reasontext = ''
 
           MessagesOf.each_key do |e|
             MessagesOf[e].each do |f|
-              next unless issuedcode.include?(f)
+              next if issuedcode.include?(f) == false
               reasontext = e
               break
             end

data/lib/sisimai/rhost/zoho.rb

@@ -0,0 +1,72 @@
+module Sisimai
+  module Rhost
+    # Sisimai::Rhost detects the bounce reason from the content of Sisimai::Fact object as an argument
+    # of find() method when the value of "destination" of the object is ".zoho.com" or ".zoho.eu".
+    # This class is called only Sisimai::Fact class.
+    module Zoho
+      class << self
+        MessagesOf = {
+          'authfailure' => [
+            # - <*******@zoho.com>: host smtpin.zoho.com[204.141.33.23] said: 550 5.7.1 Email
+            #   rejected per DMARC policy for zoho.com
+            "Email rejected per DMARC policy",
+          ],
+          'blocked' => [
+            # - mx.zoho.com[204.141.33.44]:25, delay=1202, delays=1200/0/0.91/0.30, dsn=4.7.1,
+            #   status=deferred (host mx.zoho.com[204.141.33.44] said:
+            #   451 4.7.1 Greylisted, try again after some time (in reply to RCPT TO command))
+            "Greylisted, try again after some time",
+          ],
+          'rejected' => [
+            # - <*******@zoho.com>: host smtpin.zoho.com[204.141.33.23] said: 554 5.7.1 Email
+            #   cannot be delivered. Reason: Email flagged as Spam. (in reply to RCPT TO command)
+            # - <***@zoho.com>: host mx.zoho.com[136.143.183.44] said: 541 5.4.1 Mail rejected
+            #   by destination domain (in reply to RCPT TO command)
+            "Email cannot be delivered. Reason: Email flagged as Spam",
+            "Mail rejected by destination domain",
+          ],
+          'policyviolation' => [
+            # - <*******@zoho.com>: host smtpin.zoho.com[204.141.33.23] said: 554 5.7.7 Email
+            #   policy violation detected (in reply to end of DATA command)
+            "Email policy violation detected",
+            "Mailbox delivery restricted by policy error",
+          ],
+          'systemerror' => [
+            # - https://github.com/zoho/zohodesk-oas/blob/main/v1.0/EmailFailureAlert.json#L168
+            #   452 4.3.1 Temporary System Error
+            "Temporary System Error",
+          ],
+          'userunknown' => [
+            # - <*******@zoho.com>: host smtpin.zoho.com[204.141.33.23] said:
+            #   550 5.1.1 User does not exist - <***@zoho.com> (in reply to RCPT TO command)
+            # - 552 5.1.1 <****@zoho.com> Mailbox delivery failure policy error
+            "User does not exist",
+          ],
+          'virusdetected' => [
+            # - 552 5.7.1 virus **** detected by Zoho Mail
+            " detected by Zoho Mail",
+          ],
+        }.freeze
+
+        # Detect bounce reason from Apple iCloud Mail
+        # @param    [Sisimai::Fact] argvs   Decoded email object
+        # @return   [String]                The bounce reason for Apple
+        # @see
+        # @since v5.5.0
+        # - Zoho Mail: https://www.zoho.com/mail/
+        # - Reasons an email is marked as Spam: https://www.zoho.com/mail/help/spam-reason.html
+        # - https://github.com/zoho/zohodesk-oas/blob/main/v1.0/EmailFailureAlert.json
+        # - Zoho SMTP Error Codes | SMTP Field Manual: https://smtpfieldmanual.com/provider/zoho
+        def find(argvs)
+          return '' if argvs.nil? || argvs['diagnosticcode'].size == 0
+          MessagesOf.each_key do |e|
+            return e if MessagesOf[e].any? { |a| argvs['diagnosticcode'].include?(a) }
+          end
+          return ''
+        end
+
+      end
+    end
+  end
+end
+

data/lib/sisimai/rhost.rb

@@ -24,6 +24,7 @@ module Sisimai
         "Spectrum"    => ["charter.net"],
         "Tencent"     => [".qq.com"],
         "YahooInc"    => [".yahoodns.net"],
+        "Zoho"        => [".zoho.com", ".zoho.eu"],
       }.freeze
 
       # Returns the rhost class name
@@ -44,14 +45,14 @@ module Sisimai
           # 3. lhost: local MTA hostname
           RhostClass.each_key do |e|
             # Try to match the domain part of the recipient address with each value of RhostClass
-            next unless RhostClass[e].any? { |a| a.end_with?(domainpart) }
+            next if RhostClass[e].none? { |a| a.end_with?(domainpart) }
             rhostclass = e
             throw :FINDRHOST
           end
 
           RhostClass.each_key do |e|
             # Try to match the remote host with each value of RhostClass
-            next unless RhostClass[e].any? { |a| remotehost.end_with?(a) }
+            next if RhostClass[e].none? { |a| remotehost.end_with?(a) }
             rhostclass = e
             throw :FINDRHOST
           end
@@ -59,7 +60,7 @@ module Sisimai
           # Neither the remote host nor the destination did not matched with any value of RhostClass
           RhostClass.each_key do |e|
             # Try to match the client host with each value of RhostClass
-            next unless RhostClass[e].any? { |a| clienthost.end_with?(a) }
+            next if RhostClass[e].none? { |a| clienthost.end_with?(a) }
             rhostclass = e
             throw :FINDRHOST
           end

data/lib/sisimai/smtp/command.rb

@@ -28,7 +28,7 @@ module Sisimai
         # @return   [String]        An SMTP command
         # @since v5.0.0
         def find(argv0 = '')
-          return "" unless Sisimai::SMTP::Command.test(argv0)
+          return "" if Sisimai::SMTP::Command.test(argv0) == false
 
           issuedcode = " " + argv0.downcase + " "
           commandmap = {"STAR" => "STARTTLS", "XFOR" => "XFORWARD"}
@@ -36,7 +36,7 @@ module Sisimai
 
           Detectable.each do |e|
             # Find an SMTP command from the given string
-            p0 = argv0.index(e); next unless p0
+            p0 = argv0.index(e); next if p0.nil?
             if e.include?(" ") == false
               # For example, "RCPT T" does not appear in an email address or a domain name
               cx = true; while true do

data/lib/sisimai/smtp/reply.rb

@@ -113,18 +113,25 @@ module Sisimai
         Associated = {
           "422" => ["AUTH",     "4.7.12",  "securityerror"], # RFC5238
           "432" => ["AUTH",     "4.7.12",  "securityerror"], # RFC4954, RFC5321
+          "451" => ["",         "",        "systemerror"],   # RFC2465, RFC5321
+          "452" => ["",         "",        "systemfull"],    # RFC5321
+          "454" => ["AUTH",     "4.7.0",   "securityerror"], # RFC3027, RFC4954
+          "455" => ["",         "",        "syntaxerror"],   # RFC5321
           "500" => ["",         "",        "syntaxerror"],   # RFC5321
           "501" => ["",         "",        "syntaxerror"],   # RFC5321
           "502" => ["",         "",        "syntaxerror"],   # RFC5321
           "503" => ["",         "",        "syntaxerror"],   # RFC5321
           "504" => ["",         "",        "syntaxerror"],   # RFC5321
           "521" => ["CONN",     "",        "notaccept"],     # RFC7504
-          "523" => ["AUTH",     "",        "securityerror"], # RFC5248
-          "524" => ["AUTH",     "",        "securityerror"], # RFC5248
-          "525" => ["AUTH",     "",        "securityerror"], # RFC5248
+          "523" => ["AUTH",     "5.7.10",  "securityerror"], # RFC5248
+          "524" => ["AUTH",     "5.7.11",  "securityerror"], # RFC5248
+          "525" => ["AUTH",     "5.7.13",  "securityerror"], # RFC5248
           "534" => ["AUTH",     "5.7.9",   "securityerror"], # RFC4954, RFC5248
           "535" => ["AUTH",     "5.7.8",   "securityerror"], # RFC4954, RFC5248
           "538" => ["AUTH",     "5.7.11",  "securityerror"], # RFC4954, RFC5248
+          "551" => ["",         "",        "hasmoved"],      # RFC5321, RFC5336, RFC6531
+          "552" => ["",         "",        "mailboxfull"],   # RFC5321
+          "555" => ["",         "",        "syntaxerror"],   # RFC5321
           "556" => ["RCPT",     "",        "notaccept"],     # RFC7504
         }.freeze
 
@@ -153,7 +160,7 @@ module Sisimai
 
           if first == 3
             # 3yz
-            return false unless reply == 334 || reply == 354
+            return false if reply != 334 && reply != 354
             return true
           end
 

data/lib/sisimai/smtp/status.rb

@@ -554,7 +554,7 @@ module Sisimai
           '5.4.0'  => 'networkerror',   # Other or undefined network or routing status
           '5.4.3'  => 'systemerror',    # Directory server failure
           '5.4.4'  => 'hostunknown',    # Unable to route
-          '5.5.2'  => 'syntaxerror',    # If the server cannot BASE64 decode any client response (AUTH)
+          '5.5.2'  => 'systemerror',    # If the server cannot BASE64 decode any client response (AUTH)
           '5.5.3'  => 'toomanyconn',    # Too many recipients
           '5.5.4'  => 'systemerror',    # Invalid command arguments
           '5.5.5'  => 'systemerror',    # Wrong protocol version
@@ -692,7 +692,7 @@ module Sisimai
         # @return   [String]        Reason name or an empty string
         # @see      code
         def name(argv1 = nil)
-          return "" unless Sisimai::SMTP::Status.test(argv1.to_s)
+          return "" if Sisimai::SMTP::Status.test(argv1.to_s) == false
           return StandardCode[argv1] || ""
         end
 
@@ -706,7 +706,7 @@ module Sisimai
 
           token = []
           argv1.split('.').each { |e| token << e.to_i }
-          return false unless token.size == 3
+          return false if token.size != 3
           return false if token[0] < 2 || token[0] == 3 || token[0]  > 5
           return false if token[1] < 0 || token[1]  > 7
           return false if token[2] < 0
@@ -755,7 +755,7 @@ module Sisimai
 
           lookingfor.sort_by(&:first).each do |e|
             # Try to find an SMTP Status Code from the given string
-            indexofees = esmtperror.index(e[1], e[0]); next unless indexofees
+            indexofees = esmtperror.index(e[1], e[0]); next if indexofees.nil?
             characters = [esmtperror[indexofees - 1, 1].ord]  # [0] The previous character of the status
             [2, 3].each do |i|
               # [1] The value of the "Subject", "5.[7].261"
@@ -788,7 +788,7 @@ module Sisimai
             next if characters[3] < 48 || characters[3] > 57  # The 1st digit of the detail is not a number
             readbuffer << characters[3].chr
 
-            if readbuffer.index('.0.0') || readbuffer == '4.4.7'
+            if Sisimai::SMTP::Status.is_ambiguous(readbuffer) || readbuffer == "4.4.7"
               # Find another status code except *.0.0, 4.4.7
               anotherone = readbuffer
               next
@@ -827,8 +827,8 @@ module Sisimai
         # @return   [String]        The preferred value
         # @since v5.0.0
         def prefer(argv0 = nil, argv1 = nil, argv2 = nil)
-          return argv1 unless argv0; return argv1 unless argv0.size > 4
-          return argv0 unless argv1; return argv0 unless argv1.size > 4
+          return argv1 if argv0.nil?; return argv1 if argv0.size < 5
+          return argv0 if argv1.nil?; return argv0 if argv1.size < 5
 
           statuscode = argv0
           codeinmesg = argv1
@@ -883,7 +883,7 @@ module Sisimai
           return statuscode
         end
 
-        # is_explicit() returns 0 when the argument is empty or is an internal code
+        # is_explicit() returns false when the argument is empty or is an internal code
         # @param    string argv1  Status code
         # @return   bool          false: The delivery status code is not explicit
         def is_explicit(argv1 = '')
@@ -891,6 +891,15 @@ module Sisimai
           return false if argv1.size == 7 && argv1.start_with?("5.0.9", "4.0.9")
           return true
         end
+
+        # is_ambiguous() returns true when the argument is not empty and ends with ".0.0".
+        # @param    string argv1  Status code
+        # @return   bool          false: The delivery status code is not ambiguous
+        def is_ambiguous(argv1 = '')
+          return true if argv1.nil? || argv1.empty?
+          return true if argv1.size == 5 && argv1.end_with?(".0.0")
+          return false
+        end
       end
     end
   end

data/lib/sisimai/smtp/transcript.rb

@@ -17,8 +17,8 @@ module Sisimai
           return nil if argv0.size == 0
 
           # 1. Replace label strings of SMTP client/server at the each line
-          argv0.gsub!(/^[ ]+#{argv1}\s+/m, '>>> '); return nil unless argv0.include?('>>> ')
-          argv0.gsub!(/^[ ]+#{argv2}\s+/m, '<<< '); return nil unless argv0.include?('<<< ')
+          argv0.gsub!(/^[ ]+#{argv1}\s+/m, '>>> '); return nil if argv0.include?('>>> ') == false
+          argv0.gsub!(/^[ ]+#{argv2}\s+/m, '<<< '); return nil if argv0.include?('<<< ') == false
 
           # 2. Remove strings until the first '<<<' or '>>>'
           esmtp = []
@@ -96,7 +96,7 @@ module Sisimai
               end
             else
               # SMTP server sent a response "<<< response text"
-              p = e.index('<<< '); next unless p == 0
+              p = e.index('<<< '); next if p.nil? && p != 0
               e = e[4, e.size].sub(/\A<<<[ ]/, '')
 
               if cv = e.match(/\A([2-5]\d\d)[ ]/) then cx['response']['reply'] = cv[1] end

data/lib/sisimai/string.rb

@@ -14,10 +14,8 @@ module Sisimai
       # @return [String]        Message token(MD5 hex digest) or blank(failed to create token)
       # @see    http://en.wikipedia.org/wiki/ASCII
       def token(addr1, addr2, epoch)
-        return "" unless addr1.is_a?(::String)
-        return "" unless addr2.is_a?(::String)
-        return "" unless epoch.is_a?(Integer)
-        return "" if addr1.empty? || addr2.empty?
+        return "" if addr1.is_a?(::String) == false || addr2.is_a?(::String) == false
+        return "" if addr1.empty? || addr2.empty? || epoch.is_a?(Integer) == false
 
         # Format: STX(0x02) Sender-Address RS(0x1e) Recipient-Address ETX(0x03)
         require 'digest/sha1'
@@ -30,7 +28,7 @@ module Sisimai
       def is_8bit(argvs)
         v = argvs.to_s
         return false if v.empty?
-        return true  unless v =~ /\A[\x00-\x7f]*\z/
+        return true  if v !~ /\A[\x00-\x7f]*\z/
         return false
       end
 
@@ -40,7 +38,7 @@ module Sisimai
       # @example  Clean up text
       #   sweep('  neko ') #=> 'neko'
       def sweep(argv1)
-        return argv1 unless argv1.is_a?(::String)
+        return argv1 if argv1.is_a?(::String) == false
         argv1 = argv1.chomp.squeeze(' ').strip
         argv1 = argv1.sub(/ [-]{2,}[^ ].+\z/, '')
         return argv1
@@ -52,16 +50,14 @@ module Sisimai
       # @return   [Boolean]
       # @since v5.0.0
       def aligned(argv1, argv2)
-        return false if argv1.to_s.empty?
-        return false unless argv2.is_a? Array
-        return false unless argv2.size > 1
+        return false if argv1.to_s.empty? || argv2.is_a?(Array) == false || argv2.size < 2
 
         align = -1
         right =  0
         argv2.each do |e|
           # Get the position of each element in the 1st argument using index()
           p = argv1.index(e, align + 1)
-          break unless p            # Break this loop when there is no string in the 1st argument
+          break if p == nil         # Break this loop when there is no string in the 1st argument
           align  = e.length + p - 1 # There is an aligned string in the 1st argument
           right += 1
         end

data/lib/sisimai/version.rb

@@ -1,4 +1,4 @@
 # Define the version number of Sisimai
 module Sisimai
-  VERSION = '5.4.1'.freeze
+  VERSION = '5.5.0'.freeze
 end

data/lib/sisimai.rb

@@ -44,7 +44,7 @@ module Sisimai
           end
         end
 
-        sisi += fact unless fact.empty?
+        sisi += fact if fact.empty? == false
       end
 
       return nil if sisi.empty?