sisimai 4.25.17 → 5.0.0

data/lib/sisimai/lhost/activehunter.rb

@@ -1,14 +1,12 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::Activehunter parses a bounce email which created by
-  # TransWARE Active!hunter.
+  # Sisimai::Lhost::Activehunter parses a bounce email which created by TransWARE Active!hunter.
   # Methods in the module are called from only Sisimai::Message.
   module Activehunter
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/Activehunter.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r|^Content-type:[ ]message/rfc822|.freeze
+      Boundaries = ['Content-Type: message/rfc822'].freeze
       StartingOf = { message: ['  ----- The following addresses had permanent fatal errors -----'] }.freeze
 
       # Parse bounce messages from TransWARE Active!hunter
@@ -16,21 +14,21 @@ 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/\A"MAILER-DAEMON"/,
         # :subject => %r/FAILURE NOTICE :/,
         return nil unless mhead['x-ahmailid']
 
         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 == StartingOf[:message][0]
@@ -47,29 +45,29 @@ module Sisimai::Lhost
           # 550 sorry, no mailbox here by that name (#5.1.1 - chkusr)
           v = dscontents[-1]
 
-          if cv = e.match(/\A[>]{3}[ \t]+.+[<]([^ ]+?[@][^ ]+?)[>]\z/)
+          if e.start_with?('>>> ') && e.index('@') > 1
             # >>> kijitora@example.org <kijitora@example.org>
             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('<'), e.size])
             v['diagnosis'] = ''
             recipients += 1
           else
             #  ----- Transcript of session follows -----
             # 550 sorry, no mailbox here by that name (#5.1.1 - chkusr)
-            next unless e =~ /\A[0-9A-Za-z]+/
+            next if e[0, 1].ord <  48
+            next if e[0, 1].ord > 122
             next unless v['diagnosis'].empty?
             v['diagnosis'] = e
           end
         end
         return nil unless recipients > 0
 
-        require 'sisimai/string'
         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 'TransWARE Active!hunter'; end
     end

data/lib/sisimai/lhost/amavis.rb

@@ -1,13 +1,12 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::Amavis parses a bounce email which created by
-  # amavsid-new. Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::Amavis parses a bounce email which created by amavsid-new. Methods in the module
+  # are called from only Sisimai::Message.
   module Amavis
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/Amavis.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r|^Content-Type:[ ]text/rfc822-headers|.freeze
+      Boundaries = ['Content-Type: text/rfc822-headers'].freeze
       StartingOf = { message: ['The message '] }.freeze
       MessagesOf = {
         # amavisd-new-2.11.1/amavisd:1840|%smtp_reason_by_ccat = (
@@ -75,25 +74,24 @@ module Sisimai::Lhost
       # @return [Hash]          Bounce data list and message/rfc822 part
       # @return [Nil]           it failed to parse or the arguments are missing
       # @since v4.25.0
-      def make(mhead, mbody)
+      def inquire(mhead, mbody)
         # From: "Content-filter at neko1.example.jp" <postmaster@neko1.example.jp>
         # Subject: Undeliverable mail, MTA-BLOCKED
         return nil unless mhead['from'].to_s.start_with?('"Content-filter at ')
 
-        require 'sisimai/rfc1894'
         fieldtable = Sisimai::RFC1894.FIELDTABLE
         permessage = {}     # (Hash) Store values of each Per-Message field
 
         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 message/delivery-status part
@@ -133,7 +131,7 @@ module Sisimai::Lhost
             next unless fieldtable[o[0]]
             v[fieldtable[o[0]]] = o[2]
 
-            next unless f == 1
+            next unless f
             permessage[fieldtable[o[0]]] = o[2]
           end
         end
@@ -148,8 +146,7 @@ module Sisimai::Lhost
             MessagesOf.each_key do |p|
               # Try to detect an error reason
               MessagesOf[p].each do |r|
-                # Try to find an error message including lower-cased string
-                # defined in MessagesOf constant
+                # Try to find an error message including lower-cased string defined in MessagesOf constant
                 next unless q.include?(r)
                 e['reason'] = p
                 throw :DETECT_REASON
@@ -157,7 +154,7 @@ module Sisimai::Lhost
             end
           end
         end
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'amavisd-new: https://www.amavis.org/'; end
     end

data/lib/sisimai/lhost/amazonses.rb

@@ -1,15 +1,13 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::AmazonSES parses a bounce email which created by
-  # Amazon Simple Email Service.
+  # Sisimai::Lhost::AmazonSES parses a bounce email which created by Amazon Simple Email Service.
   # Methods in the module are called from only Sisimai::Message.
   module AmazonSES
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/AmazonSES.pm
       require 'sisimai/lhost'
 
       # https://aws.amazon.com/ses/
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r|^content-type:[ ]message/rfc822|.freeze
+      Boundaries = ['Content-Type: message/rfc822'].freeze
       StartingOf = {
         message: ['The following message to <', 'An error occurred while trying to deliver the mail'],
       }.freeze
@@ -20,14 +18,14 @@ 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)
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
         recipients = 0  # (Integer) The number of 'Final-Recipient' header
 
         if mbody.start_with?('{')
           # The message body is JSON string
           return nil unless mhead['x-amz-sns-message-id']
-          return nil if mhead['x-amz-sns-message-id'].empty?
+          return nil if     mhead['x-amz-sns-message-id'].empty?
 
           # https://docs.aws.amazon.com/en_us/ses/latest/DeveloperGuide/notification-contents.html
           bouncetype = {
@@ -102,7 +100,7 @@ module Sisimai::Lhost
             while e = r.shift do
               # 'bouncedRecipients' => [ { 'emailAddress' => 'bounce@si...' }, ... ]
               # 'complainedRecipients' => [ { 'emailAddress' => 'complaint@si...' }, ... ]
-              next unless Sisimai::RFC5322.is_emailaddress(e['emailAddress'])
+              next unless Sisimai::Address.is_emailaddress(e['emailAddress'])
 
               v = dscontents[-1]
               if v['recipient']
@@ -123,22 +121,22 @@ module Sisimai::Lhost
                 v['action'] = e['action']
                 v['status'] = e['status']
 
-                if cv = e['diagnosticCode'].match(/\A(.+?);[ ]*(.+)\z/)
+                if p0 = e['diagnosticCode'].index(';') || -1; p0 > 3
                   # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
-                  v['spec'] = cv[1].upcase
-                  v['diagnosis'] = cv[2]
+                  v['spec']      = e['diagnosticCode'][0, p0].upcase
+                  v['diagnosis'] = e['diagnosticCode'][p0 + 2, e['diagnosticCode'].size]
                 else
                   v['diagnosis'] = e['diagnosticCode']
                 end
 
                 # 'reportingMTA' => 'dsn; a27-23.smtp-out.us-west-2.amazonses.com',
-                if cv = o['reportingMTA'].match(/\Adsn;[ ](.+)\z/) then v['lhost'] = cv[1] end
+                p0 = o['reportingMTA'].index('dsn; ')
+                v['lhost'] = Sisimai::String.sweep(o['reportingMTA'][p0 + 5, o['reportingMTA'].size]) if p0
 
-                if bouncetype[o['bounceType']] &&
-                   bouncetype[o['bounceType']][o['bounceSubType']]
+                if bouncetype[o['bounceType']] && bouncetype[o['bounceType']][o['bounceSubType']]
                   # 'bounce' => {
-                  #       'bounceType' => 'Permanent',
-                  #       'bounceSubType' => 'General'
+                  #   'bounceType'    => 'Permanent',
+                  #   'bounceSubType' => 'General'
                   # },
                   v['reason'] = bouncetype[o['bounceType']][o['bounceSubType']]
                 end
@@ -159,15 +157,15 @@ module Sisimai::Lhost
 
             while e = r.shift do
               # 'delivery' => {
-              #       'timestamp' => '2016-11-23T12:01:03.512Z',
-              #       'processingTimeMillis' => 3982,
-              #       'reportingMTA' => 'a27-29.smtp-out.us-west-2.amazonses.com',
-              #       'recipients' => [
-              #           'success@simulator.amazonses.com'
-              #       ],
-              #       'smtpResponse' => '250 2.6.0 Message received'
-              #   },
-              next unless Sisimai::RFC5322.is_emailaddress(e)
+              #   'timestamp' => '2016-11-23T12:01:03.512Z',
+              #   'processingTimeMillis' => 3982,
+              #   'reportingMTA' => 'a27-29.smtp-out.us-west-2.amazonses.com',
+              #   'recipients' => [
+              #     'success@simulator.amazonses.com'
+              #   ],
+              #   'smtpResponse' => '250 2.6.0 Message received'
+              # },
+              next unless Sisimai::Address.is_emailaddress(e)
 
               v = dscontents[-1]
               if v['recipient']
@@ -180,7 +178,6 @@ module Sisimai::Lhost
               v['lhost']     = o['reportingMTA'] || ''
               v['diagnosis'] = o['smtpResponse'] || ''
               v['status']    = Sisimai::SMTP::Status.find(v['diagnosis']) || ''
-              v['replycode'] = Sisimai::SMTP::Reply.find(v['diagnosis'])  || ''
               v['reason']    = 'delivered'
               v['action']    = 'delivered'
 
@@ -188,8 +185,7 @@ module Sisimai::Lhost
               v['date'].sub!(/[.]\d+Z\z/, '')
             end
           else
-            # The value of "notificationType" is not any of "Bounce", "Complaint",
-            # or "Delivery".
+            # The value of "notificationType" is not any of "Bounce", "Complaint", or "Delivery".
             return nil
           end
           return nil unless recipients > 0
@@ -232,15 +228,15 @@ module Sisimai::Lhost
           fieldtable = Sisimai::RFC1894.FIELDTABLE
           permessage = {}     # (Hash) Store values of each Per-Message field
 
-          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
           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
@@ -283,14 +279,14 @@ module Sisimai::Lhost
                 next unless fieldtable[o[0]]
                 v[fieldtable[o[0]]] = o[2]
 
-                next unless f == 1
+                next unless f
                 permessage[fieldtable[o[0]]] = o[2]
               end
             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'] << ' ' << e
               readslices[-1] = 'Diagnostic-Code: ' << e
             end
           end
@@ -313,16 +309,16 @@ module Sisimai::Lhost
             permessage.each_key { |a| e[a] ||= permessage[a] || '' }
 
             e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'].to_s.tr("\n", ' '))
-            if e['status'].to_s.start_with?('5.0.0', '5.1.0', '4.0.0', '4.1.0')
+            if e['status'].to_s.end_with?('.0.0', '.1.0')
               # Get other D.S.N. value from the error message
+              # 5.1.0 - Unknown address error 550-'5.7.1 ...
               errormessage = e['diagnosis']
-
-              if cv = e['diagnosis'].match(/["'](\d[.]\d[.]\d.+)['"]/)
-                # 5.1.0 - Unknown address error 550-'5.7.1 ...
-                errormessage = cv[1]
-              end
+              p1 = e['diagnosis'].index("-'");  p1 = e['diagnosis'].index('-"')  unless p1
+              p2 = e['diagnosis'].rindex("' "); p2 = e['diagnosis'].rindex('" ') unless p2
+              errormessage = e['diagnosis'][p1 + 2, p2 - p1 - 2] if p1 && p2
               e['status'] = Sisimai::SMTP::Status.find(errormessage) || e['status']
             end
+            e['replycode'] ||= Sisimai::SMTP::Reply.find(e['diagnosis'], e['status'])
 
             MessagesOf.each_key do |r|
               # Verify each regular expression of session errors
@@ -332,7 +328,7 @@ module Sisimai::Lhost
             end
           end
 
-          return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+          return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
         end # END of a parser for email message
 
       end

data/lib/sisimai/lhost/amazonworkmail.rb

@@ -1,14 +1,13 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::AmazonWorkMail parses a bounce email which created by
-  # Amazon WorkMail. Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::AmazonWorkMail parses a bounce email which created by Amazon WorkMail. Methods
+  # in the module are called from only Sisimai::Message.
   module AmazonWorkMail
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/AmazonWorkMail.pm
       require 'sisimai/lhost'
 
       # https://aws.amazon.com/workmail/
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r|^content-type:[ ]message/rfc822|.freeze
+      Boundaries = ['Content-Type: message/rfc822'].freeze
       StartingOf = { message: ['Technical report:'] }.freeze
 
       # Parse bounce messages from Amazon WorkMail
@@ -16,7 +15,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-Mailer: Amazon WorkMail
         # X-Original-Mailer: Amazon WorkMail
         # X-Ses-Outgoing: 2016.01.14-54.240.27.159
@@ -36,15 +35,15 @@ module Sisimai::Lhost
         permessage = {}     # (Hash) Store values of each Per-Message field
 
         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 message/delivery-status part
@@ -84,7 +83,7 @@ module Sisimai::Lhost
               next unless fieldtable[o[0]]
               v[fieldtable[o[0]]] = o[2]
 
-              next unless f == 1
+              next unless f
               permessage[fieldtable[o[0]]] = o[2]
             end
           end
@@ -103,7 +102,7 @@ module Sisimai::Lhost
           permessage.each_key { |a| e[a] ||= permessage[a] || '' }
 
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
-          if e['status'].to_s.start_with?('5.0.0', '5.1.0', '4.0.0', '4.1.0')
+          if e['status'].to_s.end_with?('.0.0', '.1.0')
             # Get other D.S.N. value from the error message
             errormessage = e['diagnosis']
 
@@ -114,15 +113,13 @@ module Sisimai::Lhost
             e['status'] = Sisimai::SMTP::Status.find(errormessage) || e['status']
           end
 
-          if cv = e['diagnosis'].match(/[<]([245]\d\d)[ ].+[>]/)
-            # 554 4.4.7 Message expired: unable to deliver in 840 minutes.
-            # <421 4.4.2 Connection timed out>
-            e['replycode'] = cv[1]
-          end
-          e['reason'] ||= Sisimai::SMTP::Status.name(e['status']) || ''
+          # 554 4.4.7 Message expired: unable to deliver in 840 minutes.
+          # <421 4.4.2 Connection timed out>
+          e['replycode'] = Sisimai::SMTP::Reply.find(e['diagnosis']) || ''
+          e['reason']  ||= Sisimai::SMTP::Status.name(e['status'])   || ''
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'Amazon WorkMail: https://aws.amazon.com/workmail/'; end
     end

data/lib/sisimai/lhost/aol.rb

@@ -1,13 +1,12 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::Aol parses a bounce email which created by Aol Mail.
-  # Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::Aol parses a bounce email which created by Aol Mail. Methods in the module are
+  # called from only Sisimai::Message.
   module Aol
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/Aol.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r|^Content-Type:[ ]message/rfc822|.freeze
+      Boundaries = ['Content-Type: message/rfc822'].freeze
       StartingOf = { message: ['Content-Type: message/delivery-status'] }.freeze
       MessagesOf = {
         'hostunknown' => ['Host or domain name not found'],
@@ -19,7 +18,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-AOL-IP: 192.0.2.135
         # X-AOL-VSS-INFO: 5600.1067/98281
         # X-AOL-VSS-CODE: clean
@@ -32,21 +31,20 @@ module Sisimai::Lhost
         # X-Outbound-Mail-Relay-Sender: rfc822; shironeko@aol.example.jp
         return nil unless mhead['x-aol-ip']
 
-        require 'sisimai/rfc1894'
         fieldtable = Sisimai::RFC1894.FIELDTABLE
         permessage = {}     # (Hash) Store values of each Per-Message field
 
         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
@@ -87,14 +85,14 @@ module Sisimai::Lhost
               next unless fieldtable[o[0]]
               v[fieldtable[o[0]]] = o[2]
 
-              next unless f == 1
+              next unless f
               permessage[fieldtable[o[0]]] = o[2]
             end
           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
@@ -119,7 +117,7 @@ module Sisimai::Lhost
           end
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'Aol Mail: https://www.aol.com'; end
     end

data/lib/sisimai/lhost/apachejames.rb

@@ -1,13 +1,12 @@
 module Sisimai::Lhost
-  # Sisimai::Lhost::ApacheJames parses a bounce email which created by ApacheJames.
-  # Methods in the module are called from only Sisimai::Message.
+  # Sisimai::Lhost::ApacheJames parses a bounce email which created by ApacheJames. Methods in the
+  # module are called from only Sisimai::Message.
   module ApacheJames
     class << self
-      # Imported from p5-Sisimail/lib/Sisimai/Lhost/ApacheJames.pm
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      ReBackbone = %r|^Content-Type:[ ]message/rfc822|.freeze
+      Boundaries = ['Content-Type: message/rfc822'].freeze
       StartingOf = {
         # apache-james-2.3.2/src/java/org/apache/james/transport/mailets/
         #   AbstractNotify.java|124:  out.println("Error message below:");
@@ -21,7 +20,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)
         match  = 0
         match += 1 if mhead['subject'] == '[BOUNCE]'
         match += 1 if mhead['message-id'].to_s.include?('.JavaMail.')
@@ -29,18 +28,18 @@ module Sisimai::Lhost
         return nil unless match > 0
 
         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
-        diagnostic = ''     # (String) Alternative diagnostic message
+        issuedcode = ''     # (String) Alternative diagnostic message
         subjecttxt = nil    # (String) Alternative Subject text
         gotmessage = nil    # (Boolean) Flag for error message
         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
@@ -61,23 +60,23 @@ module Sisimai::Lhost
           #   Number of lines: 64
           v = dscontents[-1]
 
-          if cv = e.match(/\A[ ][ ]RCPT[ ]TO:[ ]([^ ]+[@][^ ]+)\z/)
+          if e.start_with?('  RCPT TO: ')
             #   RCPT TO: kijitora@example.org
             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[12, e.size]
             recipients += 1
 
-          elsif cv = e.match(/\A[ ][ ]Sent[ ]date:[ ](.+)\z/)
+          elsif e.start_with?('  Sent date: ')
             #   Sent date: Thu Apr 29 01:20:50 JST 2015
-            v['date'] = cv[1]
+            v['date'] = e[13, e.size]
 
-          elsif cv = e.match(/\A[ ][ ]Subject:[ ](.+)\z/)
+          elsif e.start_with?('  Subject: ')
             #   Subject: Nyaaan
-            subjecttxt = cv[1]
+            subjecttxt = e[11, e.size]
           else
             next if gotmessage
             if v['diagnosis']
@@ -106,12 +105,11 @@ module Sisimai::Lhost
         end
         return nil unless recipients > 0
 
-        # Set the value of subjecttxt as a Subject if there is no original
-        # message in the bounce mail.
-        emailsteak[1] << ('Subject: ' << subjecttxt << "\n") unless emailsteak[1] =~ /^Subject: /
+        # Set the value of subjecttxt as a Subject if there is no original message in the bounce mail.
+        emailparts[1] << ('Subject: ' << subjecttxt << "\n") unless emailparts[1].index("\nSubject:")
 
-        dscontents.each { |e| e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'] || diagnostic) }
-        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
+        dscontents.each { |e| e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'] || issuedcode) }
+        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
       end
       def description; return 'Java Apache Mail Enterprise Server'; end
     end