iron_mailer 0.0.7 → 0.0.8

data/lib/iron_mailer/send_email.rb

@@ -1,6 +1,6 @@
 require 'iron_cache'
 class IronMailer::SendEmail
-  attr_reader  :iron_mq_client, :iron_cache_client, :queue, :cache, :debug
+  attr_reader  :iron_mq_client, :iron_cache_client, :queue, :cache, :debug, :delivery_method, :delivery_method_settings
   
   def initialize(options={})    
     @iron_mq_client = IronMQ::Client.new(options['iron_mq'])
@@ -9,14 +9,33 @@ class IronMailer::SendEmail
     
     @cache = @iron_cache_client.cache(options['iron_cache']['cache_name'])
     @debug = options['debug']
-    Mail.defaults do
+
       if options['delivery_method'].is_a?(Hash)
         delivery_method_hash = options['delivery_method']
-        delivery_method delivery_method_hash.keys.first.to_sym, delivery_method_hash.values.first
+        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
+        @delivery_method_settings = params
       else
-        delivery_method options['delivery_method'].to_sym          
+        @delivery_method=options['delivery_method'].to_sym          
+        @delivery_method_settings={}
       end
-    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)
@@ -32,7 +51,7 @@ class IronMailer::SendEmail
           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
@@ -65,8 +84,8 @@ class IronMailer::SendEmail
         mails = self.split_email(source_email)
 
         mails.each do |mail|
+          mail.delivery_method self.delivery_method, self.delivery_method_settings
           mail.deliver
-        
           self.cache.put(mail.message_id, self.extract_cache_info(mail).to_json)
         end
         message.delete

data/lib/iron_mailer/version.rb

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

data/payload.json

@@ -0,0 +1,23 @@
+{
+    "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"
+    }
+}

data/spec/iron_mailer/send_email_spec.rb

@@ -25,7 +25,8 @@ describe IronMailer::SendEmail do
     
     it "should allow setting of a test delivery_method" do
       IronMailer::SendEmail.new(@options.merge('delivery_method'=>'test'))
-      Mail.delivery_method.class.should == Mail::TestMailer
+      @send_email.delivery_method.should == :smtp
+      @send_email.delivery_method_settings.class.should == Hash
     end
   
     describe "iron_mq_client" do
@@ -56,34 +57,38 @@ describe IronMailer::SendEmail do
         @send_email.cache.name.should == @options['iron_cache']['cache_name']
       end
     end
-  
+    
+    it "should set delivery_method" do
+       @send_email.delivery_method.should == @options['delivery_method'].keys.first.to_sym
+    end
+    
     describe "smtp_config" do
       it "should assign the address" do
-        Mail.delivery_method.settings['address'].should == @options['delivery_method']['smtp']['address']
+        @send_email.delivery_method_settings[:address].should == @options['delivery_method']['smtp']['address']
       end
       
       it "should assign the port" do
-        Mail.delivery_method.settings['port'] == @options['delivery_method']['smtp']['port']
+        @send_email.delivery_method_settings[:port] == @options['delivery_method']['smtp']['port']
       end
       
       it "should assign the domain" do
-        Mail.delivery_method.settings['domain'] == @options['delivery_method']['smtp']['domain']
+        @send_email.delivery_method_settings[:domain] == @options['delivery_method']['smtp']['domain']
       end
       
       it "should assign the user_name" do
-        Mail.delivery_method.settings['user_name'] == @options['delivery_method']['smtp']['user_name']
+        @send_email.delivery_method_settings[:user_name] == @options['delivery_method']['smtp']['user_name']
       end
       
       it "should assign the password" do
-        Mail.delivery_method.settings['password'] == @options['delivery_method']['smtp']['password']
+        @send_email.delivery_method_settings[:password] == @options['delivery_method']['smtp']['password']
       end
       
       it "should assign the authentication" do
-        Mail.delivery_method.settings['authentication'] == @options['delivery_method']['smtp']['authentication']
+        @send_email.delivery_method_settings[:authentication] == @options['delivery_method']['smtp']['authentication']
       end
       
       it "should assign enable_starttls_auto" do
-        Mail.delivery_method.settings['enable_starttls_auto'] == @options['delivery_method']['smtp']['enable_starttls_auto']
+        @send_email.delivery_method_settings[:enable_starttls_auto] == @options['delivery_method']['smtp']['enable_starttls_auto']
       end
     end
     
@@ -92,7 +97,7 @@ describe IronMailer::SendEmail do
   def test_config
     @iron_mq_config = JSON.parse(File.read('spec/config/iron_mq.json'))
     @iron_cache_config = JSON.parse(File.read('spec/config/iron_cache.json'))
-    {'iron_mq'=>@iron_mq_config, 'iron_cache'=>@iron_cache_config.merge('cache_name'=>"test_email_cache"), 'delivery_method'=>'test', 'debug'=>true}
+    {'iron_mq'=>@iron_mq_config, 'iron_cache'=>@iron_cache_config.merge('cache_name'=>"test_email_cache"), 'delivery_method'=>'test', 'debug'=>false}
   end
   
   def test_email(other_tos=[])
@@ -147,13 +152,14 @@ describe IronMailer::SendEmail do
     
     it "should call deliver with on the results of split_email" do
       @test_email=test_email
+      @test_email.stub(:message_id).and_return(Time.now.to_f.to_s)
       @send_email.stub(:split_email).and_return([@test_email])
       @test_email.should_receive(:deliver)
       @execute.call
     end
     
     it "should add the message back to the queue if there's an error " do
-      @send_email.queue.clear
+      @send_email.queue.clear if @send_email.cache.size > 0
       email = test_email
       email.to.clear
       class ErrorMailer
@@ -211,7 +217,7 @@ describe IronMailer::SendEmail do
       @send_email.extract_cache_info(@test_email)['content'].should == @test_email.text_part.body.to_s
     end
   end
-
+  
   describe "split_email" do
     before(:each) do
       @send_email = IronMailer::SendEmail.new(test_config)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_mailer
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-06 00:00:00.000000000 Z
+date: 2013-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -141,6 +141,7 @@ 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: ''