tuktuk 0.2.1 → 0.2.2

data/README.md

@@ -1,7 +1,15 @@
 Tuktuk - SMTP client for Ruby
 =============================
 
-````
+Unlike Pony (which is friggin' awesome by the way) Tuktuk does not rely on 
+`sendmail` or a separate SMTP server in order to send email. Tuktuk looks up the
+MX servers of the destination address and connects directly using Net::SMTP. 
+This way you don't need to install Exim or Postfix and you can actually handle 
+response status codes -- like bounces, 5xx -- within your application. 
+
+Plus, it supports DKIM out of the box.
+
+``` ruby
   require 'tuktuk'
 
   email = {
@@ -12,11 +20,11 @@ Tuktuk - SMTP client for Ruby
   }
 
   Tuktuk.deliver(email)
-````
+```
 
 To enable DKIM:
 
-````
+``` ruby
   require 'tuktuk'
 
   Tuktuk.options = {
@@ -35,18 +43,18 @@ To enable DKIM:
   }
 
   Tuktuk.deliver(email)
-````
+```
 
 Additional options:
 
-````
+``` ruby
   Tuktuk.options = {
     :log_to => 'log/mailer.log',
     :max_attempts => 5,
     :retry_sleep => 10,
     :dkim => { ... }
   }
-````
+```
 
 That's all.
 

data/lib/tuktuk/cache.rb

@@ -0,0 +1,28 @@
+class Cache
+
+  attr_reader :store, :max_keys
+
+  def initialize(max_keys = 1000)
+    @store = {}
+    @max_keys = max_keys
+  end
+
+  def get(key)
+    store[key]
+  end
+
+  def set(key, value)
+    return if store[key] == value
+    pop if store.length > max_keys
+    store[key] = value
+  end
+
+  def pop
+    store.delete(store.keys.last)
+  end
+
+  def show
+    store.each { |k,v| puts "#{k} -> #{v}" }; nil
+  end
+
+end

data/lib/tuktuk/tuktuk.rb

@@ -3,10 +3,12 @@ require 'net/dns/resolver'
 require 'dkim'
 require 'logger'
 require 'tuktuk/package'
+require 'tuktuk/cache'
 
 DEFAULTS = {
   :retry_sleep  => 10,
   :max_attempts => 3,
+  :read_timeout => nil,
   :verify_ssl   => true,
   :log_to       => nil # $stdout,
 }
@@ -18,6 +20,10 @@ module Tuktuk
 
   class << self
 
+    def cache
+      @cache ||= Cache.new(100)
+    end
+
     def deliver(message, opts = {})
       self.options = opts if opts.any?
       mail = Package.new(message)
@@ -61,8 +67,8 @@ module Tuktuk
       logger.info("#{to} - Successfully sent!")
     end
 
-    def error(mail, to, error, attempt = 1)
-      if attempt <= config[:max_attempts] && (error.is_a?(Net::SMTPServerBusy) or error.is_a?(EOFError))
+    def error(mail, to, error, attempt)
+      if attempt < config[:max_attempts] and (error.is_a?(EOFError) || error.is_a?(TimeoutError))
         logger.info "#{to} - Got #{error.class.name} error. Retrying after #{config[:retry_sleep]} secs..."
         sleep config[:retry_sleep]
         lookup_and_deliver(mail, attempt+1)
@@ -73,11 +79,19 @@ module Tuktuk
     end
 
     def smtp_servers_for_domain(domain)
-      res = Net::DNS::Resolver.new
-      if mx = res.mx(domain)
+      unless servers = cache.get(domain)
+        if servers = lookup_smtp_servers(domain) and servers.any?
+          cache.set(domain, servers)
+        end
+      end
+      servers
+    end
+
+    def lookup_smtp_servers(domain)
+      if mx = Net::DNS::Resolver.new.mx(domain)
         mx.sort {|x,y| x.preference <=> y.preference}.map {|rr| rr.exchange}
       else
-        raise DNSError, "Could not locate MX records for domain #{domain}."
+        raise DNSError, "No MX records found for domain #{domain}."
       end
     end
 
@@ -89,7 +103,7 @@ module Tuktuk
 
         domain = get_domain(to)
         servers = smtp_servers_for_domain(domain)
-        error(mail, to, DNSError.new("Unknown host: #{domain}")) && next if servers.empty?
+        error(mail, to, DNSError.new("Unknown host: #{domain}"), attempt) && next if servers.empty?
 
         last_error = nil
         servers.each do |server|
@@ -118,6 +132,7 @@ module Tuktuk
 
       smtp = Net::SMTP.new(server, nil)
       smtp.enable_starttls_auto(context)
+      smtp.read_timeout = config[:read_timeout] if config[:read_timeout]
 
       response = nil
       smtp.start(helo_domain, nil, nil, nil) do |smtp|

data/lib/tuktuk/version.rb

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

data/tuktuk.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.email       = ['tomas@forkhq.com']
   s.homepage    = "https://github.com/tomas/tuktuk"
   s.summary     = "SMTP client for Ruby with DKIM support."
-  s.description = "Easy way of sending DKIM-signed emails from Ruby, no depenencies needed."
+  s.description = "Easy way of sending DKIM-signed emails from Ruby, no dependencies needed."
 
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "tuktuk"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tuktuk
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - "Tom\xC3\xA1s Pollak"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-02 00:00:00 Z
+date: 2012-07-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler
@@ -80,7 +80,7 @@ dependencies:
         version: 0.0.2
   type: :runtime
   version_requirements: *id004
-description: Easy way of sending DKIM-signed emails from Ruby, no depenencies needed.
+description: Easy way of sending DKIM-signed emails from Ruby, no dependencies needed.
 email: 
 - tomas@forkhq.com
 executables: []
@@ -95,6 +95,7 @@ files:
 - README.md
 - Rakefile
 - lib/tuktuk.rb
+- lib/tuktuk/cache.rb
 - lib/tuktuk/package.rb
 - lib/tuktuk/tuktuk.rb
 - lib/tuktuk/version.rb