sisimai 5.4.1-java → 5.5.0-java

data/lib/sisimai/fact/json.rb

@@ -8,8 +8,7 @@ module Sisimai
         # @param    [Sisimai::Fact] argvs Object
         # @return   [String]              Dumped data or an empty string if the argument is missing
         def dump(argvs)
-          return "" unless argvs
-          return "" unless argvs.is_a? Sisimai::Fact
+          return "" if argvs.nil? || argvs.is_a?(Sisimai::Fact) == false
 
           if RUBY_PLATFORM.start_with?('java')
             # java-based ruby environment like JRuby.

data/lib/sisimai/fact/yaml.rb

@@ -10,8 +10,7 @@ module Sisimai
         # @param    [Sisimai::Fact] argvs Object
         # @return   [String, nil]         Dumped data or nil if the argument is missing
         def dump(argvs)
-          return "" unless argvs
-          return "" unless argvs.is_a? Sisimai::Fact
+          return "" if argvs.nil? || argvs.is_a?(Sisimai::Fact) == false
 
           damneddata = argvs.damn
           yamlstring = nil

data/lib/sisimai/fact.rb

@@ -43,6 +43,7 @@ module Sisimai
       :timestamp,       # [Sisimai::Time] Date: header in the original message
       :timezoneoffset,  # [Integer] Time zone offset(seconds)
       :token,           # [String] Message token/MD5 Hex digest value
+      :toxic,           # [Boolean] EXPERIMENTAL
     ]
     attr_accessor(*@@rwaccessors)
 
@@ -93,6 +94,7 @@ module Sisimai
       @token          = argvs['token']
       @timestamp      = argvs['timestamp']
       @timezoneoffset = argvs['timezoneoffset']
+      @toxic          = argvs['toxic']
     end
 
     # Constructor of Sisimai::Fact
@@ -104,15 +106,12 @@ module Sisimai
     # @options argvs [String]  origin     Path to the original email file
     # @return        [Array]              Array of Sisimai::Fact objects
     def self.rise(**argvs)
-      return nil unless argvs
-      return nil unless argvs.is_a? Hash
+      return nil if argvs.is_a?(Hash) == false
 
-      email = argvs[:data]; return nil unless email
+      email = argvs[:data]; return nil if email.nil?
       args1 = {data: email, hook: argvs[:hook]}
       mesg1 = Sisimai::Message.rise(**args1)
-      return nil unless mesg1
-      return nil unless mesg1['ds']
-      return nil unless mesg1['rfc822']
+      return nil if mesg1.nil? || mesg1['ds'].nil? || mesg1['rfc822'].nil?
 
       deliveries = mesg1['ds'].dup
       rfc822data = mesg1['rfc822']
@@ -142,36 +141,36 @@ module Sisimai
           "replycode"      => e["replycode"],
           "rhost"          => e["rhost"],
           "decodedby"      => e["agent"],
+          "toxic"          => e["toxic"],
         }
 
         # EMAILADDRESS: Detect an email address from message/rfc822 part
         RFC822Head[:addresser].each do |f|
           # Check each header in message/rfc822 part
-          next unless rfc822data[f]
-          next if rfc822data[f].empty?
+          next if rfc822data[f].nil? || rfc822data[f].empty?
 
           j = Sisimai::Address.find(rfc822data[f]) || next
           piece['addresser'] = j.shift
           break
         end
 
-        unless piece['addresser']
+        if piece['addresser'].nil?
           # Fallback: Get the sender address from the header of the bounced email if the address is
           # not set at loop above.
           j = Sisimai::Address.find(mesg1['header']['to']) || []
           piece['addresser'] = j.shift
         end
-        next unless piece['addresser']
+        next if piece['addresser'].nil?
 
         # TIMESTAMP: Convert from a time stamp or a date string to a machine time.
         datestring = nil
         zoneoffset = 0
-        datevalues = []; datevalues << e['date'] unless e['date'].to_s.empty?
+        datevalues = []; datevalues << e['date'] if e['date'].to_s.empty? == false
 
         # Date information did not exist in message/delivery-status part,...
         RFC822Head[:date].each do |f|
           # Get the value of Date header or other date related header.
-          next unless rfc822data[f]
+          next if rfc822data[f].nil?
           datevalues << rfc822data[f]
         end
 
@@ -197,7 +196,7 @@ module Sisimai
         rescue
           warn " ***warning: Failed to strptime #{datestring.to_s}"
         end
-        next unless piece['timestamp']
+        next if piece['timestamp'].nil?
 
         # OTHER_TEXT_HEADERS:
         recv = mesg1["header"]["received"] || []
@@ -213,7 +212,7 @@ module Sisimai
               # Check the Received: headers backwards and get a remote hostname
               break if piece["rhost"].size > 0
               cv = Sisimai::RFC5322.received(re)[0]
-              next unless Sisimai::RFC1123.is_internethost(cv)
+              next if Sisimai::RFC1123.is_internethost(cv) == false
               piece['rhost'] = cv
             end
           end
@@ -225,7 +224,7 @@ module Sisimai
           recv.each do |le|
             # Check the Received: headers backwards and get a local hostname
             cv = Sisimai::RFC5322.received(le)[0]
-            next unless Sisimai::RFC1123.is_internethost(cv)
+            next if Sisimai::RFC1123.is_internethost(cv) == false
             piece['lhost'] = cv
             break
           end
@@ -241,7 +240,7 @@ module Sisimai
           end
           piece[v].delete!('[]()')    # Remove square brackets and curly brackets from the host variable
           piece[v].sub!(/\A.+=/, '')  # Remove string before "="
-          piece[v].sub!("\r", '')     # Remove CR at the end of the value
+          piece[v].delete_suffix("\r")# Remove CR at the end of the value
 
           if piece[v].include?(' ')
             # Check space character in each value and get the first hostname
@@ -255,13 +254,13 @@ module Sisimai
             end
           end
           piece[v] = ee[0] if piece[v].include?(' ')
-          piece[v].chomp!('.') if piece[v].end_with?('.')   # Remove "." at the end of the value
+          piece[v].delete_suffix!('.')  # Remove "." at the end of the value
         end
 
         # Subject: header of the original message
         piece['subject'] = rfc822data['subject'] || ''
         piece['subject'].scrub!('?')
-        piece['subject'].chomp!("\r") if piece['subject'].end_with?("\r")
+        piece['subject'].delete_suffix("\r")
 
         # The value of "List-Id" header
         if Sisimai::String.aligned(rfc822data['list-id'], ['<', '.', '>'])
@@ -290,7 +289,7 @@ module Sisimai
         # CHECK_DELIVERY_STATUS_VALUE: Cleanup the value of "Diagnostic-Code:" header
         if piece['diagnosticcode'].to_s.size > 0
           # Get an SMTP Reply Code and an SMTP Enhanced Status Code
-          piece['diagnosticcode'].chop if piece['diagnosticcode'][-1, 1] == "\r"
+          piece['diagnosticcode'].delete_suffix("\r")
 
           cs = Sisimai::SMTP::Status.find(piece['diagnosticcode'])
           cr = Sisimai::SMTP::Reply.find(piece['diagnosticcode'], cs)
@@ -355,11 +354,11 @@ module Sisimai
 
         piece["diagnostictype"] = "X-UNIX" if piece["reason"] == "mailererror"
         if piece["diagnostictype"].empty?
-          piece["diagnostictype"] = "SMTP" unless %w[feedback vacation].include?(piece["reason"])
+          piece["diagnostictype"] = "SMTP" if %w[feedback vacation].include?(piece["reason"]) == false
         end
 
         # Check the value of SMTP command
-        piece['command'] = '' unless Sisimai::SMTP::Command.test(piece['command'])
+        piece['command'] = '' if Sisimai::SMTP::Command.test(piece['command']) == false
 
         # Create parameters for the constructor
         as = Sisimai::Address.new(piece['addresser'])          || next; next if as.void
@@ -383,6 +382,7 @@ module Sisimai
         thing['catch']          = piece['catch'] || nil
         thing["feedbackid"]     = ""
         thing['hardbounce']     = piece['hardbounce']
+        thing['toxic']          = piece['toxic']
         thing['replycode']      = Sisimai::SMTP::Reply.find(piece['diagnosticcode']) if thing['replycode'].empty?
         thing['timestamp']      = TimeModule.parse(::Time.at(piece['timestamp']).to_s)
         thing['timezoneoffset'] = piece['timezoneoffset'] || '+0000'
@@ -394,16 +394,15 @@ module Sisimai
           # when the recipient address is same with the value of thing['alias'].
           break if thing['alias'].empty?
           break if thing['recipient'].address != thing['alias']
-          break unless rfc822data.has_key?('received')
+          break if rfc822data.has_key?('received') == false
           break if rfc822data['received'].empty?
 
           rfc822data['received'].reverse.each do |er|
             # Search for the string " for " from the Received: header
-            next unless er.include?(' for ')
+            next if er.include?(' for ') == false
 
             af = Sisimai::RFC5322.received(er)
-            next if af.empty? || af[5].empty?
-            next unless Sisimai::Address.is_emailaddress(af[5])
+            next if af.empty? || af[5].empty? || Sisimai::Address.is_emailaddress(af[5]) == false
             next if thing['recipient'].address == af[5]
 
             thing['alias'] = af[5]
@@ -430,7 +429,7 @@ module Sisimai
         # HARDBOUNCE: Set the value of "hardbounce", default value of "bouncebounce" is false
         if thing['reason'] == 'delivered' || thing['reason'] == 'feedback' || thing['reason'] == 'vacation'
           # Delete the value of ReplyCode when the Reason is "feedback" or "vacation"
-          thing['replycode'] = '' unless thing['reason'] == 'delivered'
+          thing['replycode'] = '' if thing['reason'] != 'delivered'
         else
           # The reason is not "delivered", or "feedback", or "vacation"
           smtperrors = "#{piece['deliverystatus']} #{piece['diagnosticcode']}"
@@ -456,7 +455,7 @@ module Sisimai
           thing['replycode'] = cx[1].start_with?(cx[0]) ? cx[1] : ''
         end
 
-        unless ActionList.has_key?(thing['action'])
+        if ActionList.has_key?(thing['action']) == false
           # There is an action value which is not described at RFC1894
           if ox = Sisimai::RFC1894.field("Action: #{thing['action']}")
             # Rewrite the value of "Action:" field to the valid value
@@ -484,12 +483,44 @@ module Sisimai
 
         # Feedback-ID: 1.us-west-2.QHuyeCQrGtIIMGKQfVdUhP9hCQR2LglVOrRamBc+Prk=:AmazonSES
         thing["feedbackid"] = rfc822data["feedback-id"] || ""
+        thing["toxic"]    ||= is_toxic(thing)
 
         listoffact << Sisimai::Fact.new(thing)
       end
       return listoffact
     end
 
+    def self.is_toxic(thing = nil)
+      return false unless thing
+      cr = thing['reason']         || 'undefined'
+      cv = thing['replycode']      || ''
+      cw = thing['deliverystatus'] || ''
+
+      # 1. Hard bounces or some soft bounces with a permanent error.
+      #   1-1. Hard bounce: UserUnknown, HostUnknown, HasMoved, NotAccept
+      #   1-2. Almost hard bounce: Suspend, Suppressed
+      return false if cv.start_with?('4') || cw.start_with?('4')
+      return true  if %w[userunknown hostunknown hasmoved notaccept suspend suppressed].any? { |a| cr == a }
+
+      if %w[mailboxfull filtered norelaying].any? { |a| cr == a }
+        # 2. Several softbounces: MailboxFull, Filtered, NoRelaying
+        #   2-1. The SMTP command is "RCPT" except "MailboxFull".
+        #   2-2. The SMTP reply code begins with "5" such as "550".
+        #   2-3. The SMTP status code is explicit code (not empty, not 5.0.9XX).
+        #   2-4. The SMTP status code begins with "5." such as "5.1.1".
+        return true  if cr != 'mailboxfull' && thing['command'] == "RCPT"
+        return true  if cv.start_with?('5')
+        return false if Sisimai::SMTP::Status.is_explicit(cw) == false
+        return true  if cw.start_with?('5.')
+
+      elsif cr == 'feedback'
+        # 3. Feedback Loop
+        #   3-1. The Feedback Type is any of "abuse", "fraud", "opt-out"
+        return true  if %w[abuse fraud opt-out].any? { |a| thing['feedbacktype'] == a }
+      end
+      return false
+    end
+
     # Convert from Sisimai::Fact object to a Hash
     # @return   [Hash] Hashed data
     def damn
@@ -504,13 +535,10 @@ module Sisimai
         v = {}
         stringdata.each { |e| v[e] = self.send(e.to_sym) || '' }
         v['hardbounce'] = self.hardbounce
+        v['toxic']      = self.toxic
         v['addresser']  = self.addresser.address
         v['recipient']  = self.recipient.address
         v['timestamp']  = self.timestamp.to_time.to_i
-
-        # Backward compatibility until v5.5.0
-        v["smtpagent"] = self.decodedby
-        v["smtpcommand"] = self.command
         data = v
       rescue
         warn ' ***warning: Failed to execute Sisimai::Fact.damn'
@@ -524,7 +552,7 @@ module Sisimai
     # @return   [String]        data
     #           [Nil]           The value of the first argument is neither "json" nor "yaml"
     def dump(type = 'json')
-      return nil unless %w[json yaml].include?(type)
+      return nil if %w[json yaml].include?(type) == false
       referclass = "Sisimai::Fact::#{type.upcase}"
 
       begin
@@ -542,9 +570,6 @@ module Sisimai
     def to_json(*)
       return self.dump('json')
     end
-
-    def smtpagent;  warn " ***warning: Sisimai::Fact.smtpagent will be removed at v5.5.0"; return self.decodedby; end
-    def smtpcomand; warn " ***warning: Sisimai::Fact.smtpcommand will be removed at v5.5.0"; return self.command; end
   end
 end
 

data/lib/sisimai/lda.rb

@@ -78,14 +78,14 @@ module Sisimai
 
         LocalAgent.each_key do |e|
           # Find a lcoal delivery agent name from the entire message body
-          next unless LocalAgent[e].any? { |a| issuedcode.include?(a) }
+          next if LocalAgent[e].none? { |a| issuedcode.include?(a) }
           deliversby = e; break
         end
         return "" if deliversby.empty?
 
         MessagesOf[deliversby].each_key do |e|
           # The key is a bounce reason name
-          next unless MessagesOf[deliversby][e].any? { |a| issuedcode.include?(a) }
+          next if MessagesOf[deliversby][e].none? { |a| issuedcode.include?(a) }
           reasontext = e; break
         end
 

data/lib/sisimai/lhost/activehunter.rb

@@ -18,7 +18,7 @@ module Sisimai::Lhost
       def inquire(mhead, mbody)
         # :from    => %r/\A"MAILER-DAEMON"/,
         # :subject => %r/FAILURE NOTICE :/,
-        return nil unless mhead['x-ahmailid']
+        return nil if mhead['x-ahmailid'].nil?
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = nil
         emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
@@ -57,13 +57,12 @@ module Sisimai::Lhost
           else
             #  ----- Transcript of session follows -----
             # 550 sorry, no mailbox here by that name (#5.1.1 - chkusr)
-            next if e[0, 1].ord <  48
-            next if e[0, 1].ord > 122
-            next unless v['diagnosis'].empty?
+            next if e[0, 1].ord <  48 || e[0, 1].ord > 122
+            next if v['diagnosis'].empty? == false
             v['diagnosis'] = e
           end
         end
-        return nil unless recipients > 0
+        return nil if recipients == 0
 
         dscontents.each { |e| e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) }
         return {"ds" => dscontents, "rfc822" => emailparts[1]}

data/lib/sisimai/lhost/amazonses.rb

@@ -45,7 +45,7 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       ReasonPair = {
-        "Supressed"                => "suppressed",
+        "Suppressed"               => "suppressed",
         "OnAccountSuppressionList" => "suppressed",
         "General"                  => "onhold",
         "MailboxFull"              => "mailboxfull",
@@ -87,8 +87,7 @@ module Sisimai::Lhost
             p3 = sespayload.index("{", p2 + 9)
             p4 = sespayload.index("\n", p2 + 9)
             sespayload = sespayload[p3, p4 - p3]
-            sespayload = sespayload.chop if sespayload[-1, 1] == ","
-            sespayload = sespayload.chop if sespayload[-1, 1] == '"'
+            sespayload = sespayload.delete_suffix(',').delete_suffix('"')
           end
 
           break if sespayload.include?("notificationType") == false
@@ -150,7 +149,7 @@ module Sisimai::Lhost
 
           ReasonPair.each_key do |f|
             #  Try to find the bounce reason by "bounceSubType"
-            next unless ReasonPair[f] == p["bounceSubType"]
+            next if ReasonPair[f] != p["bounceSubType"]
             v["reason"] = f; break
           end
 

data/lib/sisimai/lhost/apachejames.rb

@@ -24,7 +24,7 @@ module Sisimai::Lhost
         match += 1 if mhead["subject"] == "[BOUNCE]"
         match += 1 if mhead["message-id"].to_s.include?(".JavaMail.")
         match += 1 if mhead["received"].any? { |a| a.include?("JAMES SMTP Server") }
-        return nil unless match > 0
+        return nil if match == 0
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = dscontents[-1]
         emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
@@ -87,7 +87,7 @@ module Sisimai::Lhost
 
           end
         end
-        return nil unless recipients > 0
+        return nil if recipients == 0
 
         if emailparts[1].empty?
           # The original message is empty

data/lib/sisimai/lhost/biglobe.rb

@@ -22,9 +22,9 @@ module Sisimai::Lhost
       # @return [Hash]          Bounce data list and message/rfc822 part
       # @return [Nil]           it failed to decode or the arguments are missing
       def inquire(mhead, mbody)
-        return nil unless mhead['from'].include?('postmaster@')
-        return nil unless %w[biglobe inacatv tmtv ttv].any? { |a| mhead['from'].include?('@' + a + '.ne.jp') }
-        return nil unless mhead['subject'].start_with?('Returned mail:')
+        return nil if mhead['from'].include?('postmaster@') == false
+        return nil if %w[biglobe inacatv tmtv ttv].none? { |a| mhead['from'].include?('@' + a + '.ne.jp') }
+        return nil if mhead['subject'].start_with?('Returned mail:') == false
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = nil
         emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
@@ -67,7 +67,7 @@ module Sisimai::Lhost
               v = dscontents[-1]
             end
 
-            next unless Sisimai::Address.is_emailaddress(e)
+            next if Sisimai::Address.is_emailaddress(e) == false
             v['recipient'] = e
             recipients += 1
           else
@@ -75,14 +75,14 @@ module Sisimai::Lhost
             v['diagnosis'] += "#{e }"
           end
         end
-        return nil unless recipients > 0
+        return nil if recipients == 0
 
         dscontents.each do |e|
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
           MessagesOf.each_key do |r|
             # Verify each regular expression of session errors
-            next unless MessagesOf[r].any? { |a| e['diagnosis'].include?(a) }
+            next if MessagesOf[r].none? { |a| e['diagnosis'].include?(a) }
             e['reason'] = r
             break
           end

data/lib/sisimai/lhost/courier.rb

@@ -36,7 +36,7 @@ module Sisimai::Lhost
           # Message-ID: <courier.4D025E3A.00001792@5jo.example.org>
           match += 1 if mhead['message-id'].start_with?('<courier.')
         end
-        return nil unless match > 0
+        return nil if match == 0
 
         require 'sisimai/rfc1123'
         require 'sisimai/rfc1894'
@@ -94,11 +94,11 @@ module Sisimai::Lhost
               v['diagnosis'] = o[2]
             else
               # Other DSN fields defined in RFC3464
-              next unless fieldtable[o[0]]
+              next if fieldtable[o[0]].nil?
               next if o[3] == "host" && Sisimai::RFC1123.is_internethost(o[2]) == false
               v[fieldtable[o[0]]] = o[2]
 
-              next unless f == 1
+              next if f != 1
               permessage[fieldtable[o[0]]] = o[2]
             end
           else
@@ -114,14 +114,14 @@ module Sisimai::Lhost
               thecommand = Sisimai::SMTP::Command.find(e)
             else
               # Continued line of the value of Diagnostic-Code field
-              next unless readslices[-2].start_with?('Diagnostic-Code:')
-              next unless e.start_with?(' ')
+              next if readslices[-2].start_with?('Diagnostic-Code:') == false
+              next if e.start_with?(' ') == false
               v['diagnosis'] += " #{Sisimai::String.sweep(e)}"
               readslices[-1]  = "Diagnostic-Code: #{e}"
             end
           end
         end
-        return nil unless recipients > 0
+        return nil if recipients == 0
 
         dscontents.each do |e|
           # Set default values if each value is empty.
@@ -131,7 +131,7 @@ module Sisimai::Lhost
 
           MessagesOf.each_key do |r|
             # Verify each regular expression of session errors
-            next unless MessagesOf[r].any? { |a| e['diagnosis'].include?(a) }
+            next if MessagesOf[r].none? { |a| e['diagnosis'].include?(a) }
             e['reason'] = r
             break
           end

data/lib/sisimai/lhost/domino.rb

@@ -26,7 +26,7 @@ module Sisimai::Lhost
       # @return [Hash]          Bounce data list and message/rfc822 part
       # @return [Nil]           it failed to decode or the arguments are missing
       def inquire(mhead, mbody)
-        return nil unless mhead['subject'].start_with?('DELIVERY FAILURE:', 'DELIVERY_FAILURE:')
+        return nil if mhead['subject'].start_with?('DELIVERY FAILURE:', 'DELIVERY_FAILURE:') == false
 
         require 'sisimai/rfc1123'
         require 'sisimai/rfc1894'
@@ -107,17 +107,17 @@ module Sisimai::Lhost
                 v['diagnosis'] = o[2] if v['diagnosis'].empty?
               else
                 # Other DSN fields defined in RFC3464
-                next unless fieldtable[o[0]]
+                next if fieldtable[o[0]].nil?
                 next if o[3] == "host" && Sisimai::RFC1123.is_internethost(o[2]) == false
                 v[fieldtable[o[0]]] = o[2]
 
-                next unless f == 1
+                next if f != 1
                 permessage[fieldtable[o[0]]] = o[2]
               end
             end
           end
         end
-        return nil unless recipients > 0
+        return nil if recipients == 0
 
         dscontents.each do |e|
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
@@ -126,7 +126,7 @@ module Sisimai::Lhost
 
           MessagesOf.each_key do |r|
             # Check each regular expression of Domino error messages
-            next unless MessagesOf[r].any? { |a| e['diagnosis'].include?(a) }
+            next if MessagesOf[r].none? { |a| e['diagnosis'].include?(a) }
             e['reason'] = r
             e['status'] = Sisimai::SMTP::Status.code(r, false) if e["status"].empty?
             break
@@ -134,7 +134,7 @@ module Sisimai::Lhost
         end
 
         # Set the value of subjecttxt as a Subject if there is no original message in the bounce mail.
-        emailparts[1] += "Subject: #{subjecttxt}\n" unless emailparts[1].include?("\nSubject:")
+        emailparts[1] += "Subject: #{subjecttxt}\n" if emailparts[1].include?("\nSubject:") == false
 
         return {"ds" => dscontents, "rfc822" => emailparts[1]}
       end

data/lib/sisimai/lhost/dragonfly.rb

@@ -38,8 +38,8 @@ module Sisimai::Lhost
       # @return [Hash]          Bounce data list and message/rfc822 part
       # @return [Nil]           it failed to decode or the arguments are missing
       def inquire(mhead, mbody)
-        return nil unless mhead['subject'].start_with?('Mail delivery failed')
-        return nil unless mhead['received'].any? { |a| a.include?(' (DragonFly Mail Agent') }
+        return nil if mhead['subject'].start_with?('Mail delivery failed') == false
+        return nil if mhead['received'].none? { |a| a.include?(' (DragonFly Mail Agent') }
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = nil
         emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
@@ -83,7 +83,7 @@ module Sisimai::Lhost
 
             # Pick the remote hostname, and the SMTP command
             # net.c:500| snprintf(errmsg, sizeof(errmsg), "%s [%s] did not like our %s:\n%s",
-            next unless e.include?(' did not like our ')
+            next if e.include?(' did not like our ') == false
             next if v['rhost'] != ""
 
             p = e.split(' ', 3)
@@ -91,13 +91,13 @@ module Sisimai::Lhost
             v['command'] = Sisimai::SMTP::Command.find(e)
           end
         end
-        return nil unless recipients > 0
+        return nil if recipients == 0
 
         dscontents.each do |e|
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
           MessagesOf.each_key do |r|
             # Verify each regular expression of session errors
-            next unless MessagesOf[r].any? { |a| e['diagnosis'].include?(a) }
+            next if MessagesOf[r].none? { |a| e['diagnosis'].include?(a) }
             e['reason'] = r
             break
           end

data/lib/sisimai/lhost/einsundeins.rb

@@ -19,8 +19,8 @@ module Sisimai::Lhost
       # @return [Hash]          Bounce data list and message/rfc822 part
       # @return [Nil]           it failed to decode or the arguments are missing
       def inquire(mhead, mbody)
-        return nil unless mhead['from'].start_with?('"Mail Delivery System"')
-        return nil unless mhead['subject'] == 'Mail delivery failed: returning message to sender'
+        return nil if mhead['from'].start_with?('"Mail Delivery System"') == false
+        return nil if mhead['subject'] != 'Mail delivery failed: returning message to sender'
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = nil
         emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
@@ -76,7 +76,7 @@ module Sisimai::Lhost
             end
           end
         end
-        return nil unless recipients > 0
+        return nil if recipients == 0
 
         require 'sisimai/smtp/command'
         dscontents.each do |e|
@@ -102,7 +102,7 @@ module Sisimai::Lhost
 
           MessagesOf.each_key do |r|
             # Verify each regular expression of session errors
-            next unless MessagesOf[r].any? { |a| e['diagnosis'].include?(a) }
+            next if MessagesOf[r].none? { |a| e['diagnosis'].include?(a) }
             e['reason'] = r
             break
           end

data/lib/sisimai/lhost/exchange2003.rb

@@ -74,14 +74,14 @@ module Sisimai::Lhost
             throw :EXCHANGE_OR_NOT if mhead['received'].empty?
             mhead['received'].each do |e|
               # Received: by ***.**.** with Internet Mail Service (5.5.2657.72)
-              next unless e.include?(' with Internet Mail Service (')
+              next if e.include?(' with Internet Mail Service (') == false
               match += 1
               throw :EXCHANGE_OR_NOT
             end
             break
           end
         end
-        return nil unless match > 0
+        return nil if match == 0
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = nil
         emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
@@ -160,26 +160,26 @@ module Sisimai::Lhost
             #
             if e.start_with?('  To: ') || e.start_with?('      To: ')
               #  To:      shironeko@example.jp
-              next unless connheader['to'].empty?
+              next if connheader['to'].empty? == false
               connheader['to'] = e[e.rindex(' ') + 1, e.size]
               connvalues += 1
 
             elsif e.start_with?('      Subject: ') || e.start_with?('  Subject: ')
               #  Subject: ...
-              next unless connheader['subject'].empty?
+              next if connheader['subject'].empty? == false
               connheader['subject'] = e[e.rindex(' ') + 1, e.size]
               connvalues += 1
 
             elsif e.start_with?('  Sent: ') || e.start_with?('      Sent: ')
               #  Sent:    Thu, 29 Apr 2010 18:14:35 +0000
               #  Sent:    4/29/99 9:19:59 AM
-              next unless connheader['date'].empty?
+              next if connheader['date'].empty? == false
               connheader['date'] = e[e.index(':') + 2, e.size]
               connvalues += 1
             end
           end
         end
-        return nil unless recipients > 0
+        return nil if recipients == 0
 
         dscontents.each do |e|
           e.delete('msexch')
@@ -193,7 +193,7 @@ module Sisimai::Lhost
 
             ErrorCodes.each_key do |r|
               # Find captured code from the error code table
-              next unless ErrorCodes[r].index(capturedcode)
+              next if ErrorCodes[r].index(capturedcode).nil?
               e['reason'] = r
               e['status'] = Sisimai::SMTP::Status.code(r)
               break