Add support for passing empty hashes as attachment

Author: krissi

lib/pony.rb

@@ -233,15 +233,17 @@ def build_mail(options)
       # we need to explicitly define a second multipart/alternative
       # boundary to encapsulate the body-parts within the
       # multipart/mixed boundary that will be created automatically.
-      if options[:attachments] && options[:html_body] && options[:body]
+      options[:attachments] ||= {}
+
+      if options[:attachments].any? && options[:html_body] && options[:body]
         mail.part(:content_type => 'multipart/alternative') do |p|
           p.html_part = build_html_part(options)
           p.text_part = build_text_part(options)
         end
 
       # Otherwise if there is more than one part we still need to
       # ensure that they are all declared to be separate.
-      elsif options[:html_body] || options[:attachments]
+      elsif options[:html_body] || options[:attachments].any?
         mail.html_part = build_html_part(options) if options[:html_body]
         mail.text_part = build_text_part(options) if options[:body]
 
@@ -254,7 +256,7 @@ def build_mail(options)
         mail[key] = value
       end
 
-      add_attachments(mail, options[:attachments]) if options[:attachments]
+      add_attachments(mail, options[:attachments]) if options[:attachments].any?
 
       mail.charset = options[:charset] if options[:charset] # charset must be set after setting content_type
 

spec/pony_spec.rb

@@ -301,6 +301,24 @@
   end
 
   describe "content type" do
+    shared_examples 'a mail with only html_body and body set' do
+      it { expect(mail.parts.length).to eq 2 }
+      it { expect(mail.content_type.to_s).to include( 'multipart/alternative' ) }
+      it { expect(mail.parts[0].to_s).to include( 'Content-Type: text/html' ) }
+      it { expect(mail.parts[1].to_s).to include( 'Content-Type: text/plain' ) }
+    end
+
+    context "mail html_body and body" do
+      subject(:mail) do
+        Pony.send(:build_mail,
+                  :body => 'test',
+                  :html_body => 'What do you know, Joe?',
+                  )
+      end
+
+      it_behaves_like 'a mail with only html_body and body set'
+    end
+
     context "mail with attachments, html_body and body " do
       subject(:mail) do
         Pony.send(:build_mail,
@@ -318,6 +336,18 @@
       it { expect(mail.parts[0].parts[1].to_s).to include( 'Content-Type: text/plain' ) }
       it { expect(mail.parts[1].to_s).to include( 'Content-Type: text/plain' ) }
     end
+
+    context "mail html_body and body and empty attachment list" do
+      subject(:mail) do
+        Pony.send(:build_mail,
+                  :body => 'test',
+                  :html_body => 'What do you know, Joe?',
+                  :attachments => {},
+                  )
+      end
+
+      it_behaves_like 'a mail with only html_body and body set'
+    end
   end
 
   describe "additional headers" do