sisimai 4.22.3 → 4.22.4

data/lib/sisimai/bite/email/yandex.rb

@@ -6,15 +6,11 @@ module Sisimai::Bite::Email
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/Yandex.pm
       require 'sisimai/bite/email'
 
-      Re0 = {
-        :from   => %r/\Amailer-daemon[@]yandex[.]ru\z/,
-      }.freeze
-      Re1 = {
-        :begin  => %r/\AThis is the mail system at host yandex[.]ru[.]/,
-        :rfc822 => %r|\AContent-Type: message/rfc822|,
-        :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = {
+        message: ['This is the mail system at host yandex.ru.'],
+        rfc822:  ['Content-Type: message/rfc822'],
+      }.freeze
 
       def description; return 'Yandex.Mail: http://www.yandex.ru'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
@@ -27,7 +23,6 @@ module Sisimai::Bite::Email
       # X-Yandex-Queue-ID: 367D79E130D
       # X-Yandex-Sender: rfc822; shironeko@yandex.example.com
       def headerlist;  return ['X-Yandex-Uniq']; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from Yandex.Mail
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -44,7 +39,7 @@ module Sisimai::Bite::Email
         return nil unless mhead
         return nil unless mbody
         return nil unless mhead['x-yandex-uniq']
-        return nil unless mhead['from'] =~ Re0[:from]
+        return nil unless mhead['from'] == 'mailer-daemon@yandex.ru'
 
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
         hasdivided = mbody.split("\n")
@@ -61,14 +56,14 @@ module Sisimai::Bite::Email
         }
         v = nil
 
-        hasdivided.each do |e|
+        while e = hasdivided.shift do
           # Save the current line for the next loop
           havepassed << e
           p = havepassed[-2]
 
           if readcursor.zero?
             # Beginning of the bounce message or delivery status part
-            if e =~ Re1[:begin]
+            if e.start_with?(StartingOf[:message][0])
               readcursor |= Indicators[:deliverystatus]
               next
             end
@@ -76,7 +71,7 @@ module Sisimai::Bite::Email
 
           if (readcursor & Indicators[:'message-rfc822']).zero?
             # Beginning of the original message part
-            if e =~ Re1[:rfc822]
+            if e.start_with?(StartingOf[:rfc822][0])
               readcursor |= Indicators[:'message-rfc822']
               next
             end
@@ -90,7 +85,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -109,7 +103,7 @@ module Sisimai::Bite::Email
               # Content-Type: message/rfc822
               v = dscontents[-1]
 
-              if cv = e.match(/\A[Ff]inal-[Rr]ecipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/)
+              if cv = e.match(/\AFinal-Recipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/)
                 # Final-Recipient: rfc822; kijitora@example.jp
                 if v['recipient']
                   # There are multiple recipient addresses in the message body.
@@ -119,33 +113,30 @@ module Sisimai::Bite::Email
                 v['recipient'] = cv[1]
                 recipients += 1
 
-              elsif cv = e.match(/\A[Aa]ction:[ ]*(.+)\z/)
+              elsif cv = e.match(/\AAction:[ ]*(.+)\z/)
                 # Action: failed
                 v['action'] = cv[1]
 
-              elsif cv = e.match(/\A[Ss]tatus:[ ]*(\d[.]\d+[.]\d+)/)
+              elsif cv = e.match(/\AStatus:[ ]*(\d[.]\d+[.]\d+)/)
                 # Status:5.2.0
                 v['status'] = cv[1]
 
-              elsif cv = e.match(/\A[Rr]emote-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
+              elsif cv = e.match(/\ARemote-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
                 # Remote-MTA: DNS; mx.example.jp
                 v['rhost'] = cv[1].downcase
-
               else
                 # Get error message
-                if cv = e.match(/\A[Dd]iagnostic-[Cc]ode:[ ]*(.+?);[ ]*(.+)\z/)
+                if cv = e.match(/\ADiagnostic-Code:[ ]*(.+?);[ ]*(.+)\z/)
                   # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
                   v['spec'] = cv[1].upcase
                   v['diagnosis'] = cv[2]
 
-                elsif p =~ /\A[Dd]iagnostic-[Cc]ode:[ ]*/ && cv = e.match(/\A[ \t]+(.+)\z/)
+                elsif p.start_with?('Diagnostic-Code:') && cv = e.match(/\A[ \t]+(.+)\z/)
                   # Continued line of the value of Diagnostic-Code header
-                  v['diagnosis'] ||= ''
-                  v['diagnosis']  += ' ' + cv[1]
-                  havepassed[-1] = 'Diagnostic-Code: ' + e
+                  v['diagnosis'] << ' ' << cv[1]
+                  havepassed[-1] = 'Diagnostic-Code: ' << e
                 end
               end
-
             else
               # Content-Type: message/delivery-status
               #
@@ -153,18 +144,17 @@ module Sisimai::Bite::Email
               # X-Yandex-Queue-ID: 367D79E130D
               # X-Yandex-Sender: rfc822; shironeko@yandex.example.com
               # Arrival-Date: Sat,  6 Dec 2014 20:12:27 +0300 (MSK)
-              if cv = e.match(/\A[Rr]eporting-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
+              if cv = e.match(/\AReporting-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
                 # Reporting-MTA: dns; mx.example.jp
                 next if connheader['lhost'].size > 0
                 connheader['lhost'] = cv[1].downcase
                 connvalues += 1
 
-              elsif cv = e.match(/\A[Aa]rrival-[Dd]ate:[ ]*(.+)\z/)
+              elsif cv = e.match(/\AArrival-Date:[ ]*(.+)\z/)
                 # Arrival-Date: Wed, 29 Apr 2009 16:03:18 +0900
                 next if connheader['date'].size > 0
                 connheader['date'] = cv[1]
                 connvalues += 1
-
               else
                 # <kijitora@example.jp>: host mx.example.jp[192.0.2.153] said: 550
                 #    5.1.1 <kijitora@example.jp>... User Unknown (in reply to RCPT TO
@@ -179,12 +169,11 @@ module Sisimai::Bite::Email
                 end
               end
             end
-
           end
         end
         return nil if recipients.zero?
-        require 'sisimai/string'
 
+        require 'sisimai/string'
         dscontents.map do |e|
           # Set default values if each value is empty.
           connheader.each_key { |a| e[a] ||= connheader[a] || '' }

data/lib/sisimai/bite/email/zoho.rb

@@ -6,24 +6,12 @@ module Sisimai::Bite::Email
       # Imported from p5-Sisimail/lib/Sisimai/Bite/Email/Zoho.pm
       require 'sisimai/bite/email'
 
-      Re0 = {
-        :'from'     => %r/mailer-daemon[@]mail[.]zoho[.]com\z/,
-        :'subject'  => %r{\A(?:
-             Undelivered[ ]Mail[ ]Returned[ ]to[ ]Sender
-            |Mail[ ]Delivery[ ]Status[ ]Notification
-            )
-        }x,
-        :'x-mailer' => %r/\AZoho Mail\z/,
-      }.freeze
-      Re1 = {
-        :begin  => %r/\AThis message was created automatically by mail delivery/,
-        :rfc822 => %r/\AReceived:[ \t]*from mail[.]zoho[.]com/,
-        :endof  => %r/\A__END_OF_EMAIL_MESSAGE__\z/,
-      }.freeze
-      ReFailure = {
-        expired: %r/Host not reachable/
-      }.freeze
       Indicators = Sisimai::Bite::Email.INDICATORS
+      StartingOf = {
+        message: ['This message was created automatically by mail delivery'],
+        rfc822:  ['from mail.zoho.com by mx.zohomail.com'],
+      }.freeze
+      ReFailures = { expired: %r/Host not reachable/ }.freeze
 
       def description; return 'Zoho Mail: https://www.zoho.com'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
@@ -32,7 +20,6 @@ module Sisimai::Bite::Email
       # X-Zoho-Virus-Status: 2
       # X-Mailer: Zoho Mail
       def headerlist;  return ['X-ZohoMail']; end
-      def pattern;     return Re0; end
 
       # Parse bounce messages from Zoho Mail
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -48,6 +35,14 @@ module Sisimai::Bite::Email
       def scan(mhead, mbody)
         return nil unless mhead
         return nil unless mbody
+
+        # :'from'     => %r/mailer-daemon[@]mail[.]zoho[.]com\z/,
+        # :'subject'  => %r{\A(?:
+        #      Undelivered[ ]Mail[ ]Returned[ ]to[ ]Sender
+        #     |Mail[ ]Delivery[ ]Status[ ]Notification
+        #     )
+        # }x,
+        # :'x-mailer' => %r/\AZoho Mail\z/,
         return nil unless mhead['x-zohomail']
 
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
@@ -59,10 +54,10 @@ module Sisimai::Bite::Email
         qprintable = false
         v = nil
 
-        hasdivided.each do |e|
+        while e = hasdivided.shift do
           if readcursor.zero?
             # Beginning of the bounce message or delivery status part
-            if e =~ Re1[:begin]
+            if e.start_with?(StartingOf[:message][0])
               readcursor |= Indicators[:deliverystatus]
               next
             end
@@ -70,7 +65,7 @@ module Sisimai::Bite::Email
 
           if (readcursor & Indicators[:'message-rfc822']).zero?
             # Beginning of the original message part
-            if e =~ Re1[:rfc822]
+            if e.include?(StartingOf[:rfc822][0])
               readcursor |= Indicators[:'message-rfc822']
               next
             end
@@ -84,7 +79,6 @@ module Sisimai::Bite::Email
               next
             end
             rfc822list << e
-
           else
             # Before "message/rfc822"
             next if (readcursor & Indicators[:deliverystatus]).zero?
@@ -115,7 +109,7 @@ module Sisimai::Bite::Email
 
               if v['diagnosis'].end_with?('=')
                 # Quoted printable
-                v['diagnosis'] = v['diagnosis'].sub(/=\z/, '')
+                v['diagnosis'] = v['diagnosis'].chomp('=')
                 qprintable = true
               end
               recipients += 1
@@ -131,27 +125,24 @@ module Sisimai::Bite::Email
               v['recipient'] = cv[1]
               v['diagnosis'] = e
               recipients += 1
-
             else
               # Continued line
               next unless qprintable
-              v['diagnosis'] ||= ''
-              v['diagnosis']  += e
-
+              v['diagnosis'] << e
             end
           end
         end
         return nil if recipients.zero?
-        require 'sisimai/string'
 
+        require 'sisimai/string'
         dscontents.map do |e|
           e['agent']     = self.smtpagent
           e['diagnosis'] = e['diagnosis'].gsub(/\\n/, ' ')
           e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'])
 
-          ReFailure.each_key do |r|
+          ReFailures.each_key do |r|
             # Verify each regular expression of session errors
-            next unless e['diagnosis'] =~ ReFailure[r]
+            next unless e['diagnosis'] =~ ReFailures[r]
             e['reason'] = r.to_s
             break
           end

data/lib/sisimai/bite/json.rb

@@ -7,12 +7,11 @@ module Sisimai
         require 'sisimai/bite'
 
         def headerlist; return []; end
-        def pattern;    return []; end
 
         # MTA list
         # @return   [Array] MTA list with order
         def index
-          return %w|SendGrid AmazonSES|
+          return %w[SendGrid AmazonSES]
         end
 
         # Convert from JSON object to Sisimai::Message

data/lib/sisimai/bite/json/amazonses.rb

@@ -49,47 +49,45 @@ module Sisimai::Bite::JSON
         jsonthings = nil
         foldedline = false
 
-        hasdivided.each do |e|
+        while e = hasdivided.shift do
           # Find JSON string from the message body
           next if e.size.zero?
-          break if e =~ /\A[-]{2}\z/
+          break if e == '--'
           break if e == '__END_OF_EMAIL_MESSAGE__'
 
           # The line starts with " ", continued from !\n.
-          e = e.sub(/\A[ ]/, '') if foldedline
+          e = e.lstrip if foldedline
           foldedline = false
 
-          if e =~ /[!]\z/
+          if e.end_with?('!')
             # ... long long line ...![\n]
-            e = e.sub(/!\z/, '')
+            e = e.chomp('!')
             foldedline = true
           end
-          jsonstring += e
+          jsonstring << e
         end
 
         begin
-          if RUBY_PLATFORM =~ /java/
+          if RUBY_PLATFORM.include?('java')
             # java-based ruby environment like JRuby.
             require 'jrjackson'
             jsonobject = JrJackson::Json.load(jsonstring)
-            if jsonobject['Message']
-              # 'Message' => '{"notificationType":"Bounce",...
-              jsonthings = JrJackson::Json.load(jsonobject['Message'])
-            end
+
+            # 'Message' => '{"notificationType":"Bounce",...
+            jsonthings = JrJackson::Json.load(jsonobject['Message']) if jsonobject['Message']
           else
             # Matz' Ruby Implementation
             require 'oj'
             jsonobject = Oj.load(jsonstring)
-            if jsonobject['Message']
-              # 'Message' => '{"notificationType":"Bounce",...
-              jsonthings = Oj.load(jsonobject['Message'])
-            end
+
+            # 'Message' => '{"notificationType":"Bounce",...
+            jsonthings = Oj.load(jsonobject['Message']) if jsonobject['Message']
           end
           jsonthings ||= jsonobject
 
         rescue StandardError => ce
           # Something wrong in decoding JSON
-          warn sprintf(' ***warning: Failed to decode JSON: %s', ce.to_s)
+          warn ' ***warning: Failed to decode JSON: ' << ce.to_s
           return nil
         end
 
@@ -117,12 +115,12 @@ module Sisimai::Bite::JSON
         }
         v = nil
 
-        if argvs['notificationType'] =~ /\A(?:Bounce|Complaint)\z/
+        if %w[Bounce Complaint].index(argvs['notificationType'])
           # { "notificationType":"Bounce", "bounce": { "bounceType":"Permanent",...
-          o = argvs[argvs['notificationType'].downcase]
+          o = argvs[argvs['notificationType'].downcase].dup
           r = o[labeltable[argvs['notificationType'].to_sym]] || []
 
-          r.each do |e|
+          while e = r.shift do
             # 'bouncedRecipients' => [ { 'emailAddress' => 'bounce@si...' }, ... ]
             # 'complainedRecipients' => [ { 'emailAddress' => 'complaint@si...' }, ... ]
             next unless Sisimai::RFC5322.is_emailaddress(e['emailAddress'])
@@ -167,7 +165,6 @@ module Sisimai::Bite::JSON
                 # },
                 v['reason'] = BounceType[o['bounceType'].to_sym][o['bounceSubType'].to_sym]
               end
-
             else
               # 'complainedRecipients' => [ {
               #   'emailAddress' => 'complaint@simulator.amazonses.com' }, ... ],
@@ -178,16 +175,15 @@ module Sisimai::Bite::JSON
             v['date'] = o['timestamp'] || argvs['mail']['timestamp']
             v['date'] = v['date'].sub(/[.]\d+Z\z/, '')
           end
-
         elsif argvs['notificationType'] == 'Delivery'
           # { "notificationType":"Delivery", "delivery": { ...
           require 'sisimai/smtp/status'
           require 'sisimai/smtp/reply'
 
-          o = argvs['delivery']
+          o = argvs['delivery'].dup
           r = o['recipients'] || []
 
-          r.each do |e|
+          while e = r.shift do
             # 'delivery' => {
             #       'timestamp' => '2016-11-23T12:01:03.512Z',
             #       'processingTimeMillis' => 3982,
@@ -217,7 +213,6 @@ module Sisimai::Bite::JSON
             v['date'] = o['timestamp'] || argvs['mail']['timestamp']
             v['date'] = v['date'].sub(/[.]\d+Z\z/, '')
           end
-
         else
           # The value of "notificationType" is not any of "Bounce", "Complaint",
           # or "Delivery".
@@ -234,7 +229,7 @@ module Sisimai::Bite::JSON
           # "headers":[ { ...
           argvs['mail']['headers'].each do |e|
             # 'headers' => [ { 'name' => 'From', 'value' => 'neko@nyaan.jp' }, ... ],
-            next unless e['name'] =~ /\A(?:From|To|Subject|Message-ID|Date)\z/
+            next unless %w[From To Subject Message-ID Date].index(e['name'])
             rfc822head[e['name'].downcase] = e['value']
           end
         end

data/lib/sisimai/bite/json/sendgrid.rb

@@ -46,7 +46,7 @@ module Sisimai::Bite::JSON
           #   'smtp-id' => '<201709042010.v84KAQ5T032530@example.nyaan.jp>',
           #   'status' => '5.2.2'
           # },
-          return nil unless argvs['event'] =~ /\A(?:bounce|deferred|delivered|spamreport)\z/
+          return nil unless %w[bounce deferred delivered spamreport].include?(argvs['event'])
           dscontents = [Sisimai::Bite.DELIVERYSTATUS]
           diagnostic = argvs['reason']   || ''
           diagnostic = argvs['response'] || '' if diagnostic.empty?

data/lib/sisimai/data.rb

@@ -44,15 +44,8 @@ module Sisimai
     EndOfEmail = Sisimai::String.EOM
     RetryIndex = Sisimai::Reason.retry
     RFC822Head = Sisimai::RFC5322.HEADERFIELDS(:all)
-    AddrHeader = {
-      addresser: RFC822Head[:addresser],
-      recipient: RFC822Head[:recipient],
-    }.freeze
-    ActionList = %r/\A(?:failed|delayed|delivered|relayed|expanded)\z/
-    ActionHead = {
-      %r/\Afailure\z/ => 'failed',
-      %r/\Aexpired\z/ => 'delayed',
-    }.freeze
+    AddrHeader = { addresser: RFC822Head[:addresser], recipient: RFC822Head[:recipient] }.freeze
+    ActionHead = { failure: 'failed', expired: 'delayed' }.freeze
 
     # Constructor of Sisimai::Data
     # @param    [Hash] argvs    Data
@@ -64,7 +57,6 @@ module Sisimai
 
       return nil unless as.is_a? Sisimai::Address
       return nil unless ar.is_a? Sisimai::Address
-
       return nil if as.void
       return nil if ar.void
 
@@ -110,7 +102,6 @@ module Sisimai
       rfc822data = messageobj.rfc822
       fieldorder = { :recipient => [], :addresser => [] }
       objectlist = []
-      rxcommands = %r/\A(?:EHLO|HELO|MAIL|RCPT|DATA|QUIT)\z/
       givenorder = argvs[:order] || {}
       delivered1 = argvs[:delivered] || false
 
@@ -133,10 +124,10 @@ module Sisimai
 
       fieldorder.each_key do |e|
         # If the order is empty, use default order.
-        if fieldorder[e].empty?
-          # Load default order of each accessor.
-          fieldorder[e] = AddrHeader[e]
-        end
+        next if fieldorder[e].size > 0
+
+        # Load default order of each accessor.
+        fieldorder[e] = AddrHeader[e]
       end
 
       messageobj.ds.each do |e|
@@ -160,7 +151,7 @@ module Sisimai
         }
         unless delivered1
           # Skip if the value of "deliverystatus" begins with "2." such as 2.1.5
-          next if p['deliverystatus'] =~ /\A2[.]/
+          next if p['deliverystatus'].start_with?('2.')
         end
 
         # EMAIL_ADDRESS:
@@ -191,9 +182,7 @@ module Sisimai
         datestring = nil
         zoneoffset = 0
         datevalues = []
-        if e['date'] && e['date'].size > 0
-          datevalues << e['date']
-        end
+        datevalues << e['date'] if e['date'].to_s.size > 0
 
         # Date information did not exist in message/delivery-status part,...
         RFC822Head[:date].each do |f|
@@ -202,12 +191,10 @@ module Sisimai
           datevalues << rfc822data[f.downcase]
         end
 
-        if datevalues.size < 2
-          # Set "date" getting from the value of "Date" in the bounce message
-          datevalues << messageobj.header['date']
-        end
+        # Set "date" getting from the value of "Date" in the bounce message
+        datevalues << messageobj.header['date'] if datevalues.size < 2
 
-        datevalues.each do |v|
+        while v = datevalues.shift do
           # Parse each date value in the array
           datestring = Sisimai::DateTime.parse(v)
           break if datestring
@@ -229,7 +216,7 @@ module Sisimai
           t = Sisimai::Time.strptime(datestring, '%a, %d %b %Y %T')
           p['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 p['timestamp']
 
@@ -237,27 +224,24 @@ module Sisimai
         recvheader = mailheader['received'] || []
         if recvheader.size > 0
           # Get localhost and remote host name from Received header.
-          %w|lhost rhost|.each { |a| e[a] ||= '' }
+          %w[lhost rhost].each { |a| e[a] ||= '' }
           e['lhost'] = Sisimai::RFC5322.received(recvheader[0]).shift if e['lhost'].empty?
           e['rhost'] = Sisimai::RFC5322.received(recvheader[-1]).pop  if e['rhost'].empty?
         end
 
         # Remove square brackets and curly brackets from the host variable
-        %w|rhost lhost|.each do |v|
+        %w[rhost lhost].each do |v|
           p[v] = p[v].delete('[]()')    # Remove square brackets and curly brackets from the host variable
           p[v] = p[v].sub(/\A.+=/, '')  # Remove string before "="
-          p[v] = p[v].gsub(/\r\z/, '')  # Remove CR at the end of the value
+          p[v] = p[v].chomp("\r")       # Remove CR at the end of the value
 
-          # Check space character in each value
-          if p[v] =~ / /
-            # Get the first element
-            p[v] = p[v].split(' ', 2).shift
-          end
+          # Check space character in each value and get the first element
+          p[v] = p[v].split(' ', 2).shift if p[v].include?(' ')
         end
 
         # Subject: header of the original message
         p['subject'] = rfc822data['subject'] || ''
-        p['subject'] = p['subject'].scrub('?').gsub(/\r\z/, '')
+        p['subject'] = p['subject'].scrub('?').chomp("\r")
 
         # The value of "List-Id" header
         p['listid'] = rfc822data['list-id'] || ''
@@ -268,8 +252,8 @@ module Sisimai
             p['listid'] = cv[1]
           end
           p['listid'] = p['listid'].delete('<>')
-          p['listid'] = p['listid'].gsub(/\r\z/, '')
-          p['listid'] = '' if p['listid'] =~ / /
+          p['listid'] = p['listid'].chomp("\r")
+          p['listid'] = '' if p['listid'].include?(' ')
         end
 
         # The value of "Message-Id" header
@@ -280,7 +264,7 @@ module Sisimai
             p['messageid'] = cv[1]
           end
           p['messageid'] = p['messageid'].delete('<>')
-          p['messageid'] = p['messageid'].gsub(/\r\z/, '')
+          p['messageid'] = p['messageid'].chomp("\r")
         end
 
         # CHECK_DELIVERY_STATUS_VALUE:
@@ -320,10 +304,10 @@ module Sisimai
           end
         end
         p['diagnostictype'] ||= 'X-UNIX' if p['reason'] == 'mailererror'
-        p['diagnostictype'] ||= 'SMTP' unless p['reason'] =~ /\A(?:feedback|vacation)\z/
+        p['diagnostictype'] ||= 'SMTP' unless %w[feedback vacation].index(p['reason'])
 
         # Check the value of SMTP command
-        p['smtpcommand'] = '' unless p['smtpcommand'] =~ rxcommands
+        p['smtpcommand'] = '' unless %w[EHLO HELO MAIL RCPT DATA QUIT].index(p['smtpcommand'])
 
         # Check the value of "action"
         if p['action'].size > 0
@@ -332,11 +316,11 @@ module Sisimai
             p['action'] = cv[1]
           end
 
-          unless p['action'] =~ ActionList
+          unless %w[failed delayed delivered relayed expanded].index(p['action'])
             # The value of "action" is not in the following values:
             # "failed" / "delayed" / "delivered" / "relayed" / "expanded"
             ActionHead.each_key do |q|
-              next unless p['action'] =~ q
+              next unless p['action'] == q.to_s
               p['action'] = ActionHead[q]
               break
             end
@@ -345,7 +329,7 @@ module Sisimai
           if p['reason'] == 'expired'
             # Action: delayed
             p['action'] = 'delayed'
-          elsif p['deliverystatus'] =~ /\A[45]/
+          elsif p['deliverystatus'].start_with?('5', '4')
             # Action: failed
             p['action'] = 'failed'
           end
@@ -357,16 +341,13 @@ module Sisimai
         if o.reason.empty? || RetryIndex.index(o.reason)
           # Decide the reason of email bounce
           r = ''
-          if Sisimai::Rhost.match(o.rhost)
-            # Remote host dependent error
-            r = Sisimai::Rhost.get(o)
-          end
+          r = Sisimai::Rhost.get(o) if Sisimai::Rhost.match(o.rhost) # Remote host dependent error
           r = Sisimai::Reason.get(o) if r.empty?
           r = 'undefined' if r.empty?
           o.reason = r
         end
 
-        if o.reason =~ /\A(?:delivered|feedback|vacation)\z/
+        if %w[delivered feedback vacation].index(o.reason)
           # The value of reason is "vacation" or "feedback"
           o.softbounce = -1
           o.replycode = '' unless o.reason == 'delivered'
@@ -377,8 +358,8 @@ module Sisimai
 
           if o.softbounce.to_s.empty?
             # The value is not set yet
-            textasargv = sprintf('%s %s', p['deliverystatus'], p['diagnosticcode'])
-            textasargv = textasargv.gsub(/\A[ ]/, '')
+            textasargv = p['deliverystatus'] + ' ' + p['diagnosticcode']
+            textasargv = textasargv.lstrip
             softorhard = Sisimai::SMTP::Error.soft_or_hard(o.reason, textasargv)
 
             o.softbounce = if softorhard.size > 0
@@ -392,8 +373,8 @@ module Sisimai
 
           if o.deliverystatus.empty?
             # Set pseudo status code
-            textasargv = sprintf('%s %s', o.replycode, p['diagnosticcode'])
-            textasargv = textasargv.gsub(/\A[ ]/, '')
+            textasargv = o.replycode + ' ' + p['diagnosticcode']
+            textasargv = textasargv.lstrip
 
             getchecked = Sisimai::SMTP::Error.is_permanent(textasargv)
             tmpfailure = getchecked.nil? ? false : (getchecked ? false : true)
@@ -435,7 +416,7 @@ module Sisimai
     def damn
       data = {}
       @@rwaccessors.each do |e|
-        next if e.to_s =~ /(?:addresser|recipient|timestamp)/
+        next if %w[addresser recipient timestamp].index(e.to_s)
         data[e.to_s] = self.send(e) || ''
       end
       data['addresser'] = self.addresser.address
@@ -450,13 +431,13 @@ module Sisimai
     # @return   [String, Nil]   Dumped data or nil if the value of the first
     #                           argument is neither "json" nor "yaml"
     def dump(type = 'json')
-      return nil unless %w|json yaml|.index(type)
-      referclass = sprintf('Sisimai::Data::%s', type.upcase)
+      return nil unless %w[json yaml].index(type)
+      referclass = 'Sisimai::Data::' << 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)