iron_mailer 0.0.2 → 0.0.4

data/.gitignore

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

data/iron_mailer.gemspec

@@ -22,8 +22,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_dependency "mail"
-  spec.add_dependency "iron_mq", '~> 4.0'
-  spec.add_dependency "iron_cache", '~> 1.4'
+  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,7 +1,6 @@
 require 'iron_cache'
-require 'uuidtools'
 class IronMailer::SendEmail
-  attr_reader  :iron_mq_client, :iron_cache_client, :queue, :cache, :debug, :delivery_method, :delivery_method_settings
+  attr_reader  :iron_mq_client, :iron_cache_client, :queue, :cache
   
   def initialize(options={})    
     @iron_mq_client = IronMQ::Client.new(options['iron_mq'])
@@ -9,43 +8,40 @@ class IronMailer::SendEmail
     @iron_cache_client = IronCache::Client.new(options['iron_cache'])
     
     @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_settings = {}
-
-        params = delivery_method_hash.values.first.clone
-
-        params.keys.each do |key|
-          @delivery_method_settings[key.to_sym] = params[key]
-        end
-        
+        delivery_method delivery_method_hash.keys.first.to_sym, delivery_method_hash.values.first
       else
-        @delivery_method=options['delivery_method'].to_sym          
-        @delivery_method_settings={}
+        delivery_method options['delivery_method'].to_sym          
       end
-
+    end
   end
   
   def split_email(source_email)
     tos = source_email.to
     tos.uniq.map{|destination|
-      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.header['X-SMTPAPI']={unique_args: {cache_key: UUIDTools::UUID.random_create.to_s}}.to_json
-      duplicate
+      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
+        
+        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      
     }
   end
 
@@ -54,16 +50,10 @@ class IronMailer::SendEmail
       'date'=>mail.date,
       'from'=>mail.from,
       'to'=>mail.to,
-      'mail'=>mail.to_s
+      'content'=>(mail.html_part || mail.text_part).body.to_s
     }
   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)['unique_args']['cache_key']
-    self.cache.put(cache_key, self.extract_cache_info(mail).to_json)
-  end
-
   def execute
     messages = self.queue.get(:n=>100)
     
@@ -71,28 +61,27 @@ class IronMailer::SendEmail
     messages.each do |message|
       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
-          cache_email(mail)
+        
+          self.cache.put(mail.message_id, self.extract_cache_info(mail).to_json)
         end
         message.delete
       rescue Exception=>e 
-        if self.debug
-          puts e.message 
-          puts e.backtrace
-        end
         errors << message
       end
     end
     errors.each do |message|
-      puts "Releasing: #{message.id}" if self.debug
       message.release
     end
 
   end
 
-end
+end
+
+if defined?(params)
+  IronMailer::SendEmail.execute(params)
+end

data/lib/iron_mailer/version.rb

@@ -1,3 +1,3 @@
 module IronMailer
-  VERSION = "0.0.2"
+  VERSION = "0.0.4"
 end

data/spec/iron_mailer/send_email_spec.rb

@@ -25,8 +25,7 @@ describe IronMailer::SendEmail do
     
     it "should allow setting of a test delivery_method" do
       IronMailer::SendEmail.new(@options.merge('delivery_method'=>'test'))
-      @send_email.delivery_method.should == :smtp
-      @send_email.delivery_method_settings.class.should == Hash
+      Mail.delivery_method.class.should == Mail::TestMailer
     end
   
     describe "iron_mq_client" do
@@ -57,43 +56,62 @@ 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
-        @send_email.delivery_method_settings[:address].should == @options['delivery_method']['smtp']['address']
+        Mail.delivery_method.settings['address'].should == @options['delivery_method']['smtp']['address']
       end
       
       it "should assign the port" do
-        @send_email.delivery_method_settings[:port] == @options['delivery_method']['smtp']['port']
+        Mail.delivery_method.settings['port'] == @options['delivery_method']['smtp']['port']
       end
       
       it "should assign the domain" do
-        @send_email.delivery_method_settings[:domain] == @options['delivery_method']['smtp']['domain']
+        Mail.delivery_method.settings['domain'] == @options['delivery_method']['smtp']['domain']
       end
       
       it "should assign the user_name" do
-        @send_email.delivery_method_settings[:user_name] == @options['delivery_method']['smtp']['user_name']
+        Mail.delivery_method.settings['user_name'] == @options['delivery_method']['smtp']['user_name']
       end
       
       it "should assign the password" do
-        @send_email.delivery_method_settings[:password] == @options['delivery_method']['smtp']['password']
+        Mail.delivery_method.settings['password'] == @options['delivery_method']['smtp']['password']
       end
       
       it "should assign the authentication" do
-        @send_email.delivery_method_settings[:authentication] == @options['delivery_method']['smtp']['authentication']
+        Mail.delivery_method.settings['authentication'] == @options['delivery_method']['smtp']['authentication']
       end
       
       it "should assign enable_starttls_auto" do
-        @send_email.delivery_method_settings[:enable_starttls_auto] == @options['delivery_method']['smtp']['enable_starttls_auto']
+        Mail.delivery_method.settings['enable_starttls_auto'] == @options['delivery_method']['smtp']['enable_starttls_auto']
       end
     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'}
+  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"
+      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
+  
   describe "execute" do    
     before(:each) do
       @iron_mq_config = JSON.parse(File.read('spec/config/iron_mq.json'))
@@ -123,20 +141,19 @@ describe IronMailer::SendEmail do
     end
     
     it "should add info about the email to the cache" do
-      @send_email.should_receive(:cache_email)
-      @execute.call
+      @execute.should change(@send_email.cache, :size).by(1)
+      @send_email.cache.get(@test_email.message_id).value.should == @send_email.extract_cache_info(@test_email).to_json
     end
     
     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 if @send_email.cache.size > 0
+      @send_email.queue.clear
       email = test_email
       email.to.clear
       class ErrorMailer
@@ -162,49 +179,7 @@ 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)['unique_args']['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'] = {unique_args: {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)
@@ -227,11 +202,16 @@ describe IronMailer::SendEmail do
       @send_email.extract_cache_info(@test_email)['date'].should == @test_email.date
     end
     
-    it "should extract the content" do
-      @send_email.extract_cache_info(@test_email)['mail'].should == @test_email.to_s
+    it "should exract html_part as content" do
+      @send_email.extract_cache_info(@test_email)['content'].should == @test_email.html_part.body.to_s
+    end
+    
+    it "should extract the text_part if the text part is nil" do
+      @test_email.stub(:html_part).and_return(nil)
+      @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)
@@ -274,44 +254,5 @@ 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
-    
-    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)['unique_args']['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.2
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-04 00:00:00.000000000 Z
+date: 2013-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: iron_cache
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
@@ -123,22 +123,6 @@ 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