sisimai 4.14.2 → 4.15.0

data/lib/sisimai/msp/us/outlook.rb

@@ -57,7 +57,6 @@ module Sisimai
           match += 1 if mhead['received'].find { |a| a =~ Re0[:received] }
           return nil if match < 2
 
-          require 'sisimai/rfc5322'
           dscontents = []; dscontents << Sisimai::MSP.DELIVERYSTATUS
           hasdivided = mbody.split("\n")
           havepassed = [''];
@@ -154,7 +153,7 @@ module Sisimai
 
                 else
                   if cv = e.match(/\A[Dd]iagnostic-[Cc]ode:[ ]*(.+?);[ ]*(.+)\z/)
-                      # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
+                    # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
                     v['spec'] = cv[1].upcase
                     v['diagnosis'] = cv[2]
 
@@ -197,7 +196,7 @@ module Sisimai
             if mhead['received'].size > 0
               # Get localhost and remote host name from Received header.
               r0 = mhead['received']
-              ['lhost', 'rhost'].each { |a| e[a] ||= '' }
+              %w|lhost rhost|.each { |a| e[a] ||= '' }
               e['lhost'] = Sisimai::RFC5322.received(r0[0]).shift if e['lhost'].empty?
               e['rhost'] = Sisimai::RFC5322.received(r0[-1]).pop  if e['rhost'].empty?
             end

data/lib/sisimai/msp/us/receivingses.rb

@@ -206,7 +206,7 @@ module Sisimai
             if mhead['received'].size > 0
               # Get localhost and remote host name from Received header.
               r0 = mhead['received']
-              ['lhost', 'rhost'].each { |a| e[a] ||= '' }
+              %w|lhost rhost|.each { |a| e[a] ||= '' }
               e['lhost'] = Sisimai::RFC5322.received(r0[0]).shift if e['lhost'].empty?
               e['rhost'] = Sisimai::RFC5322.received(r0[-1]).pop  if e['rhost'].empty?
             end

data/lib/sisimai/msp/us/sendgrid.rb

@@ -52,7 +52,7 @@ module Sisimai
           require 'sisimai/datetime'
           dscontents = []; dscontents << Sisimai::MSP.DELIVERYSTATUS
           hasdivided = mbody.split("\n")
-          havepassed = [''];
+          havepassed = ['']
           rfc822next = { 'from' => false, 'to' => false, 'subject' => false }
           rfc822part = ''     # (String) message/rfc822-headers part
           previousfn = ''     # (String) Previous field name
@@ -237,7 +237,7 @@ module Sisimai
             if mhead['received'].size > 0
               # Get localhost and remote host name from Received header.
               r0 = mhead['received']
-              ['lhost', 'rhost'].each { |a| e[a] ||= '' }
+              %w|lhost rhost|.each { |a| e[a] ||= '' }
               e['lhost'] = Sisimai::RFC5322.received(r0[0]).shift if e['lhost'].empty?
               e['rhost'] = Sisimai::RFC5322.received(r0[-1]).pop  if e['rhost'].empty?
             end

data/lib/sisimai/msp/us/verizon.rb

@@ -11,11 +11,11 @@ module Sisimai
         Re0 = {
           :'received'  => %r/by .+[.]vtext[.]com /,
           :'vtext.com' => {
-              :'from' => %r/\Apost_master[@]vtext[.]com\z/,
+            :'from' => %r/\Apost_master[@]vtext[.]com\z/,
           },
           :'vzwpix.com' => {
-              :'from'    => %r/[<]?sysadmin[@].+[.]vzwpix[.]com[>]?\z/,
-              :'subject' => %r/Undeliverable Message/,
+            :'from'    => %r/[<]?sysadmin[@].+[.]vzwpix[.]com[>]?\z/,
+            :'subject' => %r/Undeliverable Message/,
           },
         }
         Indicators = Sisimai::MSP.INDICATORS
@@ -180,9 +180,9 @@ module Sisimai
               :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
             }
             reFailure = {
-                'userunknown' => %r{
-                    No[ ]valid[ ]recipients[ ]for[ ]this[ ]MM
-                }x,
+              'userunknown' => %r{
+                  No[ ]valid[ ]recipients[ ]for[ ]this[ ]MM
+              }x,
             }
             rfc822next = { 'from' => 0, 'to' => 0, 'subject' => 0 }
             boundary00 = Sisimai::MIME.boundary(mhead['content-type'])
@@ -282,7 +282,7 @@ module Sisimai
             if mhead['received'].size > 0
               # Get localhost and remote host name from Received header.
               r0 = mhead['received']
-              ['lhost', 'rhost'].each { |a| e[a] ||= '' }
+              %w|lhost rhost|.each { |a| e[a] ||= '' }
               e['lhost'] = Sisimai::RFC5322.received(r0[0]).shift if e['lhost'].empty?
               e['rhost'] = Sisimai::RFC5322.received(r0[-1]).pop  if e['rhost'].empty?
             end

data/lib/sisimai/msp/us/yahoo.rb

@@ -157,7 +157,7 @@ module Sisimai
             if mhead['received'].size > 0
               # Get localhost and remote host name from Received header.
               r0 = mhead['received']
-              ['lhost', 'rhost'].each { |a| e[a] ||= '' }
+              %w|lhost rhost|.each { |a| e[a] ||= '' }
               e['lhost'] = Sisimai::RFC5322.received(r0[0]).shift if e['lhost'].empty?
               e['rhost'] = Sisimai::RFC5322.received(r0[-1]).pop  if e['rhost'].empty?
             end

data/lib/sisimai/msp/us/zoho.rb

@@ -169,7 +169,7 @@ module Sisimai
             if mhead['received'].size > 0
               # Get localhost and remote host name from Received header.
               r0 = mhead['received']
-              ['lhost', 'rhost'].each { |a| e[a] ||= '' }
+              %w|lhost rhost|.each { |a| e[a] ||= '' }
               e['lhost'] = Sisimai::RFC5322.received(r0[0]).shift if e['lhost'].empty?
               e['rhost'] = Sisimai::RFC5322.received(r0[-1]).pop  if e['rhost'].empty?
             end

data/lib/sisimai/mta.rb

@@ -10,8 +10,8 @@ module Sisimai
       # @private
       def INDICATORS
         return {
-          :'deliverystatus' => ( 1 << 1 ),
-          :'message-rfc822' => ( 1 << 2 ),
+          :'deliverystatus' => (1 << 1),
+          :'message-rfc822' => (1 << 2),
         }
       end
 
@@ -40,13 +40,12 @@ module Sisimai
       # MTA list
       # @return   [Array] MTA list with order
       def index
-        return [
-          'Sendmail', 'Postfix', 'Qmail', 'Exim', 'Courier', 'OpenSMTPD',
-          'Exchange', 'MessagingServer', 'Domino', 'Notes', 'ApacheJames',
-          'McAfee', 'MXLogic', 'MailFoundry', 'IMailServer', 'MFILTER',
-          'Activehunter', 'InterScanMSS', 'SurfControl', 'MailMarshalSMTP',
-          'X1', 'X2', 'X3', 'X4', 'X5', 'V5sendmail',
-        ]
+        return %w|
+          Sendmail Postfix Qmail Exim Courier OpenSMTPD Exchange MessagingServer
+          Domino Notes ApacheJames McAfee MXLogic MailFoundry IMailServer MFILTER
+          Activehunter InterScanMSS SurfControl MailMarshalSMTP
+          X1 X2 X3 X4 X5 V5sendmail
+        |
       end
 
     end

data/lib/sisimai/mta/activehunter.rb

@@ -132,7 +132,7 @@ module Sisimai
             if mhead['received'].size > 0
               # Get localhost and remote host name from Received header.
               r0 = mhead['received']
-              ['lhost', 'rhost'].each { |a| e[a] ||= '' }
+              %w|lhost rhost|.each { |a| e[a] ||= '' }
               e['lhost'] = Sisimai::RFC5322.received(r0[0]).shift if e['lhost'].empty?
               e['rhost'] = Sisimai::RFC5322.received(r0[-1]).pop  if e['rhost'].empty?
             end

data/lib/sisimai/mta/apachejames.rb

@@ -175,7 +175,7 @@ module Sisimai
             if mhead['received'].size > 0
               # Get localhost and remote host name from Received header.
               r0 = mhead['received']
-              ['lhost', 'rhost'].each { |a| e[a] ||= '' }
+              %w|lhost rhost|.each { |a| e[a] ||= '' }
               e['lhost'] = Sisimai::RFC5322.received(r0[0]).shift if e['lhost'].empty?
               e['rhost'] = Sisimai::RFC5322.received(r0[-1]).pop  if e['rhost'].empty?
             end

data/lib/sisimai/mta/courier.rb

@@ -263,7 +263,7 @@ module Sisimai
             if mhead['received'].size > 0
               # Get localhost and remote host name from Received header.
               r0 = mhead['received']
-              ['lhost', 'rhost'].each { |a| e[a] ||= '' }
+              %w|lhost rhost|.each { |a| e[a] ||= '' }
               e['lhost'] = Sisimai::RFC5322.received(r0[0]).shift if e['lhost'].empty?
               e['rhost'] = Sisimai::RFC5322.received(r0[-1]).pop  if e['rhost'].empty?
             end

data/lib/sisimai/mta/domino.rb

@@ -173,7 +173,7 @@ module Sisimai
             if mhead['received'].size > 0
               # Get localhost and remote host name from Received header.
               r0 = mhead['received']
-              ['lhost', 'rhost'].each { |a| e[a] ||= '' }
+              %w|lhost rhost|.each { |a| e[a] ||= '' }
               e['lhost'] = Sisimai::RFC5322.received(r0[0]).shift if e['lhost'].empty?
               e['rhost'] = Sisimai::RFC5322.received(r0[-1]).pop  if e['rhost'].empty?
             end

data/lib/sisimai/mta/exchange.rb

@@ -26,31 +26,31 @@ module Sisimai
           :rfc822 => %r|\AContent-Type: message/rfc822|,
           :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
         }
-        ErrorCodeTable = {
+        CodeTable = {
           'onhold' => [
-              '000B099C', # Host Unknown, Message exceeds size limit, ...
-              '000B09AA', # Unable to relay for, Message exceeds size limit,...
-              '000B09B6', # Error messages by remote MTA
+            '000B099C', # Host Unknown, Message exceeds size limit, ...
+            '000B09AA', # Unable to relay for, Message exceeds size limit,...
+            '000B09B6', # Error messages by remote MTA
           ],
           'userunknown' => [
-              '000C05A6', # Unknown Recipient,
+            '000C05A6', # Unknown Recipient,
           ],
           'systemerror' => [
-              '00010256', # Too many recipients.
-              '000D06B5', # No proxy for recipient (non-smtp mail?)
+            '00010256', # Too many recipients.
+            '000D06B5', # No proxy for recipient (non-smtp mail?)
           ],
           'networkerror' => [
-              '00120270', # Too Many Hops
+            '00120270', # Too Many Hops
           ],
           'contenterr' => [
-              '00050311', # Conversion to Internet format failed
-              '000502CC', # Conversion to Internet format failed
+            '00050311', # Conversion to Internet format failed
+            '000502CC', # Conversion to Internet format failed
           ],
           'securityerr' => [
-              '000B0981', # 502 Server does not support AUTH
+            '000B0981', # 502 Server does not support AUTH
           ],
           'filtered' => [
-              '000C0595', # Ambiguous Recipient
+            '000C0595', # Ambiguous Recipient
           ],
         }
         Indicators = Sisimai::MTA.INDICATORS
@@ -257,7 +257,7 @@ module Sisimai
             if mhead['received'].size > 0
               # Get localhost and remote host name from Received header.
               r0 = mhead['received']
-              ['lhost', 'rhost'].each { |a| e[a] ||= '' }
+              %w|lhost rhost|.each { |a| e[a] ||= '' }
               e['lhost'] = Sisimai::RFC5322.received(r0[0]).shift if e['lhost'].empty?
               e['rhost'] = Sisimai::RFC5322.received(r0[-1]).pop  if e['rhost'].empty?
             end
@@ -269,9 +269,9 @@ module Sisimai
               errormessage = cv[2]
               pseudostatus = ''
 
-              ErrorCodeTable.each_key do |r|
+              CodeTable.each_key do |r|
                 # Find captured code from the error code table
-                next unless ErrorCodeTable[r].index(capturedcode)
+                next unless CodeTable[r].index(capturedcode)
                 e['reason'] = r
                 pseudostatus = Sisimai::SMTP::Status.code(r)
                 e['status'] = pseudostatus if pseudostatus.size > 0

data/lib/sisimai/mta/imailserver.rb

@@ -181,7 +181,7 @@ module Sisimai
             if mhead['received'].size > 0
               # Get localhost and remote host name from Received header.
               r0 = mhead['received']
-              ['lhost', 'rhost'].each { |a| e[a] ||= '' }
+              %w|lhost rhost|.each { |a| e[a] ||= '' }
               e['lhost'] = Sisimai::RFC5322.received(r0[0]).shift if e['lhost'].empty?
               e['rhost'] = Sisimai::RFC5322.received(r0[-1]).pop  if e['rhost'].empty?
             end

data/lib/sisimai/mta/interscanmss.rb

@@ -146,7 +146,7 @@ module Sisimai
             if mhead['received'].size > 0
               # Get localhost and remote host name from Received header.
               r0 = mhead['received']
-              ['lhost', 'rhost'].each { |a| e[a] ||= '' }
+              %w|lhost rhost|.each { |a| e[a] ||= '' }
               e['lhost'] = Sisimai::RFC5322.received(r0[0]).shift if e['lhost'].empty?
               e['rhost'] = Sisimai::RFC5322.received(r0[-1]).pop  if e['rhost'].empty?
             end

data/lib/sisimai/mta/mailfoundry.rb

@@ -151,7 +151,7 @@ module Sisimai
             if mhead['received'].size > 0
               # Get localhost and remote host name from Received header.
               r0 = mhead['received']
-              ['lhost', 'rhost'].each { |a| e[a] ||= '' }
+              %w|lhost rhost|.each { |a| e[a] ||= '' }
               e['lhost'] = Sisimai::RFC5322.received(r0[0]).shift if e['lhost'].empty?
               e['rhost'] = Sisimai::RFC5322.received(r0[-1]).pop  if e['rhost'].empty?
             end

data/lib/sisimai/mta/mailmarshalsmtp.rb

@@ -184,7 +184,7 @@ module Sisimai
             if mhead['received'].size > 0
               # Get localhost and remote host name from Received header.
               r0 = mhead['received']
-              ['lhost', 'rhost'].each { |a| e[a] ||= '' }
+              %w|lhost rhost|.each { |a| e[a] ||= '' }
               e['lhost'] = Sisimai::RFC5322.received(r0[0]).shift if e['lhost'].empty?
               e['rhost'] = Sisimai::RFC5322.received(r0[-1]).pop  if e['rhost'].empty?
             end

data/lib/sisimai/mta/mcafee.rb

@@ -173,7 +173,7 @@ module Sisimai
             if mhead['received'].size > 0
               # Get localhost and remote host name from Received header.
               r0 = mhead['received']
-              ['lhost', 'rhost'].each { |a| e[a] ||= '' }
+              %w|lhost rhost|.each { |a| e[a] ||= '' }
               e['lhost'] = Sisimai::RFC5322.received(r0[0]).shift if e['lhost'].empty?
               e['rhost'] = Sisimai::RFC5322.received(r0[-1]).pop  if e['rhost'].empty?
             end

data/lib/sisimai/mta/messagingserver.rb

@@ -209,7 +209,7 @@ module Sisimai
             if mhead['received'].size > 0
               # Get localhost and remote host name from Received header.
               r0 = mhead['received']
-              ['lhost', 'rhost'].each { |a| e[a] ||= '' }
+              %w|lhost rhost|.each { |a| e[a] ||= '' }
               e['lhost'] = Sisimai::RFC5322.received(r0[0]).shift if e['lhost'].empty?
               e['rhost'] = Sisimai::RFC5322.received(r0[-1]).pop  if e['rhost'].empty?
             end

data/lib/sisimai/mta/mxlogic.rb

@@ -18,7 +18,7 @@ module Sisimai
               )
           }x,
           :'message-id' => %r/\A[<]mxl[~][0-9a-f]+/,
-        };
+        }
         Re1 = {
           :rfc822 => %r/\AIncluded is a copy of the message header:\z/,
           :begin  => %r/\AThis message was created automatically by mail delivery software[.]\z/,
@@ -27,7 +27,7 @@ module Sisimai
         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})/,
-        ];
+        ]
 
         ReFailure = {
           'userunknown' => %r{

data/lib/sisimai/mta/notes.rb

@@ -177,7 +177,7 @@ module Sisimai
             if mhead['received'].size > 0
               # Get localhost and remote host name from Received header.
               r0 = mhead['received']
-              ['lhost', 'rhost'].each { |a| e[a] ||= '' }
+              %w|lhost rhost|.each { |a| e[a] ||= '' }
               e['lhost'] = Sisimai::RFC5322.received(r0[0]).shift if e['lhost'].empty?
               e['rhost'] = Sisimai::RFC5322.received(r0[-1]).pop  if e['rhost'].empty?
             end

data/lib/sisimai/mta/opensmtpd.rb

@@ -196,7 +196,7 @@ module Sisimai
             if mhead['received'].size > 0
               # Get localhost and remote host name from Received header.
               r0 = mhead['received']
-              ['lhost', 'rhost'].each { |a| e[a] ||= '' }
+              %w|lhost rhost|.each { |a| e[a] ||= '' }
               e['lhost'] = Sisimai::RFC5322.received(r0[0]).shift if e['lhost'].empty?
               e['rhost'] = Sisimai::RFC5322.received(r0[-1]).pop  if e['rhost'].empty?
             end

data/lib/sisimai/mta/postfix.rb

@@ -62,7 +62,7 @@ module Sisimai
 
           dscontents = []; dscontents << Sisimai::MTA.DELIVERYSTATUS
           hasdivided = mbody.split("\n")
-          havepassed = [''];
+          havepassed = ['']
           rfc822next = { 'from' => false, 'to' => false, 'subject' => false }
           rfc822part = ''     # (String) message/rfc822-headers part
           previousfn = ''     # (String) Previous field name
@@ -284,7 +284,7 @@ module Sisimai
             if mhead['received'].size > 0
               # Get localhost and remote host name from Received header.
               r0 = mhead['received']
-              ['lhost', 'rhost'].each { |a| e[a] ||= '' }
+              %w|lhost rhost|.each { |a| e[a] ||= '' }
               e['lhost'] = Sisimai::RFC5322.received(r0[0]).shift if e['lhost'].empty?
               e['rhost'] = Sisimai::RFC5322.received(r0[-1]).pop  if e['rhost'].empty?
             end

data/lib/sisimai/mta/qmail.rb

@@ -249,7 +249,7 @@ module Sisimai
             if mhead['received'].size > 0
               # Get localhost and remote host name from Received header.
               r0 = mhead['received']
-              ['lhost', 'rhost'].each { |a| e[a] ||= '' }
+              %w|lhost rhost|.each { |a| e[a] ||= '' }
               e['lhost'] = Sisimai::RFC5322.received(r0[0]).shift if e['lhost'].empty?
               e['rhost'] = Sisimai::RFC5322.received(r0[-1]).pop  if e['rhost'].empty?
             end

data/lib/sisimai/mta/sendmail.rb

@@ -56,7 +56,7 @@ module Sisimai
 
           dscontents = []; dscontents << Sisimai::MTA.DELIVERYSTATUS
           hasdivided = mbody.split("\n")
-          havepassed = [''];
+          havepassed = ['']
           rfc822next = { 'from' => false, 'to' => false, 'subject' => false }
           rfc822part = ''     # (String) message/rfc822-headers part
           previousfn = ''     # (String) Previous field name
@@ -266,7 +266,7 @@ module Sisimai
             if mhead['received'].size > 0
               # Get localhost and remote host name from Received header.
               r0 = mhead['received']
-              ['lhost', 'rhost'].each { |a| e[a] ||= '' }
+              %w|lhost rhost|.each { |a| e[a] ||= '' }
               e['lhost'] = Sisimai::RFC5322.received(r0[0]).shift if e['lhost'].empty?
               e['rhost'] = Sisimai::RFC5322.received(r0[-1]).pop  if e['rhost'].empty?
             end

data/lib/sisimai/mta/surfcontrol.rb

@@ -171,7 +171,7 @@ module Sisimai
             if mhead['received'].size > 0
               # Get localhost and remote host name from Received header.
               r0 = mhead['received']
-              ['lhost', 'rhost'].each { |a| e[a] ||= '' }
+              %w|lhost rhost|.each { |a| e[a] ||= '' }
               e['lhost'] = Sisimai::RFC5322.received(r0[0]).shift if e['lhost'].empty?
               e['rhost'] = Sisimai::RFC5322.received(r0[-1]).pop  if e['rhost'].empty?
             end

data/lib/sisimai/mta/v5sendmail.rb

@@ -193,7 +193,7 @@ module Sisimai
             if mhead['received'].size > 0
               # Get localhost and remote host name from Received header.
               r0 = mhead['received']
-              ['lhost', 'rhost'].each { |a| e[a] ||= '' }
+              %w|lhost rhost|.each { |a| e[a] ||= '' }
               e['lhost'] = Sisimai::RFC5322.received(r0[0]).shift if e['lhost'].empty?
               e['rhost'] = Sisimai::RFC5322.received(r0[-1]).pop  if e['rhost'].empty?
             end

data/lib/sisimai/mta/x1.rb

@@ -134,7 +134,7 @@ module Sisimai
             if mhead['received'].size > 0
               # Get localhost and remote host name from Received header.
               r0 = mhead['received']
-              ['lhost', 'rhost'].each { |a| e[a] ||= '' }
+              %w|lhost rhost|.each { |a| e[a] ||= '' }
               e['lhost'] = Sisimai::RFC5322.received(r0[0]).shift if e['lhost'].empty?
               e['rhost'] = Sisimai::RFC5322.received(r0[-1]).pop  if e['rhost'].empty?
             end

data/lib/sisimai/mta/x2.rb

@@ -136,7 +136,7 @@ module Sisimai
             if mhead['received'].size > 0
               # Get localhost and remote host name from Received header.
               r0 = mhead['received']
-              ['lhost', 'rhost'].each { |a| e[a] ||= '' }
+              %w|lhost rhost|.each { |a| e[a] ||= '' }
               e['lhost'] = Sisimai::RFC5322.received(r0[0]).shift if e['lhost'].empty?
               e['rhost'] = Sisimai::RFC5322.received(r0[-1]).pop  if e['rhost'].empty?
             end

data/lib/sisimai/mta/x3.rb

@@ -149,7 +149,7 @@ module Sisimai
             if mhead['received'].size > 0
               # Get localhost and remote host name from Received header.
               r0 = mhead['received']
-              ['lhost', 'rhost'].each { |a| e[a] ||= '' }
+              %w|lhost rhost|.each { |a| e[a] ||= '' }
               e['lhost'] = Sisimai::RFC5322.received(r0[0]).shift if e['lhost'].empty?
               e['rhost'] = Sisimai::RFC5322.received(r0[-1]).pop  if e['rhost'].empty?
             end

data/lib/sisimai/mta/x4.rb

@@ -279,7 +279,7 @@ module Sisimai
             if mhead['received'].size > 0
               # Get localhost and remote host name from Received header.
               r0 = mhead['received']
-              ['lhost', 'rhost'].each { |a| e[a] ||= '' }
+              %w|lhost rhost|.each { |a| e[a] ||= '' }
               e['lhost'] = Sisimai::RFC5322.received(r0[0]).shift if e['lhost'].empty?
               e['rhost'] = Sisimai::RFC5322.received(r0[-1]).pop  if e['rhost'].empty?
             end