sisimai 4.22.1 → 4.22.2

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

@@ -1,8 +1,8 @@
 module Sisimai::Bite::Email
+  # Sisimai::Bite::Email::Exchange2007 parses a bounce email which created by
+  # Microsoft Exchange Server 2007.
+  # Methods in the module are called from only Sisimai::Message.
   module Exchange2007
-    # Sisimai::Bite::Email::Exchange2007 parses a bounce email which created by
-    # Microsoft Exchange Server 2007.
-    # Methods in the module are called from only Sisimai::Message.
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/Exchange2007.pm
       require 'sisimai/bite/email'
@@ -10,14 +10,14 @@ module Sisimai::Bite::Email
       Re0 = {
         :'subject'          => %r/\AUndeliverable:/,
         :'content-language' => %r/\A[a-z]{2}(?:[-][A-Z]{2})?\z/,
-      }
+      }.freeze
       Re1 = {
         :begin  => %r/[ ]Microsoft[ ]Exchange[ ]Server[ ]20\d{2}/,
         :error  => %r/[ ]((?:RESOLVER|QUEUE)[.][A-Za-z]+(?:[.]\w+)?);/,
         :rhost  => %r/\AGenerating[ ]server:[ ]?(.*)/,
         :rfc822 => %r/\AOriginal message headers:/,
         :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }
+      }.freeze
       NDRSubject = {
         :'SMTPSEND.DNS.NonExistentDomain'=> 'hostunknown',   # 554 5.4.4 SMTPSEND.DNS.NonExistentDomain
         :'SMTPSEND.DNS.MxLoopback'       => 'networkerror',  # 554 5.4.4 SMTPSEND.DNS.MxLoopback
@@ -31,7 +31,7 @@ module Sisimai::Bite::Email
         :'RESOLVER.RST.NotAuthorized'    => 'rejected',      # 550 5.7.1 RESOLVER.RST.NotAuthorized
         :'RESOLVER.RST.RecipSizeLimit'   => 'mesgtoobig',    # 550 5.2.3 RESOLVER.RST.RecipSizeLimit
         :'QUEUE.Expired'                 => 'expired',       # 550 4.4.7 QUEUE.Expired
-      }
+      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'Microsoft Exchange Server 2007'; end
@@ -64,7 +64,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 = {
           'rhost' => '',    # The value of Reporting-MTA header or "Generating Server:"
         }
@@ -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?
 
             if connvalues == connheader.keys.size
               # Diagnostic information for administrators:
@@ -131,7 +131,7 @@ module Sisimai::Bite::Email
                 v['diagnosis'] = e
 
               else
-                if v['diagnosis'].to_s.size > 0 && v['diagnosis'] =~ /=\z/
+                if v['diagnosis'].to_s.size > 0 && v['diagnosis'].end_with?('=')
                   # Continued line of error messages
                   v['diagnosis']  = v['diagnosis'].sub(/=\z/, '')
                   v['diagnosis'] += e

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

@@ -1,14 +1,14 @@
 module Sisimai::Bite::Email
+  # Sisimai::Bite::Email::Exim parses a bounce email which created by Exim.
+  # Methods in the module are called from only Sisimai::Message.
   module Exim
-    # Sisimai::Bite::Email::Exim parses a bounce email which created by Exim.
-    # Methods in the module are called from only Sisimai::Message.
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/Exim.pm
       require 'sisimai/bite/email'
 
       ReE = {
         :from    => %r/[@].+[.]mail[.]ru[>]?/,
-      }
+      }.freeze
       Re0 = {
         :from    => %r/\AMail Delivery System/,
         :subject => %r{(?:
@@ -22,7 +22,7 @@ module Sisimai::Bite::Email
         }x,
         # :'message-id' => %r/\A[<]\w+[-]\w+[-]\w+[@].+\z/,
         # Message-Id: <E1P1YNN-0003AD-Ga@example.org>
-      }
+      }.freeze
 
       # Error text regular expressions which defined in exim/src/deliver.c
       #
@@ -63,7 +63,7 @@ module Sisimai::Bite::Email
          }x,
         :deliverystatus => %r|\AContent-type: message/delivery-status|,
         :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }
+      }.freeze
 
       ReCommand = [
         # transports/smtp.c:564|  *message = US string_sprintf("SMTP error from remote mail server after %s%s: "
@@ -72,7 +72,7 @@ module Sisimai::Bite::Email
         %r/SMTP error from remote (?:mail server|mailer) after end of ([A-Za-z]{4})/,
         %r/LMTP error after ([A-Za-z]{4})/,
         %r/LMTP error after end of ([A-Za-z]{4})/,
-      ]
+      ].freeze
 
       # find exim/ -type f -exec grep 'message = US' {} /dev/null \;
       ReFailure = {
@@ -111,7 +111,7 @@ module Sisimai::Bite::Email
         }x,
         # deliver.c:5425|  new->message = US"Too many \"Received\" headers - suspected mail loop";
         contenterror: %r/Too[ ]many[ ]["]Received["][ ]headers/x,
-      }
+      }.freeze
 
       # retry.c:902|  addr->message = (addr->message == NULL)? US"retry timeout exceeded" :
       # deliver.c:7475|  "No action is required on your part. Delivery attempts will continue for\n"
@@ -187,7 +187,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']
@@ -206,7 +206,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.
@@ -330,7 +330,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
@@ -387,7 +387,7 @@ module Sisimai::Bite::Email
               e['diagnosis'] ||= e['alterrors']
             end
 
-            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
 
@@ -499,14 +499,13 @@ module Sisimai::Bite::Email
             e['status'] = sv if r1 > 0
           else
             # Neither Status nor SMTP reply code exist
-            if e['reason'] =~ /\A(?:expired|mailboxfull)/
-              # Set pseudo DSN (temporary error)
-              sv = Sisimai::SMTP::Status.code(e['reason'], true)
-
-            else
-              # Set pseudo DSN (permanent error)
-              sv = Sisimai::SMTP::Status.code(e['reason'], false)
-            end
+            sv = if e['reason'] =~ /\A(?:expired|mailboxfull)/
+                   # Set pseudo DSN (temporary error)
+                   Sisimai::SMTP::Status.code(e['reason'], true)
+                 else
+                   # Set pseudo DSN (permanent error)
+                   Sisimai::SMTP::Status.code(e['reason'], false)
+                 end
           end
           e['status'] ||= sv
           e.each_key { |a| e[a] ||= '' }

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

@@ -1,7 +1,7 @@
 module Sisimai::Bite::Email
+  # Sisimai::Bite::Email::EZweb parses a bounce email which created by au EZweb.
+  # Methods in the module are called from only Sisimai::Message.
   module EZweb
-    # Sisimai::Bite::Email::EZweb parses a bounce email which created by au EZweb.
-    # Methods in the module are called from only Sisimai::Message.
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/EZweb.pm
       require 'sisimai/bite/email'
@@ -11,7 +11,7 @@ module Sisimai::Bite::Email
         :'subject'    => %r/\AMail System Error - Returned Mail\z/,
         :'received'   => %r/\Afrom[ ](?:.+[.])?ezweb[.]ne[.]jp[ ]/,
         :'message-id' => %r/[@].+[.]ezweb[.]ne[.]jp[>]\z/,
-      }
+      }.freeze
       Re1 = {
         :begin  => %r{\A(?:
              The[ ]user[(]s[)][ ]
@@ -23,7 +23,7 @@ module Sisimai::Bite::Email
         :rfc822   => %r#\A(?:[-]{50}|Content-Type:[ ]*message/rfc822)#,
         :boundary => %r/\A__SISIMAI_PSEUDO_BOUNDARY__\z/,
         :endof    => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }
+      }.freeze
       ReFailure = {
         # notaccept: [ %r/The following recipients did not receive this message:/ ],
         mailboxfull: [
@@ -43,7 +43,7 @@ module Sisimai::Bite::Email
         onhold: [
           %r/Each of the following recipients was rejected by a remote mail server/,
         ],
-      }
+      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'au EZweb: http://www.au.kddi.com/mobile/'; end
@@ -102,12 +102,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] || e =~ rxboundary
               readcursor |= Indicators[:'message-rfc822']
@@ -126,7 +124,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 user(s) account is disabled.
@@ -204,7 +202,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

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

@@ -1,7 +1,7 @@
 module Sisimai::Bite::Email
+  # Sisimai::Bite::Email::Facebook parses a bounce email which created by Facebook.
+  # Methods in the module are called from only Sisimai::Message.
   module Facebook
-    # Sisimai::Bite::Email::Facebook parses a bounce email which created by Facebook.
-    # Methods in the module are called from only Sisimai::Message.
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/Facebook.pm
       require 'sisimai/bite/email'
@@ -9,12 +9,12 @@ module Sisimai::Bite::Email
       Re0 = {
         :from    => %r/\AFacebook [<]mailer-daemon[@]mx[.]facebook[.]com[>]\z/,
         :subject => %r/\ASorry, your message could not be delivered\z/,
-      }
+      }.freeze
       Re1 = {
         :begin   => %r/\AThis message was created automatically by Facebook[.]\z/,
         :rfc822  => %r/\AContent-Disposition: inline\z/,
         :endof   => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }
+      }.freeze
 
       # http://postmaster.facebook.com/response_codes
       # NOT TESTD EXCEPT RCP-P2
@@ -74,7 +74,7 @@ module Sisimai::Bite::Email
           'CON-T2', # Your mail server currently has too many connections open to Facebook's mail servers.
           'CON-T4', # Your mail server has exceeded the maximum number of recipients for its current connection.
         ],
-      }
+      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'Facebook: https://www.facebook.com'; end
@@ -107,7 +107,7 @@ module Sisimai::Bite::Email
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         fbresponse = ''     # (String) Response code from Facebook
-        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
@@ -127,7 +127,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']
@@ -146,7 +146,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
@@ -247,21 +247,20 @@ module Sisimai::Bite::Email
             end
           end
 
-          unless e['reason']
-            # http://postmaster.facebook.com/response_codes
-            #   Facebook System Resource Issues
-            #   These codes indicate a temporary issue internal to Facebook's
-            #   system. Administrators observing these issues are not required to
-            #   take any action to correct them.
-            if fbresponse =~ /\AINT-T\d+\z/
-              # * INT-Tx
-              #
-              # https://groups.google.com/forum/#!topic/cdmix/eXfi4ddgYLQ
-              # This block has not been tested because we have no email sample
-              # including "INT-T?" error code.
-              e['reason'] = 'systemerror'
-            end
-          end
+          # http://postmaster.facebook.com/response_codes
+          #   Facebook System Resource Issues
+          #   These codes indicate a temporary issue internal to Facebook's
+          #   system. Administrators observing these issues are not required to
+          #   take any action to correct them.
+          next if e['reason']
+
+          # * INT-Tx
+          #
+          # https://groups.google.com/forum/#!topic/cdmix/eXfi4ddgYLQ
+          # This block has not been tested because we have no email sample
+          # including "INT-T?" error code.
+          next unless fbresponse =~ /\AINT-T\d+\z/
+          e['reason'] = 'systemerror'
         end
 
         rfc822part = Sisimai::RFC5322.weedout(rfc822list)

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

@@ -1,7 +1,7 @@
 module Sisimai::Bite::Email
+  # Sisimai::Bite::Email::GMX parses a bounce email which created by GMX.
+  # Methods in the module are called from only Sisimai::Message.
   module GMX
-    # Sisimai::Bite::Email::GMX parses a bounce email which created by GMX.
-    # Methods in the module are called from only Sisimai::Message.
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/GMX.pm
       require 'sisimai/bite/email'
@@ -9,15 +9,15 @@ module Sisimai::Bite::Email
       Re0 = {
         :from    => %r/\AMAILER-DAEMON[@]/,
         :subject => %r/\AMail delivery failed: returning message to sender\z/,
-      }
+      }.freeze
       Re1 = {
         :begin   => %r/\AThis message was created automatically by mail delivery software/,
         :rfc822  => %r/\A--- The header of the original message is following/,
         :endof   => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }
+      }.freeze
       ReFailure = {
         expired: %r/delivery[ ]retry[ ]timeout[ ]exceeded/x,
-      }
+      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'GMX: http://www.gmx.net'; end
@@ -63,7 +63,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']
@@ -82,7 +82,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/google.rb

@@ -1,7 +1,7 @@
 module Sisimai::Bite::Email
+  # Sisimai::Bite::Email::Google parses a bounce email which created by Gmail.
+  # Methods in the module are called from only Sisimai::Message.
   module Google
-    # Sisimai::Bite::Email::Google parses a bounce email which created by Gmail.
-    # Methods in the module are called from only Sisimai::Message.
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/Google.pm
       require 'sisimai/bite/email'
@@ -9,7 +9,7 @@ module Sisimai::Bite::Email
       Re0 = {
         :from    => %r/[@]googlemail[.]com[>]?\z/,
         :subject => %r/Delivery[ ]Status[ ]Notification/,
-      }
+      }.freeze
       Re1 = {
         :begin   => %r/Delivery to the following recipient/,
         :start   => %r/Technical details of (?:permanent|temporary) failure:/,
@@ -20,7 +20,7 @@ module Sisimai::Bite::Email
             )\z
         }x,
         :endof   => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }
+      }.freeze
       ReFailure = {
         expired: %r{(?:
              DNS[ ]Error:[ ]Could[ ]not[ ]contact[ ]DNS[ ]servers
@@ -33,7 +33,7 @@ module Sisimai::Bite::Email
             |DNS[ ]server[ ]returned[ ]answer[ ]with[ ]no[ ]data
             )
         }x,
-      }
+      }.freeze
       StateTable = {
         # Technical details of permanent failure:
         # Google tried to deliver your message, but it was rejected by the recipient domain.
@@ -106,7 +106,7 @@ module Sisimai::Bite::Email
         # cause of this error. The error that the other server returned was:
         # 550 550 Unknown user *****@***.**.*** (state 18).
         '18' => { 'command' => 'DATA', 'reason' => 'filtered' },
-      }
+      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
 
       def description; return 'Google Gmail: https://mail.google.com'; end
@@ -192,12 +192,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']
@@ -216,7 +214,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?
 
             # Technical details of permanent failure:=20
@@ -272,13 +270,13 @@ module Sisimai::Bite::Email
               # the server for the recipient domain example.jp by mx.example.jp. [192.0.2.153].
               hostname = cv[1]
               ipv4addr = cv[2]
-              if hostname =~ /[-0-9a-zA-Z]+[.][a-zA-Z]+\z/
-                # Maybe valid hostname
-                e['rhost'] = hostname.downcase
-              else
-                # Use IP address instead
-                e['rhost'] = ipv4addr
-              end
+              e['rhost'] = if hostname =~ /[-0-9a-zA-Z]+[.][a-zA-Z]+\z/
+                             # Maybe valid hostname
+                             hostname.downcase
+                           else
+                             # Use IP address instead
+                             ipv4addr
+                           end
             end
           end
 
@@ -299,14 +297,13 @@ module Sisimai::Bite::Email
               break
             end
           end
-          e['status'] = Sisimai::SMTP::Status.find(e['diagnosis'])
+          next unless e['reason']
 
-          if e['reason']
-            # Set pseudo status code
-            if e['status'] =~ /\A[45][.][1-7][.][1-9]\z/
-              # Override bounce reason
-              e['reason'] = Sisimai::SMTP::Status.name(e['status'])
-            end
+          # Set pseudo status code
+          e['status'] = Sisimai::SMTP::Status.find(e['diagnosis'])
+          if e['status'] =~ /\A[45][.][1-7][.][1-9]\z/
+            # Override bounce reason
+            e['reason'] = Sisimai::SMTP::Status.name(e['status'])
           end
         end