iron_mailer 0.0.8 → 0.0.9

data/.gitignore

@@ -20,3 +20,4 @@ tmp
 .ruby-version
 .rvmrc
 spec/config/*
+scratchpad/*

data/lib/iron_mailer/send_email.rb

@@ -24,43 +24,24 @@ class IronMailer::SendEmail
         @delivery_method_settings={}
       end
 
-    # Mail.defaults do
-    #   if options['delivery_method'].is_a?(Hash)
-    #     delivery_method_hash = options['delivery_method']
-    #     params = delivery_method_hash.values.first.clone
-    #     params.keys.each do |key|
-    #       params[(key.to_sym rescue key) || key] = params.delete(key)
-    #     end
-    #     delivery_method delivery_method_hash.keys.first.to_sym, params
-    #   else
-    #     delivery_method options['delivery_method'].to_sym          
-    #   end
-    # end
   end
   
   def split_email(source_email)
     tos = source_email.to
     tos.uniq.map{|destination|
-      Mail.new do
-        to destination
-        from source_email.from
-        subject source_email.subject
-        if destination==tos.first
-          message_id source_email.message_id
-          bcc source_email.bcc
-          cc source_email.cc
-        end
-        reply_to source_email.reply_to
-        date source_email.date
-        html_part do
-          content_type  'text/html; charset=UTF-8'
-          body source_email.html_part.body.to_s
-        end if source_email.html_part
-
-        text_part do
-          body source_email.text_part.body.to_s
-        end if source_email.text_part
-      end      
+      duplicate = source_email.clone
+      duplicate.to = destination
+      
+      if destination==tos.first
+        duplicate.message_id=source_email.message_id
+        duplicate.bcc=source_email.bcc
+        duplicate.cc=source_email.cc
+      else
+        duplicate.message_id = nil
+        duplicate.bcc = nil
+        duplicate.cc = nil
+      end
+      duplicate
     }
   end
 
@@ -69,7 +50,7 @@ class IronMailer::SendEmail
       'date'=>mail.date,
       'from'=>mail.from,
       'to'=>mail.to,
-      'content'=>(mail.html_part || mail.text_part).body.to_s
+      'body'=>mail.body.to_s
     }
   end
   
@@ -81,8 +62,8 @@ class IronMailer::SendEmail
       begin
         source_email = Mail.new(message.body)
         puts "Processing: #{source_email.subject}" if self.debug
+        puts self.delivery_method=>self.delivery_method_settings if self.debug
         mails = self.split_email(source_email)
-
         mails.each do |mail|
           mail.delivery_method self.delivery_method, self.delivery_method_settings
           mail.deliver

data/lib/iron_mailer/version.rb

@@ -1,3 +1,3 @@
 module IronMailer
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/iron_mailer/send_email_spec.rb

@@ -107,12 +107,16 @@ describe IronMailer::SendEmail do
       to to
       from "from@example.com"
       subject "This is a test email"
-      text_part do
-        body "This is a test"
-      end
-      html_part do
-        content_type  'text/html; charset=UTF-8'
-        body "<h1>This is a test</h1>"
+      if block_given?
+        body yield
+      else
+        text_part do
+          body "This is a test"
+        end
+        html_part do
+          content_type  'text/html; charset=UTF-8'
+          body "<h1>This is a test</h1>"
+        end
       end
     end      
   end
@@ -260,5 +264,11 @@ describe IronMailer::SendEmail do
       @send_email.split_email(@test_email).first.cc.should == @test_email.cc
     end
     
+    it "should handle non-multipart emails" do
+      @test_email=test_email{
+        "This is not multipart"
+      }
+      @send_email.split_email(@test_email).first.body.to_s.should =~ /This is not multipart/
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_mailer
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -141,7 +141,6 @@ files:
 - lib/iron_mailer/mq_mailer.rb
 - lib/iron_mailer/send_email.rb
 - lib/iron_mailer/version.rb
-- payload.json
 - spec/iron_mailer/mq_mailer_spec.rb
 - spec/iron_mailer/send_email_spec.rb
 homepage: ''

data/payload.json

@@ -1,23 +0,0 @@
-{
-    "debug": "true", 
-    "delivery_method": {
-        "smtp": {
-            "address": "smtp.sendgrid.net", 
-            "authentication": "plain", 
-            "domain": "teamdriveaway.com", 
-            "password": "trucking2006", 
-            "port": 587, 
-            "user_name": "teamdriveaway"
-        }
-    }, 
-    "iron_cache": {
-        "cache_name": "development_email_cache", 
-        "project_id": "50a79df0a6498073e700560c", 
-        "token": "6P0Hr8umXZruKzS3SbKF1vuu1E8"
-    }, 
-    "iron_mq": {
-        "project_id": "511fb1f0d429792c50001158", 
-        "queue_name": "development_mail_queue", 
-        "token": "xv0iMDhbPB2xN5EaDH8CK4jAdQs"
-    }
-}