Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Follow up to #2456 - removed unnessary call to Mail::Encodings.value_decode and corrected test cases

Browse source
This commit is contained in:
Billy Zhou 2019-01-30 23:58:48 +08:00
parent d6d4b6bee4
commit 0b472fae67
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/channel/email_parser.rb
View file

@ -508,7 +508,7 @@ process unprocessable_mails (tmp/unprocessable_mail/*.eml) again
h['x-any-recipient'] = h.values.select(&:present?).join(', ') h['x-any-recipient'] = h.values.select(&:present?).join(', ')
h['message_id'] = imported_fields['message-id'] h['message_id'] = imported_fields['message-id']
h['subject'] = Mail::Encodings.value_decode(imported_fields['subject']) h['subject'] = imported_fields['subject']
begin begin
h['date'] = Time.zone.parse(mail.date.to_s) || imported_fields['date'] h['date'] = Time.zone.parse(mail.date.to_s) || imported_fields['date']
rescue rescue

2
spec/models/channel/email_parser_spec.rb
View file

@ -170,7 +170,7 @@ RSpec.describe Channel::EmailParser, type: :model do
end end
it 'decode utf-8 encoded strings' do it 'decode utf-8 encoded strings' do
expect( Mail::Encodings.value_decode('=?UTF-8?Q?Personal=C3=A4nderung?=') ).to eql( 'Personaländerung' ) expect( Mail::Encodings.value_decode('=?UTF-8?Q? Personal=C3=A4nderung?=') ).to eql( ' Personaländerung' )
end end
end end
end end

2
test/data/mail/mail077.box
View file

@ -5,7 +5,7 @@ Delivered-To: box@samba.example.com
Received: from me.home (1-2-1-1.adsl.highway.example.com [1.2.1.1]) Received: from me.home (1-2-1-1.adsl.highway.example.com [1.2.1.1])
by samba.example.com (Postfix) with ESMTPSA id C96F8500D3D by samba.example.com (Postfix) with ESMTPSA id C96F8500D3D
for <info@example.com>; Thu, 3 May 2012 12:04:28 +0100 (BST) for <info@example.com>; Thu, 3 May 2012 12:04:28 +0100 (BST)
Subject: =?UTF-8?Q?Personal=C3=A4nderung?= Subject: =?UTF-8?Q? Personal=C3=A4nderung?=
From: <John.Smith@example.com> From: <John.Smith@example.com>
Content-Type: text/plain; Content-Type: text/plain;
charset=iso-8859-1 charset=iso-8859-1

2
test/data/mail/mail077.yml
View file

@ -1,2 +1,2 @@
--- !ruby/hash:ActiveSupport::HashWithIndifferentAccess --- !ruby/hash:ActiveSupport::HashWithIndifferentAccess
subject: Personaländerung subject: ' Personaländerung'