bounce_email 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c78d63fcf13d9a6ff01002e733528e625c5711a0
-  data.tar.gz: 5ca361001d0929091f392ec47971b542f77e5c62
+  metadata.gz: 2b8e9f25b36dce53b33d25f917cb84b495bbc3c9
+  data.tar.gz: 35776ace384b6a8f76074fcb223112d4feae01e6
 SHA512:
-  metadata.gz: d451617b7f643007b672821870aa53afad12c1e1ff74b988363b86aed857fed34c732321975014e02a979d808d59a163d071eade8d1ff0569b23060ccbc9ff75
-  data.tar.gz: c6c50ac546c1318e232facda201ef94f82cd5658688feb31ec758fd404b726fe1f98747372fd5f4a3b9dd3166b2b79a81aa6d40570d58b83f0ab33eb9395a12d
+  metadata.gz: e6ece81090252f87b3be36f0b3c86530e1dcf910cde99463977a8fa13a7d6b8c14ae0eac94b4b915d38c27dacb15c5727796cc21a36c79658c978f50fc01a67b
+  data.tar.gz: 0c4f261ede847ad967883971895d8206da080729664061d79d28c6aa58f5d63d824dd0d1903bdecc542dda9c2ed76631533a00fa8b2c11e2fb808a0a37471df3

data/HISTORY.md

@@ -1,3 +1,8 @@
+## 0.2.6
+
+* Replaced 'X-Original-To' header with 'X-Failed-Recipients' (@saghaulor, livebg/bounce_email#10)
+* Properly extract "To" from original email (@saghaulor, livebg/bounce_email#8)
+
 ## 0.2.5
 
 * Fix parsing of original mail (@saghaulor, livebg/bounce_email#6)

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/lib/bounce_email.rb

@@ -225,7 +225,7 @@ module BounceEmail
         elsif i = index_of_original_message_delimiter(mail)
           ::Mail.new(extract_original_message_after_delimiter(mail, i))
         end
-      return extract_and_assign_fields_from_original_mail(original) if original
+      return extract_and_assign_fields_from(mail, original) if original
     rescue => e
       nil
     end
@@ -241,16 +241,24 @@ module BounceEmail
       message
     end
 
-    def extract_and_assign_fields_from_original_mail(mail)
-      if mail.message_id.nil?
-        mail.add_message_id extract_field_from(mail, 'Message-ID:')
+    def extract_and_assign_fields_from(bounce, original)
+      if original.message_id.nil?
+        original.add_message_id extract_field_from(original, /^Message-ID:/)
       end
 
-      mail.from ||= extract_field_from(mail, 'From:')
-      mail.to ||= extract_field_from(mail, 'To:')
-      mail.subject ||= extract_field_from(mail, 'Subject:')
+      original.from ||= extract_field_from(original, /^From:/)
 
-      mail
+      original.to ||= (extract_original_to_field_from_header(bounce) ||
+                       extract_field_from(original, /^To:/))
+
+      original.subject ||= extract_field_from(original, /^Subject:/)
+
+      original
+    end
+
+    def extract_original_to_field_from_header(mail)
+      header = mail.header["X-Failed-Recipients"]
+      header.value if header && header.value
     end
 
     def extract_field_from(mail, field_name)

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(03 04 05 07 10 11 13 15 16 23 24)
+    multipart_mails = %w(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)
@@ -119,6 +119,18 @@ class BounceEmailTest < Test::Unit::TestCase
     end
   end
 
+  def test_original_message_with_multipart_mails_without_to_field
+    multipart_mails = %w(03 04)
+    multipart_mails.map do |file|
+      mail = File.join(File.dirname(__FILE__), 'bounces', "tt_bounce_#{file}.txt")
+      bounce = BounceEmail::Mail.new Mail.read(mail)
+      assert_not_nil bounce.original_mail
+      assert_not_nil bounce.original_mail.message_id
+      assert_equal [], bounce.original_mail.to
+      assert_not_nil bounce.original_mail.from
+    end
+  end
+
   def test_original_message_without_inline_original_message
     bounce = test_bounce('tt_bounce_01')
     assert_nil bounce.original_mail

metadata

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