tuktuk 0.2.3 → 0.3.0

data/lib/tuktuk.rb

@@ -1 +1 @@
-require 'tuktuk/tuktuk'
+require './lib/tuktuk/tuktuk'

data/lib/tuktuk/dns.rb

@@ -0,0 +1,39 @@
+begin
+  require 'resolv'
+rescue
+  require 'net/dns/resolve'
+end
+
+module DNS
+
+  class << self
+
+    def get_mx(host)
+      if defined?(Resolv::DNS)
+        get_using_resolve(host)
+      else
+        get_using_net_dns(host)
+      end
+    end
+
+    def get_using_resolve(host)
+      Resolv::DNS.open do |dns|
+        if res = dns.getresources(host, Resolv::DNS::Resource::IN::MX)
+          sort_mx(res)
+        end
+      end
+    end
+
+    def get_using_net_dns(host)
+      if res = Net::DNS::Resolver.new.mx(host)
+        sort_mx(res)
+      end
+    end
+
+    def sort_mx(res)
+      res.sort {|x,y| x.preference <=> y.preference}.map { |rr| rr.exchange.to_s }
+    end
+
+  end
+
+end

data/lib/tuktuk/tuktuk.rb

@@ -1,9 +1,8 @@
 require 'net/smtp'
-require 'net/dns/resolver'
 require 'dkim'
 require 'logger'
-require 'tuktuk/package'
-require 'tuktuk/cache'
+%w(package cache dns).each { |lib| require "./lib/tuktuk/#{lib}" }
+require './lib/tuktuk/version' unless defined?(Tuktuk::VERSION)
 
 DEFAULTS = {
   :retry_sleep  => 10,
@@ -81,21 +80,15 @@ module Tuktuk
 
     def smtp_servers_for_domain(domain)
       unless servers = cache.get(domain)
-        if servers = lookup_smtp_servers(domain) and servers.any?
+        if servers = DNS.get_mx(domain) and servers.any?
           cache.set(domain, servers)
+        else
+          raise DNSError, "No MX records found for domain #{domain}."
         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, "No MX records found for domain #{domain}."
-      end
-    end
-
     def lookup_and_deliver(mail, attempt = 1)
       raise MissingFieldsError, "No destinations found! You need to pass a :to field." if mail.destinations.empty?
 

data/lib/tuktuk/version.rb

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

metadata

@@ -1,139 +1,120 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: tuktuk
-version: !ruby/object:Gem::Version 
-  hash: 17
+version: !ruby/object:Gem::Version
+  version: 0.3.0
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 3
-  version: 0.2.3
 platform: ruby
-authors: 
-- "Tom\xC3\xA1s Pollak"
+authors:
+- Tomás Pollak
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-07-13 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-31 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: net-dns
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: net-dns
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 6
-        - 1
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 0.6.1
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mail
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.6.1
+- !ruby/object:Gem::Dependency
+  name: mail
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 2
-        - 3
-        version: "2.3"
+      - !ruby/object:Gem::Version
+        version: '2.3'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: dkim
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: dkim
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 0
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.0.2
   type: :runtime
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.2
 description: Easy way of sending DKIM-signed emails from Ruby, no dependencies needed.
-email: 
+email:
 - tomas@forkhq.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.md
 - Rakefile
 - lib/tuktuk.rb
 - lib/tuktuk/cache.rb
+- lib/tuktuk/dns.rb
 - lib/tuktuk/package.rb
 - lib/tuktuk/tuktuk.rb
 - lib/tuktuk/version.rb
 - tuktuk.gemspec
 homepage: https://github.com/tomas/tuktuk
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: tuktuk
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: SMTP client for Ruby with DKIM support.
 test_files: []
-