sisimai 4.22.7 → 4.23.0

data/lib/sisimai/reason/userunknown.rb

@@ -153,11 +153,8 @@ module Sisimai
         #                                   false: is not unknown user.
         # @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 == 'userunknown'
 
-          require 'sisimai/smtp/status'
           diagnostic = argvs.diagnosticcode.downcase;
           tempreason = Sisimai::SMTP::Status.name(argvs.deliverystatus)
           return false if tempreason == 'suspend'
@@ -170,7 +167,7 @@ module Sisimai
             prematches = %w[NoRelaying Blocked MailboxFull HasMoved Blocked Rejected]
             matchother = false
 
-            prematches.each do |e|
+            while e = prematches.shift do
               # Check the value of "Diagnostic-Code" with other error patterns.
               p = 'Sisimai::Reason::' << e
               r = nil

data/lib/sisimai/reason/vacation.rb

@@ -21,7 +21,7 @@ module Sisimai
             'i will be traveling for work on',
           ]
 
-          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/virusdetected.rb

@@ -33,7 +33,7 @@ module Sisimai
             'your message was infected with a virus',
           ]
 
-          return true if index.find { |a| argv1.include?(a) }
+          return true if index.any? { |a| argv1.include?(a) }
           return false
         end
 

data/lib/sisimai/rfc2606.rb

@@ -13,9 +13,9 @@ module Sisimai
         return false unless argv
         return false unless argv.is_a?(::String)
 
-        return true  if argv =~ /[.](?:test|example|invalid|localhost)\z/
-        return true  if argv =~ /example[.](?:com|net|org|jp)\z/
-        return true  if argv =~ /example[.](?:ac|ad|co|ed|go|gr|lg|ne|or)[.]jp\z/
+        return true if argv =~ /[.](?:test|example|invalid|localhost)\z/
+        return true if argv =~ /example[.](?:com|net|org|jp)\z/
+        return true if argv =~ /example[.](?:ac|ad|co|ed|go|gr|lg|ne|or)[.]jp\z/
         return false
       end
     end

data/lib/sisimai/rfc3464.rb

@@ -43,13 +43,7 @@ module Sisimai
       # @return        [Hash, Nil]        Bounce data list and message/rfc822 part
       #                                   or nil if it failed to parse or the
       def scan(mhead, mbody)
-        return nil unless mhead
-        return nil unless mbody
-        return nil if mhead.keys.size.zero?
-        return nil if mbody.empty?
-
         require 'sisimai/mda'
-        require 'sisimai/address'
 
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
         hasdivided = mbody.scrub('?').split("\n")
@@ -72,7 +66,7 @@ module Sisimai
           d = e.downcase
           p = havepassed[-2]
 
-          if readcursor.zero?
+          if readcursor == 0
             # Beginning of the bounce message or delivery status part
             if d =~ MarkingsOf[:message]
               readcursor |= Indicators[:deliverystatus]
@@ -80,7 +74,7 @@ module Sisimai
             end
           end
 
-          if (readcursor & Indicators[:'message-rfc822']).zero?
+          if (readcursor & Indicators[:'message-rfc822']) == 0
             # Beginning of the original message part
             if d =~ MarkingsOf[:rfc822]
               readcursor |= Indicators[:'message-rfc822']
@@ -99,7 +93,7 @@ module Sisimai
           else
             # Before "message/rfc822"
             next unless readcursor & Indicators[:deliverystatus] > 0
-            next unless e.size > 0
+            next if e.empty?
 
             v = dscontents[-1]
             if cv = e.match(/\A(?:Final|Original)-Recipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/) ||
@@ -125,7 +119,7 @@ module Sisimai
               x = v['recipienet'] || ''
               y = Sisimai::Address.s3s4(cv[1])
 
-              if x.size > 0 && x != y
+              if !x.empty? && x != y
                 # There are multiple recipient addresses in the message body.
                 dscontents << Sisimai::Bite.DELIVERYSTATUS
                 v = dscontents[-1]
@@ -384,7 +378,7 @@ module Sisimai
             break if d =~ MarkingsOf[:rfc822]
             break if d =~ re_stop
 
-            next if e.size.zero?
+            next if e.empty?
             next if d =~ re_skip
             next if e.start_with?('*')
 
@@ -394,7 +388,7 @@ module Sisimai
               y = Sisimai::Address.s3s4(cv[1])
               next unless Sisimai::RFC5322.is_emailaddress(y)
 
-              if x.size > 0 && x != y
+              if !x.empty? && x != y
                 # There are multiple recipient addresses in the message body.
                 dscontents << Sisimai::Bite.DELIVERYSTATUS
                 b = dscontents[-1]
@@ -414,7 +408,7 @@ module Sisimai
           break
         end
 
-        if recipients.zero?
+        unless recipients > 0
           # Try to get a recipient address from email headers
           rfc822list.each do |e|
             # Check To: header in the original message
@@ -429,20 +423,18 @@ module Sisimai
             recipients += 1
           end
         end
-        return nil if recipients.zero?
+        return nil unless recipients > 0
 
-        require 'sisimai/string'
-        require 'sisimai/smtp/status'
-        dscontents.map do |e|
+        dscontents.each do |e|
           # Set default values if each value is empty.
           connheader.each_key { |a| e[a] ||= connheader[a] || '' }
 
-          if e.key?('alterrors') && e['alterrors'].size > 0
+          if e.key?('alterrors') && !e['alterrors'].empty?
             # Copy alternative error message
             e['diagnosis'] ||= e['alterrors']
             if e['diagnosis'].start_with?('-') || e['diagnosis'].end_with?('__')
               # Override the value of diagnostic code message
-              e['diagnosis'] = e['alterrors'] if e['alterrors'].size > 0
+              e['diagnosis'] = e['alterrors'] unless e['alterrors'].empty?
             end
             e.delete('alterrors')
           end
@@ -452,7 +444,7 @@ module Sisimai
             # Make bounce data by the values returned from Sisimai::MDA->scan()
             e['agent']     = scannedset['mda'] || self.smtpagent
             e['reason']    = scannedset['reason'] || 'undefined'
-            e['diagnosis'] = scannedset['message'] if scannedset['message'].size > 0
+            e['diagnosis'] = scannedset['message'] unless scannedset['message'].empty?
             e['command']   = ''
           else
             # Set the value of smtpagent

data/lib/sisimai/rfc3834.rb

@@ -53,11 +53,6 @@ module Sisimai
       #                                   or nil if it failed to parse or the
       #                                   arguments are missing
       def scan(mhead, mbody)
-        return nil unless mhead
-        return nil unless mbody
-        return nil if mhead.keys.size.zero?
-        return nil if mbody.size.zero?
-
         leave = 0
         match = 0
 
@@ -84,7 +79,6 @@ module Sisimai
         return nil if match < 1
 
         require 'sisimai/bite/email'
-        require 'sisimai/address'
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
         hasdivided = mbody.scrub('?').split("\n")
         rfc822part = '' # (String) message/rfc822-headers part
@@ -114,7 +108,6 @@ module Sisimai
         if mhead['content-type']
           # Get the boundary string and set regular expression for matching with
           # the boundary string.
-          require 'sisimai/mime'
           b0 = Sisimai::MIME.boundary(mhead['content-type'], 0)
           MarkingsOf[:boundary] = %r/\A\Q#{b0}\E\z/ unless b0.empty?
         end
@@ -124,7 +117,7 @@ module Sisimai
           # Read the first 5 lines except a blank line
           countuntil += 1 if e =~ MarkingsOf[:boundary]
 
-          unless e.size > 0
+          if e.empty?
             # Check a blank line
             blanklines += 1
             break if blanklines > countuntil
@@ -140,8 +133,6 @@ module Sisimai
           break if haveloaded >= maxmsgline
         end
         v['diagnosis'] ||= mhead['subject']
-
-        require 'sisimai/string'
         v['diagnosis'] = Sisimai::String.sweep(v['diagnosis'])
         v['reason']    = 'vacation'
         v['agent']     = self.smtpagent

data/lib/sisimai/rfc5322.rb

@@ -46,9 +46,7 @@ module Sisimai
         # called from Sisimai::Bite::Email::*
         fv = {}
         HeaderTable.each_value do |e|
-          e.each do |ee|
-            fv[ee.downcase] = 1
-          end
+          e.each { |ee| fv[ee.downcase] = 1 }
         end
         return fv
       end
@@ -60,7 +58,7 @@ module Sisimai
       # @param    [Symbol] group  RFC822 Header group name
       # @return   [Array,Hash]    RFC822 Header list
       def HEADERFIELDS(group = '')
-        return HeaderIndex unless group.size > 0
+        return HeaderIndex if group.empty?
         return HeaderTable[group] if HeaderTable.key?(group)
         return HeaderTable
       end
@@ -171,7 +169,7 @@ module Sisimai
             break
           end
 
-          if hostname.length.zero?
+          if hostname.empty?
             # 2. Use IP address as a remote host name
             addrlist.each do |e|
               # Skip if the address is a private address
@@ -187,7 +185,7 @@ module Sisimai
 
         %w[from by].each do |e|
           # Copy entries into hosts
-          next unless value[e].length > 0
+          next if value[e].empty?
           value[e] = value[e].delete('[]();?')
           hosts << value[e]
         end

data/lib/sisimai/rhost.rb

@@ -29,7 +29,6 @@ module Sisimai
       # @return   [True,False]    True: matched
       #                           False: did not match
       def match(rhost)
-        return false unless rhost.is_a? ::String
         return false if rhost.empty?
 
         host0 = rhost.downcase
@@ -48,9 +47,6 @@ module Sisimai
       # @param    [Sisimai::Data] argvs   Parsed email object
       # @return   [String]                The value of bounce reason
       def get(argvs)
-        return nil unless argvs
-        return nil unless argvs.is_a? Sisimai::Data
-
         remotehost = argvs.rhost.downcase
         rhostclass = ''
         modulename = ''

data/lib/sisimai/rhost/exchangeonline.rb

@@ -111,9 +111,7 @@ module Sisimai
         # @param    [Sisimai::Data] argvs   Parsed email object
         # @return   [String]                The bounce reason for Exchange Online
         def get(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
           statusmesg = argvs.diagnosticcode
@@ -128,7 +126,7 @@ module Sisimai
               reasontext = f[:reason]
               break
             end
-            break if reasontext.size > 0
+            break unless reasontext.empty?
           end
 
           if reasontext.empty?
@@ -142,9 +140,9 @@ module Sisimai
                   reasontext = f[:reason]
                   break
                 end
-                break if reasontext.size > 0
+                break unless reasontext.empty?
               end
-              break if reasontext.size > 0
+              break unless reasontext.empty?
             end
 
             if reasontext.empty?
@@ -157,7 +155,7 @@ module Sisimai
                   reasontext = e.to_s
                   break
                 end
-                break if reasontext.size > 0
+                break unless reasontext.empty?
               end
             end
           end

data/lib/sisimai/rhost/franceptt.rb

@@ -36,9 +36,7 @@ module Sisimai
         # @param    [Sisimai::Data] argvs   Parsed email object
         # @return   [String]                The bounce reason for Orange or La Poste
         def get(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?
 
           statusmesg = argvs.diagnosticcode
           reasontext = ''

data/lib/sisimai/rhost/godaddy.rb

@@ -43,9 +43,7 @@ module Sisimai
         # @return   [String]                The bounce reason for GoDaddy
         # @see      https://www.godaddy.com/help/what-does-my-email-bounceback-mean-3568
         def get(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?
 
           statusmesg = argvs.diagnosticcode
           reasontext = ''
@@ -61,7 +59,7 @@ module Sisimai
                 reasontext = e.to_s
                 break
               end
-              break if reasontext.size > 0
+              break unless reasontext.empty?
             end
           end
           return reasontext

data/lib/sisimai/rhost/googleapps.rb

@@ -111,9 +111,7 @@ module Sisimai
         # @return   [String]                The bounce reason for Google Apps
         # @see      https://support.google.com/a/answer/3726730?hl=en
         def get(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?
 
           reasontext = ''
           statuscode = argvs.deliverystatus.clone
@@ -123,7 +121,7 @@ module Sisimai
 
           StatusList[statuscode.to_sym].each do |e|
             # Try to match
-            next unless e[:regexp].find { |a| argvs.diagnosticcode.include?(a) }
+            next unless e[:regexp].any? { |a| argvs.diagnosticcode.include?(a) }
             reasontext = e[:reason]
             break
           end

data/lib/sisimai/rhost/kddi.rb

@@ -16,9 +16,6 @@ module Sisimai
         # @param    [Sisimai::Data] argvs   Parsed email object
         # @return   [String]                The bounce reason for au.com or ezweb.ne.jp
         def get(argvs)
-          return nil unless argvs
-          return nil unless argvs.is_a? Sisimai::Data
-
           statusmesg = argvs.diagnosticcode
           reasontext = ''
 

data/lib/sisimai/smtp/error.rb

@@ -24,9 +24,6 @@ module Sisimai
         #                           nil:   is not an error
         # @since v4.17.3
         def is_permanent(argv1 = '')
-          return nil unless argv1
-          return nil unless argv1.size > 0
-
           getchecked = nil
           statuscode = Sisimai::SMTP::Status.find(argv1)
           statuscode = Sisimai::SMTP::Reply.find(argv1) if statuscode.empty?

data/lib/sisimai/smtp/reply.rb

@@ -67,22 +67,19 @@ module Sisimai
         #                           did not include SMTP Reply Code value
         def find(argv1 = '')
           return '' unless argv1
-          return '' unless argv1.size > 0
+          return '' if argv1.empty?
           return '' if argv1.upcase.include?('X-UNIX')
 
+          # Convert found IPv4 addresses to '***.***.***.***' to avoid that
+          # the following code detects an octet of the IPv4 adress as an SMTP
+          # reply code.
           ip4re = %r{\b
             (?:\d|[01]?\d\d|2[0-4]\d|25[0-5])[.]
             (?:\d|[01]?\d\d|2[0-4]\d|25[0-5])[.]
             (?:\d|[01]?\d\d|2[0-4]\d|25[0-5])[.]
             (?:\d|[01]?\d\d|2[0-4]\d|25[0-5])
           \b}x
-
-          if argv1 =~ ip4re
-            # Convert found IPv4 addresses to '***.***.***.***' to avoid that
-            # the following code detects an octet of the IPv4 adress as an SMTP
-            # reply code.
-            argv1 = argv1.gsub(/#{ip4re}/, '***.***.***.***')
-          end
+          argv1 = argv1.gsub(/#{ip4re}/, '***.***.***.***') if argv1 =~ ip4re
 
           if cv = argv1.match(/\b([45][0-5][0-9])\b/) || argv1.match(/\b(25[0-3])\b/)
             # 550, 447, or 250

data/lib/sisimai/smtp/status.rb

@@ -712,7 +712,7 @@ module Sisimai
         # @see      name
         def code(argv1 = '', argv2 = false)
           return '' unless argv1
-          return '' unless argv1.size > 0
+          return '' if argv1.empty?
 
           table = argv2 ? InternalCode[:temporary] : InternalCode[:permanent]
           code0 = table[argv1.to_sym] || InternalCode[:permanent][argv1.to_sym] || ''
@@ -726,7 +726,6 @@ module Sisimai
         # @see      code
         def name(argv1 = '')
           return '' unless argv1
-          return '' unless argv1.size > 0
           return '' unless argv1 =~ /\A[245][.]\d[.]\d+\z/
           return StandardCode[argv1.to_sym] || ''
         end
@@ -737,7 +736,7 @@ module Sisimai
         #                           not include DSN
         def find(argv1 = '')
           return '' unless argv1
-          return '' unless argv1.size > 0
+          return '' if argv1.empty?
 
           foundvalue = ''
           regularexp = [
@@ -747,7 +746,7 @@ module Sisimai
             %r/\b(2[.][0-7][.][0-7])\b/,              # 2.1.5
           ]
 
-          regularexp.each do |e|
+          while e = regularexp.shift do
             # Get the value of D.S.N. in the text
             next unless r = argv1.match(e)
             foundvalue = r[1]

data/lib/sisimai/string.rb

@@ -17,10 +17,10 @@ module Sisimai
       # @see    http://en.wikipedia.org/wiki/ASCII
       def token(addr1, addr2, epoch)
         return '' unless addr1.is_a?(::String)
-        return '' unless addr1.length > 0
         return '' unless addr2.is_a?(::String)
-        return '' unless addr2.length > 0
         return '' unless epoch.is_a?(Integer)
+        return '' if addr1.empty?
+        return '' if addr2.empty?
 
         # Format: STX(0x02) Sender-Address RS(0x1e) Recipient-Address ETX(0x03)
         require 'digest/sha1'
@@ -47,12 +47,8 @@ module Sisimai
       #   sweep('  neko ') #=> 'neko'
       def sweep(argv1)
         return argv1 unless argv1.is_a?(::String)
-
-        argv1 = argv1.chomp
-        argv1 = argv1.squeeze(' ')
-        argv1 = argv1.delete("\t")
-        argv1 = argv1.strip
-        argv1 = argv1.sub(/ [-]{2,}[^ \t].+\z/, '')
+        argv1 = argv1.chomp.squeeze(' ').delete("\t").strip
+        argv1.sub!(/ [-]{2,}[^ \t].+\z/, '')
 
         return argv1
       end
@@ -75,17 +71,14 @@ module Sisimai
           # Rewrite <a> elements
           # 1. <a href = 'http://...'>...</a> to " http://... "
           # 2. <a href = 'mailto:...'>...</a> to " Value <mailto:...> "
-          plain = plain.scrub('?')
-          plain = plain.gsub(%r|<a\s+href\s*=\s*['"](https?://.+?)['"].*?>(.*?)</a>|i, '[\2](\1)')
-          plain = plain.gsub(%r|<a\s+href\s*=\s*["']mailto:([^\s]+?)["']>(.*?)</a>|i, '[\2](mailto:\1)')
-
-          plain = plain.gsub(/<[^<@>]+?>\s*/, ' ')  # Delete HTML tags except <neko@example.jp>
-          plain = plain.gsub(/&lt;/, '<')           # Convert to left angle brackets
-          plain = plain.gsub(/&gt;/, '>')           # Convert to right angle brackets
-          plain = plain.gsub(/&amp;/, '&')          # Convert to "&"
-          plain = plain.gsub(/&quot;/, '"')         # Convert to '"'
-          plain = plain.gsub(/&apos;/, "'")         # Convert to "'"
-          plain = plain.gsub(/&nbsp;/, ' ')         # Convert to ' '
+          plain.scrub!('?')
+          plain.gsub!(%r|<a\s+href\s*=\s*['"](https?://.+?)['"].*?>(.*?)</a>|i, '[\2](\1)')
+          plain.gsub!(%r|<a\s+href\s*=\s*["']mailto:([^\s]+?)["']>(.*?)</a>|i, '[\2](mailto:\1)')
+
+          plain = plain.gsub(/<[^<@>]+?>\s*/, ' ')              # Delete HTML tags except <neko@example.jp>
+          plain = plain.gsub(/&lt;/, '<').gsub(/&gt;/, '>')     # Convert to angle brackets
+          plain = plain.gsub(/&amp;/, '&').gsub(/&nbsp;/, ' ')  # Convert to "&"
+          plain = plain.gsub(/&quot;/, '"').gsub(/&apos;/, "'") # Convert to " and '
 
           if argv1.size > plain.size
             plain  = plain.squeeze(' ')
@@ -101,7 +94,7 @@ module Sisimai
       # @param    [String] argv2  Encoding name before converting
       # @return   [String]        UTF-8 Encoded string
       def to_utf8(argv1 = '', argv2 = nil)
-        return '' unless argv1.size > 0
+        return '' if argv1.empty?
 
         encodefrom = argv2 || false
         getencoded = ''