bounce_email 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ce130775edb415b7fbe1bb73dd5ede660400cb3
-  data.tar.gz: 47ec5c5d48f725c357f7a25056e5b71c3533307b
+  metadata.gz: 389a9e0770cb526a74372b21a69bec34e74e2838
+  data.tar.gz: 48acb9da2dc68c2a86e3ade32ce0ddb5fcefc9f8
 SHA512:
-  metadata.gz: 959c42432cc8e1e0d321da76835bf58cec27b7bcb2a60814ffaa298ed4e2a736f19d4d1ef0d90a31ed1025e389cf93d42cf8ae835ae25640a9d9d73a49f15cc2
-  data.tar.gz: b865011fe075ab2f8aaf3d265a766c58746844c7c858f8e97e5094f018e80d9f64760b149237da001f28699294cd63071ca6ccb5918202dffb627197e61b879c
+  metadata.gz: 88e393b37a5868b299bc1551d68feb785f677f47fbe2b340e218a1c091a815fd94d07c701586fda52e084cb4153bad586e016b3f7dd46f189481f6d7e31a4866
+  data.tar.gz: 3f5c4fa7c27729d0de1e0f29ba1fcc02cfc00e11923babe6f7817e7bc4dad1ca260e1cbcc5674fd3eaec076e0a5eeaa75674866b5a300f9bdad5810f2a27a5af

data/HISTORY.md

@@ -1,3 +1,7 @@
+## 0.2.8
+
+* Properly parse the email original when it's attached in the last part of a multipart bounce email (@blainejohnson17, livebg/bounce_email#12). Read more about [the issue and the reasoning behind the fix here](https://github.com/livebg/bounce_email/pull/12#issuecomment-312431646).
+
 ## 0.2.7
 
 * Extract and save the bounced email's date field in the email original (@blainejohnson17, livebg/bounce_email#11)

data/VERSION

@@ -1 +1 @@
-0.2.7
+0.2.8

data/lib/bounce_email.rb

@@ -221,7 +221,7 @@ module BounceEmail
     def get_original_mail(mail) #worked alright for me, for sure this has to be extended
       original =
         if mail.multipart?
-          ::Mail.new(mail.parts.last)
+          ::Mail.new(mail.parts.last.body)
         elsif i = index_of_original_message_delimiter(mail)
           ::Mail.new(extract_original_message_after_delimiter(mail, i))
         end
@@ -242,19 +242,7 @@ module BounceEmail
     end
 
     def extract_and_assign_fields_from(bounce, original)
-      if original.message_id.nil?
-        original.add_message_id extract_field_from(original, /^Message-ID:/)
-      end
-
-      original.from ||= extract_field_from(original, /^From:/)
-
-      original.to ||= (extract_original_to_field_from_header(bounce) ||
-                       extract_field_from(original, /^To:/))
-
-      original.subject ||= extract_field_from(original, /^Subject:/)
-
-      original.date ||= extract_field_from(original, /^Date:/)
-
+      original.to ||= extract_original_to_field_from_header(bounce)
       original
     end
 
@@ -262,15 +250,5 @@ module BounceEmail
       header = mail.header["X-Failed-Recipients"]
       header.value if header && header.value
     end
-
-    def extract_field_from(mail, field_name)
-      lines = original_mail_body_lines(mail)
-      field = lines.detect { |line| line.match field_name }
-      field.split(':', 2).last.strip if field
-    end
-
-    def original_mail_body_lines(mail)
-      @original_mail_body_lines ||= mail.body.to_s.split(/(?:\r\n|\n)+/)
-    end
   end
 end

data/test/bounce_email_test.rb

@@ -108,7 +108,7 @@ class BounceEmailTest < Test::Unit::TestCase
   end
 
   def test_original_message_with_multipart_mails
-    multipart_mails = %w(05 07 10 11 13 15 16 23 24)
+    multipart_mails = %w(04 05 07 10 11 13 15 16 23 24)
     multipart_mails.map do |file|
       mail = File.join(File.dirname(__FILE__), 'bounces', "tt_bounce_#{file}.txt")
       bounce = BounceEmail::Mail.new Mail.read(mail)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bounce_email
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Tobias Bielohlawek
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-15 00:00:00.000000000 Z
+date: 2017-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail