sisimai 4.22.1 → 4.22.2

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

@@ -1,7 +1,7 @@
 module Sisimai::Bite::Email
+  # Sisimai::Bite::Email::GSuite parses a bounce email which created by G Suite.
+  # Methods in the module are called from only Sisimai::Message.
   module GSuite
-    # Sisimai::Bite::Email::GSuite parses a bounce email which created by G Suite.
-    # Methods in the module are called from only Sisimai::Message.
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/GSuite.pm
       require 'sisimai/bite/email'
@@ -9,19 +9,19 @@ module Sisimai::Bite::Email
       Re0 = {
         :from    => %r/[@]googlemail[.]com[>]?\z/,
         :subject => %r/Delivery[ ]Status[ ]Notification/,
-      }
+      }.freeze
       Re1 = {
         :begin   => %r/\A[*][*][ ].+[ ][*][*]\z/,
         :error   => %r/\AThe[ ]response([ ]from[ ]the[ ]remote[ ]server)?[ ]was:\z/,
         :html    => %r{\AContent-Type:[ ]*text/html;[ ]*charset=['"]?(?:UTF|utf)[-]8['"]?\z},
         :rfc822  => %r{\AContent-Type:[ ]*(?:message/rfc822|text/rfc822-headers)\z},
         :endof   => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }
+      }.freeze
       ErrorMayBe = {
         :userunknown  => %r/because the address couldn't be found/,
         :notaccept    => %r/Null MX/,
         :networkerror => %r/DNS type .+ lookup of .+ responded with code NXDOMAIN/,
-      }
+      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'G Suite: https://gsuite.google.com'; end
@@ -58,7 +58,7 @@ module Sisimai::Bite::Email
         endoferror = true   # (Integer) Flag for a blank line after error messages
         anotherset = {}     # (Hash) Another error information
         emptylines = 0      # (Integer) The number of empty lines
-        connvalues = 0      # (Integer) Flag, 1 if all the value of $connheader have been set
+        connvalues = 0      # (Integer) Flag, 1 if all the value of connheader have been set
         connheader = {
           'date'  => '',    # The value of Arrival-Date header
           'lhost' => '',    # The value of Reporting-MTA header
@@ -68,12 +68,10 @@ module Sisimai::Bite::Email
         hasdivided.each do |e|
           if readcursor.zero?
             # Beginning of the bounce message or delivery status part
-            if e =~ Re1[:begin]
-              readcursor |= Indicators[:deliverystatus]
-            end
+            readcursor |= Indicators[:deliverystatus] if e =~ Re1[:begin]
           end
 
-          if readcursor & Indicators[:'message-rfc822'] == 0
+          if (readcursor & Indicators[:'message-rfc822']).zero?
             # Beginning of the original message part
             if e =~ Re1[:rfc822]
               readcursor |= Indicators[:'message-rfc822']
@@ -92,7 +90,7 @@ module Sisimai::Bite::Email
 
           else
             # Before "message/rfc822"
-            next if readcursor & Indicators[:deliverystatus] == 0
+            next if (readcursor & Indicators[:deliverystatus]).zero?
 
             if connvalues == connheader.keys.size
               # Final-Recipient: rfc822; kijitora@example.de
@@ -137,9 +135,9 @@ module Sisimai::Bite::Email
                   v['diagnosis'] = cv[2]
                 else
                   # Append error messages continued from the previous line
-                  if endoferror && ( v['diagnosis'] && v['diagnosis'].size > 0 )
+                  if endoferror && (v['diagnosis'] && v['diagnosis'].size > 0)
                     endoferror = true if e.empty?
-                    endoferror = true if e =~ /\A--/
+                    endoferror = true if e.start_with?('--')
 
                     next if endoferror
                     next unless e =~ /\A[ ]/
@@ -162,7 +160,7 @@ module Sisimai::Bite::Email
               elsif cv = e.match(/\A[Aa]rrival-[Dd]ate:[ ]*(.+)\z/)
                 # Arrival-Date: Wed, 29 Apr 2009 16:03:18 +0900
                 next if connheader['date'].size > 0
-                connheader['date'] = 1
+                connheader['date'] = cv[1]
                 connvalues += 1
 
               else
@@ -222,12 +220,12 @@ module Sisimai::Bite::Email
             if e['diagnosis'] =~ /\A\d+\z/
               e['diagnosis'] = anotherset['diagnosis']
             else
-              # More detailed error message is in "$anotherset"
+              # More detailed error message is in "anotherset"
               as = nil  # status
               ar = nil  # replycode
 
               if e['status'] == '' || e['status'] =~ /\A[45][.]0[.]0\z/
-                # Check the value of D.S.N. in $anotherset
+                # Check the value of D.S.N. in anotherset
                 as = Sisimai::SMTP::Status.find(anotherset['diagnosis'])
                 if as.size > 0 && as[-3, 3] != '0.0'
                   # The D.S.N. is neither an empty nor *.0.0
@@ -236,7 +234,7 @@ module Sisimai::Bite::Email
               end
 
               if e['replycode'] == '' || e['replycode'] =~ /\A[45]00\z/
-                # Check the value of SMTP reply code in $anotherset
+                # Check the value of SMTP reply code in anotherset
                 ar = Sisimai::SMTP::Reply.find(anotherset['diagnosis'])
                 if ar.size > 0 && ar[-2, 2].to_i != 0
                   # The SMTP reply code is neither an empty nor *00
@@ -244,8 +242,8 @@ module Sisimai::Bite::Email
                 end
               end
 
-              if ( as || ar ) && ( anotherset['diagnosis'].size > e['diagnosis'].size )
-                # Update the error message in $e->{'diagnosis'}
+              if (as || ar) && (anotherset['diagnosis'].size > e['diagnosis'].size)
+                # Update the error message in e['diagnosis']
                 e['diagnosis'] = anotherset['diagnosis']
               end
             end

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

@@ -1,8 +1,8 @@
 module Sisimai::Bite::Email
+  # Sisimai::Bite::Email::IMailServer parses a bounce email which created by
+  # Ipswitch IMail Server.
+  # Methods in the module are called from only Sisimai::Message.
   module IMailServer
-    # Sisimai::Bite::Email::IMailServer parses a bounce email which created by
-    # Ipswitch IMail Server.
-    # Methods in the module are called from only Sisimai::Message.
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Bite::Email/IMailServer.pm
       require 'sisimai/bite/email'
@@ -10,13 +10,13 @@ module Sisimai::Bite::Email
       Re0 = {
         :'x-mailer' => %r/\A[<]SMTP32 v[\d.]+[>][ ]*\z/,
         :'subject'  => %r/\AUndeliverable Mail[ ]*\z/,
-      }
+      }.freeze
       Re1 = {
         :begin  => %r/\A\z/,    # Blank line
         :error  => %r/Body of message generated response:/,
         :rfc822 => %r/\AOriginal message follows[.]\z/,
         :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }
+      }.freeze
       ReSMTP = {
         conn: %r{(?:
              SMTP[ ]connection[ ]failed,
@@ -27,7 +27,7 @@ module Sisimai::Bite::Email
         mail: %r|Server response to MAIL FROM:|,
         rcpt: %r|Additional RCPT TO generated following response:|,
         data: %r|DATA command generated response:|,
-      }
+      }.freeze
       ReFailure = {
         hostunknown: %r/Unknown[ ]host/x,
         userunknown: %r/\A(?:Unknown[ ]user|Invalid[ ]final[ ]delivery[ ]userid)/x,
@@ -35,7 +35,7 @@ module Sisimai::Bite::Email
         securityerr: %r/\ARequested[ ]action[ ]not[ ]taken:[ ]virus[ ]detected/x,
         undefined:   %r/\Aundeliverable[ ]to[ ]/x,
         expired:     %r/\ADelivery[ ]failed[ ]\d+[ ]attempts/x,
-      }
+      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'IPSWITCH IMail Server'; end
@@ -80,7 +80,7 @@ module Sisimai::Bite::Email
             end
           end
 
-          if readcursor & Indicators[:'message-rfc822'] == 0
+          if (readcursor & Indicators[:'message-rfc822']).zero?
             # Beginning of the original message part
             if e =~ Re1[:rfc822]
               readcursor |= Indicators[:'message-rfc822']
@@ -145,11 +145,11 @@ module Sisimai::Bite::Email
 
           if e['alterrors'] && e['alterrors'].size > 0
             # Copy alternative error message
-            if e['diagnosis']
-              e['diagnosis'] = e['alterrors'] + ' ' + e['diagnosis']
-            else
-              e['diagnosis'] = e['alterrors']
-            end
+            e['diagnosis'] = if e['diagnosis']
+                               e['alterrors'] + ' ' + e['diagnosis']
+                             else
+                               e['alterrors']
+                             end
             e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
             e.delete('alterrors')
           end

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

@@ -1,8 +1,8 @@
 module Sisimai::Bite::Email
+  # Sisimai::Bite::Email::InterScanMSS parses a bounce email which created by
+  # Trend Micro InterScan Messaging Security Suite. Methods in the module are
+  # called from only Sisimai::Message.
   module InterScanMSS
-    # Sisimai::Bite::Email::InterScanMSS parses a bounce email which created by
-    # Trend Micro InterScan Messaging Security Suite. Methods in the module are
-    # called from only Sisimai::Message.
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/InterScanMSS.pm
       require 'sisimai/bite/email'
@@ -17,12 +17,12 @@ module Sisimai::Bite::Email
           # メール配信に失敗しました
           '=?iso-2022-jp?B?GyRCJWEhPCVrR1s/LiRLPDpHVCQ3JF4kNyQ/GyhCDQo=?=',
         ],
-      }
+      }.freeze
       Re1 = {
         :begin  => %r|\AContent-type: text/plain|,
         :rfc822 => %r|\AContent-type: message/rfc822|,
         :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }
+      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'Trend Micro InterScan Messaging Security Suite'; end
@@ -67,7 +67,7 @@ module Sisimai::Bite::Email
             end
           end
 
-          if readcursor & Indicators[:'message-rfc822'] == 0
+          if (readcursor & Indicators[:'message-rfc822']).zero?
             # Beginning of the original message part
             if e =~ Re1[:rfc822]
               readcursor |= Indicators[:'message-rfc822']
@@ -86,7 +86,7 @@ module Sisimai::Bite::Email
 
           else
             # Before "message/rfc822"
-            next if readcursor & Indicators[:deliverystatus] == 0
+            next if (readcursor & Indicators[:deliverystatus]).zero?
             next if e.empty?
 
             # Sent <<< RCPT TO:<kijitora@example.co.jp>

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

@@ -1,7 +1,7 @@
 module Sisimai::Bite::Email
+  # Sisimai::Bite::Email::KDDI parses a bounce email which created by au by KDDI.
+  # Methods in the module are called from only Sisimai::Message.
   module KDDI
-    # Sisimai::Bite::Email::KDDI parses a bounce email which created by au by KDDI.
-    # Methods in the module are called from only Sisimai::Message.
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/KDDI.pm
       require 'sisimai/bite/email'
@@ -11,7 +11,7 @@ module Sisimai::Bite::Email
         :'reply-to'   => %r/\Afrom[ \t]+\w+[.]auone[-]net[.]jp[ \t]/,
         :'received'   => %r/\Afrom[ ](?:.+[.])?ezweb[.]ne[.]jp[ ]/,
         :'message-id' => %r/[@].+[.]ezweb[.]ne[.]jp[>]\z/,
-      }
+      }.freeze
       Re1 = {
         :begin => %r/\AYour[ ]mail[ ](?:
              sent[ ]on:?[ ][A-Z][a-z]{2}[,]
@@ -21,12 +21,12 @@ module Sisimai::Bite::Email
         :rfc822 => %r|\AContent-Type: message/rfc822\z|,
         :error  => %r/Could not be delivered to:? /,
         :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }
+      }.freeze
       ReFailure = {
         mailboxfull: %r/As[ ]their[ ]mailbox[ ]is[ ]full/x,
         norelaying:  %r/Due[ ]to[ ]the[ ]following[ ]SMTP[ ]relay[ ]error/x,
         hostunknown: %r/As[ ]the[ ]remote[ ]domain[ ]doesnt[ ]exist/x,
-      }
+      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'au by KDDI: http://www.au.kddi.com'; end
@@ -75,7 +75,7 @@ module Sisimai::Bite::Email
             end
           end
 
-          if readcursor & Indicators[:'message-rfc822'] == 0
+          if (readcursor & Indicators[:'message-rfc822']).zero?
             # Beginning of the original message part
             if e =~ Re1[:rfc822]
               readcursor |= Indicators[:'message-rfc822']
@@ -94,7 +94,7 @@ module Sisimai::Bite::Email
 
           else
             # Before "message/rfc822"
-            next if readcursor & Indicators[:deliverystatus] == 0
+            next if (readcursor & Indicators[:deliverystatus]).zero?
             next if e.empty?
 
             v = dscontents[-1]

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

@@ -1,7 +1,7 @@
 module Sisimai::Bite::Email
+  # Sisimai::Bite::Email::MailFoundry parses a bounce email which created by
+  # MailFoundry. Methods in the module are called from only Sisimai::Message.
   module MailFoundry
-    # Sisimai::Bite::Email::MailFoundry parses a bounce email which created by
-    # MailFoundry. Methods in the module are called from only Sisimai::Message.
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/MailFoundry.pm
       require 'sisimai/bite/email'
@@ -9,13 +9,13 @@ module Sisimai::Bite::Email
       Re0 = {
         :subject  => %r/\AMessage delivery has failed\z/,
         :received => %r/[(]MAILFOUNDRY[)] id /,
-      }
+      }.freeze
       Re1 = {
         :begin  => %r/\AThis is a MIME encoded message\z/,
         :error  => %r/\ADelivery failed for the following reason:\z/,
         :rfc822 => %r|\AContent-Type: message/rfc822\z|,
         :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }
+      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'MailFoundry'; end
@@ -57,7 +57,7 @@ module Sisimai::Bite::Email
             end
           end
 
-          if readcursor & Indicators[:'message-rfc822'] == 0
+          if (readcursor & Indicators[:'message-rfc822']).zero?
             # Beginning of the original message part
             if e =~ Re1[:rfc822]
               readcursor |= Indicators[:'message-rfc822']
@@ -76,7 +76,7 @@ module Sisimai::Bite::Email
 
           else
             # Before "message/rfc822"
-            next if readcursor & Indicators[:deliverystatus] == 0
+            next if (readcursor & Indicators[:deliverystatus]).zero?
             next if e.empty?
 
             # Unable to deliver message to: <kijitora@example.org>

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

@@ -1,22 +1,22 @@
 module Sisimai::Bite::Email
+  # Sisimai::Bite::Email::MailMarshalSMTP parses a bounce email which created
+  # by Trustwave Secure Email Gateway: formerly MailMarshal SMTP. Methods in
+  # the module are called from only Sisimai::Message.
   module MailMarshalSMTP
-    # Sisimai::Bite::Email::MailMarshalSMTP parses a bounce email which created
-    # by Trustwave Secure Email Gateway: formerly MailMarshal SMTP. Methods in
-    # the module are called from only Sisimai::Message.
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/MailMarshalSMTP.pm
       require 'sisimai/bite/email'
 
       Re0 = {
         :subject  => %r/\AUndeliverable Mail: ["]/,
-      }
+      }.freeze
       Re1 = {
         :begin  => %r/\AYour message:\z/,
         :rfc822 => nil,
         :error  => %r/\ACould not be delivered because of\z/,
         :rcpts  => %r/\AThe following recipients were affected:/,
         :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }
+      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'Trustwave Secure Email Gateway'; end
@@ -52,12 +52,12 @@ module Sisimai::Bite::Email
         v = nil
 
         boundary00 = Sisimai::MIME.boundary(mhead['content-type']) || ''
-        if boundary00.size > 0
-          # Convert to regular expression
-          regularexp = Regexp.new('\A' + Regexp.escape('--' + boundary00 + '--') + '\z')
-        else
-          regularexp = %r/\A[ \t]*[+]+[ \t]*\z/
-        end
+        regularexp = if boundary00.size > 0
+                       # Convert to regular expression
+                       Regexp.new('\A' + Regexp.escape('--' + boundary00 + '--') + '\z')
+                     else
+                       regularexp = %r/\A[ \t]*[+]+[ \t]*\z/
+                     end
 
         hasdivided.each do |e|
           if readcursor.zero?
@@ -68,7 +68,7 @@ module Sisimai::Bite::Email
             end
           end
 
-          if readcursor & Indicators[:'message-rfc822'] == 0
+          if (readcursor & Indicators[:'message-rfc822']).zero?
             # Beginning of the original message part
             if e =~ regularexp
               readcursor |= Indicators[:'message-rfc822']
@@ -87,7 +87,7 @@ module Sisimai::Bite::Email
 
           else
             # Before "message/rfc822"
-            next if readcursor & Indicators[:deliverystatus] == 0
+            next if (readcursor & Indicators[:deliverystatus]).zero?
             break if e =~ regularexp
 
             # Your message:

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

@@ -1,7 +1,7 @@
 module Sisimai::Bite::Email
+  # Sisimai::Bite::Email::MailRu parses a bounce email which created by @mail.ru.
+  # Methods in the module are called from only Sisimai::Message.
   module MailRu
-    # Sisimai::Bite::Email::MailRu parses a bounce email which created by @mail.ru.
-    # Methods in the module are called from only Sisimai::Message.
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/MailRu.pm
       # Based on Sisimai::Bite::Email::Exim
@@ -20,16 +20,16 @@ module Sisimai::Bite::Email
           |error[(]s[)][ ]in[ ]forwarding[ ]or[ ]filtering
           )
         }x,
-      }
+      }.freeze
       Re1 = {
         :rfc822 => %r/\A------ This is a copy of the message.+headers[.] ------\z/,
         :begin  => %r/\AThis message was created automatically by mail delivery software[.]/,
         :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }
+      }.freeze
       ReCommand = [
         %r/SMTP error from remote (?:mail server|mailer) after ([A-Za-z]{4})/,
         %r/SMTP error from remote (?:mail server|mailer) after end of ([A-Za-z]{4})/,
-      ]
+      ].freeze
       ReFailure = {
         expired: %r{(?:
              retry[ ]timeout[ ]exceeded
@@ -57,7 +57,7 @@ module Sisimai::Bite::Email
             )
         }x,
         contenterror: %r/Too[ ]many[ ]["]Received["][ ]headers[ ]/x,
-      }
+      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return '@mail.ru: https://mail.ru'; end
@@ -101,7 +101,7 @@ module Sisimai::Bite::Email
             end
           end
 
-          if readcursor & Indicators[:'message-rfc822'] == 0
+          if (readcursor & Indicators[:'message-rfc822']).zero?
             # Beginning of the original message part
             if e =~ Re1[:rfc822]
               readcursor |= Indicators[:'message-rfc822']
@@ -121,7 +121,7 @@ module Sisimai::Bite::Email
 
           else
             # Before "message/rfc822"
-            next if readcursor & Indicators[:deliverystatus] == 0
+            next if (readcursor & Indicators[:deliverystatus]).zero?
             next if e.empty?
 
             # Это письмо создано автоматически
@@ -179,7 +179,7 @@ module Sisimai::Bite::Email
             recipients = rcptinhead.size
 
             rcptinhead.each do |e|
-              # Insert each recipient address into @$dscontents
+              # Insert each recipient address into dscontents
               dscontents[-1]['recipient'] = e
               next if dscontents.size == recipients
               dscontents << Sisimai::Bite.DELIVERYSTATUS
@@ -204,7 +204,7 @@ module Sisimai::Bite::Email
           if e['alterrors'] && e['alterrors'].size > 0
             # Copy alternative error message
             e['diagnosis'] ||= e['alterrors']
-            if e['diagnosis'] =~ /\A[-]+/ || e['diagnosis'] =~ /__\z/
+            if e['diagnosis'] =~ /\A[-]+/ || e['diagnosis'].end_with?('__')
               # Override the value of diagnostic code message
               e['diagnosis'] = e['alterrors'] if e['alterrors'].size > 0
             end