mail-mad_mimi 1.0.0 → 1.1.0

data/README.md

@@ -47,11 +47,10 @@ If you are sending to an individual email address, the body must
 include `[[tracking_beacon]]` or `[[peek_image]]`.
 
 If you are sending to a list or everyone, the body must include
-`[[opt_out]]` or `unsubscribe`.
+`[[opt_out]]` or `[[unsubscribe]]`.
 
 An exception will be raised if you don't include a macro. When debugging,
-you may want to make sure that you set `raise_delivery_errors = true`
-on your `Mail` object.
+you may want to set `raise_delivery_errors = true` on your `Mail` object.
 
 ## Rails 3 support
 

data/lib/mail/mad_mimi.rb

@@ -22,19 +22,36 @@ module Mail #:nodoc:
 
     def options_from_mail(mail)
       settings.merge(
-        :recipients => mail[:to].to_s,
-        :from       => mail[:from].to_s,
-        :bcc        => mail[:bcc].to_s,
-        :subject    => mail.subject
+        :recipients     => mail[:to].to_s,
+        :from           => mail[:from].to_s,
+        :bcc            => mail[:bcc].to_s,
+        :subject        => mail.subject,
+        :raw_html       => html(mail),
+        :raw_plain_text => text(mail)
       ).tap do |options|
-        options[:raw_html]       = mail.html_part.body.to_s if mail.html_part
-        options[:raw_plain_text] = mail.text_part.body.to_s if mail.text_part
-
         if mail.respond_to? :mailer_action
-          options[:promotion_name] = mail.mailer_action 
+          options[:promotion_name] = mail.mailer_action
         end
 
         options.merge!(mail[:mad_mimi].value) if mail[:mad_mimi]
+
+        options.reject! {|k,v| v.nil? }
+      end
+    end
+
+    def html(mail)
+      body(mail, "text/html")
+    end
+
+    def text(mail)
+      body(mail, "text/plain") || mail.body.to_s
+    end
+
+    def body(mail, mime_type)
+      if part = mail.find_first_mime_type(mime_type)
+        part.body.to_s
+      elsif mail.mime_type == mime_type
+        mail.body.to_s
       end
     end
 

data/lib/mail/mad_mimi/version.rb

@@ -1,5 +1,5 @@
 module Mail
   class MadMimi
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

data/spec/mail/mad_mimi_spec.rb

@@ -70,6 +70,27 @@ describe Mail::MadMimi do
       end
     end
 
+    context "with a non-multipart text body" do
+      before(:each) do
+        mail.body         = "text body"
+        mail.content_type = "text/plain"
+      end
+
+      it "should set :raw_plain_text" do
+        options[:raw_plain_text].should == "text body"
+      end
+    end
+
+    context "with a text body no content type given" do
+      before(:each) do
+        mail.body = "text body"
+      end
+
+      it "should set :raw_plain_text" do
+        options[:raw_plain_text].should == "text body"
+      end
+    end
+
     context "with an HTML part" do
       before(:each) do
         mail.html_part do
@@ -83,6 +104,17 @@ describe Mail::MadMimi do
       end
     end
 
+    context "with a non-multipart HTML body" do
+      before(:each) do
+        mail.body         = "html body"
+        mail.content_type = "text/html"
+      end
+
+      it "should set :raw_html" do
+        options[:raw_html].should == "html body"
+      end
+    end
+
     context "with a mailer_action method" do
       before(:each) do
         mail.stub :mailer_action => "Mailer.method"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mail-mad_mimi
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Grant Hollingworth
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-06 00:00:00 Z
+date: 2011-06-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: madmimi