sisimai 4.25.17 → 5.0.0

data/lib/sisimai/lhost/surfcontrol.rb

@@ -1,14 +1,12 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::SurfControl parses a bounce email which created by
-  # WebSense SurfControl.
+  # Sisimai::Lhost::SurfControl parses a bounce email which created by WebSense SurfControl.
   # Methods in the module are called from only Sisimai::Message.
   module SurfControl
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/SurfControl.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r|^Content-Type:[ ]message/rfc822|.freeze
+      Boundaries = ['Content-Type: message/rfc822'].freeze
       StartingOf = { message: ['Your message could not be sent.'] }.freeze
 
       # Parse bounce messages from SurfControl
@@ -16,7 +14,7 @@ module Sisimai::Lhost
       # @param  [String] mbody  Message body of a bounce email
       # @return [Hash]          Bounce data list and message/rfc822 part
       # @return [Nil]           it failed to parse or the arguments are missing
-      def make(mhead, mbody)
+      def inquire(mhead, mbody)
         # X-SEF-ZeroHour-RefID: fgs=000000000
         # X-SEF-Processed: 0_0_0_000__2010_04_29_23_34_45
         # X-Mailer: SurfControl E-mail Filter
@@ -24,19 +22,18 @@ module Sisimai::Lhost
         return nil unless mhead['x-mailer']
         return nil unless mhead['x-mailer'] == 'SurfControl E-mail Filter'
 
-        require 'sisimai/rfc1894'
         fieldtable = Sisimai::RFC1894.FIELDTABLE
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
-        bodyslices = emailsteak[0].split("\n")
+        emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
+        bodyslices = emailparts[0].split("\n")
         readslices = ['']
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         v = nil
 
         while e = bodyslices.shift do
-          # Read error messages and delivery status lines from the head of the email
-          # to the previous line of the beginning of the original message.
+          # Read error messages and delivery status lines from the head of the email to the previous
+          # line of the beginning of the original message.
           readslices << e # Save the current line for the next loop
 
           if readcursor == 0
@@ -58,24 +55,27 @@ module Sisimai::Lhost
           # --- Message non-deliverable.
           v = dscontents[-1]
 
-          if cv = e.match(/\AAddressed To:[ ]*([^ ]+?[@][^ ]+?)\z/)
+          if e.start_with?('Addressed To:') && e.index('@') > 1
             # Addressed To: kijitora@example.com
             if v['recipient']
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
             end
-            v['recipient'] = cv[1]
+            v['recipient'] = Sisimai::Address.s3s4(e[e.index(':') + 2, e.size])
             recipients += 1
 
-          elsif e =~ /\A(?:Sun|Mon|Tue|Wed|Thu|Fri|Sat)[ ,]/
+          elsif %w[Sun Mon Tue Wed Thu Fri Sat].any? { |a| e.start_with?(a) }
             # Thu 29 Apr 2010 23:34:45 +0900
             v['date'] = e
 
-          elsif cv = e.match(/\A[^ ]+[@][^ ]+:[ ]*\[(\d+[.]\d+[.]\d+[.]\d)\],[ ]*(.+)\z/)
+          elsif Sisimai::String.aligned(e, ['@', ':', ' ', '[', '],', '...'])
             # kijitora@example.com: [192.0.2.5], 550 kijitora@example.com... No such user
-            v['rhost'] = cv[1]
-            v['diagnosis'] = cv[2]
+            p1 = e.index('[')
+            p2 = e.index('],', p1 + 1)
+            v['rhost'] = e[p1 + 1, p2 - p1 - 1]
+            v['diagnosis'] = Sisimai::String.sweep(e[p2 + 2, e.size])
+
           else
             # Fallback, parse RFC3464 headers.
             if f = Sisimai::RFC1894.match(e)
@@ -87,8 +87,8 @@ module Sisimai::Lhost
             else
               # Continued line of the value of Diagnostic-Code field
               next unless readslices[-2].start_with?('Diagnostic-Code:')
-              next unless cv = e.match(/\A[ \t]+(.+)\z/)
-              v['diagnosis'] << ' ' << cv[1]
+              next unless e.start_with?(' ')
+              v['diagnosis'] << ' ' << Sisimai::String.sweep(e)
               readslices[-1] = 'Diagnostic-Code: ' << e
             end
           end
@@ -96,7 +96,7 @@ module Sisimai::Lhost
         return nil unless recipients > 0
 
         dscontents.each { |e| e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) }
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'WebSense SurfControl'; end
     end

data/lib/sisimai/lhost/v5sendmail.rb

@@ -1,16 +1,13 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::V5sendmail parses a bounce email which created by
-  # Sendmail version 5.
-  # Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::V5sendmail parses a bounce email which created by Sendmail version 5. Methods in
+  # the module are called from only Sisimai::Message.
   module V5sendmail
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/V5sendmail.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r/^[ ]+-----[ ](?:Unsent[ ]message[ ]follows|No[ ]message[ ]was[ ]collected)[ ]-----/.freeze
-      StartingOf = { message: ['----- Transcript of session follows -----'] }
-      MarkingsOf = {
+      Boundaries = ['   ----- Unsent message follows -----', '  ----- No message was collected -----'].freeze
+      StartingOf = {
         # 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');
@@ -27,7 +24,8 @@ module Sisimai::Lhost
         #   savemail.c:497|   while (fgets(buf, sizeof buf, xfile) != NULL)
         #   savemail.c:498|       putline(buf, fp, m);
         #   savemail.c:499|   (void) fclose(xfile);
-        error:   %r/\A[.]+ while talking to .+[:]\z/,
+        error:   [' while talking to '],
+        message: ['----- Transcript of session follows -----'],
       }.freeze
 
       # Parse bounce messages from Sendmail version 5
@@ -35,26 +33,27 @@ module Sisimai::Lhost
       # @param  [String] mbody  Message body of a bounce email
       # @return [Hash]          Bounce data list and message/rfc822 part
       # @return [Nil]           it failed to parse or the arguments are missing
-      def make(mhead, mbody)
+      def inquire(mhead, mbody)
         # :from => %r/\AMail Delivery Subsystem/,
-        return nil unless mhead['subject'] =~ /\AReturned mail: [A-Z]/
+        return nil unless mhead['subject'].start_with?('Returned mail: ')
 
-        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
-        return nil if emailsteak[1].empty?
+        emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
+        return nil unless emailparts[1].size > 0
 
+        require 'sisimai/smtp/command'
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        bodyslices = emailsteak[0].split("\n")
+        bodyslices = emailparts[0].split("\n")
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
+        anotherset = {}     # (Hash) Another error information
         responding = []     # (Array) Responses from remote server
         commandset = []     # (Array) SMTP command which is sent to remote server
-        anotherset = {}     # (Hash) Another error information
         errorindex = -1     # (Integer)
         v = nil
 
         while e = bodyslices.shift do
-          # Read error messages and delivery status lines from the head of the email
-          # to the previous line of the beginning of the original message.
+          # Read error messages and delivery status lines from the head of the email to the previous
+          # line of the beginning of the original message.
           if readcursor == 0
             # Beginning of the bounce message or delivery status part
             readcursor |= Indicators[:deliverystatus] if e.include?(StartingOf[:message][0])
@@ -71,57 +70,64 @@ module Sisimai::Lhost
           # 421 example.org (smtp)... Deferred: Connection timed out during user open with example.org
           v = dscontents[-1]
 
-          if cv = e.match(/\A\d{3}[ ]+[<]([^ ]+[@][^ ]+)[>][.]{3}[ ]*(.+)\z/)
+          if e.start_with?('5', '4') && Sisimai::String.aligned(e, [' <', '@', '>...'])
             # 550 <kijitora@example.org>... User unknown
             if v['recipient']
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
             end
-            v['recipient'] = cv[1]
-            v['diagnosis'] = cv[2]
+            p1 = e.index('<', 0)
+            p2 = e.index('>...')
+            v['recipient'] = e[p1 + 1, p2 - p1 - 1]
+            v['diagnosis'] = e[p2 + 5, e.size]
 
             # Concatenate the response of the server and error message
             v['diagnosis'] << ': ' << responding[recipients] if responding[recipients]
             recipients += 1
 
-          elsif cv = e.match(/\A[>]{3}[ ]*([A-Z]{4})[ ]*/)
+          elsif e.start_with?('>>> ')
             # >>> RCPT To:<kijitora@example.org>
-            commandset[recipients] = cv[1]
+            cv = Sisimai::SMTP::Command.find(e); commandset[recipients] = cv if cv
 
-          elsif cv = e.match(/\A[<]{3}[ ]+(.+)\z/)
+          elsif e.start_with?('<<< ')
             # <<< Response
             # <<< 501 <shironeko@example.co.jp>... no access from mail server [192.0.2.55] which is an open relay.
             # <<< 550 Requested User Mailbox not found. No such user here.
-            responding[recipients] = cv[1]
+            responding[recipients] = e[4, e.size]
+
           else
             # Detect SMTP session error or connection error
             next if v['sessionerr']
 
-            if e =~ MarkingsOf[:error]
+            if e.include?(StartingOf[:error][0])
               # ----- Transcript of session follows -----
               # ... while talking to mta.example.org.:
               v['sessionerr'] = true
               next
             end
 
-            if cv = e.match(/\A\d{3}[ ]+.+[.]{3}[ \t]*(.+)\z/)
+            if e.start_with?('4', '5') && e.include?('... ')
               # 421 example.org (smtp)... Deferred: Connection timed out during user open with example.org
-              anotherset['diagnosis'] = cv[1]
+              anotherset['replycode'] = e[0, 3]
+              anotherset['diagnosis'] = e[e.index('... ') + 4, e.size]
             end
           end
         end
 
-        if recipients == 0 && cv = emailsteak[1].match(/^To:[ ]*(.+)$/)
+        p1 = emailparts[1].index("\nTo: ")     || -1
+        p2 = emailparts[1].index("\n", p1 + 6) || -1
+        if recipients == 0 && p1 > 0
           # Get the recipient address from "To:" header at the original message
-          dscontents[0]['recipient'] = Sisimai::Address.s3s4(cv[1])
+          dscontents[0]['recipient'] = Sisimai::Address.s3s4(emailparts[1][p1, p2 - p1 - 5])
           recipients = 1
         end
         return nil unless recipients > 0
 
         dscontents.each do |e|
           errorindex += 1
-          e['command'] = commandset[errorindex] || ''
+          e.delete('sessionerr')
+
           e['diagnosis'] ||= if anotherset['diagnosis'].to_s.size > 0
                                # Copy alternative error message
                                anotherset['diagnosis']
@@ -130,18 +136,18 @@ module Sisimai::Lhost
                                responding[errorindex]
                              end
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-
-          unless e['recipient'] =~ /\A[^ ]+[@][^ ]+\z/
-            # @example.jp, no local part
-            if cv = e['diagnosis'].match(/[<]([^ ]+[@][^ ]+)[>]/)
-              # Get email address from the value of Diagnostic-Code header
-              e['recipient'] = cv[1]
-            end
-          end
-          e.delete('sessionerr')
+          e['replycode'] = Sisimai::SMTP::Reply.find(e['diagnosis']) || anotherset['replycode']
+          e['command']   = commandset[errorindex] || Sisimai::SMTP::Command.find(e['diagnosis']) || ''
+
+          # @example.jp, no local part
+          # Get email address from the value of Diagnostic-Code header
+          next if e['recipient'].include?('@')
+          p1 = e['diagnosis'].index('<'); next unless p1
+          p2 = e['diagnosis'].index('>'); next unless p2
+          e['recipient'] = Sisimai::Address.s3s4(e[p1, p2 - p1])
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'Sendmail version 5'; end
     end

data/lib/sisimai/lhost/verizon.rb

@@ -1,10 +1,8 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::Verizon parses a bounce email which created by
-  # Verizon Wireless.
-  # Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::Verizon parses a bounce email which created by Verizon Wireless. Methods in the
+  # module are called from only Sisimai::Message.
   module Verizon
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/Verizon.pm
       require 'sisimai/lhost'
       Indicators = Sisimai::Lhost.INDICATORS
 
@@ -13,25 +11,25 @@ module Sisimai::Lhost
       # @param  [String] mbody  Message body of a bounce email
       # @return [Hash]          Bounce data list and message/rfc822 part
       # @return [Nil]           it failed to parse or the arguments are missing
-      def make(mhead, mbody)
+      def inquire(mhead, mbody)
         match = -1
         while true
           # Check the value of "From" header
           # :'subject' => %r/Undeliverable Message/,
           break unless mhead['received'].any? { |a| a.include?('.vtext.com (') }
           match = 1 if mhead['from'] == 'post_master@vtext.com'
-          match = 0 if mhead['from'] =~ /[<]?sysadmin[@].+[.]vzwpix[.]com[>]?\z/
+          match = 0 if Sisimai::String.aligned(mhead['from'], ['sysadmin@', '.vzwpix.com'])
           break
         end
         return nil if match < 0
 
+        boundaries = []
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        rebackbone = /^__BOUNDARY_STRING_HERE__/
+        emailparts = []
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         senderaddr = ''     # (String) Sender address in the message body
         subjecttxt = ''     # (String) Subject of the original message
-
         markingsof = {}     # (Hash) Delimiter patterns
         startingof = {}     # (Hash) Delimiter strings
         messagesof = {}     # (Hash) Error message patterns
@@ -39,22 +37,21 @@ module Sisimai::Lhost
 
         if match == 1
           # vtext.com
-          markingsof = { message: %r/\AError:[ \t]/ }
+          markingsof = { message: ['Error: '] }
           messagesof = {
             # The attempted recipient address does not exist.
             'userunknown' => ['550 - Requested action not taken: no such user here'],
           }
-          boundary00 = Sisimai::MIME.boundary(mhead['content-type'], 1) || ''
-          rebackbone = Regexp.new('^' << Regexp.escape(boundary00)) unless boundary00.empty?
-          emailsteak = Sisimai::RFC5322.fillet(mbody, rebackbone)
-          bodyslices = emailsteak[0].split("\n")
+          boundaries = [Sisimai::RFC2045.boundary(mhead['content-type'], 1)]
+          emailparts = Sisimai::RFC5322.part(mbody, boundaries)
+          bodyslices = emailparts[0].split("\n")
 
           while e = bodyslices.shift do
-            # Read error messages and delivery status lines from the head of the email
-            # to the previous line of the beginning of the original message.
+            # Read error messages and delivery status lines from the head of the email to the previous
+            # line of the beginning of the original message.
             if readcursor == 0
               # Beginning of the bounce message or delivery status part
-              readcursor |= Indicators[:deliverystatus] if e =~ markingsof[:message]
+              readcursor |= Indicators[:deliverystatus] if e.start_with?(markingsof[:message][0])
               next
             end
             next if (readcursor & Indicators[:deliverystatus]) == 0
@@ -66,41 +63,40 @@ module Sisimai::Lhost
             #   MAIL FROM: *******@hg.example.com
             #   RCPT TO: *****@vtext.com
             v = dscontents[-1]
-            if cv = e.match(/\A[ \t]+RCPT TO: (.*)\z/)
+            if e.start_with?('  RCPT TO: ')
               if v['recipient']
                 # There are multiple recipient addresses in the message body.
                 dscontents << Sisimai::Lhost.DELIVERYSTATUS
                 v = dscontents[-1]
               end
 
-              v['recipient'] = cv[1]
+              v['recipient'] = e[11, e.size]
               recipients += 1
               next
 
-            elsif cv = e.match(/\A[ \t]+MAIL FROM:[ \t](.+)\z/)
+            elsif e.start_with?('  MAIL FROM: ')
               #   MAIL FROM: *******@hg.example.com
-              senderaddr = cv[1] if senderaddr.empty?
+              senderaddr = e[13, e.size] if senderaddr.empty?
 
-            elsif cv = e.match(/\A[ \t]+Subject:[ \t](.+)\z/)
+            elsif e.start_with?('  Subject: ')
               #   Subject:
-              subjecttxt = cv[1] if subjecttxt.empty?
+              subjecttxt = e[11, e.size] if subjecttxt.empty?
             else
               # 550 - Requested action not taken: no such user here
-              v['diagnosis'] = e if e =~ /\A(\d{3})[ \t][-][ \t](.*)\z/
+              v['diagnosis'] = e if e.include?(' - ')
             end
           end
         else
           # vzwpix.com
           startingof = { message: ['Message could not be delivered to mobile'] }
           messagesof = { 'userunknown' => ['No valid recipients for this MM'] }
-          boundary00 = Sisimai::MIME.boundary(mhead['content-type'], 1)
-          rebackbone = Regexp.new('^' << Regexp.escape(boundary00)) unless boundary00.empty?
-          emailsteak = Sisimai::RFC5322.fillet(mbody, rebackbone)
-          bodyslices = emailsteak[0].split("\n")
+          boundaries = [Sisimai::RFC2045.boundary(mhead['content-type'], 1)]
+          emailparts = Sisimai::RFC5322.part(mbody, boundaries)
+          bodyslices = emailparts[0].split("\n")
 
           while e = bodyslices.shift do
-            # Read error messages and delivery status lines from the head of the email
-            # to the previous line of the beginning of the original message.
+            # Read error messages and delivery status lines from the head of the email to the previous
+            # line of the beginning of the original message.
             if readcursor == 0
               # Beginning of the bounce message or delivery status part
               readcursor |= Indicators[:deliverystatus] if e.start_with?(startingof[:message][0])
@@ -115,35 +111,35 @@ module Sisimai::Lhost
             # Subject: test for bounce
             # Date:  Wed, 20 Jun 2013 10:29:52 +0000
             v = dscontents[-1]
-            if cv = e.match(/\ATo:[ \t]+(.*)\z/)
+            if e.start_with?('To: ')
               if v['recipient']
                 # There are multiple recipient addresses in the message body.
                 dscontents << Sisimai::Lhost.DELIVERYSTATUS
                 v = dscontents[-1]
               end
-              v['recipient'] = Sisimai::Address.s3s4(cv[1])
+              v['recipient'] = Sisimai::Address.s3s4(e[4, e.size])
               recipients += 1
               next
 
-            elsif cv = e.match(/\AFrom:[ \t](.+)\z/)
+            elsif e.start_with?('From: ')
               # From: kijitora <kijitora@example.jp>
-              senderaddr = Sisimai::Address.s3s4(cv[1]) if senderaddr.empty?
+              senderaddr = Sisimai::Address.s3s4(e[4, e.size]) if senderaddr.empty?
 
-            elsif cv = e.match(/\ASubject:[ \t](.+)\z/)
+            elsif e.start_with?('Subject: ')
               #   Subject:
-              subjecttxt = cv[1] if subjecttxt.empty?
+              subjecttxt = e[9, e.size] if subjecttxt.empty?
             else
               # Message could not be delivered to mobile.
               # Error: No valid recipients for this MM
-              v['diagnosis'] = e if e =~ /\AError:[ \t]+(.+)\z/
+              v['diagnosis'] = Sisimai::String.sweep(e[7, e.size]) if e.start_with?('Error: ')
             end
           end
         end
         return nil unless recipients > 0
 
         # Set the value of "MAIL FROM:" and "From:"
-        emailsteak[1] << ('From: ' << senderaddr << "\n") unless emailsteak[1] =~ /^From: /
-        emailsteak[1] << ('Subject: ' << subjecttxt << "\n") unless emailsteak[1] =~ /^Subject: /
+        emailparts[1] << ('From: '    << senderaddr << "\n") if emailparts[1].include?("\nFrom: ") == false
+        emailparts[1] << ('Subject: ' << subjecttxt << "\n") if emailparts[1].include?("\nSubject: ") == false
 
         dscontents.each do |e|
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
@@ -155,7 +151,7 @@ module Sisimai::Lhost
           end
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'Verizon Wireless: https://www.verizonwireless.com'; end
     end

data/lib/sisimai/lhost/x1.rb

@@ -1,38 +1,37 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::X1 parses a bounce email which created by Unknown MTA #1.
-  # Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::X1 parses a bounce email which created by Unknown MTA #1. Methods in the module
+  # are called from only Sisimai::Message.
   module X1
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/X1.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r|^Received: from \d+[.]\d+[.]\d+[.]\d|.freeze
-      MarkingsOf = { message: %r/\AThe original message was received at (.+)\z/ }.freeze
+      Boundaries = ['Received: from '].freeze
+      MarkingsOf = { message: ['The original message was received at '] }.freeze
 
       # Parse bounce messages from Unknown MTA #1
       # @param  [Hash] mhead    Message headers of a bounce email
       # @param  [String] mbody  Message body of a bounce email
       # @return [Hash]          Bounce data list and message/rfc822 part
       # @return [Nil]           it failed to parse or the arguments are missing
-      def make(mhead, mbody)
+      def inquire(mhead, mbody)
         return nil unless mhead['subject'].start_with?('Returned Mail: ')
         return nil unless mhead['from'].start_with?('"Mail Deliver System" ')
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
-        bodyslices = emailsteak[0].split("\n")
+        emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
+        bodyslices = emailparts[0].split("\n")
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         datestring = ''     # (String) Date string
         v = nil
 
         while e = bodyslices.shift do
-          # Read error messages and delivery status lines from the head of the email
-          # to the previous line of the beginning of the original message.
+          # Read error messages and delivery status lines from the head of the email to the previous
+          # line of the beginning of the original message.
           if readcursor == 0
             # Beginning of the bounce message or delivery status part
-            readcursor |= Indicators[:deliverystatus] if e =~ MarkingsOf[:message]
+            readcursor |= Indicators[:deliverystatus] if e.start_with?(MarkingsOf[:message][0])
             next
           end
           next if (readcursor & Indicators[:deliverystatus]) == 0
@@ -46,20 +45,22 @@ module Sisimai::Lhost
           # kijitora@example.co.jp [User unknown]
           v = dscontents[-1]
 
-          if cv = e.match(/\A([^ ]+?[@][^ ]+?)[ ]+\[(.+)\]\z/)
+          if Sisimai::String.aligned(e, ['@', ' [', ']'])
             # kijitora@example.co.jp [User unknown]
             if v['recipient']
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
             end
-            v['recipient'] = cv[1]
-            v['diagnosis'] = cv[2]
+            p1 = e.index(' ')
+            p2 = e.index(']')
+            v['recipient'] = e[0, p1]
+            v['diagnosis'] = e[p1 + 2, p2 - p1 - 2]
             recipients += 1
 
-          elsif cv = e.match(MarkingsOf[:message])
+          elsif e.start_with?(MarkingsOf[:message][0])
             # The original message was received at Thu, 29 Apr 2010 23:34:45 +0900 (JST)
-            datestring = cv[1]
+            datestring = e[MarkingsOf[:message][0].size, e.size]
           end
         end
         return nil unless recipients > 0
@@ -69,7 +70,7 @@ module Sisimai::Lhost
           e['date']      = datestring || ''
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'Unknown MTA #1'; end
     end

data/lib/sisimai/lhost/x2.rb

@@ -1,13 +1,12 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::X2 parses a bounce email which created by Unknown MTA #2.
-  # Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::X2 parses a bounce email which created by Unknown MTA #2. Methods in the module
+  # are called from only Sisimai::Message.
   module X2
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/X2.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r|^--- Original message follows[.]|.freeze
+      Boundaries = ['--- Original message follows.'].freeze
       StartingOf = { message: ['Unable to deliver message to the following address'] }.freeze
 
       # Parse bounce messages from Unknown MTA #2
@@ -15,20 +14,24 @@ module Sisimai::Lhost
       # @param  [String] mbody  Message body of a bounce email
       # @return [Hash]          Bounce data list and message/rfc822 part
       # @return [Nil]           it failed to parse or the arguments are missing
-      def make(mhead, mbody)
-        return nil unless mhead['from'].include?('MAILER-DAEMON@')
-        return nil unless mhead['subject'] =~ %r/\A(?>Delivery failure|fail(?:ure|ed) delivery)/
+      def inquire(mhead, mbody)
+        match   = nil
+        match ||= 1 if mhead['from'].include?('MAILER-DAEMON@')
+        match ||= 1 if mhead['subject'].start_with?('Delivery failure')
+        match ||= 1 if mhead['subject'].start_with?('failure delivery')
+        match ||= 1 if mhead['subject'].start_with?('failed delivery')
+        return nil unless match
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
-        bodyslices = emailsteak[0].split("\n")
+        emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
+        bodyslices = emailparts[0].split("\n")
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         v = nil
 
         while e = bodyslices.shift do
-          # Read error messages and delivery status lines from the head of the email
-          # to the previous line of the beginning of the original message.
+          # Read error messages and delivery status lines from the head of the email to the previous
+          # line of the beginning of the original message.
           if readcursor == 0
             # Beginning of the bounce message or delivery status part
             readcursor |= Indicators[:deliverystatus] if e.start_with?(StartingOf[:message][0])
@@ -44,14 +47,14 @@ module Sisimai::Lhost
           # This user doesn't have a example.com account (kijitora@example.com) [0]
           v = dscontents[-1]
 
-          if cv = e.match(/\A[<]([^ ]+[@][^ ]+)[>]:\z/)
+          if e.start_with?('<') && Sisimai::String.aligned(e, ['<', '@', '>', ':'])
             # <kijitora@example.com>:
             if v['recipient']
               # There are multiple recipient addresses in the message body.
               dscontents << Sisimai::Lhost.DELIVERYSTATUS
               v = dscontents[-1]
             end
-            v['recipient'] = cv[1]
+            v['recipient'] = e[1, e.size - 3]
             recipients += 1
           else
             # This user doesn't have a example.com account (kijitora@example.com) [0]
@@ -62,7 +65,7 @@ module Sisimai::Lhost
         return nil unless recipients > 0
 
         dscontents.each { |e| e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) }
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'Unknown MTA #2'; end
     end