mad_mimi_mailer 0.0.7 → 0.0.8

data/lib/mad_mimi_mailer.rb

@@ -1,9 +1,9 @@
-require "actionmailer"
+require "action_mailer"
 require "net/http"
 require "net/https"
 
 class MadMimiMailer < ActionMailer::Base
-  VERSION = '0.0.5'
+  VERSION = '0.0.8'
   SINGLE_SEND_URL = 'https://madmimi.com/mailer'
 
   @@api_settings = {}
@@ -78,14 +78,12 @@ class MadMimiMailer < ActionMailer::Base
 
       if mail.use_erb
         if mail.parts.any?
-          mail = mail.parts.detect {|p| p.content_type == 'text/html' }
+          params['raw_plain_text'] = content_for(mail, "text/plain")
+          params['raw_html'] = content_for(mail, "text/html") { |html| validate(html.body) }
+        else
+          validate(mail.body)
+          params['raw_html'] = mail.body
         end
-
-        unless mail.body.include?("[[peek_image]]")
-          raise ValidationError, "You must include a web beacon in your Mimi email: [[peek_image]]"
-        end
-
-        params['raw_html'] = mail.body
       else
         params['body'] = mail.body.to_yaml
       end
@@ -102,6 +100,20 @@ class MadMimiMailer < ActionMailer::Base
       end
     end
 
+    def content_for(mail, content_type)
+      part = mail.parts.detect {|p| p.content_type == content_type }
+      if part
+        yield(part) if block_given?
+        part.body
+      end
+    end
+    
+    def validate(content)
+      unless content.include?("[[peek_image]]") || content.include?("[[tracking_beacon]]")
+        raise ValidationError, "You must include a web beacon in your Mimi email: [[peek_image]]"
+      end
+    end
+
     def post_request
       url = URI.parse(SINGLE_SEND_URL)
       request = Net::HTTP::Post.new(url.path)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mad_mimi_mailer
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Dave Hoover
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-20 00:00:00 -05:00
+date: 2010-01-04 00:00:00 -06:00
 default_executable: 
 dependencies: []