sisimai 4.22.7 → 4.23.0

data/lib/sisimai/bite/email/x5.rb

@@ -28,10 +28,6 @@ module Sisimai::Bite::Email
       #                                   part or nil if it failed to parse or
       #                                   the arguments are missing
       def scan(mhead, mbody)
-        return nil unless mhead
-        return nil unless mbody
-        require 'sisimai/mime'
-
         match  = 0
         match += 1 if mhead['to'].to_s.include?('NotificationRecipients')
         if mhead['from'].include?('TWFpbCBEZWxpdmVyeSBTdWJzeXN0ZW0')
@@ -66,7 +62,7 @@ module Sisimai::Bite::Email
           havepassed << e
           p = havepassed[-2]
 
-          if readcursor.zero?
+          if readcursor == 0
             # Beginning of the bounce message or delivery status part
             if e.start_with?(StartingOf[:message][0])
               readcursor |= Indicators[:deliverystatus]
@@ -74,7 +70,7 @@ module Sisimai::Bite::Email
             end
           end
 
-          if (readcursor & Indicators[:'message-rfc822']).zero?
+          if (readcursor & Indicators[:'message-rfc822']) == 0
             # Beginning of the original message part
             if e.start_with?(StartingOf[:rfc822][0])
               readcursor |= Indicators[:'message-rfc822']
@@ -137,8 +133,8 @@ module Sisimai::Bite::Email
             end
           else
             # After "message/rfc822"
-            next if recipients.zero?
-            next if (readcursor & Indicators['deliverystatus']).zero?
+            next unless recipients > 0
+            next if (readcursor & Indicators['deliverystatus']) == 0
 
             if e.empty?
               blanklines += 1
@@ -148,10 +144,9 @@ module Sisimai::Bite::Email
             rfc822list << e
           end
         end
-        return nil if recipients.zero?
+        return nil unless recipients > 0
 
-        require 'sisimai/string'
-        dscontents.map do |e|
+        dscontents.each do |e|
           e['agent']       = self.smtpagent
           e['diagnosis'] ||= Sisimai::String.sweep(e['diagnosis'])
           e.each_key { |a| e[a] ||= '' }

data/lib/sisimai/bite/email/yahoo.rb

@@ -33,9 +33,6 @@ module Sisimai::Bite::Email
       #                                   part or nil if it failed to parse or
       #                                   the arguments are missing
       def scan(mhead, mbody)
-        return nil unless mhead
-        return nil unless mbody
-
         # :subject => %r/\AFailure Notice\z/,
         return nil unless mhead['x-ymailisg']
 
@@ -48,7 +45,7 @@ module Sisimai::Bite::Email
         v = nil
 
         while e = hasdivided.shift do
-          if readcursor.zero?
+          if readcursor == 0
             # Beginning of the bounce message or delivery status part
             if e.start_with?(StartingOf[:message][0])
               readcursor |= Indicators[:deliverystatus]
@@ -56,7 +53,7 @@ module Sisimai::Bite::Email
             end
           end
 
-          if (readcursor & Indicators[:'message-rfc822']).zero?
+          if (readcursor & Indicators[:'message-rfc822']) == 0
             # Beginning of the original message part
             if e == StartingOf[:rfc822][0]
               readcursor |= Indicators[:'message-rfc822']
@@ -74,7 +71,7 @@ module Sisimai::Bite::Email
             rfc822list << e
           else
             # Before "message/rfc822"
-            next if (readcursor & Indicators[:deliverystatus]).zero?
+            next if (readcursor & Indicators[:deliverystatus]) == 0
             next if e.empty?
 
             # Sorry, we were unable to deliver your message to the following address.
@@ -125,12 +122,10 @@ module Sisimai::Bite::Email
             end
           end
         end
-        return nil if recipients.zero?
+        return nil unless recipients > 0
 
-        require 'sisimai/string'
-        dscontents.map do |e|
-          e['diagnosis'] = e['diagnosis'].gsub(/\\n/, ' ')
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
+        dscontents.each do |e|
+          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'].gsub(/\\n/, ' '))
           e['agent']     = self.smtpagent
           e['command'] ||= 'RCPT' if e['diagnosis'] =~ /[<].+[@].+[>]/
         end

data/lib/sisimai/bite/email/yandex.rb

@@ -36,8 +36,6 @@ module Sisimai::Bite::Email
       #                                   part 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 unless mhead['x-yandex-uniq']
         return nil unless mhead['from'] == 'mailer-daemon@yandex.ru'
 
@@ -61,7 +59,7 @@ module Sisimai::Bite::Email
           havepassed << e
           p = havepassed[-2]
 
-          if readcursor.zero?
+          if readcursor == 0
             # Beginning of the bounce message or delivery status part
             if e.start_with?(StartingOf[:message][0])
               readcursor |= Indicators[:deliverystatus]
@@ -69,7 +67,7 @@ module Sisimai::Bite::Email
             end
           end
 
-          if (readcursor & Indicators[:'message-rfc822']).zero?
+          if (readcursor & Indicators[:'message-rfc822']) == 0
             # Beginning of the original message part
             if e.start_with?(StartingOf[:rfc822][0])
               readcursor |= Indicators[:'message-rfc822']
@@ -87,7 +85,7 @@ module Sisimai::Bite::Email
             rfc822list << e
           else
             # Before "message/rfc822"
-            next if (readcursor & Indicators[:deliverystatus]).zero?
+            next if (readcursor & Indicators[:deliverystatus]) == 0
             next if e.empty?
 
             if connvalues == connheader.keys.size
@@ -146,13 +144,13 @@ module Sisimai::Bite::Email
               # Arrival-Date: Sat,  6 Dec 2014 20:12:27 +0300 (MSK)
               if cv = e.match(/\AReporting-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
                 # Reporting-MTA: dns; mx.example.jp
-                next if connheader['lhost'].size > 0
+                next unless connheader['lhost'].empty?
                 connheader['lhost'] = cv[1].downcase
                 connvalues += 1
 
               elsif cv = e.match(/\AArrival-Date:[ ]*(.+)\z/)
                 # Arrival-Date: Wed, 29 Apr 2009 16:03:18 +0900
-                next if connheader['date'].size > 0
+                next unless connheader['date'].empty?
                 connheader['date'] = cv[1]
                 connvalues += 1
               else
@@ -171,15 +169,13 @@ module Sisimai::Bite::Email
             end
           end
         end
-        return nil if recipients.zero?
+        return nil unless recipients > 0
 
-        require 'sisimai/string'
-        dscontents.map do |e|
+        dscontents.each do |e|
           # Set default values if each value is empty.
           connheader.each_key { |a| e[a] ||= connheader[a] || '' }
           e['command']   = commandset.shift || ''
-          e['diagnosis'] = e['diagnosis'].gsub(/\\n/, '')
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
+          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'].gsub(/\\n/, ''))
           e['agent']     = self.smtpagent
         end
 

data/lib/sisimai/bite/email/zoho.rb

@@ -33,9 +33,6 @@ module Sisimai::Bite::Email
       #                                   part or nil if it failed to parse or
       #                                   the arguments are missing
       def scan(mhead, mbody)
-        return nil unless mhead
-        return nil unless mbody
-
         # :'from'     => %r/mailer-daemon[@]mail[.]zoho[.]com\z/,
         # :'subject'  => %r{\A(?:
         #      Undelivered[ ]Mail[ ]Returned[ ]to[ ]Sender
@@ -55,7 +52,7 @@ module Sisimai::Bite::Email
         v = nil
 
         while e = hasdivided.shift do
-          if readcursor.zero?
+          if readcursor == 0
             # Beginning of the bounce message or delivery status part
             if e.start_with?(StartingOf[:message][0])
               readcursor |= Indicators[:deliverystatus]
@@ -63,7 +60,7 @@ module Sisimai::Bite::Email
             end
           end
 
-          if (readcursor & Indicators[:'message-rfc822']).zero?
+          if (readcursor & Indicators[:'message-rfc822']) == 0
             # Beginning of the original message part
             if e.include?(StartingOf[:rfc822][0])
               readcursor |= Indicators[:'message-rfc822']
@@ -81,7 +78,7 @@ module Sisimai::Bite::Email
             rfc822list << e
           else
             # Before "message/rfc822"
-            next if (readcursor & Indicators[:deliverystatus]).zero?
+            next if (readcursor & Indicators[:deliverystatus]) == 0
             next if e.empty?
 
             # This message was created automatically by mail delivery software.
@@ -132,17 +129,15 @@ module Sisimai::Bite::Email
             end
           end
         end
-        return nil if recipients.zero?
+        return nil unless recipients > 0
 
-        require 'sisimai/string'
-        dscontents.map do |e|
+        dscontents.each do |e|
           e['agent']     = self.smtpagent
-          e['diagnosis'] = e['diagnosis'].gsub(/\\n/, ' ')
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
+          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'].gsub(/\\n/, ' '))
 
           MessagesOf.each_key do |r|
             # Verify each regular expression of session errors
-            next unless MessagesOf[r].find { |a| e['diagnosis'].include?(a) }
+            next unless MessagesOf[r].any? { |a| e['diagnosis'].include?(a) }
             e['reason'] = r.to_s
             break
           end

data/lib/sisimai/bite/json/amazonses.rb

@@ -39,10 +39,8 @@ module Sisimai::Bite::JSON
       #                                   the arguments are missing
       # @since v4.20.0
       def scan(mhead, mbody)
-        return nil unless mhead
-        return nil unless mbody
         return nil unless mhead['x-amz-sns-message-id']
-        return nil unless mhead['x-amz-sns-message-id'].size > 0
+        return nil if mhead['x-amz-sns-message-id'].empty?
 
         hasdivided = mbody.split("\n")
         jsonstring = ''
@@ -51,7 +49,7 @@ module Sisimai::Bite::JSON
 
         while e = hasdivided.shift do
           # Find JSON string from the message body
-          next if e.size.zero?
+          next if e.empty?
           break if e == '--'
           break if e == '__END_OF_EMAIL_MESSAGE__'
 
@@ -102,10 +100,9 @@ module Sisimai::Bite::JSON
       # @since v4.20.0
       def adapt(argvs)
         return nil unless argvs.is_a? Hash
-        return nil unless argvs.keys.size > 0
+        return nil if argvs.empty?
         return nil unless argvs.key?('notificationType')
 
-        require 'sisimai/rfc5322'
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
         rfc822head = {}   # (Hash) Check flags for headers in RFC822 part
         recipients = 0    # (Integer) The number of 'Final-Recipient' header
@@ -173,13 +170,10 @@ module Sisimai::Bite::JSON
             end
 
             v['date'] = o['timestamp'] || argvs['mail']['timestamp']
-            v['date'] = v['date'].sub(/[.]\d+Z\z/, '')
+            v['date'].sub!(/[.]\d+Z\z/, '')
           end
         elsif argvs['notificationType'] == 'Delivery'
           # { "notificationType":"Delivery", "delivery": { ...
-          require 'sisimai/smtp/status'
-          require 'sisimai/smtp/reply'
-
           o = argvs['delivery'].dup
           r = o['recipients'] || []
 
@@ -211,14 +205,14 @@ module Sisimai::Bite::JSON
             v['action']    = 'deliverable'
 
             v['date'] = o['timestamp'] || argvs['mail']['timestamp']
-            v['date'] = v['date'].sub(/[.]\d+Z\z/, '')
+            v['date'].sub!(/[.]\d+Z\z/, '')
           end
         else
           # The value of "notificationType" is not any of "Bounce", "Complaint",
           # or "Delivery".
           return nil
         end
-        return nil if recipients.zero?
+        return nil unless recipients > 0
 
         dscontents.each do |e|
           e['agent'] = self.smtpagent

data/lib/sisimai/bite/json/sendgrid.rb

@@ -17,16 +17,10 @@ module Sisimai::Bite::JSON
       # @since v4.20.0
       def adapt(argvs)
         return nil unless argvs.is_a? Hash
-        return nil unless argvs.keys.size > 0
+        return nil if argvs.empty?
         return nil unless argvs.key?('email')
         return nil unless Sisimai::RFC5322.is_emailaddress(argvs['email'])
 
-        require 'sisimai/string'
-        require 'sisimai/address'
-        require 'sisimai/datetime'
-        require 'sisimai/smtp/reply'
-        require 'sisimai/smtp/status'
-
         dscontents = nil
         rfc822head = {}
         v = nil

data/lib/sisimai/data.rb

@@ -3,12 +3,8 @@ module Sisimai
   class Data
     # Imported from p5-Sisimail/lib/Sisimai/Data.pm
     require 'sisimai/address'
-    require 'sisimai/rfc5322'
-    require 'sisimai/smtp/error'
-    require 'sisimai/smtp/reply'
-    require 'sisimai/smtp/status'
-    require 'sisimai/string'
     require 'sisimai/reason'
+    require 'sisimai/string'
     require 'sisimai/rhost'
     require 'sisimai/time'
     require 'sisimai/datetime'
@@ -110,27 +106,28 @@ module Sisimai
       require 'sisimai/smtp'
 
       # Decide the order of email headers: user specified or system default.
-      if givenorder.is_a?(Hash) && givenorder.keys.size > 0
+      if givenorder.is_a?(Hash) && !givenorder.empty?
         # If the order of headers for searching is specified, use the order
         # for detecting an email address.
         fieldorder.each_key do |e|
           # The order should be "Array Reference".
           next unless givenorder[e]
           next unless givenorder[e].is_a? Array
-          next unless givenorder[e].size > 0
-          fieldorder[e].concat(givenorder[e])
+          next if givenorder[e].empty?
+          fieldorder[e] += givenorder[e]
         end
       end
 
       fieldorder.each_key do |e|
         # If the order is empty, use default order.
-        next if fieldorder[e].size > 0
+        next unless fieldorder[e].empty?
 
         # Load default order of each accessor.
         fieldorder[e] = AddrHeader[e]
       end
 
-      messageobj.ds.each do |e|
+      eachobject = messageobj.ds.dup
+      while e = eachobject.shift do
         # Create parameters for new() constructor.
         p = {
           'catch'          => messageobj.catch  || nil,
@@ -182,7 +179,7 @@ module Sisimai
         datestring = nil
         zoneoffset = 0
         datevalues = []
-        datevalues << e['date'] if e['date'].to_s.size > 0
+        datevalues << e['date'] unless e['date'].to_s.empty?
 
         # Date information did not exist in message/delivery-status part,...
         RFC822Head[:date].each do |f|
@@ -222,7 +219,7 @@ module Sisimai
 
         # OTHER_TEXT_HEADERS:
         recvheader = mailheader['received'] || []
-        if recvheader.size > 0
+        unless recvheader.empty?
           # Get localhost and remote host name from Received header.
           %w[lhost rhost].each { |a| e[a] ||= '' }
           e['lhost'] = Sisimai::RFC5322.received(recvheader[0]).shift if e['lhost'].empty?
@@ -231,13 +228,13 @@ module Sisimai
 
         # Remove square brackets and curly brackets from the host variable
         %w[rhost lhost].each do |v|
-          p[v] = p[v].delete('[]()')    # Remove square brackets and curly brackets from the host variable
-          p[v] = p[v].sub(/\A.+=/, '')  # Remove string before "="
-          p[v] = p[v].chomp("\r")       # Remove CR at the end of the value
+          p[v].delete!('[]()')    # Remove square brackets and curly brackets from the host variable
+          p[v].sub!(/\A.+=/, '')  # Remove string before "="
+          p[v].chomp!("\r")       # Remove CR at the end of the value
 
           # Check space character in each value and get the first element
           p[v] = p[v].split(' ', 2).shift if p[v].include?(' ')
-          p[v] = p[v].chomp('.')        # Remove "." at the end of the value
+          p[v].chomp!('.')        # Remove "." at the end of the value
         end
 
         # Subject: header of the original message
@@ -246,46 +243,44 @@ module Sisimai
 
         # The value of "List-Id" header
         p['listid'] = rfc822data['list-id'] || ''
-        if p['listid'].size > 0
+        unless p['listid'].empty?
           # Get the value of List-Id header
           if cv = p['listid'].match(/\A.*([<].+[>]).*\z/)
             # List name <list-id@example.org>
             p['listid'] = cv[1]
           end
-          p['listid'] = p['listid'].delete('<>')
-          p['listid'] = p['listid'].chomp("\r")
+          p['listid'] = p['listid'].delete('<>').chomp("\r")
           p['listid'] = '' if p['listid'].include?(' ')
         end
 
         # The value of "Message-Id" header
         p['messageid'] = rfc822data['message-id'] || ''
-        if p['messageid'].size > 0
+        unless p['messageid'].empty?
           # Remove angle brackets
           if cv = p['messageid'].match(/\A([^ ]+)[ ].*/)
             p['messageid'] = cv[1]
           end
-          p['messageid'] = p['messageid'].delete('<>')
-          p['messageid'] = p['messageid'].chomp("\r")
+          p['messageid'] = p['messageid'].delete('<>').chomp("\r")
         end
 
         # CHECK_DELIVERY_STATUS_VALUE:
         # Cleanup the value of "Diagnostic-Code:" header
-        p['diagnosticcode'] = p['diagnosticcode'].sub(/[ \t.]+#{EndOfEmail}/, '')
+        p['diagnosticcode'].sub!(/[ \t.]+#{EndOfEmail}/, '')
 
-        if p['diagnosticcode'].size > 0
+        unless p['diagnosticcode'].empty?
           # Count the number of D.S.N. and SMTP Reply Code
           vs = Sisimai::SMTP::Status.find(p['diagnosticcode'])
           vr = Sisimai::SMTP::Reply.find(p['diagnosticcode'])
           vm = 0
           re = nil
 
-          if vs.size > 0
+          unless vs.empty?
             # How many times does the D.S.N. appeared
             vm += p['diagnosticcode'].scan(/\b#{vs}\b/).size
             p['deliverystatus'] = vs if vs =~ /\A[45][.][1-9][.][1-9]\z/
           end
 
-          if vr.size > 0
+          unless vr.empty?
             # How many times does the SMTP reply code appeared
             vm += p['diagnosticcode'].scan(/\b#{vr}\b/).size
             p['replycode'] ||= vr
@@ -300,7 +295,7 @@ module Sisimai
             # 550-5.7.1 likely unsolicited mail. To reduce the amount of spam sent to Gmail,
             # 550-5.7.1 this message has been blocked. Please visit
             # 550 5.7.1 https://support.google.com/mail/answer/188131 for more information.
-            p['diagnosticcode'] = p['diagnosticcode'].gsub(re, ' ')
+            p['diagnosticcode'].gsub!(re, ' ')
             p['diagnosticdoee'] = Sisimai::String.sweep(p['diagnosticcode'])
           end
         end
@@ -359,8 +354,7 @@ module Sisimai
 
           if o.softbounce.to_s.empty?
             # The value is not set yet
-            textasargv = p['deliverystatus'] + ' ' + p['diagnosticcode']
-            textasargv = textasargv.lstrip
+            textasargv = (p['deliverystatus'] + ' ' + p['diagnosticcode']).lstrip
             softorhard = Sisimai::SMTP::Error.soft_or_hard(o.reason, textasargv)
 
             o.softbounce = if softorhard.size > 0
@@ -374,14 +368,12 @@ module Sisimai
 
           if o.deliverystatus.empty?
             # Set pseudo status code
-            textasargv = o.replycode + ' ' + p['diagnosticcode']
-            textasargv = textasargv.lstrip
-
+            textasargv = (o.replycode + ' ' + p['diagnosticcode']).lstrip
             getchecked = Sisimai::SMTP::Error.is_permanent(textasargv)
             tmpfailure = getchecked.nil? ? false : (getchecked ? false : true)
             pseudocode = Sisimai::SMTP::Status.code(o.reason, tmpfailure)
 
-            if pseudocode.size > 0
+            unless pseudocode.empty?
               # Set the value of "deliverystatus" and "softbounce"
               o.deliverystatus = pseudocode
 
@@ -400,7 +392,7 @@ module Sisimai
             end
           end
 
-          if o.replycode.size > 0
+          unless o.replycode.empty?
             # Check both of the first digit of "deliverystatus" and "replycode"
             o.replycode = '' unless o.replycode[0, 1] == o.deliverystatus[0, 1]
           end