truemail 2.0.0 → 2.2.1

data/lib/truemail.rb

@@ -10,7 +10,7 @@ module Truemail
   class << self
     def configuration(&block)
       @configuration ||= begin
-        return unless block_given?
+        return unless block
         configuration = Truemail::Configuration.new(&block)
         raise_unless(configuration.complete?, Truemail::INCOMPLETE_CONFIG)
         configuration

data/lib/truemail/configuration.rb

@@ -21,13 +21,13 @@ module Truemail
                 :blacklisted_domains,
                 :logger
 
-    attr_accessor :whitelist_validation, :not_rfc_mx_lookup_flow, :smtp_safe_check
+    attr_accessor :whitelist_validation, :not_rfc_mx_lookup_flow, :smtp_fail_fast, :smtp_safe_check
 
     def initialize(&block)
       instance_initializer.each do |instace_variable, value|
         instance_variable_set(:"@#{instace_variable}", value)
       end
-      tap(&block) if block_given?
+      tap(&block) if block
     end
 
     %i[email_pattern smtp_error_body_pattern].each do |method|
@@ -102,6 +102,7 @@ module Truemail
         whitelist_validation: false,
         blacklisted_domains: [],
         not_rfc_mx_lookup_flow: false,
+        smtp_fail_fast: false,
         smtp_safe_check: false
       }
     end

data/lib/truemail/core.rb

@@ -32,7 +32,7 @@ module Truemail
 
   module RegexConstant
     REGEX_DOMAIN = /[\p{L}0-9]+([\-.]{1}[\p{L}0-9]+)*\.\p{L}{2,63}/i.freeze
-    REGEX_EMAIL_PATTERN = /(?=\A.{6,255}\z)(\A([\p{L}0-9]+[\w|\-|.|+]*)@(#{REGEX_DOMAIN})\z)/.freeze
+    REGEX_EMAIL_PATTERN = /(?=\A.{6,255}\z)(\A([\p{L}0-9]+[\w|\-.+]*)@(#{REGEX_DOMAIN})\z)/.freeze
     REGEX_DOMAIN_PATTERN = /(?=\A.{4,255}\z)(\A#{REGEX_DOMAIN}\z)/.freeze
     REGEX_DOMAIN_FROM_EMAIL = /\A.+@(.+)\z/.freeze
     REGEX_SMTP_ERROR_BODY_PATTERN = /(?=.*550)(?=.*(user|account|customer|mailbox)).*/i.freeze

data/lib/truemail/log/serializer/base.rb

@@ -56,6 +56,7 @@ module Truemail
             whitelisted_domains: whitelisted_domains,
             blacklisted_domains: blacklisted_domains,
             not_rfc_mx_lookup_flow: executor_configuration.not_rfc_mx_lookup_flow,
+            smtp_fail_fast: executor_configuration.smtp_fail_fast,
             smtp_safe_check: executor_configuration.smtp_safe_check,
             email_pattern: email_pattern,
             smtp_error_body_pattern: smtp_error_body_pattern

data/lib/truemail/log/serializer/validator_base.rb

@@ -13,6 +13,10 @@ module Truemail
 
         attr_reader :validation_type
 
+        def replace_invalid_chars
+          ->(value) { value.encode('UTF-8', invalid: :replace) }
+        end
+
         def smtp_debug
           validation_smtp_debug = executor_result.smtp_debug
           return unless validation_smtp_debug
@@ -22,7 +26,7 @@ module Truemail
               mail_host: smtp_request.host,
               port_opened: smtp_response.port_opened,
               connection: smtp_response.connection,
-              errors: smtp_response.errors
+              errors: smtp_response.errors.transform_values(&replace_invalid_chars)
             }
           end
         end

data/lib/truemail/validate/mx.rb

@@ -30,7 +30,7 @@ module Truemail
       end
 
       def fetch_target_hosts(hosts)
-        mail_servers.push(*hosts)
+        mail_servers.push(*(hosts.uniq - mail_servers))
       end
 
       def null_mx?(domain_mx_records)

data/lib/truemail/validate/smtp.rb

@@ -24,13 +24,23 @@ module Truemail
 
       private
 
-      def request
-        smtp_results.last
+      def fail_fast?
+        configuration.smtp_fail_fast
+      end
+
+      def filtered_mail_servers_by_fail_fast_scenario
+        fail_fast? ? mail_servers.first(1) : mail_servers
       end
 
       def attempts
-        @attempts ||=
-          mail_servers.one? ? { attempts: configuration.connection_attempts } : {}
+        @attempts ||= begin
+          return {} if fail_fast? || !mail_servers.one?
+          { attempts: configuration.connection_attempts }
+        end
+      end
+
+      def request
+        smtp_results.last
       end
 
       def rcptto_error
@@ -38,7 +48,7 @@ module Truemail
       end
 
       def establish_smtp_connection
-        mail_servers.each do |mail_server|
+        filtered_mail_servers_by_fail_fast_scenario.each do |mail_server|
           smtp_results << Truemail::Validate::Smtp::Request.new(
             configuration: configuration, host: mail_server, email: result.punycode_email, **attempts
           )

data/lib/truemail/version.rb

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

data/truemail.gemspec

@@ -35,17 +35,17 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'bundler-audit', '~> 0.7.0.1'
+  spec.add_development_dependency 'faker', '~> 2.15', '>= 2.15.1'
   spec.add_development_dependency 'fasterer', '~> 0.8.3'
-  spec.add_development_dependency 'ffaker', '~> 2.17'
   spec.add_development_dependency 'json_matchers', '~> 0.11.1'
-  spec.add_development_dependency 'overcommit', '~> 0.55.0'
+  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.1'
-  spec.add_development_dependency 'rspec', '~> 3.9'
-  spec.add_development_dependency 'rubocop', '~> 0.91.0'
-  spec.add_development_dependency 'rubocop-performance', '~> 1.8', '>= 1.8.1'
-  spec.add_development_dependency 'rubocop-rspec', '~> 1.43', '>= 1.43.2'
+  spec.add_development_dependency 'reek', '~> 6.0', '>= 6.0.2'
+  spec.add_development_dependency 'rspec', '~> 3.10'
+  spec.add_development_dependency 'rubocop', '~> 1.5', '>= 1.5.2'
+  spec.add_development_dependency 'rubocop-performance', '~> 1.9', '>= 1.9.1'
+  spec.add_development_dependency 'rubocop-rspec', '~> 2.0', '>= 2.0.1'
   spec.add_development_dependency 'simplecov', '~> 0.17.1'
-  spec.add_development_dependency 'truemail-rspec', '~> 0.2.1'
+  spec.add_development_dependency 'truemail-rspec', '~> 0.3.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: truemail
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Vladislav Trotsenko
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-19 00:00:00.000000000 Z
+date: 2020-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simpleidn
@@ -53,33 +53,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.7.0.1
 - !ruby/object:Gem::Dependency
-  name: fasterer
+  name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: '2.15'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.15.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: '2.15'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.15.1
 - !ruby/object:Gem::Dependency
-  name: ffaker
+  name: fasterer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.17'
+        version: 0.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.17'
+        version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: json_matchers
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +106,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.55.0
+        version: 0.57.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.55.0
+        version: 0.57.0
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -151,7 +157,7 @@ dependencies:
         version: '6.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.1
+        version: 6.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -161,75 +167,81 @@ dependencies:
         version: '6.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.1
+        version: 6.0.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.91.0
+        version: '1.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.91.0
+        version: '1.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.2
 - !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.1
   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.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.43'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.43.2
+        version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.43'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.43.2
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -250,14 +262,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.3
 description: Configurable framework agnostic plain Ruby email validator. Verify email
   via Regex, DNS and SMTP.
 email:
@@ -268,7 +280,11 @@ extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
 - ".codeclimate.yml"
-- ".github/ISSUE_TEMPLATE.md"
+- ".github/BRANCH_NAMING_CONVENTION.md"
+- ".github/ISSUE_TEMPLATE/bug_report.md"
+- ".github/ISSUE_TEMPLATE/feature_request.md"
+- ".github/ISSUE_TEMPLATE/issue_report.md"
+- ".github/ISSUE_TEMPLATE/question.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".gitignore"
 - ".overcommit.yml"