sisimai 4.22.1 → 4.22.2

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

@@ -1,8 +1,8 @@
 module Sisimai::Bite::Email
+  # Sisimai::Bite::Email::Outlook parses a bounce email which created by
+  # Microsoft Outlook.com.
+  # Methods in the module are called from only Sisimai::Message.
   module Outlook
-    # Sisimai::Bite::Email::Outlook parses a bounce email which created by
-    # Microsoft Outlook.com.
-    # Methods in the module are called from only Sisimai::Message.
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/US/Outlook.pm
       require 'sisimai/bite/email'
@@ -11,17 +11,17 @@ module Sisimai::Bite::Email
         :from     => %r/postmaster[@]/,
         :subject  => %r/Delivery Status Notification/,
         :received => %r/.+[.]hotmail[.]com\b/,
-      }
+      }.freeze
       Re1 = {
         :begin  => %r/\AThis is an automatically generated Delivery Status Notification/,
         :error  => %r/\A[.]+ while talking to .+[:]\z/,
         :rfc822 => %r|\AContent-Type: message/rfc822\z|,
         :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }
+      }.freeze
       ReFailure = {
         hostunknown: %r/The mail could not be delivered to the recipient because the domain is not reachable/,
         userunknown: %r/Requested action not taken: mailbox unavailable/,
-      }
+      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'Microsoft Outlook.com: https://www.outlook.com/'; end
@@ -61,7 +61,7 @@ module Sisimai::Bite::Email
         blanklines = 0      # (Integer) The number of blank lines
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
-        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
@@ -81,7 +81,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']
@@ -100,7 +100,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/postfix.rb

@@ -1,7 +1,7 @@
 module Sisimai::Bite::Email
+  # Sisimai::Bite::Email::Postfix parses a bounce email which created by
+  # Postfix. Methods in the module are called from only Sisimai::Message.
   module Postfix
-    # Sisimai::Bite::Email::Postfix parses a bounce email which created by
-    # Postfix. Methods in the module are called from only Sisimai::Message.
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/Postfix.pm
       require 'sisimai/bite/email'
@@ -10,7 +10,7 @@ module Sisimai::Bite::Email
       Re0 = {
         :from    => %r/ [(]Mail Delivery System[)]\z/,
         :subject => %r/\AUndelivered Mail Returned to Sender\z/,
-      }
+      }.freeze
       Re1 = {
         :begin => %r{\A(?>
            [ ]+The[ ](?:
@@ -32,7 +32,7 @@ module Sisimai::Bite::Email
         }x,
         :rfc822 => %r!\AContent-Type:[ \t]*(?:message/rfc822|text/rfc822-headers)\z!x,
         :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }
+      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'Postfix'; end
@@ -64,7 +64,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 Received-From-MTA header
@@ -85,7 +85,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']
@@ -104,7 +104,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
@@ -203,7 +203,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
 
                 elsif cv = e.match(/\A(X-Postfix-Sender):[ ]*rfc822;[ ]*(.+)\z/)
@@ -266,12 +266,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
@@ -280,7 +280,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
@@ -288,8 +288,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/qmail.rb

@@ -1,7 +1,7 @@
 module Sisimai::Bite::Email
+  # Sisimai::Bite::Email::Qmail parses a bounce email which created by qmail.
+  # Methods in the module are called from only Sisimai::Message.
   module Qmail
-    # Sisimai::Bite::Email::Qmail parses a bounce email which created by qmail.
-    # Methods in the module are called from only Sisimai::Message.
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/qmail.pm
       require 'sisimai/bite/email'
@@ -9,7 +9,7 @@ module Sisimai::Bite::Email
       Re0 = {
         :subject  => %r/\Afailure notice/i,
         :received => %r/\A[(]qmail[ ]+\d+[ ]+invoked[ ]+(?:for[ ]+bounce|from[ ]+network)[)]/,
-      }
+      }.freeze
       #  qmail-remote.c:248|    if (code >= 500) {
       #  qmail-remote.c:249|      out("h"); outhost(); out(" does not like recipient.\n");
       #  qmail-remote.c:265|  if (code >= 500) quit("D"," failed on DATA command");
@@ -23,7 +23,7 @@ module Sisimai::Bite::Email
         :error  => %r/\ARemote host said:/,
         :sorry  => %r/\A[Ss]orry[,.][ ]/,
         :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }
+      }.freeze
       ReSMTP = {
         # Error text regular expressions which defined in qmail-remote.c
         # qmail-remote.c:225|  if (smtpcode() != 220) quit("ZConnected to "," but greeting failed");
@@ -46,7 +46,7 @@ module Sisimai::Bite::Email
           |(?:Error:)?.+[ ]failed[ ]after[ ]I[ ]sent[ ]the[ ]message[.]
           )
         }x,
-      }
+      }.freeze
       # qmail-remote.c:261|  if (!flagbother) quit("DGiving up on ","");
       ReHost = %r{(?:
          Giving[ ]up[ ]on[ ](.+[0-9a-zA-Z])[.]?\z
@@ -79,7 +79,7 @@ module Sisimai::Bite::Email
             )
           )
         }x,
-      }
+      }.freeze
       # userunknown + expired
       ReOnHold  = %r/\A[^ ]+ does not like recipient[.][ ]+.+this message has been in the queue too long[.]\z/
       # qmail-remote-fallback.patch
@@ -114,7 +114,7 @@ module Sisimai::Bite::Email
           )
         }x,
         systemfull: %r/Requested action not taken: mailbox unavailable [(]not enough free space[)]/,
-      }
+      }.freeze
       # qmail-send.c:922| ... (&dline[c],"I'm not going to try again; this message has been in the queue too long.\n")) nomem();
       ReDelayed  = %r/this[ ]message[ ]has[ ]been[ ]in[ ]the[ ]queue[ ]too[ ]long[.]\z/x
       Indicators = Sisimai::Bite::Email.INDICATORS
@@ -165,7 +165,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']
@@ -184,7 +184,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.jp>:

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

@@ -1,8 +1,8 @@
 module Sisimai::Bite::Email
+  # Sisimai::Bite::Email::ReceivingSES parses a bounce email which created
+  # by Amazon Simple Email Service. Methods in the module are called from
+  # only Sisimai::Message.
   module ReceivingSES
-    # Sisimai::Bite::Email::ReceivingSES parses a bounce email which created
-    # by Amazon Simple Email Service. Methods in the module are called from
-    # only Sisimai::Message.
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/ReceivingSES.pm
       require 'sisimai/bite/email'
@@ -11,19 +11,19 @@ module Sisimai::Bite::Email
       Re0 = {
         :subject  => %r/\ADelivery Status Notification [(]Failure[)]\z/,
         :received => %r/.+[.]smtp-out[.].+[.]amazonses[.]com\b/,
-      }
+      }.freeze
       Re1 = {
         :begin  => %r/\AThis message could not be delivered[.]\z/,
         :rfc822 => %r|\Acontent-type: text/rfc822-headers\z|,
         :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }
+      }.freeze
       ReFailure = {
         # The followings are error messages in Rule sets/*/Actions/Template
         filtered:     %r/Mailbox does not exist/,
         mesgtoobig:   %r/Message too large/,
         mailboxfull:  %r/Mailbox full/,
         contenterror: %r/Message content rejected/,
-      }
+      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'Amazon SES(Receiving): http://aws.amazon.com/ses/'; end
@@ -57,7 +57,7 @@ module Sisimai::Bite::Email
         blanklines = 0      # (Integer) The number of blank lines
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
-        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
@@ -77,7 +77,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']
@@ -96,7 +96,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/sendgrid.rb

@@ -1,22 +1,22 @@
 module Sisimai::Bite::Email
+  # Sisimai::Bite::Email::SendGrid parses a bounce email which created by
+  # SendGrid. Methods in the module are called from only Sisimai::Message.
   module SendGrid
-    # Sisimai::Bite::Email::SendGrid parses a bounce email which created by
-    # SendGrid. Methods in the module are called from only Sisimai::Message.
     class << self
-    # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/SendGrid.pm
+      # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/SendGrid.pm
       require 'sisimai/bite/email'
 
       Re0 = {
         :'from'        => %r/\AMAILER-DAEMON\z/,
         :'return-path' => %r/\A[<]apps[@]sendgrid[.]net[>]\z/,
         :'subject'     => %r/\AUndelivered Mail Returned to Sender\z/,
-      }
+      }.freeze
       Re1 = {
         :begin  => %r/\AThis is an automatically generated message from SendGrid[.]\z/,
         :error  => %r/\AIf you require assistance with this, please contact SendGrid support[.]\z/,
         :rfc822 => %r|\AContent-Type: message/rfc822|,
         :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }
+      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'SendGrid: http://sendgrid.com/'; end
@@ -54,7 +54,7 @@ module Sisimai::Bite::Email
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         commandtxt = ''     # (String) SMTP Command name begin with the string '>>>'
-        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
         }
@@ -73,7 +73,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?
             next if e.empty?
 
             if connvalues == connheader.keys.size
@@ -188,7 +188,7 @@ module Sisimai::Bite::Email
           # Get the value of SMTP status code as a pseudo D.S.N.
           if cv = e['diagnosis'].match(/\b([45])\d\d[ \t]*/)
             # 4xx or 5xx
-            e['status'] = sprintf("%d.0.0", cv[1])
+            e['status'] = sprintf('%d.0.0', cv[1])
           end
 
           if e['status'] =~ /[45][.]0[.]0/

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

@@ -1,7 +1,7 @@
 module Sisimai::Bite::Email
+  # Sisimai::Bite::Email::Sendmail parses a bounce email which created by
+  # v8 Sendmail. Methods in the module are called from only Sisimai::Message.
   module Sendmail
-    # Sisimai::Bite::Email::Sendmail parses a bounce email which created by
-    # v8 Sendmail. Methods in the module are called from only Sisimai::Message.
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/Sendmail.pm
       require 'sisimai/bite/email'
@@ -9,7 +9,7 @@ module Sisimai::Bite::Email
       Re0 = {
         :from    => %r/\AMail Delivery Subsystem/,
         :subject => %r/(?:see transcript for details\z|\AWarning: )/,
-      }
+      }.freeze
       # Error text regular expressions which defined in sendmail/savemail.c
       #   savemail.c:1040|if (printheader && !putline("   ----- Transcript of session follows -----\n",
       #   savemail.c:1041|          mci))
@@ -20,7 +20,7 @@ module Sisimai::Bite::Email
         :error   => %r/\A[.]+ while talking to .+[:]\z/,
         :rfc822  => %r{\AContent-Type:[ ]*(?:message/rfc822|text/rfc822-headers)\z},
         :endof   => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }
+      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'V8Sendmail: /usr/sbin/sendmail'; end
@@ -60,7 +60,7 @@ module Sisimai::Bite::Email
         commandtxt = ''     # (String) SMTP Command name begin with the string '>>>'
         esmtpreply = ''     # (String) Reply from remote server on SMTP session
         sessionerr = false  # (Boolean) Flag, "true" if it is SMTP session error
-        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
           'rhost' => '',    # The value of Reporting-MTA header
@@ -81,7 +81,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']
@@ -100,7 +100,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/surfcontrol.rb

@@ -1,8 +1,8 @@
 module Sisimai::Bite::Email
+  # Sisimai::Bite::Email::SurfControl parses a bounce email which created by
+  # WebSense SurfControl.
+  # Methods in the module are called from only Sisimai::Message.
   module SurfControl
-    # Sisimai::Bite::Email::SurfControl parses a bounce email which created by
-    # WebSense SurfControl.
-    # Methods in the module are called from only Sisimai::Message.
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/SurfControl.pm
       require 'sisimai/bite/email'
@@ -10,13 +10,13 @@ module Sisimai::Bite::Email
       Re0 = {
         :'from'     => %r/ [(]Mail Delivery System[)]\z/,
         :'x-mailer' => %r/\ASurfControl E-mail Filter\z/,
-      }
+      }.freeze
       Re1 = {
         :begin  => %r/\AYour message could not be sent[.]\z/,
         :error  => %r/\AFailed to send to identified host,\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 'WebSense SurfControl'; 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?
 
             # Your message could not be sent.

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

@@ -1,7 +1,7 @@
 module Sisimai::Bite::Email
+  # Sisimai::Bite::Email::UserDefined is an example module as a template to
+  # implement your custom MTA module.
   module UserDefined
-    # Sisimai::Bite::Email::UserDefined is an example module as a template to
-    # implement your custom MTA module.
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/UserDefined.pm
       require 'sisimai/bite/email'
@@ -11,7 +11,7 @@ module Sisimai::Bite::Email
       Re0 = {
         :from    => %r/\AMail Sysmet/,
         :subject => %r/\AError Mail Report/,
-      }
+      }.freeze
 
       # Re1 is delimiter set of these sections:
       #   begin:  The first line of a bounce message to be parsed.
@@ -24,7 +24,7 @@ module Sisimai::Bite::Email
         :error   => %r/\A[.]+ while talking to .+[:]\z/,
         :rfc822  => %r{\AContent-Type:[ ]*(?:message/rfc822|text/rfc822-headers)\z},
         :endof   => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }
+      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'Module description'; end
@@ -76,7 +76,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']
@@ -95,7 +95,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?
 
           end
@@ -114,7 +114,7 @@ module Sisimai::Bite::Email
         rfc822list << 'Subject: Nyaaan'
         rfc822list << 'Message-Id: 000000000000@example.jp'
 
-        # 3. Return undef when there is no recipient address which is failed to
+        # 3. Return nil when there is no recipient address which is failed to
         #    delivery in the bounce message
         return nil if recipients.zero?