iron_mailer 0.0.10 → 0.0.11

data/iron_mailer.gemspec

@@ -25,5 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "iron_mq", '~> 3.1'
   spec.add_dependency "iron_cache", '~> 1.3'
   spec.add_dependency "typhoeus"
-  
+  spec.add_dependency "uuidtools" 
 end

data/lib/iron_mailer/send_email.rb

@@ -1,4 +1,5 @@
 require 'iron_cache'
+require 'uuidtools'
 class IronMailer::SendEmail
   attr_reader  :iron_mq_client, :iron_cache_client, :queue, :cache, :debug, :delivery_method, :delivery_method_settings
   
@@ -43,6 +44,7 @@ class IronMailer::SendEmail
         duplicate.bcc = nil
         duplicate.cc = nil
       end
+      duplicate.header['X-SMTPAPI']={cache_key: UUIDTools::UUID.random_create.to_s}.to_json
       duplicate
     }
   end
@@ -56,6 +58,12 @@ class IronMailer::SendEmail
     }
   end
   
+  def cache_email(mail)
+    field = mail.header['X-SMTPAPI'].is_a?(Array) ? mail.header['X-SMTPAPI'].first : mail.header['X-SMTPAPI']
+    cache_key = JSON.parse(field.value)['cache_key']
+    self.cache.put(cache_key, self.extract_cache_info(mail).to_json)
+  end
+
   def execute
     messages = self.queue.get(:n=>100)
     
@@ -69,7 +77,7 @@ class IronMailer::SendEmail
         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)
+          cache_email(mail)
         end
         message.delete
       rescue Exception=>e 

data/lib/iron_mailer/version.rb

@@ -1,3 +1,3 @@
 module IronMailer
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/spec/iron_mailer/send_email_spec.rb

@@ -94,33 +94,6 @@ describe IronMailer::SendEmail do
     
   end
   
-  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'=>false}
-  end
-  
-  def test_email(other_tos=[])
-    to = (['to@example.com']<<other_tos)
-    
-    mail=Mail.new do
-      to to
-      from "from@example.com"
-      subject "This is a test email"
-      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
-  
   describe "execute" do    
     before(:each) do
       @iron_mq_config = JSON.parse(File.read('spec/config/iron_mq.json'))
@@ -150,11 +123,8 @@ describe IronMailer::SendEmail do
     end
     
     it "should add info about the email to the cache" do
-      @execute.should change(@send_email.cache, :size).by(1)
-      
-      lambda{
-        JSON.parse(@send_email.cache.get(@test_email.message_id).value)
-      }.should_not raise_error
+      @send_email.should_receive(:cache_email)
+      @execute.call
     end
     
     it "should call deliver with on the results of split_email" do
@@ -192,7 +162,49 @@ describe IronMailer::SendEmail do
     end
   end
   
-  
+  describe "cache_email" do
+    before(:each) do
+      @send_email = IronMailer::SendEmail.new(test_config)
+      @test_email = @send_email.split_email(test_email).first
+      @cache=lambda{
+        @send_email.cache_email(@test_email)
+        @send_email.cache.reload
+      }
+    end
+    
+    
+    after(:each) do
+      @send_email.cache.clear if @send_email.cache.size > 0
+    end
+    
+    it "should add an item to the cache " do
+      @cache.should change(@send_email.cache, :size).by(1)
+    end
+    
+    it "should use the cache key from the header" do
+      @cache.call
+      cache_key=JSON.parse(@test_email.header['X-SMTPAPI'].value)['cache_key']
+      @send_email.cache.get(cache_key).should_not be_nil
+    end
+
+    it "should blow up if the cache key is blank" do
+      @test_email.header['X-SMTPAPI'] = nil
+      @test_email.header['X-SMTPAPI'] = {cache_key: nil}.to_json
+      @cache.should raise_error
+    end
+    
+    it "should blow up if the header is blank" do
+      @test_email.header['X-SMTPAPI'] = nil
+      @test_email.header['X-SMTPAPI'] = ""
+      @cache.should raise_error
+    end
+
+    it "should handle 'X-SMTPAPI' being an array" do
+      @test_email.header['X-SMTPAPI'] = 'some_header_value'
+      @cache.should change(@send_email.cache, :size).by(1)
+    end
+
+  end
   describe "extract_cache_info" do
     before(:each) do
       @send_email = IronMailer::SendEmail.new(test_config)
@@ -268,5 +280,38 @@ describe IronMailer::SendEmail do
       }
       @send_email.split_email(@test_email).first.body.to_s.should =~ /This is not multipart/
     end
+    
+    it "should include a cache_id in the smtp headers" do
+      @email = @send_email.split_email(@test_email).first
+      JSON.parse(@email.header['X-SMTPAPI'].first.value)['cache_key'].should_not be_blank
+    end
+  end
+  
+  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'=>false}
   end
+  
+  def test_email(other_tos=[])
+    to = (['to@example.com']<<other_tos)
+    
+    mail=Mail.new do
+      to to
+      from "from@example.com"
+      subject "This is a test email"
+      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
+    
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_mailer
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-07 00:00:00.000000000 Z
+date: 2013-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -123,6 +123,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: uuidtools
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Rails mail delivery method using Iron MQ & Workers
 email:
 - erich@hordesoftware.com