sisimai 5.2.1-java → 5.4.0-java

data/lib/sisimai/lhost/exchange2003.rb

@@ -83,7 +83,7 @@ module Sisimai::Lhost
         end
         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
@@ -95,7 +95,6 @@ module Sisimai::Lhost
           'date'    => '',  # The value of "Date"
           'subject' => '',  # The value of "Subject"
         }
-        v = nil
 
         while e = bodyslices.shift do
           # Read error messages and delivery status lines from the head of the email to the previous
@@ -105,8 +104,7 @@ module Sisimai::Lhost
             readcursor |= Indicators[:deliverystatus] if e.start_with?(StartingOf[:message][0])
             next
           end
-          next if (readcursor & Indicators[:deliverystatus]) == 0
-          next if statuspart
+          next if (readcursor & Indicators[:deliverystatus]) == 0 || statuspart == true
 
           if connvalues == connheader.keys.size
             # did not reach the following recipient(s):
@@ -139,18 +137,18 @@ module Sisimai::Lhost
 
             elsif e.start_with?(' ') && e.include?('MSEXCH:')
               #     MSEXCH:IMS:KIJITORA CAT:EXAMPLE:EXCHANGE 0 (000C05A6) Unknown Recipient
-              v['diagnosis'] << e[e.index('MSEXCH:'), e.size]
+              v['diagnosis'] += e[e.index('MSEXCH:'), e.size]
             else
               next if v['msexch']
               if v['diagnosis'].start_with?('MSEXCH:')
                 # Continued from MEEXCH in the previous line
                 v['msexch'] = true
-                v['diagnosis'] << ' ' << e
+                v['diagnosis'] += " #{e}"
                 statuspart = true
               else
                 # Error message in the body part
                 v['alterrors'] ||= ''
-                v['alterrors'] << ' ' << e
+                v['alterrors'] += " #{e}"
               end
             end
           else
@@ -197,7 +195,7 @@ module Sisimai::Lhost
               # Find captured code from the error code table
               next unless ErrorCodes[r].index(capturedcode)
               e['reason'] = r
-              e['status'] = Sisimai::SMTP::Status.code(r) || ""
+              e['status'] = Sisimai::SMTP::Status.code(r)
               break
             end
             e['diagnosis'] = errormessage
@@ -208,7 +206,7 @@ module Sisimai::Lhost
             next if e["alterrors"].empty?
 
             # Copy alternative error message
-            e['diagnosis'] = e['alterrors'] + ' ' + e['diagnosis']
+            e['diagnosis'] = "#{e['alterrors']} #{e['diagnosis']}"
             e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
             e.delete('alterrors')
           end
@@ -216,9 +214,9 @@ module Sisimai::Lhost
 
         if emailparts[1].empty?
           # When original message does not included in the bounce message
-          emailparts[1] << ('From: ' << connheader['to'] << "\n")
-          emailparts[1] << ('Date: ' << connheader['date'] << "\n")
-          emailparts[1] << ('Subject: ' << connheader['subject'] << "\n")
+          emailparts[1] += "From: #{connheader['to']}\n"
+          emailparts[1] += "Date: #{connheader['date']}\n"
+          emailparts[1] += "Subject: #{connheader['subject']}\n"
         end
 
         return { 'ds' => dscontents, 'rfc822' => emailparts[1] }

data/lib/sisimai/lhost/exchange2007.rb

@@ -85,8 +85,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 == ""
+          next if (readcursor & Indicators[:deliverystatus]) == 0 || e.empty?
 
           # Diagnostic information for administrators:
           #
@@ -124,9 +123,9 @@ module Sisimai::Lhost
               if cr != "" || cs != "" || e.include?("Remote Server ")
                 # Remote Server returned '550 5.1.1 RESOLVER.ADR.RecipNotFound; not found'
                 # 3/09/2016 8:05:56 PM - Remote Server at mydomain.com (10.1.1.3) returned '550 4.4.7 QUEUE.Expired; message expired'
-                v["replycode"] = cr
-                v["status"]    = cs
-                v["diagnosis"] << e << " "
+                v["replycode"]  = cr
+                v["status"]     = cs
+                v["diagnosis"] += "#{e }"
               end
             end
           end

data/lib/sisimai/lhost/exim.rb

@@ -168,14 +168,13 @@ module Sisimai::Lhost
         require "sisimai/rfc2045"
         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
         nextcursor = false
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         boundary00 = ""     # (String) Boundary string
-        v = nil
 
         if mhead["content-type"]
           # Get the boundary string and set regular expression for matching with the boundary string.
@@ -194,8 +193,7 @@ module Sisimai::Lhost
               next unless StartingOf["frozen"].any? { |a| e.include?(a) }
             end
           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.
           #
@@ -279,7 +277,7 @@ module Sisimai::Lhost
               # Message *** has been frozen by the system filter.
               # Message *** was frozen on arrival by ACL.
               v["alterrors"] ||= ""
-              v["alterrors"] <<  e + " "
+              v["alterrors"]  += "#{e} "
             elsif boundary00 != ""
               # --NNNNNNNNNN-eximdsn-MMMMMMMMMM
               # Content-type: message/delivery-status
@@ -313,19 +311,19 @@ module Sisimai::Lhost
                 # Content-type: message/delivery-status
                 nextcursor = true if e.start_with?(StartingOf["deliverystatus"][0])
                 v["alterrors"] ||= ''
-                v["alterrors"] << e + " " unless v["alterrors"].include?(e) if e.start_with?(" ")
+                v["alterrors"]  += "#{e} " unless v["alterrors"].include?(e) if e.start_with?(" ")
               end
             else
               # There is no boundary string in $boundary00
               if dscontents.size == recipients
                 # Error message
-                v["diagnosis"] << e + "  "
+                v["diagnosis"] += "#{e} "
               else
                 # Error message when email address above does not include '@' and domain part
                 # pipe to |/path/to/prog ...
                 #   generated by kijitora@example.com
                 next unless e.start_with?("  ")
-                v["diagnosis"] << e + " "
+                v["diagnosis"] += "#{e} "
               end
             end
           end

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