truemail 2.3.4 → 2.4.4

data/lib/truemail/core.rb

@@ -20,12 +20,14 @@ 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\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
+    REGEX_IP_ADDRESS = /((1\d|[1-9]|2[0-4])?\d|25[0-5])(\.\g<1>){3}/.freeze
+    REGEX_IP_ADDRESS_PATTERN = /\A#{REGEX_IP_ADDRESS}\z/.freeze
     REGEX_PORT_NUMBER = /6553[0-5]|655[0-2]\d|65[0-4](\d){2}|6[0-4](\d){3}|[1-5](\d){4}|[1-9](\d){0,3}/.freeze
-    REGEX_DNS_SERVER_ADDRESS_PATTERN = /\A((1\d|[1-9]|2[0-4])?\d|25[0-5])(\.\g<1>){3}(:#{REGEX_PORT_NUMBER})?\z/.freeze
+    REGEX_DNS_SERVER_ADDRESS_PATTERN = /\A#{REGEX_IP_ADDRESS}(:#{REGEX_PORT_NUMBER})?\z/.freeze
   end
 
   module Dns
@@ -46,6 +48,7 @@ module Truemail
     require_relative '../truemail/validate/domain_list_match'
     require_relative '../truemail/validate/regex'
     require_relative '../truemail/validate/mx'
+    require_relative '../truemail/validate/mx_blacklist'
     require_relative '../truemail/validate/smtp'
     require_relative '../truemail/validate/smtp/response'
     require_relative '../truemail/validate/smtp/request'

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

@@ -6,6 +6,14 @@ module Truemail
       class Base
         require 'json'
 
+        CONFIGURATION_ARRAY_ATTRS = %i[
+          validation_type_by_domain
+          whitelisted_domains
+          blacklisted_domains
+          blacklisted_mx_ip_addresses
+          dns
+        ].freeze
+        CONFIGURATION_REGEX_ATTRS = %i[email_pattern smtp_error_body_pattern].freeze
         DEFAULT_GEM_VALUE = 'default gem value'
 
         def self.call(executor_instance)
@@ -30,22 +38,22 @@ module Truemail
 
         alias warnings errors
 
-        %i[validation_type_by_domain whitelisted_domains blacklisted_domains dns].each do |method|
+        Truemail::Log::Serializer::Base::CONFIGURATION_ARRAY_ATTRS.each do |method|
           define_method(method) do
-            value = executor_configuration.public_send(method)
-            return if value.empty?
-            value
+            executor_configuration_attr = executor_configuration.public_send(method)
+            return if executor_configuration_attr.empty?
+            executor_configuration_attr
           end
         end
 
-        %i[email_pattern smtp_error_body_pattern].each do |method|
+        Truemail::Log::Serializer::Base::CONFIGURATION_REGEX_ATTRS.each do |method|
           define_method(method) do
-            value = executor_configuration.public_send(method)
+            executor_configuration_attr = executor_configuration.public_send(method)
             default_pattern = Truemail::RegexConstant.const_get(
               (method.eql?(:email_pattern) ? :regex_email_pattern : :regex_smtp_error_body_pattern).upcase
             )
-            return Truemail::Log::Serializer::Base::DEFAULT_GEM_VALUE if value.eql?(default_pattern)
-            value
+            return Truemail::Log::Serializer::Base::DEFAULT_GEM_VALUE if executor_configuration_attr.eql?(default_pattern)
+            executor_configuration_attr
           end
         end
 
@@ -55,6 +63,7 @@ module Truemail
             whitelist_validation: executor_configuration.whitelist_validation,
             whitelisted_domains: whitelisted_domains,
             blacklisted_domains: blacklisted_domains,
+            blacklisted_mx_ip_addresses: blacklisted_mx_ip_addresses,
             dns: dns,
             not_rfc_mx_lookup_flow: executor_configuration.not_rfc_mx_lookup_flow,
             smtp_fail_fast: executor_configuration.smtp_fail_fast,

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

@@ -19,9 +19,9 @@ module Truemail
         def data_composer(enumerable_object)
           enumerable_object.inject([]) do |formatted_data, (key, value)|
             data =
-              case
-              when value.is_a?(::Hash) then "\n#{printer(value)}"
-              when value.is_a?(::Array) then value.join(', ')
+              case value
+              when ::Hash then "\n#{printer(value)}"
+              when ::Array then value.join(', ')
               else value
               end
             formatted_data << "#{key.to_s.tr('_', ' ')}: #{data}".chomp << "\n"

data/lib/truemail/validate/mx_blacklist.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Truemail
+  module Validate
+    class MxBlacklist < Truemail::Validate::Base
+      ERROR = 'blacklisted mx server ip address'
+
+      def run
+        return false unless Truemail::Validate::Mx.check(result)
+        return true if success(not_blacklisted_mail_servers?)
+        add_error(Truemail::Validate::MxBlacklist::ERROR)
+        false
+      end
+
+      private
+
+      def blacklisted_ip?
+        ->(mail_server) { configuration.blacklisted_mx_ip_addresses.include?(mail_server) }
+      end
+
+      def not_blacklisted_mail_servers?
+        mail_servers.none?(&blacklisted_ip?)
+      end
+    end
+  end
+end

data/lib/truemail/validate/smtp.rb

@@ -13,7 +13,7 @@ module Truemail
       end
 
       def run
-        return false unless Truemail::Validate::Mx.check(result)
+        return false unless Truemail::Validate::MxBlacklist.check(result)
         establish_smtp_connection
         return true if success(success_response?)
         result.smtp_debug = smtp_results

data/lib/truemail/validator.rb

@@ -3,7 +3,7 @@
 module Truemail
   class Validator < Truemail::Executor
     RESULT_ATTRS = %i[success email domain mail_servers errors smtp_debug configuration].freeze
-    VALIDATION_TYPES = %i[regex mx smtp].freeze
+    VALIDATION_TYPES = %i[regex mx mx_blacklist smtp].freeze
 
     Result = ::Struct.new(*RESULT_ATTRS, keyword_init: true) do
       def initialize(mail_servers: [], errors: {}, **args)
@@ -27,7 +27,7 @@ module Truemail
 
     def run
       Truemail::Validate::DomainListMatch.check(result)
-      result_not_changed? ? Truemail::Validate.const_get(validation_type.capitalize).check(result) : update_validation_type
+      result_not_changed? ? Truemail::Validate.const_get(constantize(validation_type)).check(result) : update_validation_type
       logger&.push(self)
       self
     end
@@ -43,6 +43,10 @@ module Truemail
       result.configuration.validation_type_by_domain[domain] || current_validation_type
     end
 
+    def constantize(symbol)
+      symbol.capitalize.to_s.gsub(/_[a-z]/, &:upcase).tr('_', '').to_sym
+    end
+
     def update_validation_type
       @validation_type = result.success ? :whitelist : :blacklist
     end

data/lib/truemail/version.rb

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

data/truemail.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['admin@bestweb.com.ua']
 
   spec.summary       = %(truemail)
-  spec.description   = %(Configurable framework agnostic plain Ruby email validator. Verify email via Regex, DNS and SMTP.)
+  spec.description   = %(Configurable framework agnostic plain Ruby email validator. Verify email via Regex, DNS, SMTP and even more.)
 
   spec.homepage      = 'https://github.com/truemail-rb/truemail'
   spec.license       = 'MIT'
@@ -33,21 +33,21 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'simpleidn', '~> 0.2.1'
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'bundler', '~> 2.2', '>= 2.2.21'
   spec.add_development_dependency 'bundler-audit', '~> 0.8.0'
-  spec.add_development_dependency 'dns_mock', '~> 1.2', '>= 1.2.1'
-  spec.add_development_dependency 'faker', '~> 2.17'
+  spec.add_development_dependency 'dns_mock', '~> 1.3'
+  spec.add_development_dependency 'faker', '~> 2.18'
   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 'overcommit', '~> 0.58.0'
   spec.add_development_dependency 'pry-byebug', '~> 3.9'
   spec.add_development_dependency 'rake', '~> 13.0', '>= 13.0.3'
-  spec.add_development_dependency 'reek', '~> 6.0', '>= 6.0.3'
+  spec.add_development_dependency 'reek', '~> 6.0', '>= 6.0.4'
   spec.add_development_dependency 'rspec', '~> 3.10'
-  spec.add_development_dependency 'rubocop', '~> 1.12', '>= 1.12.1'
-  spec.add_development_dependency 'rubocop-performance', '~> 1.10', '>= 1.10.2'
-  spec.add_development_dependency 'rubocop-rspec', '~> 2.2'
+  spec.add_development_dependency 'rubocop', '~> 1.18'
+  spec.add_development_dependency 'rubocop-performance', '~> 1.11', '>= 1.11.3'
+  spec.add_development_dependency 'rubocop-rspec', '~> 2.4'
   spec.add_development_dependency 'simplecov', '~> 0.17.1'
-  spec.add_development_dependency 'truemail-rspec', '~> 0.4'
-  spec.add_development_dependency 'webmock', '~> 3.12', '>= 3.12.2'
+  spec.add_development_dependency 'truemail-rspec', '~> 0.6'
+  spec.add_development_dependency 'webmock', '~> 3.13'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: truemail
 version: !ruby/object:Gem::Version
-  version: 2.3.4
+  version: 2.4.4
 platform: ruby
 authors:
 - Vladislav Trotsenko
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-16 00:00:00.000000000 Z
+date: 2021-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simpleidn
@@ -30,14 +30,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.21
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.21
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -58,34 +64,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.17'
+        version: '2.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.17'
+        version: '2.18'
 - !ruby/object:Gem::Dependency
   name: fasterer
   requirement: !ruby/object:Gem::Requirement
@@ -120,14 +120,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.57.0
+        version: 0.58.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.57.0
+        version: 0.58.0
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -171,7 +171,7 @@ dependencies:
         version: '6.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.3
+        version: 6.0.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -181,7 +181,7 @@ dependencies:
         version: '6.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.3
+        version: 6.0.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -202,54 +202,48 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.12.1
+        version: '1.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.12.1
+        version: '1.18'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.2
+        version: 1.11.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.2
+        version: 1.11.3
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -270,36 +264,30 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.12.2
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.12.2
+        version: '3.13'
 description: Configurable framework agnostic plain Ruby email validator. Verify email
-  via Regex, DNS and SMTP.
+  via Regex, DNS, SMTP and even more.
 email:
 - admin@bestweb.com.ua
 executables: []
@@ -353,6 +341,7 @@ files:
 - lib/truemail/validate/base.rb
 - lib/truemail/validate/domain_list_match.rb
 - lib/truemail/validate/mx.rb
+- lib/truemail/validate/mx_blacklist.rb
 - lib/truemail/validate/regex.rb
 - lib/truemail/validate/smtp.rb
 - lib/truemail/validate/smtp/request.rb
@@ -386,8 +375,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.3
+rubygems_version: 3.2.20
 signing_key:
 specification_version: 4
 summary: truemail