Add methods for both backends to generate a mail object from raw data.

2 files changed, 17 insertions, 0 deletions

diff --git a/lib/mail_handler/backends/mail_backend.rb b/lib/mail_handler/backends/mail_backend.rb
index ad1322923..f7dbb7624 100644
--- a/lib/mail_handler/backends/mail_backend.rb
+++ b/lib/mail_handler/backends/mail_backend.rb
@@ -7,6 +7,11 @@ module MailHandler
             def backend()
                 'Mail'
             end
+
+            def mail_from_raw_email(data)
+                Mail.new(data)
+            end
+
         end
     end
 end
\ No newline at end of file
diff --git a/lib/mail_handler/backends/tmail_backend.rb b/lib/mail_handler/backends/tmail_backend.rb
index e5bfa3f49..ff00d92df 100644
--- a/lib/mail_handler/backends/tmail_backend.rb
+++ b/lib/mail_handler/backends/tmail_backend.rb
@@ -15,6 +15,18 @@ module MailHandler
                 'TMail'
             end
 
+            # Turn raw data into a structured TMail::Mail object
+            # Documentation at http://i.loveruby.net/en/projects/tmail/doc/
+            def mail_from_raw_email(data)
+                # Hack round bug in TMail's MIME decoding.
+                # Report of TMail bug:
+                # http://rubyforge.org/tracker/index.php?func=detail&aid=21810&group_id=4512&atid=17370
+                copy_of_raw_data = data.gsub(/; boundary=\s+"/im,'; boundary="')
+                mail = TMail::Mail.parse(copy_of_raw_data)
+                mail.base64_decode
+                mail
+            end
+
         end
     end
 end
\ No newline at end of file