sisimai 4.24.1-java → 4.25.0-java

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

@@ -19,7 +19,7 @@ module Sisimai::Bite::Email
       # X-YMail-JAS: Pb65aU4VM1mei...
       # X-YMail-OSG: bTIbpDEVM1lHz...
       # X-Originating-IP: [192.0.2.9]
-      def headerlist;  return ['X-YMailISG']; end
+      def headerlist;  return %w[x-ymailisg]; end
 
       # Parse bounce messages from Yahoo! MAIL
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -62,7 +62,7 @@ module Sisimai::Bite::Email
           end
 
           if readcursor & Indicators[:'message-rfc822'] > 0
-            # After "message/rfc822"
+            # Inside of the original message part
             if e.empty?
               blanklines += 1
               break if blanklines > 1
@@ -70,7 +70,7 @@ module Sisimai::Bite::Email
             end
             rfc822list << e
           else
-            # Before "message/rfc822"
+            # Error message part
             next if (readcursor & Indicators[:deliverystatus]) == 0
             next if e.empty?
 

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

@@ -22,7 +22,7 @@ module Sisimai::Bite::Email
       # X-Yandex-Forward: 10104c00ad0726da5f37374723b1e0c8
       # X-Yandex-Queue-ID: 367D79E130D
       # X-Yandex-Sender: rfc822; shironeko@yandex.example.com
-      def headerlist;  return ['X-Yandex-Uniq']; end
+      def headerlist;  return %w[x-yandex-uniq]; end
 
       # Parse bounce messages from Yandex.Mail
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -39,6 +39,10 @@ module Sisimai::Bite::Email
         return nil unless mhead['x-yandex-uniq']
         return nil unless mhead['from'] == 'mailer-daemon@yandex.ru'
 
+        require 'sisimai/rfc1894'
+        fieldtable = Sisimai::RFC1894.FIELDTABLE
+        permessage = {}     # (Hash) Store values of each Per-Message field
+
         dscontents = [Sisimai::Bite.DELIVERYSTATUS]
         hasdivided = mbody.split("\n")
         havepassed = ['']
@@ -47,11 +51,6 @@ module Sisimai::Bite::Email
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         commandset = []     # (Array) ``in reply to * command'' list
-        connvalues = 0      # (Integer) Flag, 1 if all the value of connheader have been set
-        connheader = {
-          'date'  => '',    # The value of Arrival-Date header
-          'lhost' => '',    # The value of Reporting-MTA header
-        }
         v = nil
 
         while e = hasdivided.shift do
@@ -60,7 +59,7 @@ module Sisimai::Bite::Email
           p = havepassed[-2]
 
           if readcursor == 0
-            # Beginning of the bounce message or delivery status part
+            # Beginning of the bounce message or message/delivery-status part
             if e.start_with?(StartingOf[:message][0])
               readcursor |= Indicators[:deliverystatus]
               next
@@ -68,7 +67,7 @@ module Sisimai::Bite::Email
           end
 
           if (readcursor & Indicators[:'message-rfc822']) == 0
-            # Beginning of the original message part
+            # Beginning of the original message part(message/rfc822)
             if e.start_with?(StartingOf[:rfc822][0])
               readcursor |= Indicators[:'message-rfc822']
               next
@@ -76,7 +75,7 @@ module Sisimai::Bite::Email
           end
 
           if readcursor & Indicators[:'message-rfc822'] > 0
-            # After "message/rfc822"
+            # message/rfc822 OR text/rfc822-headers part
             if e.empty?
               blanklines += 1
               break if blanklines > 1
@@ -84,98 +83,71 @@ module Sisimai::Bite::Email
             end
             rfc822list << e
           else
-            # Before "message/rfc822"
+            # message/delivery-status part
             next if (readcursor & Indicators[:deliverystatus]) == 0
             next if e.empty?
 
-            if connvalues == connheader.keys.size
-              # Final-Recipient: rfc822; kijitora@example.jp
-              # Original-Recipient: rfc822;kijitora@example.jp
-              # Action: failed
-              # Status: 5.1.1
-              # Remote-MTA: dns; mx.example.jp
-              # Diagnostic-Code: smtp; 550 5.1.1 <kijitora@example.jp>... User Unknown
-              #
-              # --367D79E130D.1417885948/forward1h.mail.yandex.net
-              # Content-Description: Undelivered Message
-              # Content-Type: message/rfc822
+            if f = Sisimai::RFC1894.match(e)
+              # "e" matched with any field defined in RFC3464
+              next unless o = Sisimai::RFC1894.field(e)
               v = dscontents[-1]
 
-              if cv = e.match(/\AFinal-Recipient:[ ]*(?:RFC|rfc)822;[ ]*([^ ]+)\z/)
+              if o[-1] == 'addr'
                 # Final-Recipient: rfc822; kijitora@example.jp
-                if v['recipient']
-                  # There are multiple recipient addresses in the message body.
-                  dscontents << Sisimai::Bite.DELIVERYSTATUS
-                  v = dscontents[-1]
+                # X-Actual-Recipient: rfc822; kijitora@example.co.jp
+                if o[0] == 'final-recipient'
+                  # Final-Recipient: rfc822; kijitora@example.jp
+                  if v['recipient']
+                    # There are multiple recipient addresses in the message body.
+                    dscontents << Sisimai::Bite.DELIVERYSTATUS
+                    v = dscontents[-1]
+                  end
+                  v['recipient'] = o[2]
+                  recipients += 1
+                else
+                  # X-Actual-Recipient: rfc822; kijitora@example.co.jp
+                  v['alias'] = o[2]
                 end
-                v['recipient'] = cv[1]
-                recipients += 1
-
-              elsif cv = e.match(/\AAction:[ ]*(.+)\z/)
-                # Action: failed
-                v['action'] = cv[1]
-
-              elsif cv = e.match(/\AStatus:[ ]*(\d[.]\d+[.]\d+)/)
-                # Status:5.2.0
-                v['status'] = cv[1]
-
-              elsif cv = e.match(/\ARemote-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
-                # Remote-MTA: DNS; mx.example.jp
-                v['rhost'] = cv[1].downcase
+              elsif o[-1] == 'code'
+                # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
+                v['spec'] = o[1]
+                v['diagnosis'] = o[2]
               else
-                # Get error message
-                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.start_with?('Diagnostic-Code:') && cv = e.match(/\A[ \t]+(.+)\z/)
-                  # Continued line of the value of Diagnostic-Code header
-                  v['diagnosis'] << ' ' << cv[1]
-                  havepassed[-1] = 'Diagnostic-Code: ' << e
-                end
+                # Other DSN fields defined in RFC3464
+                next unless fieldtable.key?(o[0])
+                v[fieldtable[o[0]]] = o[2]
+
+                next unless f == 1
+                permessage[fieldtable[o[0]]] = o[2]
               end
             else
-              # Content-Type: message/delivery-status
-              #
-              # Reporting-MTA: dns; forward1h.mail.yandex.net
-              # 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(/\AReporting-MTA:[ ]*(?:DNS|dns);[ ]*(.+)\z/)
-                # Reporting-MTA: dns; mx.example.jp
-                next unless connheader['lhost'].empty?
-                connheader['lhost'] = cv[1].downcase
-                connvalues += 1
-
-              elsif cv = e.match(/\AArrival-Date:[ ]*(.+)\z/)
-                # Arrival-Date: Wed, 29 Apr 2009 16:03:18 +0900
-                next unless connheader['date'].empty?
-                connheader['date'] = cv[1]
-                connvalues += 1
+              # The line does not begin with a DSN field defined in RFC3464
+              if cv = e.match(/[ \t][(]in reply to .*([A-Z]{4}).*/)
+                # 5.1.1 <userunknown@example.co.jp>... User Unknown (in reply to RCPT TO
+                commandset << cv[1]
+
+              elsif cv = e.match(/([A-Z]{4})[ \t]*.*command[)]\z/)
+                # to MAIL command)
+                commandset << cv[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
-                #    command)
-                if cv = e.match(/[ \t][(]in reply to .*([A-Z]{4}).*/)
-                  # 5.1.1 <userunknown@example.co.jp>... User Unknown (in reply to RCPT TO
-                  commandset << cv[1]
-
-                elsif cv = e.match(/([A-Z]{4})[ \t]*.*command[)]\z/)
-                  # to MAIL command)
-                  commandset << cv[1]
-                end
+                # Continued line of the value of Diagnostic-Code field
+                next unless p.start_with?('Diagnostic-Code:')
+                next unless cv = e.match(/\A[ \t]+(.+)\z/)
+                v['diagnosis'] << ' ' << cv[1]
+                havepassed[-1] = 'Diagnostic-Code: ' << e
               end
             end
-          end
+          end # End of message/delivery-status
         end
         return nil unless recipients > 0
 
         dscontents.each do |e|
           # Set default values if each value is empty.
-          connheader.each_key { |a| e[a] ||= connheader[a] || '' }
+          e['lhost'] ||= permessage['rhost']
+          permessage.each_key { |a| e[a] ||= permessage[a] || '' }
+
           e['command']   = commandset.shift || ''
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'].gsub(/\\n/, ''))
+          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'].tr("\n", ' '))
           e['agent']     = self.smtpagent
         end
 

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

@@ -11,7 +11,7 @@ module Sisimai::Bite::Email
         message: ['This message was created automatically by mail delivery'],
         rfc822:  ['from mail.zoho.com by mx.zohomail.com'],
       }.freeze
-      MessagesOf = { expired: ['Host not reachable'] }.freeze
+      MessagesOf = { 'expired' => ['Host not reachable'] }.freeze
 
       def description; return 'Zoho Mail: https://www.zoho.com'; end
       def smtpagent;   return Sisimai::Bite.smtpagent(self); end
@@ -19,7 +19,7 @@ module Sisimai::Bite::Email
       # X-ZohoMail: Si CHF_MF_NL SS_10 UW48 UB48 FMWL UW48 UB48 SGR3_1_09124_42
       # X-Zoho-Virus-Status: 2
       # X-Mailer: Zoho Mail
-      def headerlist;  return ['X-ZohoMail']; end
+      def headerlist;  return %w[x-zohomail]; end
 
       # Parse bounce messages from Zoho Mail
       # @param         [Hash] mhead       Message headers of a bounce email
@@ -69,7 +69,7 @@ module Sisimai::Bite::Email
           end
 
           if readcursor & Indicators[:'message-rfc822'] > 0
-            # After "message/rfc822"
+            # Inside of the original message part
             if e.empty?
               blanklines += 1
               break if blanklines > 1
@@ -77,7 +77,7 @@ module Sisimai::Bite::Email
             end
             rfc822list << e
           else
-            # Before "message/rfc822"
+            # Error message part
             next if (readcursor & Indicators[:deliverystatus]) == 0
             next if e.empty?
 
@@ -133,12 +133,12 @@ module Sisimai::Bite::Email
 
         dscontents.each do |e|
           e['agent']     = self.smtpagent
-          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'].gsub(/\\n/, ' '))
+          e['diagnosis'] = Sisimai::String.sweep(e['diagnosis'].tr("\n", ' '))
 
           MessagesOf.each_key do |r|
             # Verify each regular expression of session errors
             next unless MessagesOf[r].any? { |a| e['diagnosis'].include?(a) }
-            e['reason'] = r.to_s
+            e['reason'] = r
             break
           end
         end

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

@@ -9,17 +9,17 @@ module Sisimai::Bite::JSON
 
       # https://docs.aws.amazon.com/en_us/ses/latest/DeveloperGuide/notification-contents.html
       BounceType = {
-        :Permanent => {
-          :General    => '',
-          :NoEmail    => '',
-          :Suppressed => '',
+        'Permanent' => {
+          'General'    => '',
+          'NoEmail'    => '',
+          'Suppressed' => '',
         },
-        :Transient => {
-          :General            => '',
-          :MailboxFull        => 'mailboxfull',
-          :MessageTooLarge    => 'mesgtoobig',
-          :ContentRejected    => '',
-          :AttachmentRejected => '',
+        'Transient' => {
+          'General'            => '',
+          'MailboxFull'        => 'mailboxfull',
+          'MessageTooLarge'    => 'mesgtoobig',
+          'ContentRejected'    => '',
+          'AttachmentRejected' => '',
         },
       }.freeze
 
@@ -54,12 +54,12 @@ module Sisimai::Bite::JSON
           break if e == '__END_OF_EMAIL_MESSAGE__'
 
           # The line starts with " ", continued from !\n.
-          e = e.lstrip if foldedline
+          e.lstrip! if foldedline
           foldedline = false
 
           if e.end_with?('!')
             # ... long long line ...![\n]
-            e = e.chomp('!')
+            e.chomp!('!')
             foldedline = true
           end
           jsonstring << e
@@ -107,15 +107,15 @@ module Sisimai::Bite::JSON
         rfc822head = {}   # (Hash) Check flags for headers in RFC822 part
         recipients = 0    # (Integer) The number of 'Final-Recipient' header
         labeltable = {
-          :Bounce    => 'bouncedRecipients',
-          :Complaint => 'complainedRecipients',
+          'Bounce'    => 'bouncedRecipients',
+          'Complaint' => 'complainedRecipients',
         }
         v = nil
 
         if %w[Bounce Complaint].index(argvs['notificationType'])
           # { "notificationType":"Bounce", "bounce": { "bounceType":"Permanent",...
           o = argvs[argvs['notificationType'].downcase].dup
-          r = o[labeltable[argvs['notificationType'].to_sym]] || []
+          r = o[labeltable[argvs['notificationType']]] || []
 
           while e = r.shift do
             # 'bouncedRecipients' => [ { 'emailAddress' => 'bounce@si...' }, ... ]
@@ -152,13 +152,13 @@ module Sisimai::Bite::JSON
               # 'reportingMTA' => 'dsn; a27-23.smtp-out.us-west-2.amazonses.com',
               if cv = o['reportingMTA'].match(/\Adsn;[ ](.+)\z/) then v['lhost'] = cv[1] end
 
-              if BounceType.key?(o['bounceType'].to_sym) &&
-                 BounceType[o['bounceType'].to_sym].key?(o['bounceSubType'].to_sym)
+              if BounceType.key?(o['bounceType']) &&
+                 BounceType[o['bounceType']].key?(o['bounceSubType'])
                 # 'bounce' => {
                 #       'bounceType' => 'Permanent',
                 #       'bounceSubType' => 'General'
                 # },
-                v['reason'] = BounceType[o['bounceType'].to_sym][o['bounceSubType'].to_sym]
+                v['reason'] = BounceType[o['bounceType']][o['bounceSubType']]
               end
             else
               # 'complainedRecipients' => [ {
@@ -197,8 +197,8 @@ module Sisimai::Bite::JSON
             v['recipient'] = e
             v['lhost']     = o['reportingMTA'] || ''
             v['diagnosis'] = o['smtpResponse'] || ''
-            v['status']    = Sisimai::SMTP::Status.find(v['diagnosis'])
-            v['replycode'] = Sisimai::SMTP::Reply.find(v['diagnosis'])
+            v['status']    = Sisimai::SMTP::Status.find(v['diagnosis']) || ''
+            v['replycode'] = Sisimai::SMTP::Reply.find(v['diagnosis'])  || ''
             v['reason']    = 'delivered'
             v['action']    = 'deliverable'
 

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

@@ -103,8 +103,8 @@ module Sisimai::Bite::JSON
             v['status'] = statuscode
           end
 
-          v['status']    ||= Sisimai::SMTP::Status.find(diagnostic)
-          v['replycode'] ||= Sisimai::SMTP::Reply.find(diagnostic)
+          v['status']    ||= Sisimai::SMTP::Status.find(diagnostic) || ''
+          v['replycode'] ||= Sisimai::SMTP::Reply.find(diagnostic)  || ''
           v['diagnosis']   = argvs['reason'] || ''
           v['agent']       = self.smtpagent
 

data/lib/sisimai/data.rb

@@ -41,7 +41,6 @@ module Sisimai
     RetryIndex = Sisimai::Reason.retry
     RFC822Head = Sisimai::RFC5322.HEADERFIELDS(:all)
     AddrHeader = { addresser: RFC822Head[:addresser], recipient: RFC822Head[:recipient] }.freeze
-    ActionHead = { failure: 'failed', expired: 'delayed' }.freeze
 
     # Constructor of Sisimai::Data
     # @param    [Hash] argvs    Data
@@ -79,7 +78,7 @@ module Sisimai
       @feedbacktype   = argvs['feedbacktype']   || ''
       @action         = argvs['action']         || ''
       @replycode      = argvs['replycode']      || ''
-      @replycode      = Sisimai::SMTP::Reply.find(argvs['diagnosticcode']) if @replycode.empty?
+      @replycode      = Sisimai::SMTP::Reply.find(argvs['diagnosticcode']).to_s if @replycode.empty?
       @softbounce     = argvs['softbounce']     || ''
     end
 
@@ -154,11 +153,11 @@ module Sisimai
         # Detect email address from message/rfc822 part
         fieldorder[:addresser].each do |f|
           # Check each header in message/rfc822 part
-          h = f.downcase
-          next unless rfc822data.key?(h)
-          next if rfc822data[h].empty?
+          next unless rfc822data.key?(f)
+          next unless rfc822data[f]
+          next if rfc822data[f].empty?
 
-          j = Sisimai::Address.find(rfc822data[h]) || []
+          j = Sisimai::Address.find(rfc822data[f]) || []
           next if j.empty?
           p['addresser'] = j[0]
           break
@@ -183,8 +182,8 @@ module Sisimai
         # Date information did not exist in message/delivery-status part,...
         RFC822Head[:date].each do |f|
           # Get the value of Date header or other date related header.
-          next unless rfc822data[f.downcase]
-          datevalues << rfc822data[f.downcase]
+          next unless rfc822data[f]
+          datevalues << rfc822data[f]
         end
 
         # Set "date" getting from the value of "Date" in the bounce message
@@ -227,23 +226,25 @@ module Sisimai
         %w[rhost lhost].each do |v|
           p[v].delete!('[]()')    # Remove square brackets and curly brackets from the host variable
           p[v].sub!(/\A.+=/, '')  # Remove string before "="
-          p[v].chomp!("\r")       # Remove CR at the end of the value
+          p[v].chomp!("\r") if p[v].end_with?("\r") # Remove CR at the end of the value
 
           # Check space character in each value and get the first element
           p[v] = p[v].split(' ', 2).shift if p[v].include?(' ')
-          p[v].chomp!('.')        # Remove "." at the end of the value
+          p[v].chomp!('.') if p[v].end_with?('.')   # Remove "." at the end of the value
         end
 
         # Subject: header of the original message
         p['subject'] = rfc822data['subject'] || ''
-        p['subject'] = p['subject'].scrub('?').chomp("\r")
+        p['subject'].scrub!('?')
+        p['subject'].chomp!("\r") if p['subject'].end_with?("\r");
 
         # The value of "List-Id" header
         p['listid'] = rfc822data['list-id'] || ''
         unless p['listid'].empty?
           # Get the value of List-Id header like "List name <list-id@example.org>"
           if cv = p['listid'].match(/\A.*([<].+[>]).*\z/) then p['listid'] = cv[1] end
-          p['listid'] = p['listid'].delete('<>').chomp("\r")
+          p['listid'].delete!('<>')
+          p['listid'].chomp!("\r") if p['listid'].end_with?("\r")
           p['listid'] = '' if p['listid'].include?(' ')
         end
 
@@ -266,13 +267,13 @@ module Sisimai
           vm = 0
           re = nil
 
-          unless vs.empty?
+          if vs
             # How many times does the D.S.N. appeared
             vm += p['diagnosticcode'].scan(/\b#{vs}\b/).size
             p['deliverystatus'] = vs if vs =~ /\A[45][.][1-9][.][1-9]\z/
           end
 
-          unless vr.empty?
+          if vr
             # How many times does the SMTP reply code appeared
             vm += p['diagnosticcode'].scan(/\b#{vr}\b/).size
             p['replycode'] ||= vr
@@ -292,26 +293,13 @@ module Sisimai
           end
         end
         p['diagnostictype'] ||= 'X-UNIX' if p['reason'] == 'mailererror'
-        p['diagnostictype'] ||= 'SMTP' unless %w[feedback vacation].index(p['reason'])
+        p['diagnostictype'] ||= 'SMTP' unless %w[feedback vacation].include?(p['reason'])
 
         # Check the value of SMTP command
-        p['smtpcommand'] = '' unless %w[EHLO HELO MAIL RCPT DATA QUIT].index(p['smtpcommand'])
-
-        # Check the value of "action"
-        if p['action'].size > 0
-          # Action: expanded (to multi-recipient alias)
-          if cv = p['action'].match(/\A(.+?) .+/) then p['action'] = cv[1] end
-
-          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.to_s
-              p['action'] = ActionHead[q]
-              break
-            end
-          end
-        else
+        p['smtpcommand'] = '' unless %w[EHLO HELO MAIL RCPT DATA QUIT].include?(p['smtpcommand'])
+
+        if p['action'].empty?
+          # Check the value of "action"
           if p['reason'] == 'expired'
             # Action: delayed
             p['action'] = 'delayed'
@@ -324,7 +312,7 @@ module Sisimai
         o = Sisimai::Data.new(p)
         next unless o.recipient
 
-        if o.reason.empty? || RetryIndex.index(o.reason)
+        if o.reason.empty? || RetryIndex.key?(o.reason)
           # Decide the reason of email bounce
           r = ''
           r = Sisimai::Rhost.get(o) if Sisimai::Rhost.match(o.rhost) # Remote host dependent error
@@ -333,7 +321,7 @@ module Sisimai
           o.reason = r
         end
 
-        if %w[delivered feedback vacation].index(o.reason)
+        if %w[delivered feedback vacation].include?(o.reason)
           # The value of reason is "vacation" or "feedback"
           o.softbounce = -1
           o.replycode = '' unless o.reason == 'delivered'
@@ -344,9 +332,8 @@ module Sisimai
 
           if o.softbounce.to_s.empty?
             # The value is not set yet
-            textasargv = (p['deliverystatus'] + ' ' + p['diagnosticcode']).lstrip
-            softorhard = Sisimai::SMTP::Error.soft_or_hard(o.reason, textasargv)
-
+            textasargv   = (p['deliverystatus'] + ' ' + p['diagnosticcode']).lstrip
+            softorhard   = Sisimai::SMTP::Error.soft_or_hard(o.reason, textasargv) || ''
             o.softbounce = if softorhard.size > 0
                              # Returned value is "soft" or "hard"
                              (softorhard == 'soft') ? 1 : 0
@@ -363,7 +350,7 @@ module Sisimai
             tmpfailure = getchecked.nil? ? false : (getchecked ? false : true)
             pseudocode = Sisimai::SMTP::Status.code(o.reason, tmpfailure)
 
-            unless pseudocode.empty?
+            if pseudocode
               # Set the value of "deliverystatus" and "softbounce"
               o.deliverystatus = pseudocode
 
@@ -399,7 +386,7 @@ module Sisimai
     def damn
       data = {}
       @@rwaccessors.each do |e|
-        next if %w[addresser recipient timestamp].index(e.to_s)
+        next if %w[addresser recipient timestamp].include?(e.to_s)
         data[e.to_s] = self.send(e) || ''
       end
       data['addresser'] = self.addresser.address
@@ -414,7 +401,7 @@ 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)
+      return nil unless %w[json yaml].include?(type)
       referclass = 'Sisimai::Data::' << type.upcase
 
       begin