sisimai 4.22.3-java → 4.22.4-java

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

@@ -6,28 +6,11 @@ module Sisimai::Bite::Email
     class << self
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/Verizon.pm
       require 'sisimai/bite/email'
-
-      Re0 = {
-        :'received'  => %r/by .+[.]vtext[.]com /,
-        :'vtext.com' => {
-          :'from' => %r/\Apost_master[@]vtext[.]com\z/,
-        },
-        :'vzwpix.com' => {
-          :'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
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
       def headerlist;  return []; end
-      def pattern
-        return {
-          :from => %r/(?:\Apost_master[@]vtext[.]com|[<]?sysadmin[@].+[.]vzwpix[.]com[>]?)\z/,
-          :subject => Re0[:'vzwpix.com'][:subject],
-        }
-      end
 
       # Parse bounce messages from Verizon
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -45,11 +28,12 @@ module Sisimai::Bite::Email
         return nil unless mbody
 
         match = -1
-        loop do
+        while true
           # Check the value of "From" header
-          break unless mhead['received'].find { |a| a =~ Re0[:received] }
-          match = 1 if mhead['from'] =~ Re0[:'vtext.com'][:from]
-          match = 0 if mhead['from'] =~ Re0[:'vzwpix.com'][:from]
+          # :'subject' => %r/Undeliverable Message/,
+          break unless mhead['received'].find { |a| a.include?('.vtext.com (') }
+          match = 1 if mhead['from'] == 'post_master@vtext.com'
+          match = 0 if mhead['from'] =~ /[<]?sysadmin[@].+[.]vzwpix[.]com[>]?\z/
           break
         end
         return nil if match < 0
@@ -65,33 +49,33 @@ module Sisimai::Bite::Email
         senderaddr = ''     # (String) Sender address in the message body
         subjecttxt = ''     # (String) Subject of the original message
 
-        re1        = {}     # (Ref->Hash) Delimiter patterns
-        reFailure  = {}     # (Ref->Hash) Error message patterns
+        markingsof = {}     # (Hash) Delimiter patterns
+        startingof = {}     # (Hash) Delimiter strings
+        reFailures = {}     # (Hash) Error message patterns
         boundary00 = ''     # (String) Boundary string
         v = nil
 
         if match == 1
           # vtext.com
-          re1 = {
-            :begin  => %r/\AError:[ \t]/,
-            :rfc822 => %r/\A__BOUNDARY_STRING_HERE__\z/,
-            :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
+          markingsof = {
+            message: %r/\AError:[ \t]/,
+            rfc822:  %r/\A__BOUNDARY_STRING_HERE__\z/,
           }
-          reFailure = {
+          reFailures = {
             # The attempted recipient address does not exist.
-            userunknown: %r/550[ ][-][ ]Requested[ ]action[ ]not[ ]taken:[ ]no[ ]such[ ]user[ ]here/x,
+            userunknown: %r/550 [-] Requested action not taken: no such user here/,
           }
           boundary00 = Sisimai::MIME.boundary(mhead['content-type']) || ''
 
           if boundary00.size > 0
             # Convert to regular expression
-            re1['rfc822'] = Regexp.new('\A' + Regexp.escape('--' + boundary00 + '--') + '\z')
+            markingsof[:rfc822] = Regexp.new('\A' << Regexp.escape('--' << boundary00 << '--') << '\z')
           end
 
-          hasdivided.each do |e|
+          while e = hasdivided.shift do
             if readcursor.zero?
               # Beginning of the bounce message or delivery status part
-              if e =~ re1[:begin]
+              if e =~ markingsof[:message]
                 readcursor |= Indicators[:deliverystatus]
                 next
               end
@@ -99,7 +83,7 @@ module Sisimai::Bite::Email
 
             if (readcursor & Indicators[:'message-rfc822']).zero?
               # Beginning of the original message part
-              if e =~ re1[:rfc822]
+              if e =~ markingsof[:rfc822]
                 readcursor |= Indicators[:'message-rfc822']
                 next
               end
@@ -113,7 +97,6 @@ module Sisimai::Bite::Email
                 next
               end
               rfc822list << e
-
             else
               # Before "message/rfc822"
               next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -143,7 +126,6 @@ module Sisimai::Bite::Email
               elsif cv = e.match(/\A[ \t]+Subject:[ \t](.+)\z/)
                 #   Subject:
                 subjecttxt = cv[1] if subjecttxt.empty?
-
               else
                 # 550 - Requested action not taken: no such user here
                 v['diagnosis'] = e if e =~ /\A(\d{3})[ \t][-][ \t](.*)\z/
@@ -153,24 +135,20 @@ module Sisimai::Bite::Email
 
         else
           # vzwpix.com
-          re1 = {
-            :begin  => %r/\AMessage could not be delivered to mobile/,
-            :rfc822 => %r/\A__BOUNDARY_STRING_HERE__\z/,
-            :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-          }
-          reFailure = {
-            userunknown: %r/No[ ]valid[ ]recipients[ ]for[ ]this[ ]MM/x,
-          }
+          startingof = { message: ['Message could not be delivered to mobile'] }
+          markingsof = { rfc822:  %r/\A__BOUNDARY_STRING_HERE__\z/ }
+          reFailures = { userunknown: %r/No valid recipients for this MM/ }
           boundary00 = Sisimai::MIME.boundary(mhead['content-type'])
+
           if boundary00.size > 0
             # Convert to regular expression
-            re1['rfc822'] = Regexp.new('\A' + Regexp.escape('--' + boundary00 + '--') + '\z')
+            markingsof[:rfc822] = Regexp.new('\A' << Regexp.escape('--' << boundary00 << '--') << '\z')
           end
 
-          hasdivided.each do |e|
+          while e = hasdivided.shift do
             if readcursor.zero?
               # Beginning of the bounce message or delivery status part
-              if e =~ re1[:begin]
+              if e.start_with?(startingof[:message][0])
                 readcursor |= Indicators[:deliverystatus]
                 next
               end
@@ -178,7 +156,7 @@ module Sisimai::Bite::Email
 
             if (readcursor & Indicators[:'message-rfc822']).zero?
               # Beginning of the original message part
-              if e =~ re1[:rfc822]
+              if e =~ markingsof[:rfc822]
                 readcursor |= Indicators[:'message-rfc822']
                 next
               end
@@ -192,7 +170,6 @@ module Sisimai::Bite::Email
                 next
               end
               rfc822list << e
-
             else
               # Before "message/rfc822"
               next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -221,7 +198,6 @@ module Sisimai::Bite::Email
               elsif cv = e.match(/\ASubject:[ \t](.+)\z/)
                 #   Subject:
                 subjecttxt = cv[1] if subjecttxt.empty?
-
               else
                 # Message could not be delivered to mobile.
                 # Error: No valid recipients for this MM
@@ -230,16 +206,15 @@ module Sisimai::Bite::Email
             end
           end
         end
-
         return nil if recipients.zero?
 
-        if !rfc822list.find { |a| a =~ /^From: / }
+        if !rfc822list.find { |a| a.start_with?('From: ') }
           # Set the value of "MAIL FROM:" or "From:"
-          rfc822list << sprintf('From: %s', senderaddr)
+          rfc822list << ('From: ' << senderaddr)
 
-        elsif !rfc822list.find { |a| a =~ /^Subject: / }
+        elsif !rfc822list.find { |a| a.start_with?('Subject: ') }
           # Set the value of "Subject:"
-          rfc822list << sprintf('Subject: %s', subjecttxt)
+          rfc822list << ('Subject: ' << subjecttxt)
         end
 
         require 'sisimai/string'
@@ -247,9 +222,9 @@ module Sisimai::Bite::Email
           e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
-          reFailure.each_key do |r|
+          reFailures.each_key do |r|
             # Verify each regular expression of session errors
-            next unless e['diagnosis'] =~ reFailure[r]
+            next unless e['diagnosis'] =~ reFailures[r]
             e['reason'] = r.to_s
             break
           end

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

@@ -6,21 +6,15 @@ module Sisimai::Bite::Email
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/X1.pm
       require '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
+      MarkingsOf = {
+        message: %r/\AThe original message was received at (.+)\z/,
+        rfc822:  %r/\AReceived: from \d+[.]\d+[.]\d+[.]\d/,
+      }.freeze
 
       def description; return 'Unknown MTA #1'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
       def headerlist;  return []; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from Unknown MTA #1
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -36,8 +30,8 @@ module Sisimai::Bite::Email
       def scan(mhead, mbody)
         return nil unless mhead
         return nil unless mbody
-        return nil unless mhead['subject'] =~ Re0[:subject]
-        return nil unless mhead['from']    =~ Re0[:from]
+        return nil unless mhead['subject'].start_with?('Returned Mail: ')
+        return nil unless mhead['from'].include?('"Mail Deliver System" ')
 
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
         hasdivided = mbody.split("\n")
@@ -48,10 +42,10 @@ module Sisimai::Bite::Email
         datestring = ''     # (String) Date string
         v = nil
 
-        hasdivided.each do |e|
+        while e = hasdivided.shift do
           if readcursor.zero?
             # Beginning of the bounce message or delivery status part
-            if e =~ Re1[:begin]
+            if e =~ MarkingsOf[:message]
               readcursor |= Indicators[:deliverystatus]
               next
             end
@@ -59,7 +53,7 @@ module Sisimai::Bite::Email
 
           if (readcursor & Indicators[:'message-rfc822']).zero?
             # Beginning of the original message part
-            if e =~ Re1[:rfc822]
+            if e =~ MarkingsOf[:rfc822]
               readcursor |= Indicators[:'message-rfc822']
               next
             end
@@ -73,7 +67,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -98,15 +91,15 @@ module Sisimai::Bite::Email
               v['diagnosis'] = cv[2]
               recipients += 1
 
-            elsif cv = e.match(Re1[:begin])
+            elsif cv = e.match(MarkingsOf[:message])
               # The original message was received at Thu, 29 Apr 2010 23:34:45 +0900 (JST)
               datestring = cv[1]
             end
           end
         end
         return nil if recipients.zero?
-        require 'sisimai/string'
 
+        require 'sisimai/string'
         dscontents.map do |e|
           e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])

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

@@ -6,25 +6,15 @@ module Sisimai::Bite::Email
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/X2.pm
       require 'sisimai/bite/email'
 
-      Re0 = {
-        :from    => %r/MAILER-DAEMON[@]/,
-        :subject => %r{\A(?>
-           Delivery[ ]failure
-          |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
+      StartingOf = {
+        message: ['Unable to deliver message to the following address'],
+        rfc822:  ['--- Original message follows'],
+      }.freeze
 
       def description; return 'Unknown MTA #2'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
       def headerlist;  return []; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from Unknown MTA #2
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -40,8 +30,8 @@ module Sisimai::Bite::Email
       def scan(mhead, mbody)
         return nil unless mhead
         return nil unless mbody
-        return nil unless mhead['subject'] =~ Re0[:subject]
-        return nil unless mhead['from']    =~ Re0[:from]
+        return nil unless mhead['from'].include?('MAILER-DAEMON@')
+        return nil unless mhead['subject'] =~ %r/\A(?>Delivery failure|fail(?:ure|ed) delivery)/
 
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
         hasdivided = mbody.split("\n")
@@ -51,10 +41,10 @@ module Sisimai::Bite::Email
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         v = nil
 
-        hasdivided.each do |e|
+        while e = hasdivided.shift do
           if readcursor.zero?
             # Beginning of the bounce message or delivery status part
-            if e =~ Re1[:begin]
+            if e.start_with?(StartingOf[:message][0])
               readcursor |= Indicators[:deliverystatus]
               next
             end
@@ -62,7 +52,7 @@ module Sisimai::Bite::Email
 
           if (readcursor & Indicators[:'message-rfc822']).zero?
             # Beginning of the original message part
-            if e =~ Re1[:rfc822]
+            if e.start_with?(StartingOf[:rfc822][0])
               readcursor |= Indicators[:'message-rfc822']
               next
             end
@@ -76,7 +66,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -98,17 +87,16 @@ module Sisimai::Bite::Email
               end
               v['recipient'] = cv[1]
               recipients += 1
-
             else
               # This user doesn't have a example.com account (kijitora@example.com) [0]
               v['diagnosis'] ||= ''
-              v['diagnosis']  += ' ' + e
+              v['diagnosis'] << ' ' << e
             end
           end
         end
         return nil if recipients.zero?
-        require 'sisimai/string'
 
+        require 'sisimai/string'
         dscontents.map do |e|
           e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])

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

@@ -6,21 +6,15 @@ module Sisimai::Bite::Email
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/X3.pm
       require '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
+      StartingOf = {
+        message: [' This is an automatically generated Delivery Status Notification'],
+        rfc822:  ['Content-Type: message/rfc822'],
+      }.freeze
 
       def description; return 'Unknown MTA #3'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
       def headerlist;  return []; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from Unknown MTA #3
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -36,8 +30,8 @@ module Sisimai::Bite::Email
       def scan(mhead, mbody)
         return nil unless mhead
         return nil unless mbody
-        return nil unless mhead['subject'] =~ Re0[:subject]
-        return nil unless mhead['from']    =~ Re0[:from]
+        return nil unless mhead['subject'].start_with?('Delivery status notification')
+        return nil unless mhead['from'].start_with?('Mail Delivery System')
 
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
         hasdivided = mbody.split("\n")
@@ -47,10 +41,10 @@ module Sisimai::Bite::Email
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         v = nil
 
-        hasdivided.each do |e|
+        while e = hasdivided.shift do
           if readcursor.zero?
             # Beginning of the bounce message or delivery status part
-            if e =~ Re1[:begin]
+            if e.include?(StartingOf[:message][0])
               readcursor |= Indicators[:deliverystatus]
               next
             end
@@ -58,7 +52,7 @@ module Sisimai::Bite::Email
 
           if (readcursor & Indicators[:'message-rfc822']).zero?
             # Beginning of the original message part
-            if e =~ Re1[:rfc822]
+            if e.start_with?(StartingOf[:rfc822][0])
               readcursor |= Indicators[:'message-rfc822']
               next
             end
@@ -72,7 +66,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -104,7 +97,6 @@ module Sisimai::Bite::Email
               end
               v['recipient'] = cv[1]
               recipients += 1
-
             else
               # Detect error message
               if cv = e.match(/\ASMTP:([^ ]+)[ ](.+)\z/)
@@ -119,11 +111,10 @@ module Sisimai::Bite::Email
             end
           end
         end
-
         return nil if recipients.zero?
+
         require 'sisimai/string'
         require 'sisimai/smtp/status'
-
         dscontents.map do |e|
           e['agent']     = self.smtpagent
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])