sisimai 4.22.1 → 4.22.2

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

@@ -1,8 +1,8 @@
 module Sisimai::Bite::Email
+  # Sisimai::Bite::Email::V5sendmail parses a bounce email which created by
+  # Sendmail version 5.
+  # Methods in the module are called from only Sisimai::Message.
   module V5sendmail
-    # Sisimai::Bite::Email::V5sendmail parses a bounce email which created by
-    # Sendmail version 5.
-    # Methods in the module are called from only Sisimai::Message.
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/V5sendmail.pm
       require 'sisimai/bite/email'
@@ -10,7 +10,7 @@ module Sisimai::Bite::Email
       Re0 = {
         :from    => %r/\AMail Delivery Subsystem/,
         :subject => %r/\AReturned mail: [A-Z]/,
-      }
+      }.freeze
       # Error text regular expressions which defined in src/savemail.c
       #   savemail.c:485| (void) fflush(stdout);
       #   savemail.c:486| p = queuename(e->e_parent, 'x');
@@ -36,7 +36,7 @@ module Sisimai::Bite::Email
           )[ ]-----
         }x,
         :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }
+      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'Sendmail version 5'; end
@@ -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?
 
             #    ----- Transcript of session follows -----
@@ -156,17 +156,17 @@ module Sisimai::Bite::Email
             end
           end
         end
-        return nil if readcursor & Indicators[:'message-rfc822'] == 0
+        return nil if (readcursor & Indicators[:'message-rfc822']).zero?
 
         if recipients.zero?
           # Get the recipient address from the original message
           rfc822list.each do |e|
-            if cv = e.match(/^To: (.+)$/m)
-              # The value of To: header in the original message
-              dscontents[0]['recipient'] = Sisimai::Address.s3s4(cv[1])
-              recipients = 1
-              break
-            end
+            next unless cv = e.match(/^To: (.+)$/m)
+
+            # The value of To: header in the original message
+            dscontents[0]['recipient'] = Sisimai::Address.s3s4(cv[1])
+            recipients = 1
+            break
           end
         end
         return nil if recipients.zero?
@@ -177,14 +177,13 @@ module Sisimai::Bite::Email
           e['agent']   = self.smtpagent
           e['command'] = commandset[errorindex] || ''
 
-          if anotherset['diagnosis'] && anotherset['diagnosis'].size > 0
-            # Copy alternative error message
-            e['diagnosis'] ||= anotherset['diagnosis']
-
-          else
-            # Set server response as a error message
-            e['diagnosis'] ||= responding[errorindex]
-          end
+          e['diagnosis'] ||= if anotherset['diagnosis'] && anotherset['diagnosis'].size > 0
+                               # Copy alternative error message
+                               anotherset['diagnosis']
+                             else
+                               # Set server response as a error message
+                               responding[errorindex]
+                             end
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
           unless e['recipient'] =~ /\A[^ ]+[@][^ ]+\z/

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

@@ -1,8 +1,8 @@
 module Sisimai::Bite::Email
+  # Sisimai::Bite::Email::Verizon parses a bounce email which created by
+  # Verizon Wireless.
+  # Methods in the module are called from only Sisimai::Message.
   module Verizon
-    # Sisimai::Bite::Email::Verizon parses a bounce email which created by
-    # Verizon Wireless.
-    # Methods in the module are called from only Sisimai::Message.
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/Verizon.pm
       require 'sisimai/bite/email'
@@ -16,7 +16,7 @@ module Sisimai::Bite::Email
           :'from'    => %r/[<]?sysadmin[@].+[.]vzwpix[.]com[>]?\z/,
           :'subject' => %r/Undeliverable Message/,
         },
-      }
+      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'Verizon Wireless: http://www.verizonwireless.com'; end
@@ -97,7 +97,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']
@@ -116,7 +116,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?
 
               # Message details:
@@ -176,7 +176,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']
@@ -195,7 +195,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?
 
               # Original Message:

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

@@ -1,7 +1,7 @@
 module Sisimai::Bite::Email
+  # Sisimai::Bite::Email::X1 parses a bounce email which created by Unknown
+  # MTA #1. Methods in the module are called from only Sisimai::Message.
   module X1
-    # Sisimai::Bite::Email::X1 parses a bounce email which created by Unknown
-    # MTA #1. Methods in the module are called from only Sisimai::Message.
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/X1.pm
       require 'sisimai/bite/email'
@@ -9,12 +9,12 @@ module Sisimai::Bite::Email
       Re0 = {
         :from    => %r/["]Mail Deliver System["] /,
         :subject => %r/\AReturned Mail: /,
-      }
+      }.freeze
       Re1 = {
         :begin   => %r/\AThe original message was received at (.+)\z/,
         :endof   => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
         :rfc822  => %r/\AReceived: from \d+[.]\d+[.]\d+[.]\d/,
-      }
+      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'Unknown MTA #1'; 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?
 
             # The original message was received at Thu, 29 Apr 2010 23:34:45 +0900 (JST)

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

@@ -1,7 +1,7 @@
 module Sisimai::Bite::Email
+  # Sisimai::Bite::Email::X2 parses a bounce email which created by Unknown
+  # MTA #2. Methods in the module are called from only Sisimai::Message.
   module X2
-    # Sisimai::Bite::Email::X2 parses a bounce email which created by Unknown
-    # MTA #2. Methods in the module are called from only Sisimai::Message.
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/X2.pm
       require 'sisimai/bite/email'
@@ -13,12 +13,12 @@ module Sisimai::Bite::Email
           |fail(?:ure|ed)[ ]delivery
           )
         }x,
-      }
+      }.freeze
       Re1 = {
         :begin  => %r/\AUnable to deliver message to the following address/,
         :rfc822 => %r/\A--- Original message follows/,
         :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }
+      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'Unknown MTA #2'; end
@@ -60,7 +60,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']
@@ -79,7 +79,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?
 
             # Message from example.com.

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

@@ -1,7 +1,7 @@
 module Sisimai::Bite::Email
+  # Sisimai::Bite::Email::X3 parses a bounce email which created by Unknown
+  # MTA #3. Methods in the module are called from only Sisimai::Message.
   module X3
-    # Sisimai::Bite::Email::X3 parses a bounce email which created by Unknown
-    # MTA #3. Methods in the module are called from only Sisimai::Message.
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/X3.pm
       require 'sisimai/bite/email'
@@ -9,12 +9,12 @@ module Sisimai::Bite::Email
       Re0 = {
         :from    => %r/\AMail Delivery System/,
         :subject => %r/\ADelivery status notification/,
-      }
+      }.freeze
       Re1 = {
         :begin  => %r/\A[ \t]+This is an automatically generated Delivery Status Notification/,
         :rfc822 => %r|\AContent-Type: message/rfc822|,
         :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }
+      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'Unknown MTA #3'; end
@@ -56,7 +56,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']
@@ -75,7 +75,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?
 
             # ============================================================================

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

@@ -1,7 +1,7 @@
 module Sisimai::Bite::Email
+  # Sisimai::Bite::Email::X4 parses a bounce email which created by some qmail
+  # clone.  Methods in the module are called from only Sisimai::Message.
   module X4
-    # Sisimai::Bite::Email::X4 parses a bounce email which created by some qmail
-    # clone.  Methods in the module are called from only Sisimai::Message.
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/X4.pm
       # MTA module for qmail clones
@@ -14,7 +14,7 @@ module Sisimai::Bite::Email
           )
         }xi,
         :received => %r/\A[(]qmail[ ]+\d+[ ]+invoked[ ]+for[ ]+bounce[)]/,
-      }
+      }.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");
@@ -49,7 +49,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");
@@ -72,7 +72,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
@@ -105,7 +105,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
@@ -139,7 +139,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
@@ -190,7 +190,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']
@@ -209,7 +209,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/x5.rb

@@ -1,7 +1,7 @@
 module Sisimai::Bite::Email
+  # Sisimai::Bite::Email::X5 parses a bounce email which created by Unknown
+  # MTA #5. Methods in the module are called from only Sisimai::Message.
   module X5
-    # Sisimai::Bite::Email::X5 parses a bounce email which created by Unknown
-    # MTA #5. Methods in the module are called from only Sisimai::Message.
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/X5.pm
       require 'sisimai/bite/email'
@@ -9,12 +9,12 @@ module Sisimai::Bite::Email
       Re0 = {
         :from => %r/\bTWFpbCBEZWxpdmVyeSBTdWJzeXN0ZW0\b/,
         :to   => %r/\bNotificationRecipients\b/,
-      }
+      }.freeze
       Re1 = {
         :begin  => %r|\AContent-Type: message/delivery-status|,
         :rfc822 => %r|\AContent-Type: message/rfc822|,
         :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }
+      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'Unknown MTA #5'; end
@@ -82,7 +82,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']
@@ -148,7 +148,7 @@ module Sisimai::Bite::Email
           else
             # After "message/rfc822"
             next if recipients.zero?
-            next if readcursor & Indicators['deliverystatus'] == 0
+            next if (readcursor & Indicators['deliverystatus']).zero?
 
             if e.empty?
               blanklines += 1

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

@@ -1,19 +1,19 @@
 module Sisimai::Bite::Email
+  # Sisimai::Bite::Email::Yahoo parses a bounce email which created by Yahoo!
+  # MAIL. Methods in the module are called from only Sisimai::Message.
   module Yahoo
-    # Sisimai::Bite::Email::Yahoo parses a bounce email which created by Yahoo!
-    # MAIL. Methods in the module are called from only Sisimai::Message.
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/Yahoo.pm
       require 'sisimai/bite/email'
 
       Re0 = {
         :subject => %r/\AFailure Notice\z/,
-      }
+      }.freeze
       Re1 = {
         :begin   => %r/\ASorry, we were unable to deliver your message/,
         :rfc822  => %r/\A--- Below this line is a copy of the message[.]\z/,
         :endof   => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }
+      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'Yahoo! MAIL: https://www.yahoo.com'; end
@@ -59,7 +59,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']
@@ -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?
 
             # Sorry, we were unable to deliver your message to the following address.
@@ -98,7 +98,7 @@ module Sisimai::Bite::Email
               recipients += 1
 
             else
-              if e =~ /\ARemote host said:/
+              if e.start_with?('Remote host said:')
                 # Remote host said: 550 5.1.1 <kijitora@example.org>... User Unknown [RCPT_TO]
                 v['diagnosis'] = e
 

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

@@ -1,19 +1,19 @@
 module Sisimai::Bite::Email
+  # Sisimai::Bite::Email::Yandex parses a bounce email which created by
+  # Yandex.Mail. Methods in the module are called from only Sisimai::Message.
   module Yandex
-    # Sisimai::Bite::Email::Yandex parses a bounce email which created by
-    # Yandex.Mail. Methods in the module are called from only Sisimai::Message.
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/Yandex.pm
       require 'sisimai/bite/email'
 
       Re0 = {
         :from   => %r/\Amailer-daemon[@]yandex[.]ru\z/,
-      }
+      }.freeze
       Re1 = {
         :begin  => %r/\AThis is the mail system at host yandex[.]ru[.]/,
         :rfc822 => %r|\AContent-Type: message/rfc822|,
         :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }
+      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'Yandex.Mail: http://www.yandex.ru'; 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
         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
@@ -74,7 +74,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']
@@ -93,7 +93,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