bounce_email 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fe2e41f68b363d56e006effeefda2677e50efc2
-  data.tar.gz: e49e1d1201f050555dd8698f501e24bb1e5d0c9f
+  metadata.gz: 55954008bef2210a6460404c920ccce94fdc4ae1
+  data.tar.gz: 1bd0ac6c90c0996cb20e10e32fa76f644cc6d01e
 SHA512:
-  metadata.gz: dac46158c4ec4666b8a94a2c3cde4ae426e5865e52d8e9117356f04103fe569d551a363c912f21df6fd2358867892dd9b7d20725cc27acb7424d13e752b0bd1f
-  data.tar.gz: 0fbffdd4385603a275a871f5e77471c7454364b5cc8e949869cc4300ae1aced6a0703637249c6d308db90eb2de6a8534cc93d7376e87c7958152103e004317cf
+  metadata.gz: afd0999f0c9f8f2fdf0685cc37492f5fa7c9655959fe81f9206f63ff3c06256860515203182bdbe0329dd774fd82e01f72f97568170b6d5c58a35b51710ab493
+  data.tar.gz: 8512ba0070b9110e4b4c16e977be338479ec63ef62ade88431dbf299fd3432262df9fc3f74aa69a3323dd4f6bd2b2749921f882ed858b9a1ea7743b9cf433786

data/HISTORY.md

@@ -1,3 +1,8 @@
+## 0.2.4
+
+* Parse and reassign message-ID, to, from, and subject from original mail
+  (@saghaulor, livebg/bounce_email#5)
+
 ## 0.2.3
 
 * add support for Gmail bounces (@saghaulor, livebg/bounce_email#4)

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/bounce_email.gemspec

@@ -16,12 +16,9 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  ["mail"].each do |gem|
-    s.add_dependency *gem.split(' ')
-  end
+  s.add_dependency 'mail'
 
-  ["rake"].each do |gem|
-    s.add_development_dependency *gem.split(' ')
-  end
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'test-unit'if RUBY_VERSION >= '2.2.0'
 end
 

data/lib/bounce_email.rb

@@ -219,11 +219,13 @@ module BounceEmail
     end
 
     def get_original_mail(mail) #worked alright for me, for sure this has to be extended
-      if mail.multipart?
-        ::Mail.new(mail.parts.last)
-      elsif i = index_of_original_message_delimiter(mail)
-        ::Mail.new(extract_original_message_after_delimiter(mail, i))
-      end
+      original =
+        if mail.multipart?
+          ::Mail.new(mail.parts.last)
+        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
     rescue => e
       nil
     end
@@ -237,5 +239,27 @@ module BounceEmail
       message = mail.body.to_s.split(delimiter).last
       message.split(INLINE_MESSAGE_END_DELIMITER).first.strip if message.match(INLINE_MESSAGE_END_DELIMITER)
     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:')
+      end
+
+      mail.from ||= extract_field_from(mail, 'From:')
+      mail.to ||= extract_field_from(mail, 'To:')
+      mail.subject ||= extract_field_from(mail, 'Subject:')
+
+      mail
+    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

@@ -113,6 +113,9 @@ class BounceEmailTest < Test::Unit::TestCase
       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_not_nil bounce.original_mail.to
+      assert_not_nil bounce.original_mail.from
     end
   end
 
@@ -127,9 +130,17 @@ class BounceEmailTest < Test::Unit::TestCase
       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_not_nil bounce.original_mail.to
+      assert_not_nil bounce.original_mail.from
     end
   end
 
+  def test_original_message_with_subject
+    bounce = test_bounce('tt_bounce_04')
+    assert_not_nil bounce.original_mail.subject
+  end
+
   private
 
   def load_email(name, prefix = 'fixtures')

metadata

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