tuktuk 0.1.0 → 0.1.1

data/lib/tuktuk/package.rb

@@ -10,7 +10,7 @@ module Package
 
       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-Id'] = message[:list_id] if message[:list_id] # <prey.tomas.github.com>
 
       if message[:return_path]
         mail['Return-Path'] = message[:return_path]
@@ -29,7 +29,7 @@ module Package
         # sender    message[:sender] if message[:sender]
         subject     message[:subject]
         message_id  message[:message_id] if message[:message_id]
-        body        message[:attachments] ? link_plain_attachments(message[:attachments], message[:body]) : message[:body]
+        body        message[:body]
       end
     end
 
@@ -42,31 +42,15 @@ module Package
         subject     message[:subject]
         message_id  message[:message_id] if message[:message_id]
         text_part do
-          body      message[:attachments] ? link_plain_attachments(message[:attachments], message[:body]) : message[:body]
+          body      message[:body]
         end
         html_part do
           content_type 'text/html; charset=UTF-8'
-          body      message[:attachments] ? link_html_attachments(message[:attachments], message[:html_body]) : message[:html_body]
+          body      message[:html_body]
         end
       end
     end
 
-    def link_plain_attachments(attachments, body)
-      text = "\n\nAttachments\n==========\n"
-      attachments.each_with_index do |att, i|
-        text += "[#{att[:name]}] #{att[:link]} \n"
-      end
-      body + text
-    end
-
-    def link_html_attachments(attachments, body)
-      text = "\n\n<h4>Attachments</h4>\n<ul>\n"
-      attachments.each_with_index do |att, i|
-        text += "<li>[<a href='#{att[:link]}' target='_blank'>#{att[:name]}</a>] <a href='#{att[:link]}' target='_blank'>#{att[:link]}</a></li>\n"
-      end
-      body + text + "</ul>"
-    end
-
   end
 
 end

data/lib/tuktuk/tuktuk.rb

@@ -5,114 +5,114 @@ require 'logger'
 require 'tuktuk/package'
 
 DEFAULTS = {
-	:retry_sleep =>  10,
-	:max_attempts => 3
+  :retry_sleep =>  10,
+  :max_attempts => 3
 }
 
 module Tuktuk
 
-	class << self
-
-		def deliver(message, opts = {})
-			config.merge(opts)
-			mail = Package.new(message)
-			mail['X-Mailer'] = opts[:smtp_server_name] || "Tuktuk SMTP #{VERSION}"
-			lookup_and_deliver(mail)
-			mail
-		end
-
-		def dkim=(dkim_opts)
-			Dkim::domain = dkim_opts[:domain]
-			Dkim::selector = dkim_opts[:selector]
-			Dkim::private_key = dkim_opts[:private_key]
-		end
-
-		private
-
-		def config
-			@config ||= DEFAULTS
-		end
-
-		def use_dkim?
-			!Dkim::domain.nil?
-		end
-
-		def logger
-			@logger ||= Logger.new(config[:logfile])
-		end
-
-		def get_domain(email_address)
-			email_address[/@([a-z0-9\._-]+)/i, 1]
-		end
-
-		def success(destination)
-			logger.info("#{destination} - Successfully sent mail!")
-		end
-
-		def error(mail, destination, 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..."
-				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}"
-			end
-		end
-
-		def smtp_servers_for_domain(domain)
-			res = Net::DNS::Resolver.new
-			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}."
-			end
-		end
-
-		def lookup_and_deliver(mail, attempt = 1)
-			raise "No destinations found! Forgot to pass the to: field?" if mail.destinations.empty?
-
-			mail.destinations.each do |destination|
-
-				domain = get_domain(destination)
-				servers = smtp_servers_for_domain(domain)
-				error(mail, destination, "Unknown host: #{domain}") && next if servers.empty?
-
-				last_error = nil
-				servers.each do |server|
-					begin
-						send_now(mail, server, destination)
-						break
-					rescue => e
-						last_error = e
-					end
-				end
-				error(mail, destination, last_error, attempt) if last_error
-			end
-		end
-
-		def send_now(mail, server, to)
-			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}..."
-
-			context = OpenSSL::SSL::SSLContext.new
-			context.verify_mode = OpenSSL::SSL::VERIFY_NONE # OpenSSL::SSL::VERIFY_PEER
-
-			domain = config[:domain] || get_domain(to)
-
-			smtp = Net::SMTP.new(server, nil)
-			smtp.enable_starttls_auto(context)
-			smtp.start(domain, nil, nil, nil) do |smtp|
-				result = smtp.send_message(raw_mail, from, to)
-				logger.info res.string
-			end
-
-			success(to)
-		end
-
-	end
+  class << self
+
+    def deliver(message, opts = {})
+      config.merge(opts)
+      mail = Package.new(message)
+      mail['X-Mailer'] = opts[:smtp_server_name] || "Tuktuk SMTP #{VERSION}"
+      lookup_and_deliver(mail)
+      mail
+    end
+
+    def dkim=(dkim_opts)
+      Dkim::domain = dkim_opts[:domain]
+      Dkim::selector = dkim_opts[:selector]
+      Dkim::private_key = dkim_opts[:private_key]
+    end
+
+    private
+
+    def config
+      @config ||= DEFAULTS
+    end
+
+    def use_dkim?
+      !Dkim::domain.nil?
+    end
+
+    def logger
+      @logger ||= Logger.new(config[:logfile])
+    end
+
+    def get_domain(email_address)
+      email_address[/@([a-z0-9\._-]+)/i, 1]
+    end
+
+    def success(destination)
+      logger.info("#{destination} - Successfully sent mail!")
+    end
+
+    def error(mail, destination, 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..."
+        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}"
+      end
+    end
+
+    def smtp_servers_for_domain(domain)
+      res = Net::DNS::Resolver.new
+      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}."
+      end
+    end
+
+    def lookup_and_deliver(mail, attempt = 1)
+      raise "No destinations found! Forgot to pass the to: field?" if mail.destinations.empty?
+
+      mail.destinations.each do |destination|
+
+        domain = get_domain(destination)
+        servers = smtp_servers_for_domain(domain)
+        error(mail, destination, "Unknown host: #{domain}") && next if servers.empty?
+
+        last_error = nil
+        servers.each do |server|
+          begin
+            send_now(mail, server, destination)
+            break
+          rescue => e
+            last_error = e
+          end
+        end
+        error(mail, destination, last_error, attempt) if last_error
+      end
+    end
+
+    def send_now(mail, server, to)
+      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}..."
+
+      context = OpenSSL::SSL::SSLContext.new
+      context.verify_mode = OpenSSL::SSL::VERIFY_NONE # OpenSSL::SSL::VERIFY_PEER
+
+      domain = config[:domain] || get_domain(to)
+
+      smtp = Net::SMTP.new(server, nil)
+      smtp.enable_starttls_auto(context)
+      smtp.start(domain, nil, nil, nil) do |smtp|
+        result = smtp.send_message(raw_mail, from, to)
+        logger.info res.string
+      end
+
+      success(to)
+    end
+
+  end
 
 end

data/lib/tuktuk/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tuktuk
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - "Tom\xC3\xA1s Pollak"