sisimai 5.3.0 → 5.4.0

data/lib/sisimai/rfc1894.rb

@@ -57,9 +57,9 @@ module Sisimai
        #"text" => ["X-Original-Message-ID", "Final-Log-ID", "Original-Envelope-ID"],
       }.freeze
 
-      SubtypeSet = { "addr" => "RFC822", "cdoe" => "SMTP", "host" => "DNS" }.freeze
+      SubtypeSet = {"addr" => "RFC822", "cdoe" => "SMTP", "host" => "DNS"}.freeze
       ActionList = ["failed", "delayed", "delivered", "relayed", "expanded"].freeze
-      Correction = { 'deliverable' => 'delivered', 'expired' => 'delayed', 'failure' => 'failed' }
+      Correction = {'deliverable' => 'delivered', 'expired' => 'delayed', 'failure' => 'failed'}
       FieldGroup = {
         'original-recipient'    => 'addr',
         'final-recipient'       => 'addr',
@@ -108,9 +108,8 @@ module Sisimai
       #                          2: Matched with per-recipient field
       # @since v4.25.0
       def match(argv0 = '')
-        return 0 unless argv0
-        return 0 unless argv0.size > 0
-        label = Sisimai::RFC1894.label(argv0); return 0 unless label
+        return 0 if argv0.to_s == ""
+        label = Sisimai::RFC1894.label(argv0); return 0 if label.empty?
         match = 0
 
         FieldNames[0].each_key do |e|
@@ -135,7 +134,7 @@ module Sisimai
       # @return   [String]       Field name as a label
       # @since v4.25.15
       def label(argv0 = '')
-        return nil if argv0.empty?
+        return "" if argv0.empty?
         return argv0.split(':', 2).shift.downcase
       end
 

data/lib/sisimai/rfc2045.rb

@@ -7,10 +7,9 @@ module Sisimai
 
       # Check that the argument is MIME-Encoded string or not
       # @param    [String] argvs  String to be checked
-      # @return   [True,False]    false: Not MIME encoded string
-      #                           true:  MIME encoded string
+      # @return   [Boolean]       false: Not MIME encoded string, true: MIME encoded string
       def is_encoded(argv1)
-        return nil unless argv1
+        return false unless argv1
 
         text1 = argv1.delete('"')
         mime1 = false
@@ -60,13 +59,12 @@ module Sisimai
             textblocks[-1].gsub!(/\r\n/, '')
             textblocks << cv[5]
           else
-            textblocks << if textblocks.empty? then e else ' ' << e end
+            textblocks << if textblocks.empty? then e else " #{e}" end
           end
         end
-
         return '' if textblocks.empty?
-        p = textblocks.join('')
 
+        p = textblocks.join('')
         if ctxcharset && qbencoding
           # utf8 => UTF-8
           ctxcharset = 'UTF-8' if ctxcharset.casecmp('UTF8') == 0
@@ -74,32 +72,32 @@ module Sisimai
           unless ctxcharset.casecmp('UTF-8') == 0
             # Characterset is not UTF-8
             begin
-              p .encode!('UTF-8', ctxcharset)
+              p = p.encode!('UTF-8', ctxcharset)
             rescue
               p = 'FAILED TO CONVERT THE SUBJECT'
             end
           end
         end
-
-        return p.force_encoding('UTF-8').scrub('?')
+        q = p.dup
+        return q.force_encoding('UTF-8').scrub('?')
       end
 
       # Decode MIME BASE64 Encoded string
       # @param  [String] argv0   MIME Encoded text
       # @return [String]         MIME-Decoded text
       def decodeB(argv0 = nil)
-        return nil unless argv0
+        return "" if argv0.nil? || argv0.empty?
 
         p = nil
         if cv = argv0.match(%r|([+/\=0-9A-Za-z\r\n]+)|) then p = Base64.decode64(cv[1]) end
-        return p ? p.scrub('?') : nil
+        return p ? p.scrub('?') : ""
       end
 
       # Decode MIME Quoted-Printable Encoded string
       # @param  [String] argv0   MIME Encoded text
       # @return [String]         MIME Decoded text
       def decodeQ(argv0 = nil)
-        return nil unless argv0
+        return "" if argv0.nil? || argv0.empty?
         return argv0.unpack('M').first.scrub('?')
       end
 
@@ -109,7 +107,7 @@ module Sisimai
       # @return   [String]        The value of the parameter
       # @since v5.0.0
       def parameter(argv0 = '', argv1 = '')
-        return nil if argv0.empty?
+        return "" if argv0.empty?
         parameterq = argv1.size > 0 ? argv1 + '=' : ''
         paramindex = argv1.size > 0 ? argv0.index(parameterq) : 0
         return '' unless paramindex
@@ -128,7 +126,7 @@ module Sisimai
       #                            1: End of boundary
       # @return   [String] Boundary string
       def boundary(argv0 = '', start = -1)
-        return nil if argv0.empty?
+        return "" if argv0.empty?
         btext = parameter(argv0, 'boundary')
         return '' if btext.empty?
 
@@ -175,8 +173,8 @@ module Sisimai
           elsif e.index('boundary=') || e.index('charset=')
             # "Content-Type" field has boundary="..." or charset="utf-8"
             next if headerpart[0].empty?
-            headerpart[0] << " " << e
-            headerpart[0].gsub!(/\s\s+/, ' ')
+            headerpart[0] += " #{e}"
+            headerpart[0]  = headerpart[0].gsub(/\s\s+/, ' ')
           end
         end
         return headerpart if heads
@@ -197,7 +195,7 @@ module Sisimai
           break if mediatypev.index('/feedback-report')
           break if ctencoding.empty?
 
-          multipart1[2] << sprintf("Content-Transfer-Encoding: %s\n", ctencoding)
+          multipart1[2] += sprintf("Content-Transfer-Encoding: %s\n", ctencoding)
           break
         end
 
@@ -206,10 +204,10 @@ module Sisimai
           break if lowerchunk.empty?
           break if lowerchunk[0, 1] == "\n"
 
-          multipart1[2] << "\n"
+          multipart1[2] += "\n"
           break
         end
-        multipart1[2] << lowerchunk
+        multipart1[2] += lowerchunk
         return multipart1
       end
 
@@ -264,10 +262,8 @@ module Sisimai
       # @param    [String] argv1  A pointer to multipart/* message blocks
       # @return   [String]        Message body
       def makeflat(argv0 = '', argv1 = '')
-        return nil unless argv0
-        return nil unless argv1
-        return ''  unless argv0.index('multipart/')
-        return ''  unless argv0.index('boundary=')
+        return "" if argv0.nil? || argv1.nil?
+        return "" if argv0.index('multipart/') == false || argv0.index('boundary=') == false
 
         # Some bounce messages include lower-cased "content-type:" field such as the followings:
         #   - content-type: message/delivery-status        => Content-Type: message/delivery-status
@@ -284,7 +280,7 @@ module Sisimai
           #   - text/plain, text/rfc822-headers
           #   - message/delivery-status, message/rfc822, message/partial, message/feedback-report
           istexthtml = false
-          mediatypev = parameter(e[0]) || 'text/plain';
+          mediatypev = parameter(e[0]); mediatypev = "text/plain" if mediatypev.empty?
           next if mediatypev.start_with?('text/', 'message/') == false
 
           if mediatypev == 'text/html'
@@ -312,7 +308,7 @@ module Sisimai
               # Content-Transfer-Encoding: 7bit
               if cv = e[0].downcase.match(iso2022set)
                 # Content-Type: text/plain; charset=ISO-2022-JP
-                bodystring = Sisimai::String.to_utf8(bodyinside, cv[1]) || ''
+                bodystring = Sisimai::String.to_utf8(bodyinside, cv[1])
               else
                 # No "charset" parameter in the value of Content-Type: header
                 bodystring = bodyinside
@@ -324,7 +320,7 @@ module Sisimai
 
             if istexthtml
               # Try to delete HTML tags inside of text/html part whenever possible
-              bodystring = Sisimai::String.to_plain(bodystring) || ''
+              bodystring = Sisimai::String.to_plain(bodystring)
             end
             next if bodystring.empty?
 
@@ -341,16 +337,16 @@ module Sisimai
                 bodystring.scrub!('?')
               else
                 # ISO-8859-1, GB2312, and so on
-                bodystring = Sisimai::String.to_utf8(bodystring, ctxcharset) || ''
+                bodystring = Sisimai::String.to_utf8(bodystring, ctxcharset)
               end
-              bodystring << "\n\n"
+              bodystring += "\n\n"
             end
 
             bodystring.gsub!(/\r\n/, "\n") if bodystring.include?("\r\n") # Convert CRLF to LF
 
           else
             # There is no Content-Transfer-Encoding header in the part
-            bodystring << bodyinside
+            bodystring += bodyinside
           end
 
           if delimiters.any? { |a| mediatypev.include?(a) }
@@ -361,8 +357,8 @@ module Sisimai
           end
 
           # Append "\n" when the last character of $bodystring is not LF
-          bodystring << "\n\n" unless bodystring[-2, 2] == "\n\n"
-          flattenout << bodystring
+          bodystring += "\n\n" unless bodystring[-2, 2] == "\n\n"
+          flattenout += bodystring
         end
 
         return flattenout

data/lib/sisimai/rfc3464/thirdparty.rb

@@ -39,7 +39,7 @@ module Sisimai
         def xfield(argv1 = "")
           return [] if argv1.nil? || argv1.empty?
           party = Sisimai::RFC3464::ThirdParty.returnedby(argv1); return [] if party.empty?
-          return Module.const_get("Sisimai::RFC3464::ThirdParty::" << party).xfield(argv1)
+          return Module.const_get("Sisimai::RFC3464::ThirdParty::#{party}").xfield(argv1)
         end
       end
 

data/lib/sisimai/rfc3464.rb

@@ -20,7 +20,7 @@ module Sisimai
         "Content-Type: message/partial",
         "Content-Disposition: inline", # See lhost-amavis-*.eml, lhost-facebook-*.eml
       ].freeze
-      StartingOf = { message: ["Content-Type: message/delivery-status"] }.freeze
+      StartingOf = {message: ["Content-Type: message/delivery-status"]}.freeze
       FieldTable = Sisimai::RFC1894.FIELDTABLE
 
       # Decode a bounce mail which have fields defined in RFC3464
@@ -37,7 +37,7 @@ module Sisimai
         end
 
         permessage = {}
-        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
+        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = nil
         alternates = Sisimai::Lhost.DELIVERYSTATUS
         emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
         readslices = [""]
@@ -46,7 +46,6 @@ module Sisimai
         beforemesg = ""     # (String) String before StartingOf[:message]
         goestonext = false  # (Bool) Flag: do not append the line into beforemesg
         isboundary = [Sisimai::RFC2045.boundary(mhead["content-type"], 0)]; isboundary[0] ||= ""
-        v = nil
 
         while emailparts[0].index('@').nil? do
           # There is no email address in the first element of emailparts
@@ -134,12 +133,11 @@ module Sisimai
               break if e.start_with?("--")              # Boundary string
               break if e.include?("--- The follow")     # ----- The following addresses had delivery problems -----
               break if e.include?("--- Transcript")     # ----- Transcript of session follows -----
-              beforemesg << e + " "; break
+              beforemesg += "#{e} "; break
             end
             next
           end
-          next if (readcursor & Indicators[:deliverystatus]) == 0
-          next if e.empty?
+          next if (readcursor & Indicators[:deliverystatus]) == 0 || e.empty?
 
           f = Sisimai::RFC1894.match(e)
           if f > 0
@@ -177,7 +175,7 @@ module Sisimai
                 # There are other error messages as a comment such as the following:
                 # Status: 5.0.0 (permanent failure)
                 # Status: 4.0.0 (cat.example.net: host name lookup failure)
-                v["diagnosis"] << " " + o[4] + " "
+                v["diagnosis"] += " #{o[4]} "
               end
               next unless FieldTable[o[0]]
               next if o[3] == "host" && Sisimai::RFC1123.is_internethost(o[2]) == false
@@ -208,13 +206,13 @@ module Sisimai
                 # In the case of multiple "message/delivery-status" line
                 next if e.start_with?("Content-") # Content-Disposition:, ...
                 next if e.start_with?("--")       # Boundary string
-                beforemesg << e + " "; next
+                beforemesg += "#{e} "; next
               end
 
               # Diagnostic-Code: SMTP; 550-5.7.26 The MAIL FROM domain [email.example.jp]
               #    has an SPF record with a hard fail
               next unless e.start_with?(" ")
-              v["diagnosis"] << " " + Sisimai::String.sweep(e)
+              v["diagnosis"] += " #{Sisimai::String.sweep(e)}"
             end
           end
         end

data/lib/sisimai/rfc3834.rb

@@ -3,7 +3,7 @@ module Sisimai
   module RFC3834
     class << self
       # http://tools.ietf.org/html/rfc3834
-      MarkingsOf = { :boundary => '__SISIMAI_PSEUDO_BOUNDARY__' }
+      MarkingsOf = {:boundary => '__SISIMAI_PSEUDO_BOUNDARY__'}
       LowerLabel = %w[from to subject auto-submitted precedence x-apple-action].freeze
       DoNotParse = {
         'from'    => ['root@', 'postmaster@', 'mailer-daemon@'],
@@ -66,7 +66,7 @@ module Sisimai
         return nil if match < 1
 
         require 'sisimai/lhost'
-        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
+        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = dscontents[-1]
         bodyslices = mbody.scrub('?').split("\n")
         rfc822part = '' # (String) message/rfc822-headers part
         recipients = 0  # (Integer) The number of 'Final-Recipient' header
@@ -74,13 +74,11 @@ module Sisimai
         haveloaded = 0  # (Integer) The number of lines loaded from message body
         blanklines = 0  # (Integer) Counter for countinuous blank lines
         countuntil = 1  # (Integer) Maximum value of blank lines in the body part
-        v = dscontents[-1]
 
         # RECIPIENT_ADDRESS
         %w[from return-path].each do |e|
           # Try to get the address of the recipient
           next unless mhead[e]
-          next unless mhead[e]
           v['recipient'] = mhead[e]
           break
         end
@@ -109,12 +107,10 @@ module Sisimai
             break if blanklines > countuntil
             next
           end
-          next unless e.include?(' ')
-          next if     e.start_with?('Content-Type')
-          next if     e.start_with?('Content-Transfer')
+          next if !e.include?(' ') || e.start_with?('Content-Type', 'Content-Transfer')
 
           v['diagnosis'] ||= ''
-          v['diagnosis']  << e + ' '
+          v['diagnosis']  += "#{e }"
           haveloaded += 1
           break if haveloaded >= maxmsgline
         end
@@ -126,7 +122,7 @@ module Sisimai
 
         if cv = lower['subject'].match(SubjectSet)
           # Get the Subject header from the original message
-          rfc822part = 'Subject: ' << cv[1] + "\n"
+          rfc822part = "Subject: #{cv[1]}\n"
         end
         return { 'ds' => dscontents, 'rfc822' => rfc822part }
       end

data/lib/sisimai/rfc5322.rb

@@ -32,19 +32,12 @@ module Sisimai
         return []
       end
 
-      # Fields that might be long
-      # @return   [Hash] Long filed(email header) list
-      def LONGFIELDS
-        return { 'to' => true, 'from' => true, 'subject' => true, 'message-id' => true }
-      end
-
       # Convert Received headers to a structured data
       # @param    [String] argv1  Received header
       # @return   [Array]         Received header as a structured data
       def received(argv1)
         return [] unless argv1.is_a?(::String)
-        return [] if argv1.include?(' invoked by uid')
-        return [] if argv1.include?(' invoked from network')
+        return [] if argv1.include?(' invoked by uid') || argv1.include?(' invoked from network')
 
         # - https://datatracker.ietf.org/doc/html/rfc5322
         #   received        =   "Received:" *received-token ";" date-time CRLF
@@ -105,41 +98,30 @@ module Sisimai
           # Check alternatives in "other", and then delete uninformative values.
           next if e.nil?
           next if e.size < 4
-          next if e == 'unknown'
-          next if e == 'localhost'
-          next if e == '[127.0.0.1]'
-          next if e == '[IPv6:::1]'
-          next unless e.include?('.')
-          next if e.include?('=')
+          next if e == 'unknown' || e == 'localhost' || e == '[127.0.0.1]' || e == '[IPv6:::1]'
+          next if e.include?('.') == false || e.include?('=') == true
           alter << e
         end
 
         %w[from by].each do |e|
           # Remove square brackets from the IP address such as "[192.0.2.25]"
-          next if token[e].nil?
-          next if token[e].empty?
-          next unless token[e].start_with?('[')
+          next if token[e].to_s.empty? || token[e].start_with?('[') == false
           token[e] = Sisimai::RFC791.find(token[e]).shift || ''
         end
         token['from'] ||= ''
 
         while true do
           # Prefer hostnames over IP addresses, except for localhost.localdomain and similar.
-          break if token['from'] == 'localhost'
-          break if token['from'] == 'localhost.localdomain'
-          break unless token['from'].include?('.')  # A hostname without a domain name
-          break unless Sisimai::RFC791.find(token['from']).empty?
+          break if token['from'] == 'localhost' || token['from'] == 'localhost.localdomain'
+          break if token['from'].include?('.') == false || Sisimai::RFC791.find(token['from']).empty? == false
 
-          # No need to rewrite token['from']
-          right = true
+          right = true # No need to rewrite token['from']
           break
         end
 
         while true do
           # Try to rewrite uninformative hostnames and IP addresses in token['from']
-          break if right        # There is no need to rewrite
-          break if alter.empty? # There is no alternative to rewriting
-          break if alter[0].include?(token['from'])
+          break if right || alter.empty? || alter[0].include?(token['from'])
 
           if token['from'].start_with?('localhost')
             # localhost or localhost.localdomain

data/lib/sisimai/rfc791.rb

@@ -18,6 +18,7 @@ module Sisimai
         end
         return true
       end
+
       # Find an IPv4 address from the given string
       # @param    [String] argv1  String including an IPv4 address
       # @return   [Array]         List of IPv4 addresses
@@ -26,14 +27,15 @@ module Sisimai
         return nil if argv0.to_s.empty?
         return []  if argv0.size < 7
 
+        given = argv0.dup
         ipv4a = []
         %w|( ) [ ] ,|.each do |e|
           # Rewrite: "mx.example.jp[192.0.2.1]" => "mx.example.jp 192.0.2.1"
-          p0 = argv0.index(e); next unless p0
-          argv0[p0, 1] = ' '
+          p0 = given.index(e); next unless p0
+          given[p0, 1] = ' '
         end
 
-        argv0.split(' ').each do |e|
+        given.split(' ').each do |e|
           # Find string including an IPv4 address
           next unless e.index('.')  # IPv4 address must include "." character
 
@@ -55,7 +57,7 @@ module Sisimai
               eo = ''
               next
             end
-            eo << as.chr
+            eo += as.chr
             break if eo.to_i > 255
           end
           ipv4a << e if eo.size > 0 && eo.to_i < 256

data/lib/sisimai/rhost/google.rb

@@ -82,7 +82,15 @@ module Sisimai
             # - 421 4.7.32 Your email has been rate limited because the From: header (RFC5322) in
             #   this message isn't aligned with either the authenticated SPF or DKIM organizational
             #   domain.
+            # - 421 5.7.32 Your email was blocked because the From: header (RFC5322) in this message
+            #   isn't aligned with either the authenticated SPF or DKIM organizational domain.
             ['421', '4.7.32', 'aligned with either the authenticated spf or dkim'],
+            ["421", "5.7.32", "aligned with either the authenticated spf or dkim"],
+
+            # - 421 4.7.40 Your email has been rate limited because the sending domain doesn't
+            #   have a DMARC record, or the DMARC record doesn’t specify a DMARC policy. Gmail
+            #   requires all bulk email senders to add a DMARC record to their sending domain.
+            ["421", "4.7.40", "to add a dmarc record to "],
           ],
           'badreputation' => [
             # - 421 4.7.0 This message is suspicious due to the very low reputation of the sending

data/lib/sisimai/rhost/microsoft.rb

@@ -23,6 +23,13 @@ module Sisimai
             # - Access denied, sending domain [$SenderDomain] does not pass DMARC verification
             # - The sender's domain in the 5322.From address doesn't pass DMARC.
             ['5.7.509', 0, 0, 'does not pass dmarc verification'],
+
+            # - 550 5.7.515 Access denied, sending domain EXAMPLE.JP doesn't meet the required
+            #   authentication level. The sender's domain in the 5322.From address doesn't meet
+            #   the authentication requirements defined for the sender. To learn how to fix this
+            #   see: https://go.microsoft.com/fwlink/p/?linkid=2319303
+            #   Spf= Fail , Dkim= Pass , DMARC= Pass ...
+            ["5.7.515", 0, 0, "doesn't meet the required authentication level"],
           ],
           'badreputation' => [
             # Undocumented error messages ---------------------------------------------------------
@@ -597,11 +604,16 @@ module Sisimai
             ['5.2.14', 0, 0, 'misconfigured forwarding address'],
 
             # Undocumented error messages ---------------------------------------------------------
-            ['4.4.3',  0, 0, 'temporary server error. please try again later attr18'],
-            ['4.7.0',  0, 0, 'temporary server error. please try again later. prx4 nexthop:'],
-            ['4.4.24', 0, 0, 'message failed to be replicated: insufficient system resource:'],
-            ['4.4.25', 0, 0, 'message failed to be replicated: no healthy secondary server available to accept replica at this time.'],
-            ['4.4.28', 0, 0, 'message failed to be replicated: the operation was canceled'],
+            # - 451 4.4.22 Message failed to be replicated: no healthy peers found ... (in reply to end of DATA command)
+            # - 451 4.4.23 Message failed to be replicated: No healthy secondary server available
+            #   to accept replica at this time. ... (in reply to end of DATA command)
+            # - 451 4.4.28 Message failed to be replicated:
+            #   Microsoft.Exchange.Transport.Net.Http.TransportHttpException(session Id: -1) ...(in reply to end of DATA command)
+            # - 451 4.4.28 Message failed to be replicated:
+            #   System.Net.Http.HttpRequestException(session Id: ****) ... (in reply to end of DATA command)
+            ["4.4.", "22", "28", "message failed to be replicated:"],
+            ["4.4.3",  "",   "", "temporary server error. please try again later attr18"],
+            ["4.7.0",  "",   "", "temporary server error. please try again later. prx4 nexthop:"],
 
             # 550 5.4.318 Message expired, connection reset (SuspiciousRemoteServerError)
             # 450 4.4.318 Connection was closed abruptly (SuspiciousRemoteServerError)

data/lib/sisimai/rhost.rb

@@ -74,8 +74,8 @@ module Sisimai
         return "" if argvs.nil?
 
         rhostclass = name(argvs); return "" if rhostclass.empty?
-        modulepath = "sisimai/rhost/"   << rhostclass.downcase; require modulepath
-        modulename = "Sisimai::Rhost::" << rhostclass
+        modulepath = "sisimai/rhost/#{rhostclass.downcase}"; require modulepath
+        modulename = "Sisimai::Rhost::#{rhostclass}"
 
         #rhostclass = "sisimai/rhost/" << modulename.downcase.split("::")[2]; require rhostclass
         reasontext = Module.const_get(modulename).find(argvs)

data/lib/sisimai/smtp/command.rb

@@ -31,7 +31,7 @@ module Sisimai
           return "" unless Sisimai::SMTP::Command.test(argv0)
 
           issuedcode = " " + argv0.downcase + " "
-          commandmap = { "STAR" => "STARTTLS", "XFOR" => "XFORWARD" }
+          commandmap = {"STAR" => "STARTTLS", "XFOR" => "XFORWARD"}
           commandset = []
 
           Detectable.each do |e|

data/lib/sisimai/smtp/failure.rb

@@ -12,8 +12,7 @@ module Sisimai
         #                           false: Is not a permanent error
         # @since v4.17.3
         def is_permanent(argv1 = '')
-          return false unless argv1
-          return false unless argv1.size > 0
+          return false if argv1.to_s == ""
 
           statuscode = Sisimai::SMTP::Status.find(argv1)
           statuscode = Sisimai::SMTP::Reply.find(argv1) if statuscode.empty?
@@ -28,16 +27,14 @@ module Sisimai
         #                           false: is not a temporary error
         # @since v5.2.0
         def is_temporary(argv1 = '')
-          return false unless argv1
-          return false unless argv1.size > 0
+          return false if argv1.to_s == ""
 
           statuscode = Sisimai::SMTP::Status.find(argv1);
           statuscode = Sisimai::SMTP::Reply.find(argv1) if statuscode.empty?
           issuedcode = argv1.downcase
 
           return true if statuscode[0, 1] == "4"
-          return true if issuedcode.include?(' temporar')
-          return true if issuedcode.include?(' persistent')
+          return true if issuedcode.include?(' temporar') || issuedcode.include?(' persistent')
           return false
         end
 
@@ -46,9 +43,7 @@ module Sisimai
         # @param    [String] argv2  String including SMTP Status code
         # @return   [Boolean]       true: is a hard bounce
         def is_hardbounce(argv1 = '', argv2 = '')
-          return false unless argv1
-          return false unless argv1.size > 0
-
+          return false if argv1.to_s == ""
           return false if argv1 == "undefined" || argv1 == "onhold"
           return false if argv1 == "delivered" || argv1 == "feedback"    || argv1 == "vacation"
           return true  if argv1 == "hasmoved"  || argv1 == "userunknown" || argv1 == "hostunknown"
@@ -76,9 +71,7 @@ module Sisimai
         # @param    [String] argv2  String including SMTP Status code
         # @return   [Boolean]       true: is a soft bounce
         def is_softbounce(argv1 = '', argv2 = '')
-          return false unless argv1
-          return false unless argv1.size > 0
-
+          return false if argv1.to_s == ""
           return false if argv1 == "delivered" || argv1 == "feedback"    || argv1 == "vacation"
           return false if argv1 == "hasmoved"  || argv1 == "userunknown" || argv1 == "hostunknown"
           return true  if argv1 == "undefined" || argv1 == "onhold"

data/lib/sisimai/smtp/reply.rb

@@ -109,7 +109,7 @@ module Sisimai
           "550", "552", "553", "551", "521", "525", "523", "524", "530", "533", "534", "535", "538",
           "555", "556", "554", "500", "501", "502", "503", "504",
         ].freeze
-        CodeOfSMTP = { '2' => ReplyCode2, '4' => ReplyCode4, '5' => ReplyCode5 }.freeze
+        CodeOfSMTP = {'2' => ReplyCode2, '4' => ReplyCode4, '5' => ReplyCode5}.freeze
         Associated = {
           "422" => ["AUTH",     "4.7.12",  "securityerror"], # RFC5238
           "432" => ["AUTH",     "4.7.12",  "securityerror"], # RFC4954, RFC5321
@@ -163,11 +163,9 @@ module Sisimai
         # Get SMTP Reply Code from the given string
         # @param    [String] argv1  String including SMTP Reply Code like 550
         # @param    [String] argv2  Status code like 5.1.1 or 2 or 4 or 5
-        # @return   [String]        SMTP Reply Code
-        #           [Nil]           The first argument did not include SMTP Reply Code value
+        # @return   [String]        SMTP Reply Code or an empty string
         def find(argv1 = '', argv2 = '0')
-          return "" if argv1.to_s.size < 3
-          return "" if argv1.upcase.include?('X-UNIX')
+          return "" if argv1.to_s.size < 3 || argv1.upcase.include?('X-UNIX')
 
           esmtperror = ' ' + argv1 + ' '
           esmtpreply = ''