sisimai 4.22.7 → 4.23.0

data/lib/sisimai/order/email.rb

@@ -160,7 +160,7 @@ module Sisimai
         # @param    [String] group  Group name for "ORDER BY"
         # @return   [Hash]          Pattern table for the group
         def by(group = '')
-          return {} unless group.size > 0
+          return {} if group.empty?
           return PatternTable[group] if PatternTable.key?(group)
           return {}
         end
@@ -169,12 +169,9 @@ module Sisimai
         # @return   [Array] Ordered module list
         def another
           rv = []
-          rv.concat(EngineOrder1)
-          rv.concat(EngineOrder2)
-          rv.concat(EngineOrder3)
-          rv.concat(EngineOrder4)
-          rv.concat(EngineOrder5)
-          rv.concat(EngineOrder9)
+          [EngineOrder1, EngineOrder2, EngineOrder3, EngineOrder4, EngineOrder5, EngineOrder9].each do |e|
+            rv += e
+          end
           return rv
         end
 
@@ -185,7 +182,7 @@ module Sisimai
           table = {}
           skips = { 'return-path' => 1, 'x-mailer' => 1 }
 
-          order.each do |e|
+          while e = order.shift do
             # Load email headers from each MTA module
             require e.gsub('::', '/').downcase
 

data/lib/sisimai/order/json.rb

@@ -15,7 +15,7 @@ module Sisimai
           # Make default order of MTA(JSON) modules to be loaded
           rv = []
           begin
-            rv.concat(Sisimai::Bite::JSON.index.map { |e| 'Sisimai::Bite::JSON::' << e })
+            rv += Sisimai::Bite::JSON.index.map { |e| 'Sisimai::Bite::JSON::' << e }
           rescue
             # Failed to load MTA(JSON) module
             next
@@ -40,7 +40,7 @@ module Sisimai
         # @param    [String] group  Group name for "ORDER BY"
         # @return   [Hash]          Pattern table for the group
         def by(group = '')
-          return {} unless group.size > 0
+          return {} if group.empty?
           return PatternTable[group] if PatternTable.key?(group)
           return {}
         end

data/lib/sisimai/reason.rb

@@ -52,7 +52,7 @@ module Sisimai
         unless GetRetried.index(argvs.reason)
           # Return reason text already decided except reason match with the
           # regular expression of ->retry() method.
-          return argvs.reason if argvs.reason.size > 0
+          return argvs.reason unless argvs.reason.empty?
         end
 
         statuscode = argvs.deliverystatus || ''
@@ -92,7 +92,7 @@ module Sisimai
               require 'sisimai/reason/vacation'
               reasontext = 'vacation' if Sisimai::Reason::Vacation.match(argvs.diagnosticcode.downcase)
             end
-            reasontext ||= 'onhold' if argvs.diagnosticcode.size > 0
+            reasontext ||= 'onhold' unless argvs.diagnosticcode.empty?
           end
           reasontext ||= 'undefined'
         end
@@ -105,17 +105,13 @@ module Sisimai
       #                                   is missing or invalid object
       # @see get
       def anotherone(argvs)
-        return nil unless argvs
         return nil unless argvs.is_a? Sisimai::Data
-        return argvs.reason if argvs.reason.size > 0
+        return argvs.reason unless argvs.reason.empty?
 
         statuscode = argvs.deliverystatus || ''
         diagnostic = argvs.diagnosticcode.downcase || ''
         commandtxt = argvs.smtpcommand    || ''
         trytomatch = nil
-        reasontext = ''
-
-        require 'sisimai/smtp/status'
         reasontext = Sisimai::SMTP::Status.name(statuscode)
 
         catch :TRY_TO_MATCH do

data/lib/sisimai/reason/blocked.rb

@@ -159,11 +159,7 @@ module Sisimai
         #                                   false: is not blocked by the client
         # @see      http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return nil unless argvs
-          return nil unless argvs.is_a? Sisimai::Data
           return true if argvs.reason == 'blocked'
-
-          require 'sisimai/smtp/status'
           return true if Sisimai::SMTP::Status.name(argvs.deliverystatus) == 'blocked'
           return true if match(argvs.diagnosticcode.downcase)
           return false

data/lib/sisimai/reason/contenterror.rb

@@ -28,7 +28,7 @@ module Sisimai
             'this message contain improperly-formatted binary content',
             'this message contain text that uses unnecessary base64 encoding',
           ]
-          return true if index.find { |a| argv1.include?(a) }
+          return true if index.any? { |a| argv1.include?(a) }
           return false
         end
 

data/lib/sisimai/reason/exceedlimit.rb

@@ -20,7 +20,7 @@ module Sisimai
           return nil unless argv1
           index = ['message too large']
 
-          return true if index.find { |a| argv1.include?(a) }
+          return true if index.any? { |a| argv1.include?(a) }
           return false
         end
 
@@ -30,15 +30,12 @@ module Sisimai
         #                                 false: Did not exceed the limit
         # @see      http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return nil unless argvs
-          return nil unless argvs.is_a? Sisimai::Data
-          return nil unless argvs.deliverystatus.size > 0
+          return nil  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
-          require 'sisimai/smtp/status'
           return true if Sisimai::SMTP::Status.name(argvs.deliverystatus) == 'exceedlimit'
 
           # Check the value of Diagnosic-Code: header with patterns

data/lib/sisimai/reason/expired.rb

@@ -37,7 +37,7 @@ module Sisimai
             'your message could not be delivered for more than',
           ]
 
-          return true if index.find { |a| argv1.include?(a) }
+          return true if index.any? { |a| argv1.include?(a) }
           return false
         end
 

data/lib/sisimai/reason/filtered.rb

@@ -36,7 +36,7 @@ module Sisimai
             'you have been blocked by the recipient',
           ]
 
-          return true if index.find { |a| argv1.include?(a) }
+          return true if index.any? { |a| argv1.include?(a) }
           return false
         end
 
@@ -46,11 +46,8 @@ module Sisimai
         #                                   false: is not filtered
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return nil unless argvs
-          return nil unless argvs.is_a? Sisimai::Data
           return true if argvs.reason == 'filtered'
 
-          require 'sisimai/smtp/status'
           require 'sisimai/reason/userunknown'
           commandtxt = argvs.smtpcommand || ''
           diagnostic = argvs.diagnosticcode.downcase || ''

data/lib/sisimai/reason/hasmoved.rb

@@ -20,7 +20,7 @@ module Sisimai
           return nil unless argv1
           index = [' has been replaced by ']
 
-          return true if index.find { |a| argv1.include?(a) }
+          return true if index.any? { |a| argv1.include?(a) }
           return false
         end
 
@@ -30,9 +30,6 @@ module Sisimai
         #                                   false: Has not moved
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return nil unless argvs
-          return nil unless argvs.is_a? Sisimai::Data
-
           return true if argvs.reason == 'hasmoved'
           return true if match(argvs.diagnosticcode.downcase)
           return false

data/lib/sisimai/reason/hostunknown.rb

@@ -35,7 +35,7 @@ module Sisimai
             'unrouteable address',
           ]
 
-          return true if index.find { |a| argv1.include?(a) }
+          return true if index.any? { |a| argv1.include?(a) }
           return false
         end
 
@@ -45,11 +45,8 @@ module Sisimai
         #                                   false: is not unknown host.
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return nil unless argvs
-          return nil unless argvs.is_a? Sisimai::Data
           return true if argvs.reason == 'hostunknown'
 
-          require 'sisimai/smtp/status'
           diagnostic = argvs.diagnosticcode.downcase || ''
           statuscode = argvs.deliverystatus || ''
 

data/lib/sisimai/reason/mailboxfull.rb

@@ -65,7 +65,7 @@ module Sisimai
             'would be over the allowed quota',
           ]            
 
-          return true if index.find { |a| argv1.include?(a) }
+          return true if index.any? { |a| argv1.include?(a) }
           return false
         end
 
@@ -75,15 +75,12 @@ module Sisimai
         #                                   false: is not mailbox full
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return nil unless argvs
-          return nil unless argvs.is_a? Sisimai::Data
-          return nil unless argvs.deliverystatus.size > 0
+          return nil  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
-          require 'sisimai/smtp/status'
           return true if Sisimai::SMTP::Status.name(argvs.deliverystatus) == 'mailboxfull'
 
           # Check the value of Diagnosic-Code: header with patterns

data/lib/sisimai/reason/mesgtoobig.rb

@@ -32,7 +32,7 @@ module Sisimai
             'taille limite du message atteinte',
           ]
 
-          return true if index.find { |a| argv1.include?(a) }
+          return true if index.any? { |a| argv1.include?(a) }
           return false
         end
 
@@ -42,11 +42,8 @@ module Sisimai
         #                                   false: is not big
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return nil unless argvs
-          return nil unless argvs.is_a? Sisimai::Data
           return true if argvs.reason == 'mesgtoobig'
 
-          require 'sisimai/smtp/status'
           statuscode = argvs.deliverystatus || ''
           tempreason = Sisimai::SMTP::Status.name(statuscode)
 

data/lib/sisimai/reason/networkerror.rb

@@ -40,7 +40,7 @@ module Sisimai
             'unrouteable mail domain',
           ]
 
-          return true if index.find { |a| argv1.include?(a) }
+          return true if index.any? { |a| argv1.include?(a) }
           return false
         end
 

data/lib/sisimai/reason/norelaying.rb

@@ -37,7 +37,7 @@ module Sisimai
             'unable to relay for',
           ]
 
-          return true if index.find { |a| argv1.include?(a) }
+          return true if index.any? { |a| argv1.include?(a) }
           return false
         end
 
@@ -47,9 +47,6 @@ module Sisimai
         #                                   false: is not
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return nil unless argvs
-          return nil unless argvs.is_a? Sisimai::Data
-
           r = argvs.reason || ''
           if r.size > 0
             # Do not overwrite the reason

data/lib/sisimai/reason/notaccept.rb

@@ -29,7 +29,7 @@ module Sisimai
             'smtp protocol returned a permanent error',
           ]
 
-          return true if index.find { |a| argv1.include?(a) }
+          return true if index.any? { |a| argv1.include?(a) }
           return false
         end
 
@@ -39,8 +39,6 @@ module Sisimai
         #                                   false: Accept
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return nil unless argvs
-          return nil unless argvs.is_a? Sisimai::Data
           return true if argvs.reason == 'notaccept'
 
           # SMTP Reply Code is 554 or 556

data/lib/sisimai/reason/onhold.rb

@@ -25,12 +25,8 @@ module Sisimai
         #                                   false: is not "onhold"
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return nil unless argvs
-          return nil unless argvs.is_a? Sisimai::Data
-          return nil unless argvs.deliverystatus.size > 0
+          return nil  if argvs.deliverystatus.empty?
           return true if argvs.reason == 'onhold'
-
-          require 'sisimai/smtp/status'
           return true if Sisimai::SMTP::Status.name(argvs.deliverystatus) == 'onhold'
           return false
         end

data/lib/sisimai/reason/policyviolation.rb

@@ -45,7 +45,7 @@ module Sisimai
             'you have exceeded the the allowable number of posts without solving a captcha',
           ]
 
-          return true if index.find { |a| argv1.include?(a) }
+          return true if index.any? { |a| argv1.include?(a) }
           return false
         end
 

data/lib/sisimai/reason/rejected.rb

@@ -69,8 +69,8 @@ module Sisimai
             'you are sending to/from an address that has been blacklisted',
           ]
 
-          return false if isnot.find { |a| argv1.include?(a) }
-          return true  if index.find { |a| argv1.include?(a) }
+          return false if isnot.any? { |a| argv1.include?(a) }
+          return true  if index.any? { |a| argv1.include?(a) }
           return false
         end
 
@@ -80,10 +80,6 @@ module Sisimai
         #                                   false: is not rejected by the sender
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return nil unless argvs
-          return nil unless argvs.is_a? Sisimai::Data
-
-          require 'sisimai/smtp/status'
           tempreason = Sisimai::SMTP::Status.name(argvs.deliverystatus)
           tempreason = 'undefined' if tempreason.empty?
           diagnostic = argvs.diagnosticcode.downcase

data/lib/sisimai/reason/spamdetected.rb

@@ -160,12 +160,8 @@ module Sisimai
         #                                   false: is not rejected due to spam
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return nil unless argvs
-          return nil unless argvs.is_a? Sisimai::Data
-          return nil unless argvs.deliverystatus.size > 0
+          return nil  if argvs.deliverystatus.empty?
           return true if argvs.reason == 'spamdetected'
-
-          require 'sisimai/smtp/status'
           return true if Sisimai::SMTP::Status.name(argvs.deliverystatus) == 'spamdetected'
           return true if match(argvs.diagnosticcode.downcase)
           return false

data/lib/sisimai/reason/suspend.rb

@@ -33,7 +33,7 @@ module Sisimai
             'vdelivermail: account is locked email bounced',
           ]
 
-          return true if index.find { |a| argv1.include?(a) }
+          return true if index.any? { |a| argv1.include?(a) }
           return false
         end
 
@@ -43,10 +43,7 @@ module Sisimai
         #                                   false: is not suspended
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return nil unless argvs
-          return nil unless argvs.is_a? Sisimai::Data
-          return nil unless argvs.deliverystatus.size > 0
-
+          return nil  if argvs.deliverystatus.empty?
           return true if argvs.reason == 'suspend'
           return true if match(argvs.diagnosticcode.downcase)
           return false

data/lib/sisimai/reason/syntaxerror.rb

@@ -26,9 +26,6 @@ module Sisimai
         # @since 4.1.25
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return nil unless argvs
-          return nil unless argvs.is_a? Sisimai::Data
-
           return true if argvs.reason == 'syntaxerror'
           return true if argvs.replycode =~ /\A[45]0[0-7]\z/
           return false

data/lib/sisimai/reason/systemerror.rb

@@ -41,7 +41,7 @@ module Sisimai
             'timeout waiting for input',
           ]
 
-          return true if index.find { |a| argv1.include?(a) }
+          return true if index.any? { |a| argv1.include?(a) }
           return false
         end
 

data/lib/sisimai/reason/systemfull.rb

@@ -23,7 +23,7 @@ module Sisimai
             'requested mail action aborted: exceeded storage allocation',   # MS Exchange
           ]
 
-          return true if index.find { |a| argv1.include?(a) }
+          return true if index.any? { |a| argv1.include?(a) }
           return false
         end
 

data/lib/sisimai/reason/toomanyconn.rb

@@ -37,7 +37,7 @@ module Sisimai
             'we have already made numerous attempts to deliver this message',
           ]
 
-          return true if index.find { |a| argv1.include?(a) }
+          return true if index.any? { |a| argv1.include?(a) }
           return false
         end
 
@@ -47,11 +47,7 @@ module Sisimai
         #                                   false: is not filtered
         # @see http://www.ietf.org/rfc/rfc2822.txt
         def true(argvs)
-          return nil unless argvs
-          return nil unless argvs.is_a? Sisimai::Data
           return true if argvs.reason == 'toomanyconn'
-
-          require 'sisimai/smtp/status'
           return true if Sisimai::SMTP::Status.name(argvs.deliverystatus) == 'toomanyconn'
           return true if match(argvs.diagnosticcode.downcase)
           return false