astrotrain 0.5.4 → 0.6.0

data/lib/astrotrain/transports/http_post.rb

@@ -0,0 +1,67 @@
+module Astrotrain
+  module Transports
+    module HttpPost
+      Astrotrain::Transports::MAP.update \
+        :http  => self,
+        :https => self
+
+      class << self
+        attr_writer :connection
+      end
+
+      def self.connection
+        @connection ||= Faraday.default_connection
+      end
+
+      # Public: Sends the message to the given address.
+      #
+      # message   - Astrotrain::Message instance
+      # url       - String address of the recipient service
+      # options   - Optional Hash:
+      #             :recipient - String email of the main recipient
+      #             :extra     - Hash to be merged with the payload
+      #
+      # Returns a RestClient::Response object for responses between 200..206
+      # Raises RestClient::Exception for any code not between 200..206 or
+      # 301..302
+      def self.deliver(message, url, options = {})
+        recipient = options[:recipient] || message.recipients.first
+        payload   = create_hash(message, recipient)
+        if extra = options[:extra]
+          payload.update(extra)
+        end
+        connection.post(url, payload)
+      end
+
+
+      # Creates a param hash for RestClient.
+      #
+      # message   - Astrotrain::Message instance
+      # recipient - String email of the main recipient.
+      #
+      # Returns a Hash for RestClient.post
+      def self.create_hash(message, recipient)
+        h = {:subject => message.subject, :to => {}, :from => {}, :cc => {},
+             :body => message.body, :emails => message.recipients.join(", "), :html => message.html,
+             :headers => message.headers, :attachments => {}}
+        [:to, :from, :cc].each do |key|
+          message.send(key).each_with_index do |addr, i|
+            h[key][i] = {:name => addr.display_name, :address => addr.address}
+          end
+        end
+        message.attachments.each_with_index do |a, i|
+          h[:attachments][i] = a
+        end
+        [:attachments, :to, :from, :cc].each do |key|
+          h.delete(key) if h[key].empty?
+        end
+        h
+      end
+
+      # kept for backwards compatibility
+      def self.process(url, message, recipient = nil, extra = nil)
+        deliver(message, url, :recipient => recipient, :extra => extra)
+      end
+    end
+  end
+end

data/lib/astrotrain/transports/resque.rb

@@ -0,0 +1,63 @@
+require 'resque'
+
+module Astrotrain
+  module Transports
+    module Resque
+      # resque://QUEUE/KLASS
+      Astrotrain::Transports::MAP[:resque] = self
+
+      # Public: Sends the message to the given address.
+      #
+      # message   - Astrotrain::Message instance
+      # url       - String address of the Resque in this form:
+      #             "QUEUE/KLASS"
+      # options   - Optional Hash:
+      #             :recipient - String email of the main recipient
+      #             :extra     - Hash to be merged with the payload
+      #
+      # Returns a queued Resque::Job instance.
+      def self.deliver(message, url, options = {})
+        recipient = options[:recipient] || message.recipients.first
+        uri       = url.is_a?(Addressable::URI) ?
+          url :
+          Addressable::URI.parse(url)
+        path = uri.path.dup
+        path.sub! /^\//, ''
+        queue, *job = path.split("/")
+        if qu = uri.host
+          job.unshift(queue)
+          queue = qu
+        end
+        payload = create_hash(message, recipient)
+        if extra = options[:extra]
+          payload.update(extra)
+        end
+        ::Resque::Job.create(queue, job.join("/"), payload)
+      end
+
+      # Creates a param hash for RestClient.
+      #
+      # message   - Astrotrain::Message instance
+      # recipient - String email of the main recipient.
+      #
+      # Returns a Hash for Resque.
+      def self.create_hash(message, recipient)
+        h = {:subject => message.subject, :to => [], :from => [], :cc => [],
+             :body => message.body, :emails => message.recipients.join(", "), :html => message.html,
+             :headers => message.headers}
+        [:to, :from, :cc].each do |key|
+          message.send(key).each_with_index do |addr, i|
+            h[key] << {:name => addr.display_name, :address => addr.address}
+          end
+        end
+        h
+      end
+
+      # kept for backwards compatibility
+      def self.process(url, message, recipient = nil, extra = nil)
+        deliver(message, url, :recipient => recipient, :extra => extra)
+      end
+    end
+  end
+end
+

data/test/fixtures/bad_email_format.txt

@@ -0,0 +1,15 @@
+Delivered-To: "Processor" <processor@astrotrain.com>
+Message-ID: <a16be7390810161014n52b603e9k1aa6bb803c6735aa@mail.gmail.com>
+Date: Thu, 16 Oct 2008 10:14:18 -0700
+From: Ricky <ricky.bobby@foo.com>, Bobby:bobby@foo.com, reply....@foo.com
+To: Processor <processor@astrotrain.com>
+Cc: Fred <fred@example.com>
+Subject: Fwd: blah blah
+MIME-Version: 1.0
+X-Custom: reply
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 7bit
+Content-Disposition: inline
+
+---------- Forwarded message ----------
+blah blah

data/test/fixtures/basic.txt

@@ -1,8 +1,11 @@
 Delivered-To: "Processor" <processor@astrotrain.com>
 Message-ID: <a16be7390810161014n52b603e9k1aa6bb803c6735aa@mail.gmail.com>
+Received: by 10.231.149.194 with SMTP id u2mr924086ibv.32.1298067999839; Fri, 18 Feb 2011 14:26:39 -0800
+Received: by 10.231.153.2 with HTTP; Fri, 18 Feb 2011 14:26:39 -0800
 Date: Thu, 16 Oct 2008 10:14:18 -0700
 From: Bob <user@example.com>
 To: Processor <processor@astrotrain.com>
+Cc: Fred <fred@example.com>
 Subject: Fwd: blah blah
 MIME-Version: 1.0
 X-Custom: reply
@@ -11,4 +14,4 @@ Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 ---------- Forwarded message ----------
-blah blah
+blah blah

data/test/fixtures/iso-8859-1.txt

@@ -2,6 +2,7 @@ Delivered-To: "Processor" <processor@astrotrain.com>
 Message-ID: <a16be7390810161014n52b603e9k1aa6bb803c6735aa@mail.gmail.com>
 Date: Thu, 16 Oct 2008 10:14:18 -0700
 From: =?ISO-8859-1?Q?Matth=E9w?= <user@example.com>
+Cc: =?ISO-8859-1?Q?Matth=E9w?= <cc@example.com>
 To: Processor <processor@astrotrain.com>
 Subject: Fwd: blah blah
 MIME-Version: 1.0

data/test/message_test.rb

@@ -1,492 +1,181 @@
-require File.join(File.dirname(__FILE__), "test_helper")
-
-class Astrotrain::MessageTest < Astrotrain::TestCase
-  describe "mapping" do
-    describe "against default domain" do
-      before :all do
-        Astrotrain::Mapping.transaction do
-          Astrotrain::LoggedMail.all.destroy!
-          Astrotrain::Mapping.all.destroy!
-          @mapping  = Astrotrain::Mapping.create!(:email_user => 'xyz')
-          @mapping2 = Astrotrain::Mapping.create!(:email_user => 'xyz',  :email_domain => 'sample.com')
-        end
-      end
-
-      describe "without mapping" do
-        before do
-          Astrotrain::LoggedMail.all.destroy!
-        end
-
-        it "doesn't log message" do
-          @msg = Astrotrain::Message.receive(mail(:basic))
-          @log = Astrotrain::LoggedMail.first
-          assert_nil @log
-        end
-
-        it "logs message if Astrotrain::LoggedMail.log_processed" do
-          Astrotrain::LoggedMail.log_processed = true
-          @msg = Astrotrain::Message.receive(mail(:basic))
-          @log = Astrotrain::LoggedMail.first
-          assert @log
-          assert @log.error_message.blank?
-        end
-
-        it "calls pre_mapping callback" do
-          Astrotrain::LoggedMail.log_processed = true
-          callback_msg = nil
-          Astrotrain.callback(:pre_mapping) do |message|
-            callback_msg = message
-          end
-
-          @msg = Astrotrain::Message.receive(mail(:mapped))
-          assert_equal callback_msg, @msg
-        end
-
-        it "it allows pre_mapping callback to cancel processing" do
-          Astrotrain::LoggedMail.log_processed = true
-          Astrotrain.callback(:pre_mapping) do |message|
-            raise Astrotrain::ProcessingCancelled
-          end
-
-          @msg = Astrotrain::Message.receive(mail(:mapped))
-          assert_equal 0, Astrotrain::LoggedMail.count
-        end
-
-        it "calls pre_processing callback" do
-          Astrotrain::LoggedMail.log_processed = true
-          callback_msg, callback_map = nil
-          Astrotrain.callback(:pre_processing) do |message, mapping|
-            callback_msg = message
-            callback_map = mapping
-          end
-
-          @msg = Astrotrain::Message.receive(mail(:mapped))
-          @log = Astrotrain::LoggedMail.first
-          assert_equal callback_msg, @msg
-          assert_equal callback_map, @log.mapping
-        end
-
-        it "it allows pre_processing callback to cancel processing" do
-          Astrotrain::LoggedMail.log_processed = true
-          Astrotrain.callback(:pre_processing) do |message, mapping|
-            raise Astrotrain::ProcessingCancelled
-          end
-
-          @msg = Astrotrain::Message.receive(mail(:mapped))
-          @log = Astrotrain::LoggedMail.first
-          assert_equal "Cancelled.", @log.error_message
-        end
-
-        it "calls post_processing callback" do
-          Astrotrain::LoggedMail.log_processed = true
-          callback_msg, callback_map, callback_log = nil
-          Astrotrain.callback(:post_processing) do |message, mapping, log|
-            callback_msg = message
-            callback_map = mapping
-            callback_log = log
-          end
-
-          @msg = Astrotrain::Message.receive(mail(:mapped))
-          @log = Astrotrain::LoggedMail.first
-          assert_equal callback_msg, @msg
-          assert_equal callback_map, @log.mapping
-          assert_equal callback_log, @log
-        end
-
-        after do
-          Astrotrain::LoggedMail.log_processed = false
-          Astrotrain.clear_callbacks
-        end
-      end
-
-      describe "erroring" do
-        before do
-          Astrotrain::LoggedMail.all.destroy!
-        end
-
-        it "logs message without mappping" do
-          stub(Astrotrain::Mapping).match { raise RuntimeError }
-          @msg = Astrotrain::Message.receive(mail(:basic))
-          @log = Astrotrain::LoggedMail.first
-          assert @log
-          assert_nil @log.delivered_at
-          assert_match /RuntimeError/, @log.error_message
-          assert_nil @log.mapping
-        end
-
-        it "logs message with mappping" do
-          stub(Astrotrain::Mapping).match {@mapping}
-          stub(@mapping).process { raise RuntimeError }
-          @msg = Astrotrain::Message.receive(mail(:basic))
-          @log = Astrotrain::LoggedMail.first
-          assert @log
-          assert_nil @log.delivered_at
-          assert_match /RuntimeError/, @log.error_message
-          assert_equal @mapping, @log.mapping
-        end
-      end
-
-      describe "with mapping" do
-        before :all do
-          @msg = Astrotrain::Message.receive(mail(:mapped))
-          @log = Astrotrain::LoggedMail.first
-        end
-
-        it "does not log message" do
-          assert_nil @log
-        end
-      end
-    end
-  end
-
-  describe "parsing" do
-    before :all do
-      @body = "---------- Forwarded message ----------\nblah blah"
-    end
-
-    describe "basic, with bad content type header" do
-      before :all do
-        @raw = mail(:bad_content_type)
-        @message = Astrotrain::Message.parse(@raw)
-      end
-
-      it "parses body" do
-        expected = "--====boundary====\nContent-Type: text/plain; charset=\"us-ascii\"\n\nThis message is being generated automatically to notify you\nthat PowerMTA has crashed on mtasv.net.\n\nAs the information below is likely to be essential for debugging\nthe problem, please forward this message to <support@port25.com>.\nThank you.\n\n--====boundary====\nContent-Type: text/plain; charset=\"us-ascii\"\n\nYo\n--====boundary====--"
-        assert_equal expected, @message.body
-      end
-
-      it "attempts parsing bad header" do
-        assert_equal "multipart/mixed; boundary=\"====boundary=\"===\"\"", @message.header('content-type')
-      end
-    end
-
-    describe "basic, single sender/recipient" do
-      before :all do
-        @raw     = mail(:basic)
-        @message = Astrotrain::Message.parse(@raw)
-      end
-
-      it "parses message-id and headers" do
-        assert_equal 'a16be7390810161014n52b603e9k1aa6bb803c6735aa@mail.gmail.com', @message.message_id
-        expected = {'mime-version' => '1.0', 'content-type' => 'text/plain; charset=ISO-8859-1', 'to' => 'Processor <processor@astrotrain.com>',
-          'x-custom' => 'reply', 'content-transfer-encoding' => '7bit', 'content-disposition' => 'inline', 'message-id' => '<a16be7390810161014n52b603e9k1aa6bb803c6735aa@mail.gmail.com>'}
-        assert_equal expected, @message.headers
-      end
-
-      it "#parse parses TMail::Mail object from raw text" do
-        assert_kind_of TMail::Mail, @message.mail
-      end
-
-      it "recognizes Delivered-To and To: headers as recipients" do
-        assert_equal %w(processor@astrotrain.com), @message.recipients
-      end
-
-      it "recognizes From: header as sender" do
-        assert_equal %(Bob <user@example.com>), @message.sender
-      end
-
-      it "recognizes Subject: header" do
-        assert_equal 'Fwd: blah blah', @message.subject
-      end
-
-      it "recognizes message body" do
-        assert_equal @body, @message.body
-      end
-
-      it "retains raw message" do
-        assert_equal @raw, @message.raw
-      end
-    end
-    
-    describe "iso 8859 1 encoded headers" do
-      before :all do
-        @raw     = mail("iso-8859-1")
-        @message = Astrotrain::Message.parse(@raw)
-      end
-
-      it "recognizes From: header with strange encoding" do
-        assert_equal %(Matthéw <user@example.com>), @message.sender
-      end
-    end
-
-    describe "gb2312 encoded body" do
-      before :all do
-        @raw     = mail("gb2312_encoding")
-        @message = Astrotrain::Message.parse(@raw)
-      end
-
-      it "converts to UTF-8" do
-        assert_equal "Dear Sirs, \r\nWe are given to understand that you are  Manufacturer of  plstic  Bottles\r\nAdd： blah China", 
-          @message.body
-      end
-    end
-
-    describe "gb2312 encoded body with invalid charset in mime version header" do
-      before :all do
-        @raw     = mail("gb2312_encoding_invalid")
-        @message = Astrotrain::Message.parse(@raw)
-      end
-
-      it "converts to UTF-8" do
-        assert_equal "Dear Sirs, \r\nWe are given to understand that you are  Manufacturer of  plstic  Bottles\r\nAdd： blah China",
-          @message.body
-      end
-    end
+# encoding: UTF-8
+require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
 
-    describe "utf 8 encoded headers" do
-      before :all do
-        @raw     = mail("utf-8")
-        @message = Astrotrain::Message.parse(@raw)
-      end
-      
-      it "recognizes From: header with strange encoding" do
-        assert_equal %(isnard naiké <user@example.com>), @message.sender
-      end
-    end
-
-    describe "multipart message with name property on Content Type" do
-      before :all do
-        @raw     = mail(:multipart)
-        @message = Astrotrain::Message.parse(@raw)
-      end
-
-      it "#parse parses TMail::Mail object from raw text" do
-        assert_kind_of TMail::Mail, @message.mail
-      end
-
-      it "recognizes Delivered-To/To: headers as recipient" do
-        assert_equal %w(foo@example.com), @message.recipients
-      end
-
-      it "recognizes message body" do
-        assert_equal "Testing out rich emails with attachments!\nThis one has a name property on Content-Type.\n[state:hold responsible:rick]\n\n",
-          @message.body
-      end
-
-      it "retrieves attachments" do
-        assert_equal 1, @message.attachments.size
-      end
-
-      it "retrieves attachment filename" do
-        assert_equal 'bandit.jpg', @message.attachments.first.filename
-      end
-
-      it "retrieves attachment content_type" do
-        assert_equal 'image/jpeg', @message.attachments.first.content_type
-      end
-    end
-
-    describe "multipart message with filename property on Content Disposition" do
-      before :all do
-        @raw     = mail(:multipart2)
-        @message = Astrotrain::Message.parse(@raw)
-      end
-
-      it "#parse parses TMail::Mail object from raw text" do
-        assert_kind_of TMail::Mail, @message.mail
-      end
-
-      it "recognizes Delivered-To/To: headers as recipient" do
-        assert_equal %w(foo@example.com), @message.recipients
-      end
-
-      it "recognizes message body" do
-        assert_equal "Testing out rich emails with attachments!\nThis one has NO name property on Content-Type.\n[state:hold responsible:rick]\n\n", 
-          @message.body
-      end
-
-      it "retrieves attachments" do
-        assert_equal 1, @message.attachments.size
-      end
-
-      it "retrieves attachment filename" do
-        assert_equal 'bandit.jpg', @message.attachments.first.filename
-      end
-
-      it "retrieves attachment content_type" do
-        assert_equal 'image/jpeg', @message.attachments.first.content_type
-      end
-    end
+class MessageParsingTest < Test::Unit::TestCase
+  test "bad content type header" do
+    msg = astrotrain :bad_content_type
 
-    describe "apple multipart message" do
-      before :all do
-        @raw     = mail(:apple_multipart)
-        @message = Astrotrain::Message.parse(@raw)
-      end
+    expected_body   = "This message is being generated automatically to notify you\nthat PowerMTA has crashed on mtasv.net.\n\nAs the information below is likely to be essential for debugging\nthe problem, please forward this message to <support@port25.com>.\nThank you.\nYo"
+    expected_header = "multipart/mixed; boundary=\"====boundary====\""
 
-      it "#parse parses TMail::Mail object from raw text" do
-        assert_kind_of TMail::Mail, @message.mail
-      end
-
-      it "recognizes To: header as recipient" do
-        assert_equal %w(foo@example.com), @message.recipients
-      end
-
-      it "recognizes message body" do
-        assert_equal "Let's have a test here:\r\n\r\n\r\n\nYum\r\n\r\n\r\nOn Feb 10, 2009, at 3:37 PM, Tender Support wrote:\r\n\r\n> // Add your reply above here\r\n> ==================================================\r\n> From: Tyler Durden\r\n> Subject: Email attachments and file upload\r\n>\r\n> not at the moment ... let me test\r\n>\r\n> View this Discussion online: http://foobar.com\r\n> .\r\n\r\n\r\n\r\n\r\n--Apple-Mail-7-451386929--", 
-          @message.body
-      end
-
-      it "retrieves attachments" do
-        assert_equal 1, @message.attachments.size
-      end
-
-      it "retrieves attachment filename" do
-        assert_equal 'logo.gif', @message.attachments.first.filename
-      end
-
-      it "retrieves attachment content_type" do
-        assert_equal 'image/gif', @message.attachments.first.content_type
-      end
-    end
-
-    describe "multiple sender/recipients" do
-      before :all do
-        @raw     = mail(:multiple)
-        @message = Astrotrain::Message.parse(@raw)
-      end
+    assert_equal expected_body,   msg.body
+    assert_equal expected_header, msg.headers['content-type']
+  end
 
-      it "#parse parses TMail::Mail object from raw text" do
-        assert_kind_of TMail::Mail, @message.mail
-      end
+  test "basic email" do
+    body = "---------- Forwarded message ----------\nblah blah"
+    msg  = astrotrain :basic
 
-      it "recognizes To: headers as recipients" do
-        assert_equal %w(processor@astrotrain.com other@example.com), @message.recipients
-      end
+    assert_equal 'a16be7390810161014n52b603e9k1aa6bb803c6735aa@mail.gmail.com', msg.message_id
+    expected = {'mime-version' => '1.0', 'content-type' => 'text/plain; charset=ISO-8859-1', 'date' => "Thu, 16 Oct 2008 10:14:18 -0700",
+      'x-custom' => 'reply', 'content-transfer-encoding' => '7bit', 'content-disposition' => 'inline', 'message-id' => '<a16be7390810161014n52b603e9k1aa6bb803c6735aa@mail.gmail.com>'}
+    assert_equal expected, msg.headers
 
-      it "recognizes To: headers as recipients with custom header order" do
-        assert_equal %w(other@example.com processor@astrotrain.com), @message.recipients(%w(to original_to delivered_to))
-      end
+    assert_kind_of Mail::Message, msg.mail
 
-      it "recognizes From: header as sender" do
-        assert_equal %(user@example.com, boss@example.com), @message.sender
-      end
+    assert_equal %w(processor@astrotrain.com), msg.recipients
+    assert_equal %(Bob <user@example.com>),    msg.sender.join
+    assert_equal %(Bob),                       msg.sender.first.display_name
+    assert_equal %(user@example.com),          msg.sender.first.address
+    assert_equal 'Fwd: blah blah',             msg.subject
+    assert_equal body,                         msg.body
+  end
 
-      it "recognizes Subject: header" do
-        assert_equal 'Fwd: blah blah', @message.subject
-      end
+  test "iso 8859 1 encoded headers" do
+    msg = astrotrain "iso-8859-1"
+    s   = Object.const_defined?(:Encoding) ? "Matthéw" :  "Matth\351w"
+    assert_equal "user@example.com", msg.sender.first.address
+    assert_equal "cc@example.com",   msg.cc.first.address
+    assert_equal s,       msg.sender.first.display_name
+    assert_equal s,       msg.cc.first.display_name
+  end
 
-      it "recognizes message body" do
-        assert_equal @body, @message.body
-      end
+  test "gb2312 encoded body" do
+    msg = astrotrain(:gb2312_encoding)
+    # encoding problem?
+    # "Dear Sirs, \r\nWe are given to understand that you are  Manufacturer of  plstic  Bottles\r\nAdd： blah China"
+    s = if Object.const_defined?(:Encoding)
+      # ruby 1.9 is our bro
+      "Dear Sirs, \r\nWe are given to understand that you are  Manufacturer of  plstic  Bottles\r\nAdd： blah China"
+    else
+      # ruby 1.8 gets messed up crap
+      "Dear Sirs, \r\nWe are given to understand that you are  Manufacturer of  plstic  Bottles\r\nAdd\357\274\232 blah China"
+    end
+    assert_equal s, msg.body
+  end
 
-      it "retains raw message" do
-        assert_equal @raw, @message.raw
-      end
-    end
+  test "gb2312 encoded body with invalid charset in mime version header" do
+    msg = astrotrain(:gb2312_encoding_invalid)
+    # encoding problem?
+    # "Dear Sirs, \r\nWe are given to understand that you are  Manufacturer of  plstic  Bottles\r\nAdd： blah China"
+    s = "Dear Sirs, \r\nWe are given to understand that you are  Manufacturer of  plstic  Bottles\r\nAdd?? blah China"
+    assert_equal s, msg.body
+  end
 
-    describe "recipients in the body" do
-      before :all do
-        @raw     = mail(:multiple_with_body_recipients)
-        @message = Astrotrain::Message.parse(@raw)
-      end
+  test "utf-8 encoded headers" do
+    msg = astrotrain('utf-8')
+    assert_equal "isnard naik\303\251", msg.sender.first.display_name
+    assert_equal "user@example.com",    msg.sender.first.address
+  end
 
-      it "recognizes in-body emails and To: headers as recipients" do
-        assert_equal %w(processor@astrotrain.com other@example.com processor+foobar@astrotrain.com processor+blah@astrotrain.com), 
-          @message.recipients
-      end
-    end
+  test "multipart message with name property on Content Type" do
+    msg = astrotrain(:multipart)
 
-    describe "with only HTML body in a multipart message" do
-      before :all do
-        @raw     = mail(:html_multipart)
-        @message = Astrotrain::Message.parse(@raw)
-      end
+    assert_kind_of Mail::Message, msg.mail
 
-      it "parses emtpy body" do
-        assert_equal '', @message.body
-      end
+    assert_equal %w(foo@example.com), msg.recipients
+    assert_equal "Testing out rich emails with attachments!\nThis one has a name property on Content-Type.\n[state:hold responsible:rick]",
+      msg.body
+    assert_equal 1,            msg.attachments.size
+    assert_equal 'bandit.jpg', msg.attachments.first.filename
+    assert_match 'image/jpeg', msg.attachments.first.content_type
+  end
 
-      it "parses HTML body" do
-        assert_equal "<p>ABC</p>\n------", @message.html
-      end
-    end
+  test "multipart message with filename property on Content Disposition" do
+    msg = astrotrain(:multipart2)
 
-    describe "with only HTML body" do
-      before :all do
-        @raw     = mail(:html)
-        @message = Astrotrain::Message.parse(@raw)
-      end
+    assert_kind_of Mail::Message, msg.mail
 
-      it "parses emtpy body" do
-        assert_equal '', @message.body
-      end
+    assert_equal %w(foo@example.com), msg.recipients
+    assert_equal "Testing out rich emails with attachments!\nThis one has NO name property on Content-Type.\n[state:hold responsible:rick]",
+      msg.body
+    assert_equal 1,            msg.attachments.size
+    assert_equal 'bandit.jpg', msg.attachments.first.filename
+    assert_match 'image/jpeg', msg.attachments.first.content_type
+  end
 
-      it "parses HTML body" do
-        assert_equal "<p>ABC</p>", @message.html
-      end
-    end
+  test "apple multipart message" do
+    msg = astrotrain(:apple_multipart)
 
-    describe "with X Original To header" do
-      before :all do
-        @raw     = mail(:custom)
-        @message = Astrotrain::Message.parse(@raw)
-      end
+    assert_kind_of Mail::Message, msg.mail
 
-      it "#parse parses TMail::Mail object from raw text" do
-        assert_kind_of TMail::Mail, @message.mail
-      end
+    assert_equal %w(foo@example.com), msg.recipients
+    assert_equal "Let's have a test here:\nYum\n\n\nOn Feb 10, 2009, at 3:37 PM, Tender Support wrote:\n\n> // Add your reply above here\n> ==================================================\n> From: Tyler Durden\n> Subject: Email attachments and file upload\n>\n> not at the moment ... let me test\n>\n> View this Discussion online: http://foobar.com\n> .", 
+      msg.body
+    assert_equal 1,           msg.attachments.size
+    assert_equal 'logo.gif',  msg.attachments.first.filename
+    assert_match 'image/gif', msg.attachments.first.content_type
+  end
 
-      it "recognizes X-Original-to: header as recipient" do
-        assert_equal %w(processor-reply-57@custom.com processor-delivered@astrotrain.com processor@astrotrain.com), @message.recipients
-      end
+  test "multiple sender/recipients" do
+    body = "---------- Forwarded message ----------\nblah blah"
+    msg  = astrotrain(:multiple)
+
+    assert_kind_of Mail::Message,                                msg.mail
+    assert_equal %w(processor@astrotrain.com other@example.com), msg.recipients
+    assert_equal %w(other@example.com processor@astrotrain.com), msg.recipients(%w(to original_to delivered_to))
+    assert_equal %(user@example.com),                            msg.sender[0].address
+    assert_equal %(boss@example.com),                            msg.sender[1].address
+    assert_equal 'Fwd: blah blah',                               msg.subject
+    assert_equal body,                                           msg.body
+  end
 
-      it "recognizes Delivered-To: header as recipient with custom header order" do
-        assert_equal %w(processor-delivered@astrotrain.com processor-reply-57@custom.com processor@astrotrain.com), @message.recipients(%w(delivered_to original_to to))
-      end
+  test "recipients in the body" do
+    msg = astrotrain(:multiple_with_body_recipients)
 
-      it "recognizes To: header as recipient with custom header order" do
-        assert_equal %w(processor@astrotrain.com processor-reply-57@custom.com processor-delivered@astrotrain.com), @message.recipients(%w(to original_to delivered_to))
-      end
+    assert_equal %w(processor@astrotrain.com other@example.com processor+foobar@astrotrain.com processor+blah@astrotrain.com), 
+      msg.recipients
+  end
 
-      it "recognizes From: header as sender" do
-        assert_equal %(user@example.com, boss@example.com), @message.sender
-      end
+  test "with only HTML body in a multipart message" do
+    msg = astrotrain(:html_multipart)
 
-      it "recognizes Subject: header" do
-        assert_equal 'Fwd: blah blah', @message.subject
-      end
+    assert_equal '',                   msg.body
+    assert_equal "<p>ABC</p>\n------", msg.html
+  end
 
-      it "recognizes message body" do
-        assert_equal @body, @message.body
-      end
+  test "with only HTML body in a multipart message" do
+    msg = astrotrain(:html)
 
-      it "retains raw message" do
-        assert_equal @raw, @message.raw
-      end
-    end
+    assert_equal '',           msg.body
+    assert_equal "<p>ABC</p>", msg.html
+  end
 
-    describe "with multiple Delivered To headers" do
-      before :all do
-        @raw     = mail(:multiple_delivered_to)
-        @message = Astrotrain::Message.parse(@raw)
-      end
+  test "with X Original To header" do
+    body = "---------- Forwarded message ----------\nblah blah"
+    msg  = astrotrain(:custom)
+
+    assert_kind_of Mail::Message, msg.mail
+    assert_equal %w(processor-reply-57@custom.com processor-delivered@astrotrain.com processor@astrotrain.com), msg.recipients
+    assert_equal %w(processor-delivered@astrotrain.com processor-reply-57@custom.com processor@astrotrain.com), msg.recipients(%w(delivered_to original_to to))
+    assert_equal %w(processor@astrotrain.com processor-reply-57@custom.com processor-delivered@astrotrain.com), msg.recipients(%w(to original_to delivered_to))
+    assert_equal 'user@example.com', msg.sender[0].address
+    assert_equal 'boss@example.com', msg.sender[1].address
+    assert_equal 'Fwd: blah blah',   msg.subject
+    assert_equal body,               msg.body
+  end
 
-      it "recognizes Delivered-to: header as recipient" do
-        assert_equal %w(processor-reply-57@custom.com processor-delivered@astrotrain.com processor@astrotrain.com), @message.recipients
-      end
-    end
+  test "with multiple Delivered To headers" do
+    msg = astrotrain(:multiple_delivered_to)
 
-    it "parses invalid email collection" do
-      assert_equal %w(ricky@foo.com bobby@foo.com), Astrotrain::Message.parse_email_addresses("Ricky <ricky@foo.com>, Bobby:bobby@foo.com")
-    end
+    assert_equal %w(processor-reply-57@custom.com processor-delivered@astrotrain.com processor@astrotrain.com), msg.recipients
+  end
 
-    it "parses invalid email" do
-      assert_equal({:name => "Name", :email => "email@server.com"}, Astrotrain::Message.parse_email_address("Name:email@server.com"))
-    end
+  test "parsing invalid email collection" do
+    msg = astrotrain(:bad_email_format)
+    assert_equal 'ricky.bobby@foo.com', msg.from[0].address
+    assert_equal 'bobby@foo.com', msg.from[1].address
+    assert_equal 2, msg.from.size
+  end
 
-    it "parses undisclosed recipients" do
-      raw = mail(:undisclosed)
-      m   = Astrotrain::Message.parse(raw)
-      assert_equal(["undisclosed-recipients: ;"], m.recipients_from_to)
-      assert_equal({:name => "undisclosed-recipients"}, Astrotrain::Message.parse_email_address(m.recipients_from_to.first))
-    end
+  test "parsing undisclosed recipients" do
+    msg = astrotrain(:undisclosed)
+    assert_equal([], msg.recipients_from_to)
   end
 
-  describe "queueing" do
-    it "writes contents queue path" do
-      filename = Astrotrain::Message.queue("boo!")
-      assert_equal 'boo!', IO.read(filename)
-    end
+  test "saves path of parsed email" do
+    path = mail(:basic)
+    msg  = Astrotrain::Message.read(path)
+    assert_equal path, msg.path
   end
-end
+end