sisimai 4.22.1 → 4.22.2

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

@@ -1,7 +1,7 @@
 module Sisimai::Bite::Email
+  # Sisimai::Bite::Email::McAfee parses a bounce email which created by McAfee
+  # Email Appliance. Methods in the module are called from only Sisimai::Message.
   module McAfee
-    # Sisimai::Bite::Email::McAfee parses a bounce email which created by McAfee
-    # Email Appliance. Methods in the module are called from only Sisimai::Message.
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/McAfee.pm
       require 'sisimai/bite/email'
@@ -9,20 +9,20 @@ module Sisimai::Bite::Email
       Re0 = {
         :'x-nai'   => %r/Modified by McAfee /,
         :'subject' => %r/\ADelivery Status\z/,
-      }
+      }.freeze
       Re1 = {
         :begin   => %r/[-]+ The following addresses had delivery problems [-]+\z/,
         :error   => %r|\AContent-Type: [^ ]+/[^ ]+; name="deliveryproblems[.]txt"|,
         :rfc822  => %r|\AContent-Type: message/rfc822\z|,
         :endof   => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }
+      }.freeze
       ReFailure = {
         userunknown: %r{(?:
            User[ ][(].+[@].+[)][ ]unknown[.]
           |550[ ]Unknown[ ]user[ ][^ ]+[@][^ ]+
           )
         }x,
-      }
+      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'McAfee Email Appliance'; end
@@ -72,7 +72,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']
@@ -91,7 +91,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?
 
             # Content-Type: text/plain; name="deliveryproblems.txt"

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

@@ -1,8 +1,8 @@
 module Sisimai::Bite::Email
+  # Sisimai::Bite::Email::MessageLabs parses a bounce email which created by
+  # Symantec.cloud: formerly MessageLabs. Methods in the module are called
+  # from only Sisimai::Message.
   module MessageLabs
-    # Sisimai::Bite::Email::MessageLabs parses a bounce email which created by
-    # Symantec.cloud: formerly MessageLabs. Methods in the module are called
-    # from only Sisimai::Message.
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/MessageLabs.pm
       require 'sisimai/bite/email'
@@ -10,16 +10,16 @@ module Sisimai::Bite::Email
       Re0 = {
         :from    => %r/MAILER-DAEMON[@]messagelabs[.]com/,
         :subject => %r/\AMail Delivery Failure/,
-      }
+      }.freeze
       Re1 = {
         :begin   => %r|\AContent-Type: message/delivery-status|,
         :error   => %r/\AReason:[ \t]*(.+)\z/,
         :rfc822  => %r|\AContent-Type: text/rfc822-headers\z|,
         :endof   => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }
+      }.freeze
       ReFailure = {
         userunknown: %r/No[ ]such[ ]user/x,
-      }
+      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'Symantec.cloud http://www.messagelabs.com'; end
@@ -59,7 +59,7 @@ module Sisimai::Bite::Email
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         commandset = []     # (Array) ``in reply to * command'' list
-        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
@@ -79,7 +79,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']
@@ -98,7 +98,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?
 
             if connvalues == connheader.keys.size

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

@@ -1,8 +1,8 @@
 module Sisimai::Bite::Email
+  # Sisimai::Bite::Email::MessagingServer parses a bounce email which created
+  # by Oracle Communications Messaging Server and Sun Java System Messaging
+  # Server. Methods in the module are called from only Sisimai::Message.
   module MessagingServer
-    # Sisimai::Bite::Email::MessagingServer parses a bounce email which created
-    # by Oracle Communications Messaging Server and Sun Java System Messaging
-    # Server. Methods in the module are called from only Sisimai::Message.
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/MessagingServer.pm
       require 'sisimai/bite'
@@ -12,15 +12,15 @@ module Sisimai::Bite::Email
         :subject  => %r/\ADelivery Notification: /,
         :received => %r/[ ][(]MessagingServer[)][ ]with[ ]/,
         :boundary => %r/Boundary_[(]ID_.+[)]/,
-      }
+      }.freeze
       Re1 = {
         :begin  => %r/\AThis report relates to a message you sent with the following header fields:/,
         :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
         :rfc822 => %r!\A(?:Content-type:[ ]*message/rfc822|Return-path:[ ]*)!x,
-      }
+      }.freeze
       ReFailure = {
         hostunknown: %r|Illegal[ ]host/domain[ ]name[ ]found|x,
-      }
+      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'Oracle Communications Messaging Server'; end
@@ -66,7 +66,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']
@@ -85,7 +85,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?
 
             # --Boundary_(ID_0000000000000000000000)

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

@@ -1,8 +1,8 @@
 module Sisimai::Bite::Email
+  # Sisimai::Bite::Email::mFILTER parses a bounce email which created by
+  # Digital Arts m-FILTER.
+  # Methods in the module are called from only Sisimai::Message.
   module MFILTER
-    # Sisimai::Bite::Email::mFILTER parses a bounce email which created by
-    # Digital Arts m-FILTER.
-    # Methods in the module are called from only Sisimai::Message.
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/mFILTER.pm
       require 'sisimai/bite/email'
@@ -11,14 +11,14 @@ module Sisimai::Bite::Email
         :'from'     => %r/\AMailer Daemon [<]MAILER-DAEMON[@]/,
         :'subject'  => %r/\Afailure notice\z/,
         :'x-mailer' => %r/\Am-FILTER\z/,
-      }
+      }.freeze
       Re1 = {
         :begin   => %r/\A[^ ]+[@][^ ]+[.][a-zA-Z]+\z/,
         :error   => %r/\A-------server message\z/,
         :command => %r/\A-------SMTP command\z/,
         :rfc822  => %r/\A-------original (?:message|mail info)\z/,
         :endof   => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }
+      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'Digital Arts m-FILTER'; end
@@ -59,7 +59,7 @@ module Sisimai::Bite::Email
             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']
@@ -78,7 +78,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?
 
             # このメールは「m-FILTER」が自動的に生成して送信しています。

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

@@ -1,8 +1,8 @@
 module Sisimai::Bite::Email
+  # Sisimai::Bite::Email::MXLogic parses a bounce email which created by
+  # McAfee SaaS (formerly MX Logic).
+  # Methods in the module are called from only Sisimai::Message.
   module MXLogic
-    # Sisimai::Bite::Email::MXLogic parses a bounce email which created by
-    # McAfee SaaS (formerly MX Logic).
-    # Methods in the module are called from only Sisimai::Message.
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/MXLogic.pm
       # Based on Sisimai::Bite::Email::Exim
@@ -17,16 +17,16 @@ module Sisimai::Bite::Email
             )
         }x,
         :'message-id' => %r/\A[<]mxl[~][0-9a-f]+/,
-      }
+      }.freeze
       Re1 = {
         :rfc822 => %r/\AIncluded is a copy of the message header:\z/,
         :begin  => %r/\AThis message was created automatically by mail delivery software[.]\z/,
         :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 = {
         userunknown: %r{
             user[ ]not[ ]found
@@ -58,7 +58,7 @@ module Sisimai::Bite::Email
         contenterror: %r{
             Too[ ]many[ ]["]Received["][ ]headers
         }x,
-      }
+      }.freeze
       ReDelayed = %r{(?:
          retry[ ]timeout[ ]exceeded
         |No[ ]action[ ]is[ ]required[ ]on[ ]your[ ]part
@@ -119,7 +119,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']
@@ -138,7 +138,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?
 
             # This message was created automatically by mail delivery software.

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

@@ -1,19 +1,19 @@
 module Sisimai::Bite::Email
+  # Sisimai::Bite::::Email::Notes parses a bounce email which created by Lotus
+  # Notes Server. Methods in the module are called from only Sisimai::Message.
   module Notes
-    # Sisimai::Bite::::Email::Notes parses a bounce email which created by Lotus
-    # Notes Server. Methods in the module are called from only Sisimai::Message.
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/Notes.pm
       require 'sisimai/bite/email'
 
       Re0 = {
         :'subject' => %r/\AUndeliverable message/,
-      }
+      }.freeze
       Re1 = {
         :begin  => %r/\A[-]+[ ]+Failure Reasons[ ]+[-]+\z/,
         :rfc822 => %r/^[-]+[ ]+Returned Message[ ]+[-]+$/,
         :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }
+      }.freeze
       ReFailure = {
         userunknown: %r{(?:
            User[ ]not[ ]listed[ ]in[ ]public[ ]Name[ ][&][ ]Address[ ]Book
@@ -21,7 +21,7 @@ module Sisimai::Bite::Email
           )
         }x,
         networkerror: %r/Message has exceeded maximum hop count/,
-      }
+      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'Lotus Notes'; end
@@ -65,7 +65,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']
@@ -92,7 +92,7 @@ module Sisimai::Bite::Email
 
           else
             # Before "message/rfc822"
-            next if readcursor & Indicators[:deliverystatus] == 0
+            next if (readcursor & Indicators[:deliverystatus]).zero?
 
             # ------- Failure Reasons  --------
             #
@@ -143,11 +143,11 @@ module Sisimai::Bite::Email
         if recipients.zero?
           # Fallback: Get the recpient address from RFC822 part
           rfc822list.each do |e|
-            if cv = e.match(/^To:[ ]*(.+)$/m)
-              v['recipient'] = Sisimai::Address.s3s4(cv[1])
-              recipients += 1 if v['recipient'].size > 0
-              break
-            end
+            next unless cv = e.match(/^To:[ ]*(.+)$/m)
+
+            v['recipient'] = Sisimai::Address.s3s4(cv[1])
+            recipients += 1 if v['recipient'].size > 0
+            break
           end
         end
 

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

@@ -1,8 +1,8 @@
 module Sisimai::Bite::Email
+  # Sisimai::Bite::Email::Office365 parses a bounce email which created by
+  # Microsoft Office 365.
+  # Methods in the module are called from only Sisimai::Message.
   module Office365
-    # Sisimai::Bite::Email::Office365 parses a bounce email which created by
-    # Microsoft Office 365.
-    # Methods in the module are called from only Sisimai::Message.
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/Office365.pm
       require 'sisimai/bite/email'
@@ -11,7 +11,7 @@ module Sisimai::Bite::Email
         :'subject'    => %r/Undeliverable:/,
         :'received'   => %r/.+[.](?:outbound[.]protection|prod)[.]outlook[.]com\b/,
         :'message-id' => %r/.+[.](?:outbound[.]protection|prod)[.]outlook[.]com\b/,
-      }
+      }.freeze
       Re1 = {
         :begin  => %r{\A(?:
            Delivery[ ]has[ ]failed[ ]to[ ]these[ ]recipients[ ]or[ ]groups:
@@ -22,7 +22,7 @@ module Sisimai::Bite::Email
         :eoerr  => %r/\AOriginal message headers:\z/,
         :rfc822 => %r|\AContent-Type: message/rfc822\z|,
         :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }
+      }.freeze
       CodeTable = {
         # https://support.office.com/en-us/article/Email-non-delivery-reports-in-Office-365-51daa6b9-2e35-49c4-a0c9-df85bf8533c3
         %r/\A4[.]4[.]7\z/        => 'expired',
@@ -49,7 +49,7 @@ module Sisimai::Bite::Email
         %r/\A5[.]7[.]60[6-9]\z/  => 'blocked',
         %r/\A5[.]7[.]6[1-4]\d\z/ => 'blocked',
         %r/\A5[.]7[.]7[0-4]\d\z/ => 'toomanyconn',
-      }
+      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'Microsoft Office 365: http://office.microsoft.com/'; end
@@ -126,7 +126,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,7 +145,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?
 
             # kijitora@example.com<mailto:kijitora@example.com>
@@ -241,14 +241,13 @@ module Sisimai::Bite::Email
             pseudostatus = Sisimai::SMTP::Status.find(e['diagnosis'])
             e['status'] = pseudostatus if pseudostatus.size > 0
           end
+          next unless e['status']
 
-          if e['status']
-            CodeTable.each_key do |f|
-              # Try to match with each key as a regular expression
-              next unless e['status'] =~ f
-              e['reason'] = CodeTable[f]
-              break
-            end
+          CodeTable.each_key do |f|
+            # Try to match with each key as a regular expression
+            next unless e['status'] =~ f
+            e['reason'] = CodeTable[f]
+            break
           end
         end
 

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

@@ -1,7 +1,7 @@
 module Sisimai::Bite::Email
+  # Sisimai::Bite::Email::OpenSMTPD parses a bounce email which created by
+  # OpenSMTPD. Methods in the module are called from only Sisimai::Message.
   module OpenSMTPD
-    # Sisimai::Bite::Email::OpenSMTPD parses a bounce email which created by
-    # OpenSMTPD. Methods in the module are called from only Sisimai::Message.
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/OpenSMTPD.pm
       require 'sisimai/bite/email'
@@ -10,7 +10,7 @@ module Sisimai::Bite::Email
         :from     => %r/\AMailer Daemon [<][^ ]+[@]/,
         :subject  => %r/\ADelivery status notification/,
         :received => %r/[ ][(]OpenSMTPD[)][ ]with[ ]/,
-      }
+      }.freeze
       # http://www.openbsd.org/cgi-bin/man.cgi?query=smtpd&sektion=8
       # opensmtpd-5.4.2p1/smtpd/
       #   bounce.c/317:#define NOTICE_INTRO \
@@ -40,7 +40,7 @@ module Sisimai::Bite::Email
         :begin  => %r/\A[ \t]*This is the MAILER-DAEMON, please DO NOT REPLY to this e[-]?mail[.]\z/,
         :rfc822 => %r/\A[ \t]*Below is a copy of the original message:\z/,
         :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }
+      }.freeze
       ReFailure = {
         expired: %r{
           # smtpd/queue.c:221|  envelope_set_errormsg(&evp, "Envelope expired");
@@ -76,7 +76,7 @@ module Sisimai::Bite::Email
           # smtpd/mta.c:1013|  relay->failstr = "Could not retrieve credentials";
           Could[ ]not[ ]retrieve[ ]credentials
         }x,
-      }
+      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'OpenSMTPD'; end
@@ -119,7 +119,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']
@@ -138,7 +138,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?
 
             #    Hi!