sisimai 5.2.1-java → 5.4.0-java

data/lib/sisimai/lhost/mfilter.rb

@@ -22,13 +22,12 @@ module Sisimai::Lhost
         return nil unless mhead['x-mailer'].to_s == 'm-FILTER'
         return nil unless mhead['subject'] == 'failure notice'
 
-        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
+        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = nil
         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
-        markingset = { 'diagnosis' => false, 'command' => false }
-        v = nil
+        markingset = {'diagnosis' => false, 'command' => false}
 
         while e = bodyslices.shift do
           # Read error messages and delivery status lines from the head of the email to the previous
@@ -39,8 +38,7 @@ module Sisimai::Lhost
               readcursor |= Indicators[:deliverystatus]
             end
           end
-          next if (readcursor & Indicators[:deliverystatus]) == 0
-          next if e.empty?
+          next if (readcursor & Indicators[:deliverystatus]) == 0 || e.empty?
 
           # このメールは「m-FILTER」が自動的に生成して送信しています。
           # メールサーバーとの通信中、下記の理由により
@@ -111,7 +109,7 @@ module Sisimai::Lhost
             e['rhost'] = ee
           end
         end
-        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
+        return {"ds" => dscontents, "rfc822" => emailparts[1]}
       end
       def description; return 'Digital Arts m-FILTER'; end
     end

data/lib/sisimai/lhost/notes.rb

@@ -7,7 +7,7 @@ module Sisimai::Lhost
 
       Indicators = Sisimai::Lhost.INDICATORS
       Boundaries = ['------- Returned Message --------'].freeze
-      StartingOf = { message: ['------- Failure Reasons '] }.freeze
+      StartingOf = {message: ['------- Failure Reasons ']}.freeze
       MessagesOf = {
         'userunknown' => [
           'User not listed in public Name & Address Book',
@@ -24,7 +24,7 @@ module Sisimai::Lhost
       def inquire(mhead, mbody)
         return nil unless mhead['subject'].start_with?('Undeliverable message')
 
-        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
+        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = nil
         emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
         bodyslices = emailparts[0].split("\n")
         readcursor = 0      # (Integer) Points the current cursor position
@@ -32,7 +32,6 @@ module Sisimai::Lhost
         characters = ''     # (String) Character set name of the bounce mail
         removedmsg = 'MULTIBYTE CHARACTERS HAVE BEEN REMOVED'
         encodedmsg = ''
-        v = nil
 
         if mhead['content-type'].include?('charset=')
           # Get character set name, Content-Type: text/plain; charset=ISO-2022-JP
@@ -66,8 +65,7 @@ module Sisimai::Lhost
             v["recipient"] = e if v["recipient"].empty?
             recipients += 1
           else
-            next if e.empty?
-            next if e.start_with?('-')
+            next if e.empty? || e.start_with?('-')
 
             if e =~ /[^\x20-\x7e]/
               # Error message is not ISO-8859-1
@@ -83,10 +81,10 @@ module Sisimai::Lhost
                 # No character set in Content-Type header
                 encodedmsg = removedmsg
               end
-              v['diagnosis'] << encodedmsg
+              v['diagnosis'] += encodedmsg
             else
               # Error message does not include multi-byte character
-              v['diagnosis'] << e
+              v['diagnosis'] += e
             end
           end
         end
@@ -96,7 +94,7 @@ module Sisimai::Lhost
           p1 = emailparts[1].index("\nTo: ")     || -1
           p2 = emailparts[1].index("\n", p1 + 6) || -1
           if p1 > 0
-            v['recipient'] = Sisimai::Address.s3s4(emailparts[1][p1 + 5, p2 - p1 - 5]) || ''
+            v['recipient'] = Sisimai::Address.s3s4(emailparts[1][p1 + 5, p2 - p1 - 5])
             recipients += 1 unless v['recipient'].empty?
           end
         end
@@ -115,7 +113,7 @@ module Sisimai::Lhost
           end
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
+        return {"ds" => dscontents, "rfc822" => emailparts[1]}
       end
       def description; return 'Lotus Notes'; end
     end

data/lib/sisimai/lhost/opensmtpd.rb

@@ -76,12 +76,11 @@ module Sisimai::Lhost
         return nil unless mhead['from'].start_with?('Mailer Daemon <')
         return nil unless mhead['received'].any? { |a| a.include?(' (OpenSMTPD) with ') }
 
-        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
+        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = nil
         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
@@ -91,8 +90,7 @@ module Sisimai::Lhost
             readcursor |= Indicators[:deliverystatus] if e.start_with?(StartingOf[:message][0])
             next
           end
-          next if (readcursor & Indicators[:deliverystatus]) == 0
-          next if e.empty?
+          next if (readcursor & Indicators[:deliverystatus]) == 0 || e.empty?
 
           #    Hi!
           #

data/lib/sisimai/lhost/postfix.rb

@@ -38,11 +38,10 @@ module Sisimai::Lhost
           # Subject: Undelivered Mail Returned to Sender
           match = 1 if mhead['subject'] == 'Undelivered Mail Returned to Sender'
         end
-        return nil if match == 0
-        return nil if mhead['x-aol-ip']
+        return nil if match == 0 || mhead['x-aol-ip']
 
         permessage = {}     # (Hash) Store values of each Per-Message field
-        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
+        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = nil
         emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
         bodyslices = emailparts[0].split("\n")
         readslices = ['']
@@ -50,7 +49,6 @@ module Sisimai::Lhost
         nomessages = false  # (Boolean) Delivery report unavailable
         commandset = []     # (Array) ``in reply to * command'' list
         anotherset = {}     # Another error information
-        v = nil
 
         if match == 2
           # The message body starts with 'Transcript of session follows.'
@@ -104,8 +102,7 @@ module Sisimai::Lhost
               readcursor |= Indicators[:deliverystatus] if StartingOf[:message].any? { |a| Sisimai::String.aligned(e, a) }
               next
             end
-            next if (readcursor & Indicators[:deliverystatus]) == 0
-            next if e.empty?
+            next if (readcursor & Indicators[:deliverystatus]) == 0 || e.empty?
 
             f = Sisimai::RFC1894.match(e)
             if f > 0
@@ -153,12 +150,12 @@ module Sisimai::Lhost
               # 5.1.1 <userunknown@example.co.jp>... User Unknown (in reply to RCPT TO command)
               if readslices[-2].start_with?('Diagnostic-Code:') && e.include?(' ')
                 # Continued line of the value of Diagnostic-Code header
-                v['diagnosis'] << ' ' << Sisimai::String.sweep(e)
-                readslices[-1] = 'Diagnostic-Code: ' << e
+                v['diagnosis'] += " #{Sisimai::String.sweep(e)}"
+                readslices[-1]  = "Diagnostic-Code: #{e}"
 
               elsif Sisimai::String.aligned(e, ['X-Postfix-Sender:', 'rfc822;', '@'])
                 # X-Postfix-Sender: rfc822; shironeko@example.org
-                emailparts[1] << 'X-Postfix-Sender: ' << Sisimai::Address.s3s4(e[e.index(';') + 1, e.size]) << "\n"
+                emailparts[1] += "X-Postfix-Sender: #{Sisimai::Address.s3s4(e[e.index(';') + 1, e.size])}\n"
 
               else
                 # Alternative error message and recipient
@@ -166,7 +163,7 @@ module Sisimai::Lhost
                   # 5.1.1 <userunknown@example.co.jp>... User Unknown (in reply to RCPT TO
                   cv = Sisimai::SMTP::Command.find(e) || ""; commandset << cv unless cv.empty?
                   anotherset['diagnosis'] ||= ''
-                  anotherset['diagnosis'] << ' ' << e
+                  anotherset['diagnosis']  += " #{e}"
 
                 elsif Sisimai::String.aligned(e, ['<', '@', '>', '(expanded from<', '):'])
                   # <r@example.ne.jp> (expanded from <kijitora@example.org>): user ...
@@ -198,7 +195,7 @@ module Sisimai::Lhost
                   next unless anotherset['diagnosis']
                   if e.start_with?('    ')
                     #    host mx.example.jp said:...
-                    anotherset['diagnosis'] << ' ' << e[4, e.size]
+                    anotherset['diagnosis'] += " #{e[4, e.size]}"
                   end
                 end
               end

data/lib/sisimai/lhost/qmail.rb

@@ -17,7 +17,6 @@ module Sisimai::Lhost
         "Content-Type: message/rfc822",
         "Original message follows.",
       ].freeze
-      RelayedVia = [["(qmail ", "invoked for bounce)"], ["(qmail ", "invoked from ", "network)"]].freeze
       EmailTitle = [
         "failure notice", # qmail-send.c:Subject: failure notice\n\
         "Failure Notice", # Yahoo
@@ -138,17 +137,16 @@ module Sisimai::Lhost
         mhead["received"].each do |e|
           # Received: (qmail 2222 invoked for bounce);29 Apr 2017 23:34:45 +0900
           # Received: (qmail 2202 invoked from network); 29 Apr 2018 00:00:00 +0900
-          proceedsto = true if RelayedVia.any? { |a| Sisimai::String.aligned(e, a) }
+          proceedsto = true if Sisimai::String.aligned(e, ["(qmail", " invoked "])
         end
         return nil if proceedsto == false
 
         require "sisimai/smtp/command"
-        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
+        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = nil
         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
@@ -158,8 +156,7 @@ module Sisimai::Lhost
             readcursor |= Indicators[:deliverystatus] if StartingOf["message"].any? { |a| e.include?(a) }
             next
           end
-          next if (readcursor & Indicators[:deliverystatus]) == 0
-          next if e.empty?
+          next if (readcursor & Indicators[:deliverystatus]) == 0 || e.empty?
 
           # <kijitora@example.jp>:
           # 192.0.2.153 does not like recipient.
@@ -179,8 +176,8 @@ module Sisimai::Lhost
 
           elsif dscontents.size == recipients
             # Append error message
-            v["diagnosis"] << e + " "
-            v["alterrors"] = e if e.start_with?(StartingOf["error"][0])
+            v["diagnosis"] += "#{e} "
+            v["alterrors"]  = e if e.start_with?(StartingOf["error"][0])
 
             next if v["rhost"] != ""
             StartingOf["rhost"].each do |r|

data/lib/sisimai/lhost/sendmail.rb

@@ -38,7 +38,7 @@ module Sisimai::Lhost
 
         fieldtable = Sisimai::RFC1894.FIELDTABLE
         permessage = {}     # (Hash) Store values of each Per-Message field
-        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
+        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = nil
         emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
         bodyslices = emailparts[0].split("\n")
         readslices = ['']
@@ -48,7 +48,6 @@ module Sisimai::Lhost
         esmtpreply = []     # (Array) Reply from remote server on SMTP session
         sessionerr = false  # (Boolean) Flag, "true" if it is SMTP session error
         anotherset = {}     # Another error information
-        v = nil
 
         while e = bodyslices.shift do
           # Read error messages and delivery status lines from the head of the email to the previous
@@ -60,8 +59,7 @@ module Sisimai::Lhost
             readcursor |= Indicators[:deliverystatus] if e.start_with?(StartingOf[:message][0])
             next
           end
-          next if (readcursor & Indicators[:deliverystatus]) == 0
-          next if e.empty?
+          next if (readcursor & Indicators[:deliverystatus]) == 0 || e.empty?
 
           f = Sisimai::RFC1894.match(e)
           if f > 0
@@ -147,13 +145,13 @@ module Sisimai::Lhost
                     # 554 5.3.0 unknown mailer error 255
                     anotherset['status']      = cs
                     anotherset['diagnosis'] ||= ''
-                    anotherset['diagnosis'] << ' ' << e
+                    anotherset['diagnosis']  += " #{e}"
 
                   elsif e.start_with?('Message ', 'Warning: ')
                     # Message could not be delivered for too long
                     # Warning: message still undelivered after 4 hours
                     anotherset['diagnosis'] ||= ''
-                    anotherset['diagnosis'] << ' ' << e
+                    anotherset['diagnosis']  += " #{e}"
                   end
                 end
               end
@@ -161,8 +159,8 @@ module Sisimai::Lhost
               # Continued line of the value of Diagnostic-Code field
               next unless readslices[-2].start_with?('Diagnostic-Code:')
               next unless e.start_with?(' ')
-              v['diagnosis'] << ' ' << Sisimai::String.sweep(e)
-              readslices[-1] = 'Diagnostic-Code: ' << e
+              v['diagnosis'] += " #{Sisimai::String.sweep(e)}"
+              readslices[-1]  = "Diagnostic-Code: #{e}"
             end
           end
         end # End of message/delivery-status
@@ -182,8 +180,7 @@ module Sisimai::Lhost
           while true
             # Replace or append the error message in "diagnosis" with the ESMTP Reply Code when the
             # following conditions have matched
-            break if esmtpreply.empty?
-            break if recipients != 1
+            break if esmtpreply.empty? || recipients != 1
 
             e['diagnosis'] = sprintf("%s %s", esmtpreply.join(' '), e['diagnosis'])
             break

data/lib/sisimai/lhost/v5sendmail.rb

@@ -43,14 +43,13 @@ module Sisimai::Lhost
 
         require 'sisimai/rfc1123'
         require 'sisimai/smtp/command'
-        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
+        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = nil
         bodyslices = emailparts[0].split("\n")
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         anotherone = {}     # (Hash) Another error information
         remotehost = ""     # The last remote hostname
-		    curcommand = ""     # The last SMTP command
-        v = nil
+        curcommand = ""     # The last SMTP command
 
         while e = bodyslices.shift do
           # Read error messages and delivery status lines from the head of the email to the previous
@@ -60,8 +59,7 @@ module Sisimai::Lhost
             readcursor |= Indicators[:deliverystatus] if e.include?(StartingOf[:message][0])
             next
           end
-          next if (readcursor & Indicators[:deliverystatus]) == 0
-          next if e.empty?
+          next if (readcursor & Indicators[:deliverystatus]) == 0 || e.empty?
 
           #    ----- Transcript of session follows -----
           # While talking to smtp.example.com:
@@ -82,7 +80,7 @@ module Sisimai::Lhost
 
             if remotehost == ""
               # Keep error messages before "While talking to ..." line
-              anotherone[recipients] ||= ""; anotherone[recipients] << " " << e
+              anotherone[recipients] ||= ""; anotherone[recipients] += " #{e}"
               next
             end
 
@@ -90,9 +88,9 @@ module Sisimai::Lhost
               # The recipient address is the same address with the last appeared address
               # like "550 <mikeneko@example.co.jp>... User unknown"
               # Append this line to the string which is keeping error messages
-              v["diagnosis"] << " " << e
-              v["replycode"] = Sisimai::SMTP::Reply.find(e)
-              curcommand     = ""
+              v["diagnosis"] += " #{e}"
+              v["replycode"]  = Sisimai::SMTP::Reply.find(e)
+              curcommand      = ""
             else
               # The recipient address in this line differs from the last appeared address
               # or is the first recipient address in this bounce message
@@ -101,12 +99,12 @@ module Sisimai::Lhost
                 dscontents << Sisimai::Lhost.DELIVERYSTATUS
                 v = dscontents[-1]
               end
-              recipients += 1
-              v["recipient"] = cv
-              v["rhost"]     = remotehost
-              v["replycode"] = Sisimai::SMTP::Reply.find(e)
-              v["diagnosis"] << " " << e
-              v["command"]   = curcommand if v["command"].empty?
+              recipients     += 1
+              v["recipient"]  = cv
+              v["rhost"]      = remotehost
+              v["replycode"]  = Sisimai::SMTP::Reply.find(e)
+              v["diagnosis"] += " #{e}"
+              v["command"]    = curcommand if v["command"].empty?
             end
           else
             # This line does not include a recipient address
@@ -122,10 +120,10 @@ module Sisimai::Lhost
                 # >>> QUIT
                 # <<< 421 dns.example.org Sorry, unable to contact destination SMTP daemon.
                 # <<< 550 Requested User Mailbox not found. No such user here.
-                v["diagnosis"] << " " << e
+                v["diagnosis"] += " #{e}"
               else
                 # 421 Other error message
-                anotherone[recipients] ||= ""; anotherone[recipients] << " " << e
+                anotherone[recipients] ||= ""; anotherone[recipients] += " #{e}"
               end
             end
           end

data/lib/sisimai/lhost/verizon.rb

@@ -24,20 +24,17 @@ module Sisimai::Lhost
         return nil if match < 0
 
         boundaries = []
-        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
+        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = nil
         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
-        v = nil
 
         if match == 1
           # vtext.com
-          markingsof = { message: ['Error: '] }
+          markingsof = {message: ['Error: ']}
           messagesof = {
             # The attempted recipient address does not exist.
             'userunknown' => ['550 - Requested action not taken: no such user here'],
@@ -54,8 +51,7 @@ module Sisimai::Lhost
               readcursor |= Indicators[:deliverystatus] if e.start_with?(markingsof[:message][0])
               next
             end
-            next if (readcursor & Indicators[:deliverystatus]) == 0
-            next if e.empty?
+            next if (readcursor & Indicators[:deliverystatus]) == 0 || e.empty?
 
             # Message details:
             #   Subject: Test message
@@ -88,8 +84,8 @@ module Sisimai::Lhost
           end
         else
           # vzwpix.com
-          startingof = { message: ['Message could not be delivered to mobile'] }
-          messagesof = { 'userunknown' => ['No valid recipients for this MM'] }
+          startingof = {message: ['Message could not be delivered to mobile']}
+          messagesof = {'userunknown' => ['No valid recipients for this MM']}
           boundaries = [Sisimai::RFC2045.boundary(mhead['content-type'], 1)]
           emailparts = Sisimai::RFC5322.part(mbody, boundaries)
           bodyslices = emailparts[0].split("\n")
@@ -102,8 +98,7 @@ module Sisimai::Lhost
               readcursor |= Indicators[:deliverystatus] if e.start_with?(startingof[:message][0])
               next
             end
-            next if (readcursor & Indicators[:deliverystatus]) == 0
-            next if e.empty?
+            next if (readcursor & Indicators[:deliverystatus]) == 0 || e.empty?
 
             # Original Message:
             # From: kijitora <kijitora@example.jp>
@@ -138,8 +133,8 @@ module Sisimai::Lhost
         return nil unless recipients > 0
 
         # Set the value of "MAIL FROM:" and "From:"
-        emailparts[1] << ('From: '    << senderaddr << "\n") if emailparts[1].include?("\nFrom: ") == false
-        emailparts[1] << ('Subject: ' << subjecttxt << "\n") if emailparts[1].include?("\nSubject: ") == false
+        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'])
@@ -151,7 +146,7 @@ module Sisimai::Lhost
           end
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailparts[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

@@ -7,7 +7,7 @@ module Sisimai::Lhost
 
       Indicators = Sisimai::Lhost.INDICATORS
       Boundaries = ['Received: from '].freeze
-      MarkingsOf = { message: ['The original message was received at '] }.freeze
+      MarkingsOf = {message: ['The original message was received at ']}.freeze
 
       # @abstract Decodes the bounce message from Unknown MTA #1
       # @param  [Hash] mhead    Message headers of a bounce email
@@ -18,13 +18,12 @@ module Sisimai::Lhost
         return nil unless mhead['subject'].start_with?('Returned Mail: ')
         return nil unless mhead['from'].start_with?('"Mail Deliver System" ')
 
-        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
+        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = nil
         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
@@ -34,8 +33,7 @@ module Sisimai::Lhost
             readcursor |= Indicators[:deliverystatus] if e.start_with?(MarkingsOf[:message][0])
             next
           end
-          next if (readcursor & Indicators[:deliverystatus]) == 0
-          next if e.empty?
+          next if (readcursor & Indicators[:deliverystatus]) == 0 || e.empty?
 
           # The original message was received at Thu, 29 Apr 2010 23:34:45 +0900 (JST)
           # from shironeko@example.jp
@@ -70,7 +68,7 @@ module Sisimai::Lhost
           e['date']      = datestring || ''
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
+        return {"ds" => dscontents, "rfc822" => emailparts[1]}
       end
       def description; return 'Unknown MTA #1'; end
     end

data/lib/sisimai/lhost/x2.rb

@@ -7,7 +7,7 @@ module Sisimai::Lhost
 
       Indicators = Sisimai::Lhost.INDICATORS
       Boundaries = ['--- Original message follows.'].freeze
-      StartingOf = { message: ['Unable to deliver message to the following address'] }.freeze
+      StartingOf = {message: ['Unable to deliver message to the following address']}.freeze
 
       # @abstract Decodes the bounce message from Unknown MTA #2
       # @param  [Hash] mhead    Message headers of a bounce email
@@ -22,12 +22,11 @@ module Sisimai::Lhost
         match ||= 1 if mhead['subject'].start_with?('failed delivery')
         return nil unless match
 
-        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
+        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = nil
         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
@@ -37,8 +36,7 @@ module Sisimai::Lhost
             readcursor |= Indicators[:deliverystatus] if e.start_with?(StartingOf[:message][0])
             next
           end
-          next if (readcursor & Indicators[:deliverystatus]) == 0
-          next if e.empty?
+          next if (readcursor & Indicators[:deliverystatus]) == 0 || e.empty?
 
           # Message from example.com.
           # Unable to deliver message to the following address(es).
@@ -58,13 +56,13 @@ module Sisimai::Lhost
             recipients += 1
           else
             # This user doesn't have a example.com account (kijitora@example.com) [0]
-            v['diagnosis'] << ' ' << e
+            v['diagnosis'] += " #{e}"
           end
         end
         return nil unless recipients > 0
 
         dscontents.each { |e| e['diagnosis'] = Sisimai::String.sweep(e['diagnosis']) }
-        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
+        return {"ds" => dscontents, "rfc822" => emailparts[1]}
       end
       def description; return 'Unknown MTA #2'; end
     end

data/lib/sisimai/lhost/x3.rb

@@ -7,7 +7,7 @@ module Sisimai::Lhost
 
       Indicators = Sisimai::Lhost.INDICATORS
       Boundaries = ['Content-Type: message/rfc822'].freeze
-      StartingOf = { message: ['      This is an automatically generated Delivery Status Notification.'] }.freeze
+      StartingOf = {message: ['      This is an automatically generated Delivery Status Notification.']}.freeze
 
       # @abstract Decodes the bounce message from Unknown MTA #3
       # @param  [Hash] mhead    Message headers of a bounce email
@@ -34,8 +34,7 @@ module Sisimai::Lhost
             readcursor |= Indicators[:deliverystatus] if e.start_with?(StartingOf[:message][0])
             next
           end
-          next if (readcursor & Indicators[:deliverystatus]) == 0
-          next if e.empty?
+          next if (readcursor & Indicators[:deliverystatus]) == 0 || e.empty?
 
           # ============================================================================
           #      This is an automatically generated Delivery Status Notification.
@@ -87,7 +86,7 @@ module Sisimai::Lhost
           e['status']    = Sisimai::SMTP::Status.find(e['diagnosis'])
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
+        return {"ds" => dscontents, "rfc822" => emailparts[1]}
       end
       def description; return 'Unknown MTA #3'; end
     end

data/lib/sisimai/lhost/x6.rb

@@ -7,7 +7,7 @@ module Sisimai::Lhost
 
       Indicators = Sisimai::Lhost.INDICATORS
       Boundaries = ['The attachment contains the original mail headers'].freeze
-      StartingOf = { message: ['We had trouble delivering your message. Full details follow:'] }.freeze
+      StartingOf = {message: ['We had trouble delivering your message. Full details follow:']}.freeze
 
       # @abstract Decodes the bounce message from Unknown MTA #6
       # @param  [Hash] mhead    Message headers of a bounce email
@@ -18,12 +18,11 @@ module Sisimai::Lhost
       def inquire(mhead, mbody)
         return nil unless mhead['subject'].start_with?('There was an error sending your mail')
 
-        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
+        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = nil
         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
@@ -33,8 +32,7 @@ module Sisimai::Lhost
             readcursor |= Indicators[:deliverystatus] if e.start_with?(StartingOf[:message][0])
             next
           end
-          next if (readcursor & Indicators[:deliverystatus]) == 0
-          next if e.empty?
+          next if (readcursor & Indicators[:deliverystatus]) == 0 || e.empty?
 
           # We had trouble delivering your message. Full details follow:
           #
@@ -89,7 +87,7 @@ module Sisimai::Lhost
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
+        return {"ds" => dscontents, "rfc822" => emailparts[1]}
       end
       def description; return 'Unknown MTA #6'; end
     end