diff --git a/lib/sisimai/data.rb b/lib/sisimai/data.rb index c524cf5d..08f8a06f 100644 --- a/lib/sisimai/data.rb +++ b/lib/sisimai/data.rb @@ -48,7 +48,7 @@ class Data addresser: RFC822Head[:addresser], recipient: RFC822Head[:recipient], }.freeze - ActionList = ['failed', 'delayed', 'delivered', 'relayed', 'expanded'] + ActionList = %w[failed delayed delivered relayed expanded] ActionHead = { :failure => 'failed', :expired => 'delayed', @@ -110,7 +110,7 @@ def self.make(data: nil, **argvs) rfc822data = messageobj.rfc822 fieldorder = { :recipient => [], :addresser => [] } objectlist = [] - commandset = ['EHLO', 'HELO', 'MAIL', 'RCPT', 'DATA', 'QUIT'] + commandset = %w[EHLO HELO MAIL RCPT DATA QUIT] givenorder = argvs[:order] || {} delivered1 = argvs[:delivered] || false @@ -435,7 +435,7 @@ def self.make(data: nil, **argvs) def damn data = {} @@rwaccessors.each do |e| - next if ['addresser', 'recipient', 'timestamp'].include?(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 diff --git a/lib/sisimai/message/email.rb b/lib/sisimai/message/email.rb index e721b3be..b7e27ea7 100644 --- a/lib/sisimai/message/email.rb +++ b/lib/sisimai/message/email.rb @@ -412,7 +412,7 @@ def self.parse(argvs) mesgformat = (mailheader['content-type'] || '').downcase ctencoding = (mailheader['content-transfer-encoding'] || '').downcase - if mesgformat.start_with?('text/plain;') || mesgformat.start_with?('text/html;') + if mesgformat.start_with?('text/plain;', 'text/html;') # Content-Type: text/plain; charset=UTF-8 if ctencoding == 'base64' || ctencoding == 'quoted-printable' # Content-Transfer-Encoding: base64