sisimai 5.2.1-java → 5.4.0-java

data/lib/sisimai/datetime.rb

@@ -4,34 +4,7 @@ module Sisimai
     require 'date'
 
     class << self
-      BASE_D = 86400    # 1 day = 86400 sec
-      BASE_Y = 365.2425 # 1 year = 365.2425 days
-      BASE_L = 29.53059 # 1 lunar month = 29.53059 days
-
-      CONST_P = 4 * Math.atan2(1, 1)  # PI, 3.1415926535
-      CONST_E = Math.exp(1)           # e, Napier's constant
-      TZ_OFFSET = 54000               # Max time zone offset, 54000 seconds
-
-      TimeUnit = {
-        'o' => (BASE_D * BASE_Y * 4), # Olympiad, 4 years
-        'y' => (BASE_D * BASE_Y),     # Year, Gregorian Calendar
-        'q' => (BASE_D * BASE_Y / 4), # Quarter, year/4
-        'l' => (BASE_D * BASE_L),     # Lunar month
-        'f' => (BASE_D * 14),         # Fortnight, 2 weeks
-        'w' => (BASE_D * 7),          # Week, 604800 seconds
-        'd' => BASE_D,                # Day
-        'h' => 3600,                  # Hour
-        'b' => 86.4,                  # Beat, Swatch internet time: 1000b = 1d
-        'm' => 60,                    # Minute,
-        's' => 1,                     # Second
-      }.freeze
-
-      MathematicalConstant = {
-        'e' => CONST_E,
-        'p' => CONST_P,
-        'g' => CONST_E**CONST_P,
-      }.freeze
-
+      TZ_OFFSET = 54000 # Max time zone offset, 54000 seconds
       MonthName = {
         full: %w[January February March April May June July August September October November December],
         abbr: %w[Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec],
@@ -191,12 +164,9 @@ module Sisimai
       #   parse("2015-11-03T23:34:45 Tue")    #=> Tue, 3 Nov 2015 23:34:45 +0900
       #   parse("Tue, Nov 3 2015 2:2:2")      #=> Tue, 3 Nov 2015 02:02:02 +0900
       def parse(argv1)
-        return nil unless argv1.is_a?(::String)
-        return nil if argv1.empty?
+        return "" if argv1.is_a?(::String) == false || argv1.empty?
 
-        datestring = argv1
-        datestring.sub!(/[,](\d+)/, ', \1') # Thu,13 -> Thu, 13
-        datestring.sub!(/(\d{1,2}),/, '\1') # Apr,29 -> Apr 29
+        datestring = argv1.sub(/[,](\d+)/, ', \1').sub(/(\d{1,2}),/, '\1')
         timetokens = datestring.split(' ')
         afternoon1 = 0    # (Integer) After noon flag
         altervalue = {}   # (Hash) To store alternative values
@@ -267,7 +237,7 @@ module Sisimai
 
             elsif p =~ /\A[(]?[A-Z]{2,5}[)]?\z/
               # Timezone abbreviation; JST, GMT, UTC, ...
-              v[:z] ||= abbr2tz(p) || '+0000'
+              v[:z] ||= abbr2tz(p); v[:z] = "+0000" if v[:z].empty?
             else
               # Other date format
               if cr = p.match(%r|\A(\d{4})[-/](\d{1,2})[-/](\d{1,2})\z|)
@@ -333,13 +303,9 @@ module Sisimai
         if v.value?(nil)
           # Strange date format
           warn sprintf(' ***warning: Strange date format [%s]', datestring)
-          return nil
-        end
-
-        if v[:Y].to_i < 1902 || v[:Y].to_i > 2037
-          # -(2^31) ~ (2^31)
-          return nil
+          return ""
         end
+        return "" if v[:Y].to_i < 1902 || v[:Y].to_i > 2037 # -(2^31) ~ (2^31)
 
         # Build date string
         #   Thu, 29 Apr 2004 10:01:11 +0900
@@ -348,23 +314,23 @@ module Sisimai
 
       # Abbreviation -> Tiemzone
       # @param    [String] argv1  Abbr. e.g.) JST, GMT, PDT
-      # @return   [String, Nil]   +0900, +0000, -0600 or nil if the argument is invalid format or
-      #                           not supported abbreviation
+      # @return   [String]        +0900, +0000, -0600 or an empty string if the argument is invalid
+      #                           format or not supported abbreviation
       # @example  Get the timezone string of "JST"
       #   abbr2tz('JST')  #=> '+0900'
       def abbr2tz(argv1)
-        return nil unless argv1.is_a?(::String)
-        return TimeZones[argv1]
+        return "" if argv1.is_a?(::String) == false
+        return TimeZones[argv1] || ""
       end
 
       # Convert to second
       # @param    [String] argv1  Timezone string e.g) +0900
-      # @return   [Integer, Nil]  n: seconds or nil it the argument is invalid format string
+      # @return   [Integer]       n: seconds or 0 when the argument is invalid format
       # @see      second2tz
       # @example  Convert '+0900' to seconds
       #   tz2second('+0900')  #=> 32400
       def tz2second(argv1)
-        return nil unless argv1.is_a?(::String)
+        return 0 if argv1.is_a?(::String) == false
         ztime = 0
 
         if cr = argv1.match(/\A([-+])(\d)(\d)(\d{2})\z/)
@@ -378,13 +344,13 @@ module Sisimai
           ztime += (digit[:'minutes'] * 60)
           ztime *= -1 if digit[:'operator'] == '-'
 
-          return nil if ztime.abs > TZ_OFFSET
+          return 0 if ztime.abs > TZ_OFFSET
           return ztime
 
         elsif argv1 =~ /\A[A-Za-z]+\z/
           return tz2second(TimeZones[argv1])
         else
-          return nil
+          return 0
         end
       end
 
@@ -396,9 +362,9 @@ module Sisimai
       #   second2tz(12345)    #=> '+0325'
       def second2tz(argv1)
         return '+0000' unless argv1.is_a?(::Integer)
-        return nil if argv1.abs > TZ_OFFSET  # UTC+14 + 1(DST?)
+        return "" if argv1.abs > TZ_OFFSET  # UTC+14 + 1(DST?)
 
-        digit = { :operator => '+' }
+        digit = {:operator => '+'}
         digit[:operator] = '-' if argv1 < 0
         digit[:hours]    = (argv1.abs / 3600).to_i
         digit[:minutes]  = ((argv1.abs % 3600) / 60).to_i

data/lib/sisimai/fact/json.rb

@@ -6,10 +6,10 @@ module Sisimai
       class << self
         # Serializer (JSON)
         # @param    [Sisimai::Fact] argvs Object
-        # @return   [String, nil]         Dumped data or nil if the argument is missing
+        # @return   [String]              Dumped data or an empty string 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
 
           if RUBY_PLATFORM.start_with?('java')
             # java-based ruby environment like JRuby.
@@ -17,7 +17,7 @@ module Sisimai
               require 'jrjackson'
               jsonstring = JrJackson::Json.dump(argvs.damn)
             rescue StandardError => ce
-              warn '***warning: Failed to JrJackson::Json.dump: ' << ce.to_s
+              warn '***warning: Failed to JrJackson::Json.dump: ' + ce.to_s
             end
           else
             # MRI
@@ -25,7 +25,7 @@ module Sisimai
               require 'oj'
               jsonstring = Oj.dump(argvs.damn, :mode => :compat)
             rescue StandardError => ce
-              warn '***warning: Failed to Oj.dump: ' << ce.to_s
+              warn '***warning: Failed to Oj.dump: ' + ce.to_s
             end
           end
 

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:
@@ -473,6 +472,16 @@ module Sisimai
         thing["action"] = "delayed"   if thing["action"].empty? && thing["reason"] == "expired"
         thing["action"] = "failed"    if thing["action"].empty? && cx[0] == "4" || cx[0] == "5"
 
+        if thing["replycode"].size > 0
+          # Fill empty values: ["SMTP Command", "DSN", "Reason"]
+          cv = Sisimai::SMTP::Reply.associatedwith(thing["replycode"])
+          if cv.size > 0
+            thing["command"]        = cv[0] if cv[0] != "" && thing["command"].empty?
+            thing["deliverystatus"] = cv[1] if cv[1] != "" && Sisimai::SMTP::Status.is_explicit(thing["deliverystatus"]) == false
+            thing["reason"]         = cv[2] if cv[2] != "" && Sisimai::Reason.is_explicit(thing["reason"]) == false
+          end
+        end
+
         # Feedback-ID: 1.us-west-2.QHuyeCQrGtIIMGKQfVdUhP9hCQR2LglVOrRamBc+Prk=:AmazonSES
         thing["feedbackid"] = rfc822data["feedback-id"] || ""
 
@@ -499,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
@@ -516,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