truemail 2.2.0 → 2.3.1

data/lib/truemail/validate/mx.rb

@@ -3,8 +3,6 @@
 module Truemail
   module Validate
     class Mx < Truemail::Validate::Base
-      require 'resolv'
-
       ERROR = 'target host(s) not found'
       NULL_MX_RECORD = 'null_mx_record'
 
@@ -43,11 +41,11 @@ module Truemail
       end
 
       def mx_records(hostname)
-        domain_mx_records = Resolv::DNS.new.getresources(hostname, Resolv::DNS::Resource::IN::MX)
+        domain_mx_records = Truemail::Dns::Resolver.mx_records(hostname, configuration: configuration)
         return [Truemail::Validate::Mx::NULL_MX_RECORD] if null_mx?(domain_mx_records)
-        domain_mx_records.sort_by(&:preference).map do |mx_record|
-          Resolv.getaddresses(mx_record.exchange.to_s)
-        end.flatten
+        domain_mx_records.sort_by(&:preference).flat_map do |mx_record|
+          Truemail::Dns::Resolver.a_records(mx_record.exchange.to_s, configuration: configuration)
+        end
       end
 
       def mail_servers_found?
@@ -64,15 +62,15 @@ module Truemail
       end
 
       def a_record(hostname)
-        Resolv.getaddress(hostname)
+        Truemail::Dns::Resolver.a_record(hostname, configuration: configuration)
       end
 
       def hosts_from_cname_records?
-        cname_records = Resolv::DNS.new.getresources(domain, Resolv::DNS::Resource::IN::CNAME)
+        cname_records = Truemail::Dns::Resolver.cname_records(domain, configuration: configuration)
         return if cname_records.empty?
         cname_records.each do |cname_record|
           host = a_record(cname_record.name.to_s)
-          hostname = Resolv.getname(host)
+          hostname = Truemail::Dns::Resolver.dns_lookup(host, configuration: configuration)
           found_hosts = mx_records(hostname)
           fetch_target_hosts(found_hosts.empty? ? [host] : found_hosts)
         end

data/lib/truemail/validate/smtp/request.rb

@@ -13,20 +13,24 @@ module Truemail
 
         attr_reader :configuration, :host, :email, :response
 
-        def initialize(configuration:, host:, email:, attempts: nil)
+        def initialize(configuration:, host:, email:, attempts: nil, port_open_status: proc { true })
           @configuration = Truemail::Validate::Smtp::Request::Configuration.new(configuration)
           @response = Truemail::Validate::Smtp::Response.new
           @host = host
           @email = email
           @attempts = attempts
+          @port_open_status = port_open_status
         end
 
         def check_port
-          Timeout.timeout(configuration.connection_timeout) do
-            return response.port_opened = !TCPSocket.new(host, Truemail::Validate::Smtp::Request::SMTP_PORT).close
-          end
+          response.port_opened = ::Socket.tcp(
+            host,
+            Truemail::Validate::Smtp::Request::SMTP_PORT,
+            connect_timeout: configuration.connection_timeout,
+            &port_open_status
+          )
         rescue => error
-          retry if attempts_exist? && error.is_a?(Timeout::Error)
+          retry if attempts_exist? && error.is_a?(::Errno::ETIMEDOUT)
           response.port_opened = false
         end
 
@@ -53,7 +57,7 @@ module Truemail
           end
         end
 
-        attr_reader :attempts
+        attr_reader :attempts, :port_open_status
 
         def attempts_exist?
           return false unless attempts
@@ -61,7 +65,7 @@ module Truemail
         end
 
         def session
-          Net::SMTP.new(host, Truemail::Validate::Smtp::Request::SMTP_PORT).tap do |settings|
+          ::Net::SMTP.new(host, Truemail::Validate::Smtp::Request::SMTP_PORT).tap do |settings|
             settings.open_timeout = configuration.connection_timeout
             settings.read_timeout = configuration.response_timeout
           end

data/lib/truemail/validate/smtp/response.rb

@@ -5,7 +5,7 @@ module Truemail
     class Smtp
       RESPONSE_ATTRS = %i[port_opened connection helo mailfrom rcptto errors].freeze
 
-      Response = Struct.new(*RESPONSE_ATTRS, keyword_init: true) do
+      Response = ::Struct.new(*RESPONSE_ATTRS, keyword_init: true) do
         def initialize(errors: {}, **args)
           super
         end

data/lib/truemail/validator.rb

@@ -5,13 +5,13 @@ module Truemail
     RESULT_ATTRS = %i[success email domain mail_servers errors smtp_debug configuration].freeze
     VALIDATION_TYPES = %i[regex mx smtp].freeze
 
-    Result = Struct.new(*RESULT_ATTRS, keyword_init: true) do
+    Result = ::Struct.new(*RESULT_ATTRS, keyword_init: true) do
       def initialize(mail_servers: [], errors: {}, **args)
         super
       end
 
       def punycode_email
-        @punycode_email ||= Truemail::PunycodeRepresenter.call(email)
+        @punycode_email ||= Truemail::Dns::PunycodeRepresenter.call(email)
       end
       alias_method :valid?, :success
     end

data/lib/truemail/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Truemail
-  VERSION = '2.2.0'
+  VERSION = '2.3.1'
 end

data/lib/truemail/wrapper.rb

@@ -15,10 +15,10 @@ module Truemail
     end
 
     def call(&block)
-      Timeout.timeout(timeout, &block)
-    rescue Resolv::ResolvError, IPAddr::InvalidAddressError
+      ::Timeout.timeout(timeout, &block)
+    rescue ::Resolv::ResolvError, ::IPAddr::InvalidAddressError
       false
-    rescue Timeout::Error
+    rescue ::Timeout::Error
       retry unless (self.attempts -= 1).zero?
       false
     end

data/truemail.gemspec

@@ -31,21 +31,23 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'simpleidn', '~> 0.1.1'
+  spec.add_runtime_dependency 'simpleidn', '~> 0.2.1'
 
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'bundler-audit', '~> 0.7.0.1'
-  spec.add_development_dependency 'fasterer', '~> 0.8.3'
-  spec.add_development_dependency 'ffaker', '~> 2.17'
+  spec.add_development_dependency 'dns_mock', '~> 1.2'
+  spec.add_development_dependency 'faker', '~> 2.16'
+  spec.add_development_dependency 'fasterer', '~> 0.9.0'
   spec.add_development_dependency 'json_matchers', '~> 0.11.1'
   spec.add_development_dependency 'overcommit', '~> 0.57.0'
   spec.add_development_dependency 'pry-byebug', '~> 3.9'
-  spec.add_development_dependency 'rake', '~> 13.0', '>= 13.0.1'
-  spec.add_development_dependency 'reek', '~> 6.0', '>= 6.0.2'
+  spec.add_development_dependency 'rake', '~> 13.0', '>= 13.0.3'
+  spec.add_development_dependency 'reek', '~> 6.0', '>= 6.0.3'
   spec.add_development_dependency 'rspec', '~> 3.10'
-  spec.add_development_dependency 'rubocop', '~> 1.3'
-  spec.add_development_dependency 'rubocop-performance', '~> 1.8', '>= 1.8.1'
-  spec.add_development_dependency 'rubocop-rspec', '~> 2.0'
+  spec.add_development_dependency 'rubocop', '~> 1.10'
+  spec.add_development_dependency 'rubocop-performance', '~> 1.9', '>= 1.9.2'
+  spec.add_development_dependency 'rubocop-rspec', '~> 2.2'
   spec.add_development_dependency 'simplecov', '~> 0.17.1'
-  spec.add_development_dependency 'truemail-rspec', '~> 0.2.1'
+  spec.add_development_dependency 'truemail-rspec', '~> 0.4'
+  spec.add_development_dependency 'webmock', '~> 3.12'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: truemail
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Vladislav Trotsenko
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-01 00:00:00.000000000 Z
+date: 2021-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simpleidn
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -53,33 +53,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.7.0.1
 - !ruby/object:Gem::Dependency
-  name: fasterer
+  name: dns_mock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: '2.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: '2.16'
 - !ruby/object:Gem::Dependency
-  name: ffaker
+  name: fasterer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.17'
+        version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.17'
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: json_matchers
   requirement: !ruby/object:Gem::Requirement
@@ -131,7 +145,7 @@ dependencies:
         version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 13.0.1
+        version: 13.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -141,7 +155,7 @@ dependencies:
         version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 13.0.1
+        version: 13.0.3
 - !ruby/object:Gem::Dependency
   name: reek
   requirement: !ruby/object:Gem::Requirement
@@ -151,7 +165,7 @@ dependencies:
         version: '6.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.2
+        version: 6.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -161,7 +175,7 @@ dependencies:
         version: '6.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.2
+        version: 6.0.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -182,48 +196,48 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.9.2
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -244,14 +258,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.12'
 description: Configurable framework agnostic plain Ruby email validator. Verify email
   via Regex, DNS and SMTP.
 email:
@@ -293,6 +321,9 @@ files:
 - lib/truemail/auditor.rb
 - lib/truemail/configuration.rb
 - lib/truemail/core.rb
+- lib/truemail/dns/punycode_representer.rb
+- lib/truemail/dns/resolver.rb
+- lib/truemail/dns/worker.rb
 - lib/truemail/executor.rb
 - lib/truemail/log/event.rb
 - lib/truemail/log/serializer/auditor_json.rb