multi_mail 0.1.0 → 0.1.1

data/spec/fixtures/simple/invalid.txt

@@ -0,0 +1,4 @@
+HTTP/1.1 200 OK
+Content-Type: application/x-www-form-urlencoded
+
+message=Return-Path%3A+%3Cjames%40opennorth.ca%3E%0AReceived%3A+from+%5B192.168.0.104%5D+%28%5B69.165.204.186%5D%29%0A++++++++by+mx.google.com+with+ESMTPS+id+ez8sm24876706igb.17.2012.12.27.12.25.27%0A++++++++%28version%3DTLSv1%2FSSLv3+cipher%3DOTHER%29%3B%0A++++++++Thu%2C+27+Dec+2012+12%3A25%3A28+-0800+%28PST%29%0AFrom%3A+James+McKinney+%3Cjames%40opennorth.ca%3E%0AContent-Type%3A+multipart%2Falternative%3B+boundary%3D%22Apple-Mail%3D_9BF84D11-673B-4F5C-B5F7-46FA0E73983F%22%0ASubject%3A+Test%0ADate%3A+Thu%2C+27+Dec+2012+15%3A25%3A37+-0500%0AMessage-Id%3A+%3C24D8D853-1C75-4F64-ABA5-33A6C81471FA%40opennorth.ca%3E%0ATo%3A+foo%2Bbar%40govkit.org%0AMime-Version%3A+1.0+%28Apple+Message+framework+v1283%29%0AX-Mailer%3A+Apple+Mail+%282.1283%29%0A%0A%0A--Apple-Mail%3D_9BF84D11-673B-4F5C-B5F7-46FA0E73983F%0AContent-Transfer-Encoding%3A+7bit%0AContent-Type%3A+text%2Fplain%3B%0A++charset%3Dus-ascii%0A%0Abold+text%0A%0A%0A%3E+multiline%0A%3E+quoted%0A%3E+text%0A%0A--%0ASignature+block%0A--Apple-Mail%3D_9BF84D11-673B-4F5C-B5F7-46FA0E73983F%0AContent-Transfer-Encoding%3A+7bit%0AContent-Type%3A+text%2Fhtml%3B%0A++charset%3Dus-ascii%0A%0A%3Chtml%3E%3Chead%3E%3C%2Fhead%3E%3Cbody+style%3D%22word-wrap%3A+break-word%3B+-webkit-nbsp-mode%3A+space%3B+-webkit-line-break%3A+after-white-space%3B+%22%3E%3Cdiv%3E%3Cb%3Ebold+text%3C%2Fb%3E%3C%2Fdiv%3E%3Cdiv%3E%3Cbr%3E%3C%2Fdiv%3E%3Cdiv%3E%3Cblockquote+type%3D%22cite%22%3E%3C%2Fblockquote%3E%3C%2Fdiv%3E%3Cdiv%3E%3Cblockquote+type%3D%22cite%22%3Emultiline%3C%2Fblockquote%3E%3C%2Fdiv%3E%3Cblockquote+type%3D%22cite%22%3E%3Cdiv%3Equoted%3C%2Fdiv%3E%3Cdiv%3Etext%3C%2Fdiv%3E%3C%2Fblockquote%3E%3Cbr%3E%3Cdiv%3E--%3C%2Fdiv%3E%3Cdiv%3ESignature+block%3C%2Fdiv%3E%3C%2Fbody%3E%3C%2Fhtml%3E%0A--Apple-Mail%3D_9BF84D11-673B-4F5C-B5F7-46FA0E73983F--%0A&timestamp=1366071615&token=5o56tmpwd3dnwthehwclemd-i-7u2gv9vb3u745ywj67d0mc87&signature=xxx

data/spec/fixtures/simple/missing.txt

@@ -0,0 +1,4 @@
+HTTP/1.1 200 OK
+Content-Type: application/x-www-form-urlencoded
+
+message=Return-Path%3A+%3Cjames%40opennorth.ca%3E%0AReceived%3A+from+%5B192.168.0.104%5D+%28%5B69.165.204.186%5D%29%0A++++++++by+mx.google.com+with+ESMTPS+id+ez8sm24876706igb.17.2012.12.27.12.25.27%0A++++++++%28version%3DTLSv1%2FSSLv3+cipher%3DOTHER%29%3B%0A++++++++Thu%2C+27+Dec+2012+12%3A25%3A28+-0800+%28PST%29%0AFrom%3A+James+McKinney+%3Cjames%40opennorth.ca%3E%0AContent-Type%3A+multipart%2Falternative%3B+boundary%3D%22Apple-Mail%3D_9BF84D11-673B-4F5C-B5F7-46FA0E73983F%22%0ASubject%3A+Test%0ADate%3A+Thu%2C+27+Dec+2012+15%3A25%3A37+-0500%0AMessage-Id%3A+%3C24D8D853-1C75-4F64-ABA5-33A6C81471FA%40opennorth.ca%3E%0ATo%3A+foo%2Bbar%40govkit.org%0AMime-Version%3A+1.0+%28Apple+Message+framework+v1283%29%0AX-Mailer%3A+Apple+Mail+%282.1283%29%0A%0A%0A--Apple-Mail%3D_9BF84D11-673B-4F5C-B5F7-46FA0E73983F%0AContent-Transfer-Encoding%3A+7bit%0AContent-Type%3A+text%2Fplain%3B%0A++charset%3Dus-ascii%0A%0Abold+text%0A%0A%0A%3E+multiline%0A%3E+quoted%0A%3E+text%0A%0A--%0ASignature+block%0A--Apple-Mail%3D_9BF84D11-673B-4F5C-B5F7-46FA0E73983F%0AContent-Transfer-Encoding%3A+7bit%0AContent-Type%3A+text%2Fhtml%3B%0A++charset%3Dus-ascii%0A%0A%3Chtml%3E%3Chead%3E%3C%2Fhead%3E%3Cbody+style%3D%22word-wrap%3A+break-word%3B+-webkit-nbsp-mode%3A+space%3B+-webkit-line-break%3A+after-white-space%3B+%22%3E%3Cdiv%3E%3Cb%3Ebold+text%3C%2Fb%3E%3C%2Fdiv%3E%3Cdiv%3E%3Cbr%3E%3C%2Fdiv%3E%3Cdiv%3E%3Cblockquote+type%3D%22cite%22%3E%3C%2Fblockquote%3E%3C%2Fdiv%3E%3Cdiv%3E%3Cblockquote+type%3D%22cite%22%3Emultiline%3C%2Fblockquote%3E%3C%2Fdiv%3E%3Cblockquote+type%3D%22cite%22%3E%3Cdiv%3Equoted%3C%2Fdiv%3E%3Cdiv%3Etext%3C%2Fdiv%3E%3C%2Fblockquote%3E%3Cbr%3E%3Cdiv%3E--%3C%2Fdiv%3E%3Cdiv%3ESignature+block%3C%2Fdiv%3E%3C%2Fbody%3E%3C%2Fhtml%3E%0A--Apple-Mail%3D_9BF84D11-673B-4F5C-B5F7-46FA0E73983F--%0A

data/spec/fixtures/simple/valid.txt

@@ -1,4 +1,4 @@
 HTTP/1.1 200 OK
 Content-Type: application/x-www-form-urlencoded
 
-message=Return-Path%3A+%3Cjames%40opennorth.ca%3E%0AReceived%3A+from+%5B192.168.0.104%5D+%28%5B69.165.204.186%5D%29%0A++++++++by+mx.google.com+with+ESMTPS+id+ez8sm24876706igb.17.2012.12.27.12.25.27%0A++++++++%28version%3DTLSv1%2FSSLv3+cipher%3DOTHER%29%3B%0A++++++++Thu%2C+27+Dec+2012+12%3A25%3A28+-0800+%28PST%29%0AFrom%3A+James+McKinney+%3Cjames%40opennorth.ca%3E%0AContent-Type%3A+multipart%2Falternative%3B+boundary%3D%22Apple-Mail%3D_9BF84D11-673B-4F5C-B5F7-46FA0E73983F%22%0ASubject%3A+Test%0ADate%3A+Thu%2C+27+Dec+2012+15%3A25%3A37+-0500%0AMessage-Id%3A+%3C24D8D853-1C75-4F64-ABA5-33A6C81471FA%40opennorth.ca%3E%0ATo%3A+foo%2Bbar%40govkit.org%0AMime-Version%3A+1.0+%28Apple+Message+framework+v1283%29%0AX-Mailer%3A+Apple+Mail+%282.1283%29%0A%0A%0A--Apple-Mail%3D_9BF84D11-673B-4F5C-B5F7-46FA0E73983F%0AContent-Transfer-Encoding%3A+7bit%0AContent-Type%3A+text%2Fplain%3B%0A++charset%3Dus-ascii%0A%0Abold+text%0A%0A%0A%3E+multiline%0A%3E+quoted%0A%3E+text%0A%0A--%0ASignature+block%0A--Apple-Mail%3D_9BF84D11-673B-4F5C-B5F7-46FA0E73983F%0AContent-Transfer-Encoding%3A+7bit%0AContent-Type%3A+text%2Fhtml%3B%0A++charset%3Dus-ascii%0A%0A%3Chtml%3E%3Chead%3E%3C%2Fhead%3E%3Cbody+style%3D%22word-wrap%3A+break-word%3B+-webkit-nbsp-mode%3A+space%3B+-webkit-line-break%3A+after-white-space%3B+%22%3E%3Cdiv%3E%3Cb%3Ebold+text%3C%2Fb%3E%3C%2Fdiv%3E%3Cdiv%3E%3Cbr%3E%3C%2Fdiv%3E%3Cdiv%3E%3Cblockquote+type%3D%22cite%22%3E%3C%2Fblockquote%3E%3C%2Fdiv%3E%3Cdiv%3E%3Cblockquote+type%3D%22cite%22%3Emultiline%3C%2Fblockquote%3E%3C%2Fdiv%3E%3Cblockquote+type%3D%22cite%22%3E%3Cdiv%3Equoted%3C%2Fdiv%3E%3Cdiv%3Etext%3C%2Fdiv%3E%3C%2Fblockquote%3E%3Cbr%3E%3Cdiv%3E--%3C%2Fdiv%3E%3Cdiv%3ESignature+block%3C%2Fdiv%3E%3C%2Fbody%3E%3C%2Fhtml%3E%0A--Apple-Mail%3D_9BF84D11-673B-4F5C-B5F7-46FA0E73983F--%0A
+message=Return-Path%3A+%3Cjames%40opennorth.ca%3E%0AReceived%3A+from+%5B192.168.0.104%5D+%28%5B69.165.204.186%5D%29%0A++++++++by+mx.google.com+with+ESMTPS+id+ez8sm24876706igb.17.2012.12.27.12.25.27%0A++++++++%28version%3DTLSv1%2FSSLv3+cipher%3DOTHER%29%3B%0A++++++++Thu%2C+27+Dec+2012+12%3A25%3A28+-0800+%28PST%29%0AFrom%3A+James+McKinney+%3Cjames%40opennorth.ca%3E%0AContent-Type%3A+multipart%2Falternative%3B+boundary%3D%22Apple-Mail%3D_9BF84D11-673B-4F5C-B5F7-46FA0E73983F%22%0ASubject%3A+Test%0ADate%3A+Thu%2C+27+Dec+2012+15%3A25%3A37+-0500%0AMessage-Id%3A+%3C24D8D853-1C75-4F64-ABA5-33A6C81471FA%40opennorth.ca%3E%0ATo%3A+foo%2Bbar%40govkit.org%0AMime-Version%3A+1.0+%28Apple+Message+framework+v1283%29%0AX-Mailer%3A+Apple+Mail+%282.1283%29%0A%0A%0A--Apple-Mail%3D_9BF84D11-673B-4F5C-B5F7-46FA0E73983F%0AContent-Transfer-Encoding%3A+7bit%0AContent-Type%3A+text%2Fplain%3B%0A++charset%3Dus-ascii%0A%0Abold+text%0A%0A%0A%3E+multiline%0A%3E+quoted%0A%3E+text%0A%0A--%0ASignature+block%0A--Apple-Mail%3D_9BF84D11-673B-4F5C-B5F7-46FA0E73983F%0AContent-Transfer-Encoding%3A+7bit%0AContent-Type%3A+text%2Fhtml%3B%0A++charset%3Dus-ascii%0A%0A%3Chtml%3E%3Chead%3E%3C%2Fhead%3E%3Cbody+style%3D%22word-wrap%3A+break-word%3B+-webkit-nbsp-mode%3A+space%3B+-webkit-line-break%3A+after-white-space%3B+%22%3E%3Cdiv%3E%3Cb%3Ebold+text%3C%2Fb%3E%3C%2Fdiv%3E%3Cdiv%3E%3Cbr%3E%3C%2Fdiv%3E%3Cdiv%3E%3Cblockquote+type%3D%22cite%22%3E%3C%2Fblockquote%3E%3C%2Fdiv%3E%3Cdiv%3E%3Cblockquote+type%3D%22cite%22%3Emultiline%3C%2Fblockquote%3E%3C%2Fdiv%3E%3Cblockquote+type%3D%22cite%22%3E%3Cdiv%3Equoted%3C%2Fdiv%3E%3Cdiv%3Etext%3C%2Fdiv%3E%3C%2Fblockquote%3E%3Cbr%3E%3Cdiv%3E--%3C%2Fdiv%3E%3Cdiv%3ESignature+block%3C%2Fdiv%3E%3C%2Fbody%3E%3C%2Fhtml%3E%0A--Apple-Mail%3D_9BF84D11-673B-4F5C-B5F7-46FA0E73983F--%0A&timestamp=1366071615&token=5o56tmpwd3dnwthehwclemd-i-7u2gv9vb3u745ywj67d0mc87&signature=bc2ab6c1080d52f2a06928b93f21e86c2d28c548e2ef64354f8ba1a95bb53cd6

data/spec/mail_ext/message_spec.rb

@@ -0,0 +1,45 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Mail::Message do
+  # @see https://github.com/mikel/mail/blob/master/spec/mail/message_spec.rb#L491
+  describe 'setting headers' do
+    it 'should accept them in block form' do
+      message = Mail.new do
+        tag 'foo'
+      end
+      message.tag.should == 'foo'
+    end
+
+    it 'should accept them in assignment form' do
+      message = Mail.new
+      message.tag = 'foo'
+      message.tag.should == 'foo'
+    end
+
+    it 'should accept them in key, value form as symbols' do
+      message = Mail.new
+      message[:tag] = 'foo'
+      message.tag.should == 'foo'
+    end
+
+    it 'should accept them in key, value form as strings' do
+      message = Mail.new
+      message['tag'] = 'foo'
+      message.tag.should == 'foo'
+    end
+
+    it 'should accept them as a hash with symbols' do
+      message = Mail.new({
+        :tag => 'foo',
+      })
+      message.tag.should == 'foo'
+    end
+
+    it 'should accept them as a hash with strings' do
+      message = Mail.new({
+        'tag' => 'foo',
+      })
+      message.tag.should == 'foo'
+    end
+  end
+end

data/spec/mailgun/message_spec.rb

@@ -1,5 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require 'multi_mail/mailgun/message'
 
 describe MultiMail::Message::Mailgun do
   let :message do
@@ -121,6 +120,19 @@ describe MultiMail::Message::Mailgun do
     MultiMail::Message::Mailgun.new
   end
 
+  let :message_with_one_tag do
+    MultiMail::Message::Mailgun.new do
+      tag 'foo'
+    end
+  end
+
+  let :message_with_many_tags do
+    MultiMail::Message::Mailgun.new do
+      tag 'foo'
+      tag 'bar'
+    end
+  end
+
   describe '#mailgun_attachments' do
     it 'should return the attachments' do
       attachments = message.mailgun_attachments
@@ -196,13 +208,13 @@ describe MultiMail::Message::Mailgun do
     it 'should return the message as Mailgun parameters' do
       hash = message.to_mailgun_hash
 
-      hash[:from].should       == [%("John Doe" <foo@example.com>)]
-      hash[:to].should         == [%("Jane Doe" <bar@example.com>), '<baz@example.com>']
-      hash[:cc].should         == ['cc@example.com']
-      hash[:bcc].should        == ['bcc@example.com']
-      hash[:subject].should    == ['test']
-      hash[:text].should       == ['hello']
-      hash[:html].should       == ['<p>hello</p>']
+      hash[:from].should         == [%("John Doe" <foo@example.com>)]
+      hash[:to].should           == [%("Jane Doe" <bar@example.com>), '<baz@example.com>']
+      hash[:cc].should           == ['cc@example.com']
+      hash[:bcc].should          == ['bcc@example.com']
+      hash[:subject].should      == ['test']
+      hash[:text].should         == ['hello']
+      hash[:html].should         == ['<p>hello</p>']
       hash[:'h:Reply-To'].should == ['noreply@example.com']
 
       Time.parse(hash[:'h:Date'][0]).should be_within(1).of(Time.at(946702800))
@@ -225,6 +237,12 @@ describe MultiMail::Message::Mailgun do
       hash.size.should == 16
     end
 
+    it 'should return the recipients without names' do
+      hash = message_without_names.to_mailgun_hash
+      hash[:from].should == ['foo@example.com']
+      hash[:to].should == ['bar@example.com', 'baz@example.com']
+    end
+
     it 'should convert the message without a text body' do
       message_without_text_body.to_mailgun_hash.should == {
         :from             => ['foo@example.com'],
@@ -247,5 +265,17 @@ describe MultiMail::Message::Mailgun do
     it 'should convert an empty message' do
       empty_message.to_mailgun_hash.should == {}
     end
+
+    it 'should convert the message with one tag' do
+      message_with_one_tag.to_mailgun_hash.should == {
+        :'o:tag' => ['foo'],
+      }
+    end
+
+    it 'should convert the message with many tags' do
+      message_with_many_tags.to_mailgun_hash.should == {
+        :'o:tag' => ['foo', 'bar'],
+      }
+    end
   end
 end

data/spec/mailgun/receiver_spec.rb

@@ -2,141 +2,135 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 require 'multi_mail/mailgun/receiver'
 
 describe MultiMail::Receiver::Mailgun do
-  context 'after initialization' do
-    context 'with invalid HTTP POST format' do
-      let :service do
-        MultiMail::Receiver.new({
-          :provider => :mailgun,
-          :mailgun_api_key => 'foo',
-          :http_post_format => 'invalid',
-        })
-      end
+  context 'with invalid HTTP POST format' do
+    let :service do
+      MultiMail::Receiver.new({
+        :provider => :mailgun,
+        :mailgun_api_key => 'foo',
+        :http_post_format => 'invalid',
+      })
+    end
 
-      describe '#transform' do
-        it 'should raise an error if :http_post_format is invalid' do
-          expect{ service.transform({}) }.to raise_error(ArgumentError)
-        end
+    describe '#transform' do
+      it 'should raise an error if :http_post_format is invalid' do
+        expect{ service.transform({}) }.to raise_error(ArgumentError)
       end
     end
+  end
+
+  context 'without optional arguments' do
+    let :service do
+      MultiMail::Receiver.new(:provider => :mailgun)
+    end
+
+    def params(fixture)
+      MultiMail::Receiver::Mailgun.parse(response('mailgun/parsed', fixture))
+    end
 
-    context 'without optional arguments' do
-      let :service do
-        MultiMail::Receiver.new(:provider => :mailgun)
+    describe '#valid?' do
+      it 'should return true if the response is valid' do
+        service.valid?(params('valid')).should == true
       end
 
-      def params(fixture)
-        MultiMail::Receiver::Mailgun.parse(response('mailgun/parsed', fixture))
+      it 'should return true if the response is invalid' do
+        service.valid?(params('invalid')).should == true
       end
 
-      describe '#valid?' do
-        it 'should return true if the response is valid' do
-          service.valid?(params('valid')).should == true
-        end
+      it 'should return true if parameters are missing' do
+        service.valid?(params('missing')).should == true
+      end
+    end
+  end
 
-        it 'should return true if the response is invalid' do
-          service.valid?(params('invalid')).should == true
-        end
+  [false, true].each do |action_dispatch|
+    let :action_dispatch do
+      action_dispatch
+    end
 
-        it 'should return true if parameters are missing' do
-          service.valid?(params('missing')).should == true
+    ['parsed', 'raw', '', nil].each do |http_post_format|
+      context "with #{http_post_format.inspect} format and #{action_dispatch ? 'ActionDispatch' : 'Rack'}" do
+        let :actual_http_post_format do
+          http_post_format.to_s.empty? ? 'parsed' : http_post_format
         end
-      end
-    end
 
-    [false, true].each do |action_dispatch|
-      let :action_dispatch do
-        action_dispatch
-      end
+        let :service do
+          MultiMail::Receiver.new({
+            :provider => :mailgun,
+            :mailgun_api_key => 'foo',
+            :http_post_format => http_post_format,
+          })
+        end
 
-      ['parsed', 'raw', '', nil].each do |http_post_format|
-        context "with #{http_post_format.inspect} format and #{action_dispatch ? 'ActionDispatch' : 'Rack'}" do
-          let :http_post_format do
-            http_post_format
-          end
+        def params(fixture)
+          MultiMail::Receiver::Mailgun.parse(response("mailgun/#{actual_http_post_format}", fixture, action_dispatch))
+        end
 
-          let :actual_http_post_format do
-            http_post_format.to_s.empty? ? 'parsed' : http_post_format
+        describe '#valid?' do
+          it 'should return true if the response is valid' do
+            service.valid?(params('valid')).should == true
           end
 
-          let :service do
-            MultiMail::Receiver.new({
-              :provider => :mailgun,
-              :mailgun_api_key => 'foo',
-              :http_post_format => http_post_format,
-            })
+          it 'should return false if the response is invalid' do
+            service.valid?(params('invalid')).should == false
           end
 
-          def params(fixture)
-            MultiMail::Receiver::Mailgun.parse(response("mailgun/#{actual_http_post_format}", fixture, action_dispatch))
+          it 'should raise an error if parameters are missing' do
+            expect{ service.valid?(params('missing')) }.to raise_error(IndexError)
           end
+        end
 
-          describe '#valid?' do
-            it 'should return true if the response is valid' do
-              service.valid?(params('valid')).should == true
-            end
-
-            it 'should return false if the response is invalid' do
-              service.valid?(params('invalid')).should == false
-            end
-
-            it 'should raise an error if parameters are missing' do
-              expect{ service.valid?(params('missing')) }.to raise_error(IndexError)
+        describe '#transform' do
+          it 'should return a mail message' do
+            messages = service.transform(params('valid'))
+            messages.size.should == 1
+            message = messages[0]
+
+            # Headers
+            message.date.should    == DateTime.parse('Mon, 15 Apr 2013 20:20:12 -04:00')
+            message.from.should    == ['james@opennorth.ca']
+            message.to.should      == ['foo+bar@multimail.mailgun.org']
+            message.subject.should == 'Test'
+
+            # Body
+            message.multipart?.should            == true
+            message.parts.size.should            == 4
+            text_part = message.parts.find{|part| part.content_type == 'text/plain'}
+            html_part = message.parts.find{|part| part.content_type == 'text/html; charset=UTF-8'}
+            text_part.body.decoded.should == "bold text\n\n\n\nsome more bold text\n\n\n\nsome italic text\n\n> multiline\n> quoted\n> text\n\n\n--\nSignature block"
+            html_part.body.decoded.should == %(<html><head></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><b>bold text</b><div><br></div><div></div></body></html><html><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><head></head><br><div></div><div><br></div><div><b>some more bold text</b></div><div><b><br></b></div><div><b></b></div></body></html><html><head></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><br><div><b></b></div><div><b><span class="Apple-style-span" style="font-weight: normal; "><br></span></b></div><div><b><span class="Apple-style-span" style="font-weight: normal; "><i>some italic text</i></span></b></div><div><b><span class="Apple-style-span" style="font-weight: normal; "><br></span></b></div><div><blockquote type="cite">multiline</blockquote><blockquote type="cite">quoted</blockquote><blockquote type="cite">text</blockquote></div><div><br></div><div>--</div><div>Signature block</div></body></html>)
+
+            # Attachments
+            attachment0 = message.attachments.find{|attachment| attachment.filename == 'foo.txt'}
+            attachment1 = message.attachments.find{|attachment| attachment.filename == 'bar.txt'}
+            attachment0.read.should == "Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n"
+            attachment1.read.should == "Nam accumsan euismod eros et rhoncus.\n"
+
+            # Extra Mailgun parameters
+            # @note Due to a Mailgun bug, `stripped-text` contains "some italic
+            #    text" but `stripped-html` doesn't. `stripped-signature` and
+            #    `stripped-text` use CRLF line endings.
+            if actual_http_post_format == 'raw'
+              message['stripped-text'].should be_nil
+              message['stripped-signature'].should be_nil
+              message['stripped-html'].should be_nil
+            else
+              message['stripped-text'].value.should      == "bold text\r\n\r\n\r\n\r\nsome more bold text\r\n\r\n\r\n\r\nsome italic text"
+              message['stripped-signature'].value.should == "--\r\nSignature block"
+              message['stripped-html'].value.should      == '<html><head></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><b>bold text</b><div><br></div><div></div></body><html><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><br><div></div><div><br></div><div><b>some more bold text</b></div><div><b><br></b></div><div><b></b></div></body></html><html><head></head></html></html>'
             end
           end
+        end
 
-          describe '#transform' do
-            it 'should return a mail message' do
-              messages = service.transform(params('valid'))
-              messages.size.should == 1
-              message = messages[0]
-
-              # Headers
-              message.date.should    == DateTime.parse('Mon, 15 Apr 2013 20:20:12 -04:00')
-              message.from.should    == ['james@opennorth.ca']
-              message.to.should      == ['foo+bar@multimail.mailgun.org']
-              message.subject.should == 'Test'
-
-              # Body
-              message.multipart?.should            == true
-              message.parts.size.should            == 4
-              text_part = message.parts.find{|part| part.content_type == 'text/plain'}
-              html_part = message.parts.find{|part| part.content_type == 'text/html; charset=UTF-8'}
-              text_part.body.decoded.should == "bold text\n\n\n\nsome more bold text\n\n\n\nsome italic text\n\n> multiline\n> quoted\n> text\n\n\n--\nSignature block"
-              html_part.body.decoded.should == %(<html><head></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><b>bold text</b><div><br></div><div></div></body></html><html><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><head></head><br><div></div><div><br></div><div><b>some more bold text</b></div><div><b><br></b></div><div><b></b></div></body></html><html><head></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><br><div><b></b></div><div><b><span class="Apple-style-span" style="font-weight: normal; "><br></span></b></div><div><b><span class="Apple-style-span" style="font-weight: normal; "><i>some italic text</i></span></b></div><div><b><span class="Apple-style-span" style="font-weight: normal; "><br></span></b></div><div><blockquote type="cite">multiline</blockquote><blockquote type="cite">quoted</blockquote><blockquote type="cite">text</blockquote></div><div><br></div><div>--</div><div>Signature block</div></body></html>)
-
-              # Attachments
-              attachment0 = message.attachments.find{|attachment| attachment.filename == 'foo.txt'}
-              attachment1 = message.attachments.find{|attachment| attachment.filename == 'bar.txt'}
-              attachment0.read.should == "Lorem ipsum dolor sit amet, consectetur adipiscing elit.\n"
-              attachment1.read.should == "Nam accumsan euismod eros et rhoncus.\n"
-
-              # Extra Mailgun parameters
-              # @note Due to a Mailgun bug, `stripped-text` contains "some italic
-              #    text" but `stripped-html` doesn't. `stripped-signature` and
-              #    `stripped-text` use CRLF line endings.
-              if actual_http_post_format == 'raw'
-                message['stripped-text'].should be_nil
-                message['stripped-signature'].should be_nil
-                message['stripped-html'].should be_nil
-              else
-                message['stripped-text'].value.should      == "bold text\r\n\r\n\r\n\r\nsome more bold text\r\n\r\n\r\n\r\nsome italic text"
-                message['stripped-signature'].value.should == "--\r\nSignature block"
-                message['stripped-html'].value.should      == '<html><head></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><b>bold text</b><div><br></div><div></div></body><html><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><br><div></div><div><br></div><div><b>some more bold text</b></div><div><b><br></b></div><div><b></b></div></body></html><html><head></head></html></html>'
-              end
-            end
+        describe '#spam?' do
+          it 'should return true if the response is spam' do
+            # The raw MIME HTTP POST format doesn't perform spam filtering.
+            message = service.transform(params('spam'))[0]
+            service.spam?(message).should == (actual_http_post_format != 'raw')
           end
 
-          describe '#spam?' do
-            it 'should return true if the response is spam' do
-              # The raw MIME HTTP POST format doesn't perform spam filtering.
-              message = service.transform(params('spam'))[0]
-              service.spam?(message).should == (actual_http_post_format != 'raw')
-            end
-
-            it 'should return false if the response is ham' do
-              message = service.transform(params('valid'))[0]
-              service.spam?(message).should == false
-            end
+          it 'should return false if the response is ham' do
+            message = service.transform(params('valid'))[0]
+            service.spam?(message).should == false
           end
         end
       end

data/spec/mailgun/sender_spec.rb

@@ -1,5 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require 'multi_mail/mailgun/sender'
 
 describe MultiMail::Sender::Mailgun do
   let :message do
@@ -52,38 +51,41 @@ describe MultiMail::Sender::Mailgun do
     it 'should raise an error if :api_key is missing' do
       expect{
         message.delivery_method MultiMail::Sender::Mailgun, :domain => 'xxx'
-        message.deliver # request not sent
       }.to raise_error(ArgumentError, "Missing required arguments: api_key")
     end
 
     it 'should raise an error if :domain is missing' do
       expect{
         message.delivery_method MultiMail::Sender::Mailgun, :api_key => 'xxx'
-        message.deliver # request not sent
       }.to raise_error(ArgumentError, "Missing required arguments: domain")
     end
 
     it 'should raise an error if :api_key is nil' do
       expect{
         message.delivery_method MultiMail::Sender::Mailgun, :api_key => nil, :domain => 'xxx'
-        message.deliver # request not sent
       }.to raise_error(ArgumentError, "Missing required arguments: api_key")
     end
 
     it 'should raise an error if :domain is nil' do
       expect{
         message.delivery_method MultiMail::Sender::Mailgun, :api_key => 'xxx', :domain => nil
-        message.deliver # request not sent
       }.to raise_error(ArgumentError, "Missing required arguments: domain")
     end
 
-    it 'should raise an error if :domain or :api_key are invalid' do
+    it 'should raise an error if :api_key is invalid' do
       expect{
-        message.delivery_method MultiMail::Sender::Mailgun, :api_key => 'xxx', :domain => 'xxx'
+        message.delivery_method MultiMail::Sender::Mailgun, :api_key => 'xxx', :domain => 'multimail.mailgun.org'
         message.deliver
       }.to raise_error(MultiMail::InvalidAPIKey)
     end
 
+    it 'should raise an error if :domain is invalid' do
+      expect{
+        message.delivery_method MultiMail::Sender::Mailgun, :api_key => ENV['MAILGUN_API_KEY'], :domain => 'xxx'
+        message.deliver
+      }.to raise_error(MultiMail::InvalidRequest, "Domain not found: xxx")
+    end
+
     it 'should assign custom settings' do
       sender = MultiMail::Sender::Mailgun.new(:api_key => 'xxx', :domain => 'xxx')
 
@@ -168,6 +170,10 @@ describe MultiMail::Sender::Mailgun do
       expect{message_without_to.deliver!}.to raise_error(MultiMail::MissingRecipients, "'to' parameter is missing")
     end
 
+    it 'should send a message without a subject' do
+      expect{message_without_subject.deliver!}.to_not raise_error
+    end
+
     it 'should not send a message without a body' do
       expect{message_without_body.deliver!}.to raise_error(MultiMail::MissingBody, "Need at least one of 'text' or 'html' parameters specified")
     end