tuktuk 0.1.3 → 0.2.0

data/.gitignore

@@ -1,4 +1,5 @@
 *~
+*.gem
 test
 log
 pkg

data/README.md

@@ -19,10 +19,12 @@ To enable DKIM:
 ````
   require 'tuktuk'
 
-  Tuktuk.dkim = {
+  Tuktuk.options = {
+    :dkim => {
       :domain => 'yoursite.com',
       :selector => 'mailer',
       :private_key => IO.read('ssl/yoursite.com.key')
+    }
   }
 
   email = {
@@ -35,6 +37,17 @@ To enable DKIM:
   Tuktuk.deliver(email)
 ````
 
+Additional options:
+
+````
+  Tuktuk.options = {
+    :log_to => 'log/mailer.log',
+    :max_attempts => 5,
+    :retry_sleep => 10,
+    :dkim => { ... }
+  }
+````
+
 That's all.
 
 --

data/lib/tuktuk/tuktuk.rb

@@ -7,19 +7,22 @@ require 'tuktuk/package'
 DEFAULTS = {
   :retry_sleep =>  10,
   :max_attempts => 3,
-  :mailer => "Tuktuk SMTP #{VERSION}"
+  :log_to => nil # $stdout
 }
 
 module Tuktuk
 
+  class DNSError < RuntimeError; end
+  class MissingFieldsError < ArgumentError; end
+
   class << self
 
     def deliver(message, opts = {})
       options = opts
       mail = Package.new(message)
-      mail['X-Mailer'] = config[:mailer]
-      lookup_and_deliver(mail)
-      mail
+      mail['X-Mailer'] = "Tuktuk SMTP v#{VERSION}"
+      response = lookup_and_deliver(mail)
+      return response, mail
     end
 
     def options=(hash)
@@ -30,7 +33,6 @@ module Tuktuk
     end
 
     def dkim=(dkim_opts)
-      # logger.info "Enabling DKIM for domain #{dkim_opts[:domain]}..."
       Dkim::domain = dkim_opts[:domain]
       Dkim::selector = dkim_opts[:selector]
       Dkim::private_key = dkim_opts[:private_key]
@@ -47,11 +49,11 @@ module Tuktuk
     end
 
     def logger
-      @logger ||= Logger.new(config[:logfile])
+      @logger ||= Logger.new(config[:log_to])
     end
 
     def get_domain(email_address)
-      email_address && email_address[/@([a-z0-9\._-]+)/i, 1]
+      email_address && email_address.to_s[/@([a-z0-9\._-]+)/i, 1]
     end
 
     def success(destination)
@@ -64,9 +66,8 @@ module Tuktuk
         sleep config[:retry_sleep]
         lookup_and_deliver(mail, attempt+1)
       else
-        error_message = error.respond_to?(:message) ? "#{error.message} [#{error.class.name}]" : error
-        logger.error("#{to} - Error: #{error_message}")
-        raise "Unable to send to #{to}: #{error_message}"
+        logger.error("#{to} - Unable to send after #{attempt} attempts: #{error.message} [#{error.class.name}]")
+        raise error
       end
     end
 
@@ -75,51 +76,55 @@ module Tuktuk
       if mx = res.mx(domain)
         mx.sort {|x,y| x.preference <=> y.preference}.map {|rr| rr.exchange}
       else
-        raise RuntimeError, "Could not locate MX records for domain #{domain}."
+        raise DNSError, "Could not locate MX records for domain #{domain}."
       end
     end
 
     def lookup_and_deliver(mail, attempt = 1)
-      raise "No destinations found! Forgot to pass the to: field?" if mail.destinations.empty?
+      raise MissingFieldsError, "No destinations found! You need to pass a :to field." if mail.destinations.empty?
 
-      mail.destinations.each do |destination|
+      response = nil
+      mail.destinations.each do |to|
 
-        domain = get_domain(destination)
+        domain = get_domain(to)
         servers = smtp_servers_for_domain(domain)
-        error(mail, destination, "Unknown host: #{domain}") && next if servers.empty?
+        error(mail, to, DNSError.new("Unknown host: #{domain}")) && next if servers.empty?
 
         last_error = nil
         servers.each do |server|
           begin
-            send_now(mail, server, destination)
+            response = send_now(mail, server, to)
             break
           rescue => e
             last_error = e
           end
         end
-        error(mail, destination, last_error, attempt) if last_error
+        error(mail, to, last_error, attempt) if last_error
       end
+      response
     end
 
     def send_now(mail, server, to)
-      raw_mail = use_dkim? ? Dkim.sign(mail.to_s).to_s : mail.to_s
+      logger.info "#{to} - Delivering email at #{server}..."
 
+      raw_mail = use_dkim? ? Dkim.sign(mail.to_s).to_s : mail.to_s
       from = mail.return_path || mail.sender || mail.from_addrs.first
-      logger.info "#{to} - Delivering email at #{server}..."
+      helo_domain = Dkim::domain || config[:helo_domain] || get_domain(from)
 
       context = OpenSSL::SSL::SSLContext.new
       context.verify_mode = OpenSSL::SSL::VERIFY_NONE # OpenSSL::SSL::VERIFY_PEER
 
-      helo_domain = config[:helo_domain] || Dkim::domain || get_domain(mail[:from])
-
       smtp = Net::SMTP.new(server, nil)
       smtp.enable_starttls_auto(context)
+
+      response = nil
       smtp.start(helo_domain, nil, nil, nil) do |smtp|
-        result = smtp.send_message(raw_mail, from, to)
-        logger.info "#{to} - #{result.string.strip}"
+        response = smtp.send_message(raw_mail, from, to)
+        logger.info "#{to} - #{response.message.strip}"
       end
 
       success(to)
+      response
     end
 
   end

data/lib/tuktuk/version.rb

@@ -1,7 +1,7 @@
 module Tuktuk
   MAJOR = 0
-  MINOR = 1
-  PATCH = 3
+  MINOR = 2
+  PATCH = 0
 
   VERSION = [MAJOR, MINOR, PATCH].join('.')
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tuktuk
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 3
-  version: 0.1.3
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - "Tom\xC3\xA1s Pollak"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-01 00:00:00 Z
+date: 2012-06-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler