sisimai 5.3.0-java → 5.4.0-java

data/lib/sisimai/fact/yaml.rb

@@ -10,8 +10,8 @@ module Sisimai
         # @param    [Sisimai::Fact] argvs Object
         # @return   [String, nil]         Dumped data or nil if the argument is missing
         def dump(argvs)
-          return nil unless argvs
-          return nil unless argvs.is_a? Sisimai::Fact
+          return "" unless argvs
+          return "" unless argvs.is_a? Sisimai::Fact
 
           damneddata = argvs.damn
           yamlstring = nil
@@ -19,7 +19,7 @@ module Sisimai
           begin
             yamlstring = ::YAML.dump(damneddata)
           rescue StandardError => ce
-            warn '***warning: Failed to YAML.dump: ' << ce.to_s
+            warn '***warning: Failed to YAML.dump: ' + ce.to_s
           end
 
           return yamlstring

data/lib/sisimai/fact.rb

@@ -48,7 +48,7 @@ module Sisimai
 
     RetryIndex = Sisimai::Reason.retry
     RFC822Head = Sisimai::RFC5322.HEADERTABLE
-    ActionList = { delayed: 1, delivered: 1, expanded: 1, failed: 1, relayed: 1 };
+    ActionList = {delayed: 1, delivered: 1, expanded: 1, failed: 1, relayed: 1};
 
     if RUBY_PLATFORM.start_with?('java')
       # [WORKAROUND] #159 #267 JRuby seems to fail and throws exception at strptime(), but this
@@ -108,7 +108,7 @@ module Sisimai
       return nil unless argvs.is_a? Hash
 
       email = argvs[:data]; return nil unless email
-      args1 = { data: email, hook: argvs[:hook] }
+      args1 = {data: email, hook: argvs[:hook]}
       mesg1 = Sisimai::Message.rise(**args1)
       return nil unless mesg1
       return nil unless mesg1['ds']
@@ -179,7 +179,7 @@ module Sisimai
         datevalues << mesg1['header']['date'] if datevalues.size < 2
         while v = datevalues.shift do
           # Parse each date value in the array
-          datestring = Sisimai::DateTime.parse(v) || next
+          datestring = Sisimai::DateTime.parse(v); next if datestring.empty?
 
           if cv = datestring.match(/\A(.+)[ ]+([-+]\d{4})\z/)
             # Get the value of timezone offset from datestring: Wed, 26 Feb 2014 06:05:48 -0500
@@ -195,7 +195,7 @@ module Sisimai
           t = TimeModule.strptime(datestring, '%a, %d %b %Y %T')
           piece['timestamp'] = (t.to_time.to_i - zoneoffset) || nil
         rescue
-          warn ' ***warning: Failed to strptime ' << datestring.to_s
+          warn " ***warning: Failed to strptime #{datestring.to_s}"
         end
         next unless piece['timestamp']
 
@@ -402,8 +402,7 @@ module Sisimai
             next unless er.include?(' for ')
 
             af = Sisimai::RFC5322.received(er)
-            next if af.empty?
-            next if af[5].empty?
+            next if af.empty? || af[5].empty?
             next unless Sisimai::Address.is_emailaddress(af[5])
             next if thing['recipient'].address == af[5]
 
@@ -434,14 +433,14 @@ module Sisimai
           thing['replycode'] = '' unless thing['reason'] == 'delivered'
         else
           # The reason is not "delivered", or "feedback", or "vacation"
-          smtperrors = piece['deliverystatus'] + ' ' << piece['diagnosticcode']
+          smtperrors = "#{piece['deliverystatus']} #{piece['diagnosticcode']}"
           smtperrors = '' if smtperrors.size < 4
           thing['hardbounce'] = Sisimai::SMTP::Failure.is_hardbounce(thing['reason'], smtperrors)
         end
 
         # DELIVERYSTATUS: Set a pseudo status code if the value of "deliverystatus" is empty
         if thing['deliverystatus'].empty?
-          smtperrors = piece['replycode'] + ' ' << piece['diagnosticcode']
+          smtperrors = "#{piece['replycode']} #{piece['diagnosticcode']}"
           smtperrors = '' if smtperrors.size < 4
           permanent0 = Sisimai::SMTP::Failure.is_permanent(smtperrors)
           temporary0 = Sisimai::SMTP::Failure.is_temporary(smtperrors)
@@ -459,7 +458,7 @@ module Sisimai
 
         unless ActionList.has_key?(thing['action'])
           # There is an action value which is not described at RFC1894
-          if ox = Sisimai::RFC1894.field('Action: ' << thing['action'])
+          if ox = Sisimai::RFC1894.field("Action: #{thing['action']}")
             # Rewrite the value of "Action:" field to the valid value
             #
             #    The syntax for the action-field is:
@@ -509,7 +508,7 @@ module Sisimai
         v['recipient']  = self.recipient.address
         v['timestamp']  = self.timestamp.to_time.to_i
 
-        # Backward compatibility until v5.2.0
+        # Backward compatibility until v5.5.0
         v["smtpagent"] = self.decodedby
         v["smtpcommand"] = self.command
         data = v
@@ -526,12 +525,12 @@ module Sisimai
     #           [Nil]           The value of the first argument is neither "json" nor "yaml"
     def dump(type = 'json')
       return nil unless %w[json yaml].include?(type)
-      referclass = 'Sisimai::Fact::' << type.upcase
+      referclass = "Sisimai::Fact::#{type.upcase}"
 
       begin
         require referclass.downcase.gsub('::', '/')
       rescue
-        warn '***warning: Failed to load' << referclass
+        warn "***warning: Failed to load #{referclass}"
       end
 
       dumpeddata = Module.const_get(referclass).dump(self)

data/lib/sisimai/lda.rb

@@ -68,9 +68,9 @@ module Sisimai
       # @param  [Sisimai::Fact] argvs Decoded email object
       # @return [String]        Bounce reason
       def find(argvs)
-        return nil if argvs.nil?
-        return ""  if argvs["diagnosticcode"].empty?
-        return ""  if argvs["command"] != "" && argvs["command"] != "DATA"
+        return "" if argvs.nil?
+        return "" if argvs["diagnosticcode"].empty?
+        return "" if argvs["command"] != "" && argvs["command"] != "DATA"
 
         deliversby = ""   # [String] Local Delivery Agent name
         reasontext = ""   # [String] Error reason

data/lib/sisimai/lhost/activehunter.rb

@@ -8,7 +8,7 @@ module Sisimai::Lhost
 
       Indicators = Sisimai::Lhost.INDICATORS
       Boundaries = ['Content-Type: message/rfc822'].freeze
-      StartingOf = { message: ['  ----- The following addresses had permanent fatal errors -----'] }.freeze
+      StartingOf = {message: ['  ----- The following addresses had permanent fatal errors -----']}.freeze
 
       # @abstract decodes the bounce message from QUALITIA Active!hunter
       # @param  [Hash] mhead    Message headers of a bounce email
@@ -20,12 +20,11 @@ module Sisimai::Lhost
         # :subject => %r/FAILURE NOTICE :/,
         return nil unless mhead['x-ahmailid']
 
-        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
             readcursor |= Indicators[:deliverystatus] if e == StartingOf[:message][0]
             next
           end
-          next if (readcursor & Indicators[:deliverystatus]) == 0
-          next if e.empty?
+          next if (readcursor & Indicators[:deliverystatus]) == 0 || e.empty?
 
           #  ----- The following addresses had permanent fatal errors -----
           #
@@ -68,7 +66,7 @@ module Sisimai::Lhost
         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 'TransWARE Active!hunter'; end
     end

data/lib/sisimai/lhost/amazonses.rb

@@ -111,7 +111,7 @@ module Sisimai::Lhost
           end
         rescue StandardError => ce
           # Something wrong in decoding JSON
-          warn ' ***warning: Failed to decode JSON: ' << ce.to_s
+          warn " ***warning: Failed to decode JSON: #{ce.to_s}"
           return nil
         end
         return nil if jsonobject.has_key?("notificationType") == false
@@ -121,10 +121,9 @@ module Sisimai::Lhost
         require "sisimai/smtp/reply"
         require "sisimai/smtp/status"
         require "sisimai/smtp/command"
-        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
+        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = dscontents[-1]
         recipients = 0  # (Integer) The number of 'Final-Recipient' header
         whatnotify = jsonobject["notificationType"][0, 1] || ""
-        v          = dscontents[-1]
 
         if whatnotify == "B"
           # "notificationType":"Bounce"
@@ -207,13 +206,13 @@ module Sisimai::Lhost
 
         cv = ""
         jsonobject["mail"]["headers"].each do |e|
-          cv << sprintf("%s: %s\n", e["name"], e["value"])
+          cv += sprintf("%s: %s\n", e["name"], e["value"])
         end
         %w[date subject].each do |e|
           next if jsonobject["mail"]["commonHeaders"].has_key?(e) == false
-          cv << sprintf("%s: %s\n", e.capitalize, jsonobject["mail"]["commonHeaders"][e])
+          cv += sprintf("%s: %s\n", e.capitalize, jsonobject["mail"]["commonHeaders"][e])
         end
-        return { "ds" => dscontents, "rfc822" => cv }
+        return {"ds" => dscontents, "rfc822" => cv}
       end
       def description; return 'Amazon SES(Sending): https://aws.amazon.com/ses/'; end
     end

data/lib/sisimai/lhost/apachejames.rb

@@ -26,13 +26,12 @@ module Sisimai::Lhost
         match += 1 if mhead["received"].any? { |a| a.include?("JAMES SMTP Server") }
         return nil unless match > 0
 
-        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
+        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]; v = dscontents[-1]
         emailparts = Sisimai::RFC5322.part(mbody, Boundaries)
         bodyslices = emailparts[0].split("\n")
         readcursor = 0                # Points the current cursor position
         recipients = 0                # The number of 'Final-Recipient' header
         alternates = ["", "", "", ""] # [Envelope-From, Header-From, Date, Subject]
-        v          = dscontents[-1]
 
         while e = bodyslices.shift do
           # Read error messages and delivery status lines from the head of the email to the previous
@@ -45,11 +44,10 @@ module Sisimai::Lhost
               readcursor |= Indicators[:deliverystatus]
               next
             end
-            v["diagnosis"] << e << " " if e != ""
+            v["diagnosis"] += "#{e }" if e != ""
             next
           end
-          next if (readcursor & Indicators[:deliverystatus]) == 0
-          next if e.empty?
+          next if (readcursor & Indicators[:deliverystatus]) == 0 || e.empty?
 
           # Message details:
           #   Subject: Nyaaan
@@ -93,16 +91,16 @@ module Sisimai::Lhost
 
         if emailparts[1].empty?
           # The original message is empty
-          emailparts[1] << sprintf("From: %s\n", alternates[1]) if alternates[1] != ""
-          emailparts[1] << sprintf("Date: %s\n", alternates[2]) if alternates[2] != ""
+          emailparts[1] += sprintf("From: %s\n", alternates[1]) if alternates[1] != ""
+          emailparts[1] += sprintf("Date: %s\n", alternates[2]) if alternates[2] != ""
         end
         if emailparts[1].include?("Return-Path: ") == false
           # Set the envelope from address as a Return-Path: header
-          emailparts[1] << sprintf("Return-Path: <%s>\n", alternates[0]) if alternates[0] != ""
+          emailparts[1] += sprintf("Return-Path: <%s>\n", alternates[0]) if alternates[0] != ""
         end
         if emailparts[1].include?("\nSubject: ") == false
           # Set the envelope from address as a Return-Path: header
-          emailparts[1] << sprintf("Subject: %s\n", alternates[3]) if alternates[3] != ""
+          emailparts[1] += sprintf("Subject: %s\n", alternates[3]) if alternates[3] != ""
         end
 
         dscontents.each { |e| e["diagnosis"] = Sisimai::String.sweep(e["diagnosis"]) }

data/lib/sisimai/lhost/biglobe.rb

@@ -26,12 +26,11 @@ module Sisimai::Lhost
         return nil unless %w[biglobe inacatv tmtv ttv].any? { |a| mhead['from'].include?('@' + a + '.ne.jp') }
         return nil unless mhead['subject'].start_with?('Returned 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
@@ -41,8 +40,7 @@ module Sisimai::Lhost
             readcursor |= Indicators[:deliverystatus] if e == 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 a MIME-encapsulated message.
           #
@@ -74,7 +72,7 @@ module Sisimai::Lhost
             recipients += 1
           else
             next if e.include?('--')
-            v['diagnosis'] << e + ' '
+            v['diagnosis'] += "#{e }"
           end
         end
         return nil unless recipients > 0

data/lib/sisimai/lhost/courier.rb

@@ -44,14 +44,13 @@ 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 = ['']
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         thecommand = ''     # (String) SMTP Command name begin with the string '>>>'
-        v = nil
 
         while e = bodyslices.shift do
           # Read error messages and delivery status lines from the head of the email to the previous
@@ -65,8 +64,7 @@ module Sisimai::Lhost
               next
             end
           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
@@ -118,8 +116,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

data/lib/sisimai/lhost/domino.rb

@@ -7,7 +7,7 @@ module Sisimai::Lhost
 
       Indicators = Sisimai::Lhost.INDICATORS
       Boundaries = ['Content-Type: message/rfc822'].freeze
-      StartingOf = { message: ['Your message'] }.freeze
+      StartingOf = {message: ['Your message']}.freeze
       MessagesOf = {
         "filtered"    => ["Cannot route mail to user"],
         "systemerror" => ["Several matches found in Domino Directory"],
@@ -33,13 +33,12 @@ 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")
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         subjecttxt = ''     # (String) 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
@@ -135,9 +134,9 @@ module Sisimai::Lhost
         end
 
         # 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].include?("\nSubject:")
+        emailparts[1] += "Subject: #{subjecttxt}\n" unless emailparts[1].include?("\nSubject:")
 
-        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
+        return {"ds" => dscontents, "rfc822" => emailparts[1]}
       end
       def description; return 'IBM Domino Server'; end
     end

data/lib/sisimai/lhost/dragonfly.rb

@@ -41,12 +41,11 @@ module Sisimai::Lhost
         return nil unless mhead['subject'].start_with?('Mail delivery failed')
         return nil unless mhead['received'].any? { |a| a.include?(' (DragonFly Mail Agent') }
 
-        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
@@ -56,8 +55,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 the DragonFly Mail Agent v0.13 at df.example.jp.
           #
@@ -81,7 +79,7 @@ module Sisimai::Lhost
             recipients += 1
           else
             # Pick the error message
-            v['diagnosis'] << ' ' << e
+            v['diagnosis'] += " #{e}"
 
             # Pick the remote hostname, and the SMTP command
             # net.c:500| snprintf(errmsg, sizeof(errmsg), "%s [%s] did not like our %s:\n%s",

data/lib/sisimai/lhost/einsundeins.rb

@@ -11,7 +11,7 @@ module Sisimai::Lhost
         message: ['This message was created automatically by mail delivery software'],
         error:   ['For the following reason:'],
       }.freeze
-      MessagesOf = { 'mesgtoobig' => ['Mail size limit exceeded'] }.freeze
+      MessagesOf = {'mesgtoobig' => ['Mail size limit exceeded']}.freeze
 
       # @abstract Decode the bounce message from 1&1
       # @param  [Hash] mhead    Message headers of a bounce email
@@ -22,12 +22,11 @@ module Sisimai::Lhost
         return nil unless mhead['from'].start_with?('"Mail Delivery System"')
         return nil unless mhead['subject'] == 'Mail delivery failed: returning message to sender'
 
-        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?
 
           # The following address failed:
           #
@@ -68,13 +66,13 @@ module Sisimai::Lhost
           else
             if v['diagnosis']
               # Get error message and append error message strings
-              v['diagnosis'] << ' ' << e
+              v['diagnosis'] += " #{e}"
             else
               # OR the following format:
               #   neko@example.fr:
               #   SMTP error from remote server for TEXT command, host: ...
               v['alterrors'] ||= ''
-              v['alterrors'] << ' ' << e
+              v['alterrors']  += " #{e}"
             end
           end
         end
@@ -110,7 +108,7 @@ module Sisimai::Lhost
           end
         end
 
-        return { 'ds' => dscontents, 'rfc822' => emailparts[1] }
+        return {"ds" => dscontents, "rfc822" => emailparts[1]}
       end
       def description; return '1&1: https://www.1und1.de'; end
     end

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