tuktuk 0.1.2 → 0.1.3

data/.gitignore

@@ -1 +1,4 @@
 *~
+test
+log
+pkg

data/lib/tuktuk/package.rb

@@ -9,13 +9,13 @@ module Package
       mail.charset = 'UTF-8'
 
       mail['In-Reply-To'] = message[:in_reply_to] if message[:in_reply_to]
-      mail['List-Archive'] = message[:list_archive] if message[:list_archive] # https://github.com/tomas/prey
-      mail['List-Id'] = message[:list_id] if message[:list_id] # <prey.tomas.github.com>
+      mail['List-Archive'] = message[:list_archive] if message[:list_archive]
+      mail['List-Id'] = message[:list_id] if message[:list_id]
 
       if message[:return_path]
         mail['Return-Path'] = message[:return_path]
-        mail['Bounces-To'] = message[:return_path]
-        mail['Errors-To'] = message[:return_path]
+        mail['Bounces-To']  = message[:return_path]
+        mail['Errors-To']   = message[:return_path]
       end
 
       mail

data/lib/tuktuk/tuktuk.rb

@@ -6,7 +6,8 @@ require 'tuktuk/package'
 
 DEFAULTS = {
   :retry_sleep =>  10,
-  :max_attempts => 3
+  :max_attempts => 3,
+  :mailer => "Tuktuk SMTP #{VERSION}"
 }
 
 module Tuktuk
@@ -14,14 +15,22 @@ module Tuktuk
   class << self
 
     def deliver(message, opts = {})
-      config.merge(opts)
+      options = opts
       mail = Package.new(message)
-      mail['X-Mailer'] = opts[:smtp_server_name] || "Tuktuk SMTP #{VERSION}"
+      mail['X-Mailer'] = config[:mailer]
       lookup_and_deliver(mail)
       mail
     end
 
+    def options=(hash)
+      if dkim_opts = hash.delete(:dkim)
+        self.dkim = dkim_opts
+      end
+      config.merge!(hash)
+    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]
@@ -42,22 +51,22 @@ module Tuktuk
     end
 
     def get_domain(email_address)
-      email_address[/@([a-z0-9\._-]+)/i, 1]
+      email_address && email_address[/@([a-z0-9\._-]+)/i, 1]
     end
 
     def success(destination)
-      logger.info("#{destination} - Successfully sent mail!")
+      logger.info("#{destination} - Successfully sent!")
     end
 
-    def error(mail, destination, error, attempt = 1)
+    def error(mail, to, error, attempt = 1)
       if attempt <= config[:max_attempts] && (error.is_a?(Net::SMTPServerBusy) or error.is_a?(EOFError))
-        logger.info "#{destination} - Got #{error.class.name} error. Retrying after #{config[:retry_sleep]} secs..."
+        logger.info "#{to} - Got #{error.class.name} error. Retrying after #{config[:retry_sleep]} secs..."
         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("#{destination} - Unable to send: #{error_message}")
-        raise "Unable to send to #{destination}: #{error_message}"
+        logger.error("#{to} - Error: #{error_message}")
+        raise "Unable to send to #{to}: #{error_message}"
       end
     end
 
@@ -101,13 +110,13 @@ module Tuktuk
       context = OpenSSL::SSL::SSLContext.new
       context.verify_mode = OpenSSL::SSL::VERIFY_NONE # OpenSSL::SSL::VERIFY_PEER
 
-      domain = config[:domain] || get_domain(to)
+      helo_domain = config[:helo_domain] || Dkim::domain || get_domain(mail[:from])
 
       smtp = Net::SMTP.new(server, nil)
       smtp.enable_starttls_auto(context)
-      smtp.start(domain, nil, nil, nil) do |smtp|
+      smtp.start(helo_domain, nil, nil, nil) do |smtp|
         result = smtp.send_message(raw_mail, from, to)
-        logger.info result.string
+        logger.info "#{to} - #{result.string.strip}"
       end
 
       success(to)

data/lib/tuktuk/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tuktuk
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - "Tom\xC3\xA1s Pollak"