sisimai 5.3.0 → 5.4.0

data/lib/sisimai/lhost/ezweb.rb

@@ -7,7 +7,7 @@ module Sisimai::Lhost
 
       Indicators = Sisimai::Lhost.INDICATORS
       Boundaries = ["--------------------------------------------------", "Content-Type: message/rfc822"].freeze
-      StartingOf = { message: ['The user(s) ', 'Your message ', 'Each of the following', '<'] }.freeze
+      StartingOf = {message: ['The user(s) ', 'Your message ', 'Each of the following', '<']}.freeze
       Messagesof = {
         # notaccept: ['The following recipients did not receive this message:'],
         'expired' => [
@@ -43,13 +43,12 @@ module Sisimai::Lhost
         return nil if match < 2
 
         fieldtable = Sisimai::RFC1894.FIELDTABLE
-        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
         substrings = []; Messagesof.each_value { |a| substrings << a }; substrings.flatten!
-        v = nil
 
         while e = bodyslices.shift do
           # Read error messages and delivery status lines from the head of the email to the previous
@@ -58,8 +57,7 @@ module Sisimai::Lhost
             # Beginning of the bounce message or delivery status part
             readcursor |= Indicators[:deliverystatus] if StartingOf[:message].any? { |a| e.include?(a) }
           end
-          next if (readcursor & Indicators[:deliverystatus]) == 0
-          next if e.empty?
+          next if (readcursor & Indicators[:deliverystatus]) == 0 || e.empty?
 
           # The user(s) account is disabled.
           #
@@ -85,7 +83,7 @@ module Sisimai::Lhost
               v = dscontents[-1]
             end
             v["recipient"]  = Sisimai::Address.s3s4(e[p1, p2 - p1])
-            v["diagnosis"] << " " << e
+            v["diagnosis"] += " #{e}"
             recipients += 1
 
           elsif Sisimai::RFC1894.match(e) > 0
@@ -99,22 +97,22 @@ module Sisimai::Lhost
             next if Sisimai::String.is_8bit(e)
             if e.include?(" >>> ")
               #    >>> RCPT TO:<******@ezweb.ne.jp>
-              v["command"] = Sisimai::SMTP::Command.find(e)
-              v["diagnosis"] << " " << e
+              v["command"]    = Sisimai::SMTP::Command.find(e)
+              v["diagnosis"] += " #{e}"
 
             elsif e.include?(" <<< ")
               #    <<< 550 ...
-              v["diagnosis"] << " " << e
+              v["diagnosis"] += " #{e}"
 
             else
               # Check error message
               isincluded = false
               if substrings.any? { |a| e.include?(a) }
                 # Check with regular expressions of each error
-                v["diagnosis"] << " " << e
+                v["diagnosis"] += " #{e}"
                 isincluded = true
               end
-              v["diagnosis"] << " " << e if isincluded
+              v["diagnosis"] += " #{e}" if isincluded
             end
           end
         end
@@ -148,7 +146,7 @@ module Sisimai::Lhost
           e["reason"] = "userunknown" if e["diagnosis"].start_with?("<")
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
+        return {"ds" => dscontents, "rfc822" => emailparts[1]}
       end
       def description; return 'au EZweb: http://www.au.kddi.com/mobile/'; end
     end

data/lib/sisimai/lhost/fml.rb

@@ -49,11 +49,10 @@ module Sisimai::Lhost
         return nil unless mhead['from'].include?('-admin@')
         return nil unless mhead['message-id'].index('.FML') > 1
 
-        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
+        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = nil
         emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
         bodyslices = emailparts[0].split("\n")
         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
@@ -79,7 +78,7 @@ module Sisimai::Lhost
           else
             # If you know the general guide of this list, please send mail with
             # the mail body
-            v['diagnosis'] << e
+            v['diagnosis'] += e
           end
         end
         return nil unless recipients > 0

data/lib/sisimai/lhost/gmail.rb

@@ -152,12 +152,11 @@ module Sisimai::Lhost
         return nil unless mhead['subject'].start_with?('Delivery Status Notification')
 
         require 'sisimai/address'
-        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
@@ -166,8 +165,7 @@ module Sisimai::Lhost
             # Beginning of the bounce message or delivery status part
             readcursor |= Indicators[:deliverystatus] if e.start_with?(StartingOf[:message][0])
           end
-          next if (readcursor & Indicators[:deliverystatus]) == 0
-          next if e.empty?
+          next if (readcursor & Indicators[:deliverystatus]) == 0 || e.empty?
 
           # Technical details of permanent failure:=20
           # Google tried to deliver your message, but it was rejected by the recipient =
@@ -199,7 +197,7 @@ module Sisimai::Lhost
             v['recipient'] = r
             recipients += 1
           else
-            v["diagnosis"] << e << " "
+            v["diagnosis"] += "#{e }"
           end
         end
         return nil unless recipients > 0
@@ -249,7 +247,7 @@ module Sisimai::Lhost
           # Set pseudo status code
           e['status'] = Sisimai::SMTP::Status.find(e['diagnosis'])
           next if e['status'].size == 0 || e['status'].include?('.0')
-          e['reason'] = Sisimai::SMTP::Status.name(e['status']).to_s || ''
+          e['reason'] = Sisimai::SMTP::Status.name(e['status'])
         end
 
         return { 'ds' => dscontents, 'rfc822' => emailparts[1] }

data/lib/sisimai/lhost/gmx.rb

@@ -7,8 +7,8 @@ module Sisimai::Lhost
 
       Indicators = Sisimai::Lhost.INDICATORS
       Boundaries = ['--- The header of the original message is following. ---'].freeze
-      StartingOf = { message: ['This message was created automatically by mail delivery software'] }.freeze
-      MessagesOf = { 'expired' => ['delivery retry timeout exceeded'] }.freeze
+      StartingOf = {message: ['This message was created automatically by mail delivery software']}.freeze
+      MessagesOf = {'expired' => ['delivery retry timeout exceeded']}.freeze
 
       # @abstract Decodes the bounce message from GMX
       # @param  [Hash] mhead    Message headers of a bounce email
@@ -23,12 +23,11 @@ module Sisimai::Lhost
         return nil unless mhead['x-gmx-antispam']
 
         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
@@ -38,8 +37,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 message was created automatically by mail delivery software.
           #
@@ -78,7 +76,7 @@ module Sisimai::Lhost
           else
             # Get error messages
             next if e.empty?
-            v['diagnosis']  += e + ' '
+            v['diagnosis'] += "#{e }"
           end
         end
         return nil unless recipients > 0
@@ -94,7 +92,7 @@ module Sisimai::Lhost
           end
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
+        return {"ds" => dscontents, "rfc822" => emailparts[1]}
       end
       def description; return 'GMX: https://www.gmx.net'; end
     end

data/lib/sisimai/lhost/googlegroups.rb

@@ -36,10 +36,9 @@ module Sisimai::Lhost
         # Thanks,
         #
         # Google Groups
-        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
+        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = dscontents[-1]
         emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
         recipients = 0
-        v = dscontents[-1]
 
         # * You might have spelled or formatted the group name incorrectly.
         # * The owner of the group may have removed this group.

data/lib/sisimai/lhost/googleworkspace.rb

@@ -46,11 +46,10 @@ module Sisimai::Lhost
             if e.start_with?(StartingOf[:message][0])
               # ** Message not delivered **
               readcursor |= Indicators[:deliverystatus]
-              entiremesg << e + " "
+              entiremesg += "#{e }"
             end
           end
-          next if (readcursor & Indicators[:deliverystatus]) == 0
-          next if e.empty?
+          next if (readcursor & Indicators[:deliverystatus]) == 0 || e.empty?
 
           # ** Message not delivered **
           # You're sending this from a different address or alias using the 'Send mail as' feature.
@@ -59,7 +58,7 @@ module Sisimai::Lhost
           # The response was:
           # Unspecified Error (SENT_SECOND_EHLO): Smtp server does not advertise AUTH capability
           next if e.start_with?("Content-Type: ")
-          entiremesg << e + " "
+          entiremesg += "#{e }"
         end
 
         while recipients == 0 do

data/lib/sisimai/lhost/imailserver.rb

@@ -7,7 +7,7 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Boundaries = ['Original message follows.'].freeze
-      StartingOf = { error: ['Body of message generated response:'] }.freeze
+      StartingOf = {error: ['Body of message generated response:']}.freeze
       MessagesOf = {
         'hostunknown'   => ['Unknown host'],
         'userunknown'   => ['Unknown user', 'Invalid final delivery userid'],
@@ -29,11 +29,10 @@ module Sisimai::Lhost
         match += 1 if mhead['x-mailer'].to_s.start_with?('<SMTP32 v')
         return nil unless match > 0
 
-        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
+        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = nil
         emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
         bodyslices = emailparts[0].split("\n")
         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
@@ -58,8 +57,8 @@ module Sisimai::Lhost
             recipients += 1
           else
             # Other error message text
-            v['alterrors'] << ' ' << e if v['alterrors']
-            v['alterrors'] = e if e.include?(StartingOf[:error][0])
+            v['alterrors'] += " #{e}" if v['alterrors']
+            v['alterrors']  = e if e.include?(StartingOf[:error][0])
           end
         end
         return nil unless recipients > 0
@@ -69,7 +68,7 @@ module Sisimai::Lhost
           unless e['alterrors'].to_s.empty?
             # Copy alternative error message
             e['diagnosis'] = if e['diagnosis']
-                               e['alterrors'] + ' ' + e['diagnosis']
+                               "#{e['alterrors']} #{e['diagnosis']}"
                              else
                                e['alterrors']
                              end
@@ -87,7 +86,7 @@ module Sisimai::Lhost
           end
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
+        return {"ds" => dscontents, "rfc822" => emailparts[1]}
       end
       def description; return 'IPSWITCH IMail Server'; end
     end

data/lib/sisimai/lhost/interscanmss.rb

@@ -26,11 +26,10 @@ module Sisimai::Lhost
         return nil unless match > 0
 
         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")
         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

data/lib/sisimai/lhost/kddi.rb

@@ -7,7 +7,7 @@ module Sisimai::Lhost
 
       Indicators = Sisimai::Lhost.INDICATORS
       Boundaries = ['Content-Type: message/rfc822'].freeze
-      StartingOf = { message: ['Your mail sent on:', 'Your mail attempted to be delivered on:'] }.freeze
+      StartingOf = {message: ['Your mail sent on:', 'Your mail attempted to be delivered on:']}.freeze
       MessagesOf = {
         'mailboxfull' => ['As their mailbox is full'],
         'norelaying'  => ['Due to the following SMTP relay error'],
@@ -28,12 +28,11 @@ module Sisimai::Lhost
         match += 1 if mhead['received'].any? { |a| a.include?('.au.com (') }
         return nil unless match > 0
 
-        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
@@ -43,8 +42,7 @@ module Sisimai::Lhost
             readcursor |= Indicators[:deliverystatus] if StartingOf[:message].any? { |a| e.start_with?(a) }
             next
           end
-          next if (readcursor & Indicators[:deliverystatus]) == 0
-          next if e.empty?
+          next if (readcursor & Indicators[:deliverystatus]) == 0 || e.empty?
 
           v = dscontents[-1]
           if e.include?(' Could not be delivered to: <')
@@ -66,7 +64,7 @@ module Sisimai::Lhost
             v['date'] = e[19, e.size]
           else
             #     As their mailbox is full.
-            v['diagnosis'] << e + ' ' if e.start_with?(' ')
+            v['diagnosis'] += "#{e} " if e.start_with?(' ')
           end
         end
         return nil unless recipients > 0
@@ -94,10 +92,9 @@ module Sisimai::Lhost
               end
             end
           end
-
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
+        return {"ds" => dscontents, "rfc822" => emailparts[1]}
       end
       def description; return 'au by KDDI: https://www.au.kddi.com'; end
     end

data/lib/sisimai/lhost/mailfoundry.rb

@@ -21,12 +21,11 @@ module Sisimai::Lhost
         return nil unless mhead['subject'] == 'Message delivery has failed'
         return nil unless mhead['received'].any? { |a| a.include?('(MAILFOUNDRY) id ') }
 
-        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
@@ -35,8 +34,7 @@ module Sisimai::Lhost
             # Beginning of the bounce message or delivery status part
             readcursor |= Indicators[:deliverystatus] if e.start_with?(StartingOf[:message][0])
           end
-          next if (readcursor & Indicators[:deliverystatus]) == 0
-          next if e.empty?
+          next if (readcursor & Indicators[:deliverystatus]) == 0 || e.empty?
 
           # Unable to deliver message to: <kijitora@example.org>
           # Delivery failed for the following reason:
@@ -61,9 +59,8 @@ module Sisimai::Lhost
               v['diagnosis'] = e
             else
               # Detect error message
-              next if v['diagnosis'].nil? || v['diagnosis'].empty?
-              next if e.start_with?('-')
-              v['diagnosis'] << ' ' << e
+              next if v['diagnosis'].nil? || v['diagnosis'].empty? || e.start_with?('-')
+              v['diagnosis'] += " #{e}"
             end
           end
         end

data/lib/sisimai/lhost/mailmarshalsmtp.rb

@@ -22,14 +22,12 @@ module Sisimai::Lhost
       def inquire(mhead, mbody)
         return nil unless mhead['subject'].start_with?('Undeliverable 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
         endoferror = false  # (Boolean) Flag for the end of error message
-        q = Sisimai::RFC2045.boundary(mhead['content-type'], 1); Boundaries << q if q
-        v = nil
 
         while e = bodyslices.shift do
           # Read error messages and delivery status lines from the head of the email
@@ -74,7 +72,7 @@ module Sisimai::Lhost
               # Append error messages
               endoferror = true if e.start_with?(StartingOf[:rcpts][0])
               next if endoferror
-              v['diagnosis'] << ' ' << e
+              v['diagnosis'] += " #{e}"
             else
               # Additional Information
               # ======================
@@ -89,7 +87,7 @@ module Sisimai::Lhost
               if e.start_with?('Original Sender: ')
                 # Original Sender:    <originalsender@example.com>
                 # Use this line instead of "From" header of the original message.
-                emailparts[1] << ('From: ' << e[p1 + 1, p2 - p1 - 1] << "\n")
+                emailparts[1] += ("From: #{e[p1 + 1, p2 - p1 - 1]}\n")
 
               elsif e.start_with?('Sender-MTA: ')
                 # Sender-MTA:         <10.11.12.13>
@@ -106,7 +104,7 @@ module Sisimai::Lhost
                 p2 = e.index(':')
                 cf = e[p1 + 1, p2 - p1 - 1]
                 cv = Sisimai::String.sweep(e[p2 + 1, e.size])
-                emailparts[1] << sprintf("%s: %s\n", cf, cv)
+                emailparts[1] += sprintf("%s: %s\n", cf, cv)
               end
             end
           end

data/lib/sisimai/lhost/messagingserver.rb

@@ -8,8 +8,8 @@ module Sisimai::Lhost
 
       Indicators = Sisimai::Lhost.INDICATORS
       Boundaries = ['Content-Type: message/rfc822', 'Return-path: '].freeze
-      StartingOf = { message: ['This report relates to a message you sent with the following header fields:'] }.freeze
-      MessagesOf = { 'hostunknown' => ['Illegal host/domain name found'] }.freeze
+      StartingOf = {message: ['This report relates to a message you sent with the following header fields:']}.freeze
+      MessagesOf = {'hostunknown' => ['Illegal host/domain name found']}.freeze
 
       # @abstract Decodes the bounce message from MessagingServer
       # @param  [Hash] mhead    Message headers of a bounce email
@@ -22,12 +22,11 @@ module Sisimai::Lhost
         match += 1 if mhead['subject'].start_with?('Delivery Notification: ')
         return nil unless match > 0
 
-        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?
 
           # --Boundary_(ID_0000000000000000000000)
           # Content-type: text/plain; charset=us-ascii
@@ -148,7 +146,7 @@ module Sisimai::Lhost
           end
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
+        return {"ds" => dscontents, "rfc822" => emailparts[1]}
       end
       def description; return 'Oracle Communications Messaging Server'; end
     end

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!
           #