mad_mimi_mailer 0.0.6 → 0.0.7

data/lib/mad_mimi_mailer.rb

@@ -12,13 +12,13 @@ class MadMimiMailer < ActionMailer::Base
   # Custom Mailer attributes
 
   def promotion(promotion = nil)
-    if promotion.nil? 
+    if promotion.nil?
       @promotion
     else
       @promotion = promotion
     end
   end
-  
+
   def use_erb(use_erb = nil)
     if use_erb.nil?
       @use_erb
@@ -26,7 +26,7 @@ class MadMimiMailer < ActionMailer::Base
       @use_erb = use_erb
     end
   end
-  
+
   def hidden(hidden = nil)
     if hidden.nil?
       @hidden
@@ -36,39 +36,38 @@ class MadMimiMailer < ActionMailer::Base
   end
 
   # Class methods
-  
-  class << self  
-        
+
+  class << self
+
     def method_missing(method_symbol, *parameters)
       if method_symbol.id2name.match(/^deliver_(mimi_[_a-z]\w*)/)
         deliver_mimi_mail($1, *parameters)
       else
         super
-      end    
+      end
     end
-    
+
     def deliver_mimi_mail(method, *parameters)
-      mail = new      
+      mail = new
       mail.__send__(method, *parameters)
 
       if mail.use_erb
         mail.create!(method, *parameters)
       end
-      
+
       return unless perform_deliveries
 
       if delivery_method == :test
-        deliveries << mail
+        deliveries << (mail.mail ? mail.mail : mail)
       else
         call_api!(mail, method)
       end
     end
-      
+
     def call_api!(mail, method)
       params = {
         'username' => api_settings[:username],
         'api_key' =>  api_settings[:api_key],
-        
         'promotion_name' => mail.promotion || method.to_s.sub(/^mimi_/, ''),
         'recipients' =>     serialize(mail.recipients),
         'subject' =>        mail.subject,
@@ -78,18 +77,23 @@ class MadMimiMailer < ActionMailer::Base
       }
 
       if mail.use_erb
+        if mail.parts.any?
+          mail = mail.parts.detect {|p| p.content_type == 'text/html' }
+        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
-      
+
       response = post_request do |request|
         request.set_form_data(params)
       end
-      
+
       case response
       when Net::HTTPSuccess
         response.body
@@ -97,7 +101,7 @@ class MadMimiMailer < ActionMailer::Base
         response.error!
       end
     end
-    
+
     def post_request
       url = URI.parse(SINGLE_SEND_URL)
       request = Net::HTTP::Post.new(url.path)
@@ -108,7 +112,7 @@ class MadMimiMailer < ActionMailer::Base
         http.request(request)
       end
     end
-    
+
     def serialize(recipients)
       case recipients
       when String
@@ -122,7 +126,7 @@ class MadMimiMailer < ActionMailer::Base
       end
     end
   end
-  
+
   class ValidationError < StandardError; end
 end
 

metadata

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