truemail 2.7.5 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e06a06a5475f233ad747c59b77d50aac4465e231aaf9fef7cd40bed66fb4282
-  data.tar.gz: d5ebb376ee5b00dc9100373f733afd8af5c5bdcaf0a11c1c467b6b996320950a
+  metadata.gz: 14cf6d4a2b730702849ca49317fdb3a054562f3e41de01b4e88737dc1da09ff8
+  data.tar.gz: b07cf758750e1532189f57e88ba61b06f4a2c5b9c570f76187c52d2e38c1e2f6
 SHA512:
-  metadata.gz: '0696f4165309a5a9b82e337c3c1efd813de5da1c136c2015dae539e30e2a3e3f4aabd46920eab38051fa093be6c1af8845412545f8a7ab91e5b5ee233f639390'
-  data.tar.gz: 958d4e6999f596d056cfe8a75fc058ce417e14f7cc0de500848d9f0ed7e8a250fad435f62f546282dd196a136c30a04556bef7c884933dcc375e4bb4f95a87af
+  metadata.gz: 665f453be4cd3bfbc10a66dfce4cc41b842ef1e36fdd22f8aacbe2def6f1ca542043647f528910320fa498d10c31cabc86d74b9fb5a8f5f4d79b6b02ae34eff6
+  data.tar.gz: 7f229a5a880117b42d7a070a83d5040e147402db193139929ea192f0451e2c7934f81b048146ed79369a2b0d985dab2f82dd80ee750f58ae452472254a2ddf95

data/.circleci/config.yml

@@ -6,7 +6,7 @@ defaults: &defaults
     - image: cimg/ruby:<< parameters.ruby-version >>
 
 orbs:
-  ruby: circleci/ruby@1.8.0
+  ruby: circleci/ruby@2.0.0
 
 references:
   restore_bundle_cache: &restore_bundle_cache
@@ -122,7 +122,7 @@ jobs:
       - checkout
       - <<: *use_compatible_gemspec
       - ruby/install-deps:
-          bundler-version: "2.3.23"
+          bundler-version: "2.3.24"
           with-cache: false
           path: './vendor/custom_bundle'
       - <<: *install_system_dependencies

data/.circleci/gemspec_compatible

@@ -35,8 +35,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'ffaker', '~> 2.21'
   spec.add_development_dependency 'json_matchers', '~> 0.11.1'
   spec.add_development_dependency 'rake', '~> 13.0', '>= 13.0.6'
-  spec.add_development_dependency 'rspec', '~> 3.11'
+  spec.add_development_dependency 'rspec', '~> 3.12'
   spec.add_development_dependency 'smtp_mock', '~> 1.2', '>= 1.2.2'
-  spec.add_development_dependency 'truemail-rspec', '~> 0.9.2'
+  spec.add_development_dependency 'truemail-rspec', '~> 1.0'
   spec.add_development_dependency 'webmock', '~> 3.18', '>= 3.18.1'
 end

data/.circleci/gemspec_latest

@@ -41,12 +41,12 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry-byebug', '~> 3.10', '>= 3.10.1'
   spec.add_development_dependency 'rake', '~> 13.0', '>= 13.0.6'
   spec.add_development_dependency 'reek', '~> 6.1', '>= 6.1.1'
-  spec.add_development_dependency 'rspec', '~> 3.11'
-  spec.add_development_dependency 'rubocop', '~> 1.36'
+  spec.add_development_dependency 'rspec', '~> 3.12'
+  spec.add_development_dependency 'rubocop', '~> 1.37', '>= 1.37.1'
   spec.add_development_dependency 'rubocop-performance', '~> 1.15'
-  spec.add_development_dependency 'rubocop-rspec', '~> 2.13', '>= 2.13.2'
+  spec.add_development_dependency 'rubocop-rspec', '~> 2.14', '>= 2.14.2'
   spec.add_development_dependency 'simplecov', '~> 0.21.2'
   spec.add_development_dependency 'smtp_mock', '~> 1.2', '>= 1.2.2'
-  spec.add_development_dependency 'truemail-rspec', '~> 0.9.2'
+  spec.add_development_dependency 'truemail-rspec', '~> 1.0'
   spec.add_development_dependency 'webmock', '~> 3.18', '>= 3.18.1'
 end

data/.codeclimate.yml

@@ -7,7 +7,7 @@ checks:
 plugins:
   rubocop:
     enabled: true
-    channel: rubocop-1-36
+    channel: rubocop-1-37
 
   reek:
     enabled: true

data/.reek.yml

@@ -15,6 +15,7 @@ detectors:
       - Truemail::Configuration#logger=
       - Truemail::Validate::Smtp::Request#initialize
       - Truemail::Validate::Smtp::Request::Session#initialize
+      - Truemail::RSpec::ValidatorHelper::ValidatorFactory#process_validator_params
 
   TooManyInstanceVariables:
     exclude:

data/CHANGELOG.md

@@ -2,6 +2,49 @@
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.0.1] - 2022.11.01
+
+### Fixed
+
+- Fixed wrong semantic version comparison in gemspec runtime dependency definition
+
+### Updated
+
+- Updated RSpec helpers
+- Updated gemspecs, circleci config
+- Updated gem version
+
+## [3.0.0] - 2022.10.24
+
+### Added
+
+- Added ability to specify whitelisted/blacklisted emails by complete match
+
+```ruby
+Truemail.configure do |config|
+  # Optional parameter. Validation of email which contains whitelisted emails always will
+  # return true. Other validations will not processed even if it was defined in validation_type_for
+  # It is equal to empty array by default.
+  config.whitelisted_emails = %w[user@somedomain1.com user@somedomain2.com]
+
+  # Optional parameter. Validation of email which contains blacklisted emails always will
+  # return false. Other validations will not processed even if it was defined in validation_type_for
+  # It is equal to empty array by default.
+  config.blacklisted_emails = %w[user@somedomain3.com user@somedomain4.com]
+end
+```
+
+### Updated
+
+- Updated `Truemail::Configuration`, tests
+- Updated namespace from `Truemail::Validate::DomainListMatch` to `Truemail::Validate::ListMatch`
+- Updated `Truemail::Validator#run, tests
+- Updated `Truemail::Log::Serializer::ValidatorJson`, tests
+- Updated `Truemail::Log::Serializer::ValidatorText`, tests
+- Updated `Truemail::Log::Serializer::AuditorJson`, tests
+- Updated schemas, gemspecs, circleci/codeclimate config
+- Updated docs, gem version
+
 ## [2.7.5] - 2022.10.10
 
 ### Updated

data/README.md

@@ -130,9 +130,11 @@ You can use global gem configuration or custom independent configuration. Availa
 - connection attempts
 - default validation type
 - validation type for domains
+- whitelisted emails
+- blacklisted emails
 - whitelisted domains
-- whitelist validation
 - blacklisted domains
+- whitelist validation
 - blacklisted mx ip-addresses
 - custom DNS gateway(s)
 - RFC MX lookup flow
@@ -190,22 +192,32 @@ Truemail.configure do |config|
   # It is equal to empty hash by default.
   config.validation_type_for = { 'somedomain.com' => :regex, 'otherdomain.com' => :mx }
 
+  # Optional parameter. Validation of email which contains whitelisted emails always will
+  # return true. Other validations will not processed even if it was defined in validation_type_for
+  # It is equal to empty array by default.
+  config.whitelisted_emails = %w[user@somedomain1.com user@somedomain2.com]
+
+  # Optional parameter. Validation of email which contains blacklisted emails always will
+  # return false. Other validations will not processed even if it was defined in validation_type_for
+  # It is equal to empty array by default.
+  config.blacklisted_emails = %w[user@somedomain3.com user@somedomain4.com]
+
   # Optional parameter. Validation of email which contains whitelisted domain always will
   # return true. Other validations will not processed even if it was defined in validation_type_for
   # It is equal to empty array by default.
   config.whitelisted_domains = %w[somedomain1.com somedomain2.com]
 
+  # Optional parameter. Validation of email which contains blacklisted domain always will
+  # return false. Other validations will not processed even if it was defined in validation_type_for
+  # It is equal to empty array by default.
+  config.blacklisted_domains = %w[somedomain3.com somedomain4.com]
+
   # Optional parameter. With this option Truemail will validate email which contains whitelisted
   # domain only, i.e. if domain whitelisted, validation will passed to Regex, MX or SMTP validators.
   # Validation of email which not contains whitelisted domain always will return false.
   # It is equal false by default.
   config.whitelist_validation = true
 
-  # Optional parameter. Validation of email which contains blacklisted domain always will
-  # return false. Other validations will not processed even if it was defined in validation_type_for
-  # It is equal to empty array by default.
-  config.blacklisted_domains = %w[somedomain3.com somedomain4.com]
-
   # Optional parameter. With this option Truemail will filter out unwanted mx servers via
   # predefined list of ip addresses. It can be used as a part of DEA (disposable email
   # address) validations. It is equal to empty array by default.
@@ -259,9 +271,11 @@ Truemail.configuration
  @connection_attempts=3,
  @default_validation_type=:mx,
  @validation_type_by_domain={"somedomain.com" => :regex, "otherdomain.com" => :mx},
+ @whitelisted_emails=["user@somedomain1.com", "user@somedomain2.com"],
+ @blacklisted_emails=["user@somedomain3.com", "user@somedomain4.com"],
  @whitelisted_domains=["somedomain1.com", "somedomain2.com"],
- @whitelist_validation=true,
  @blacklisted_domains=["somedomain3.com", "somedomain4.com"],
+ @whitelist_validation=true,
  @blacklisted_mx_ip_addresses=["1.1.1.1", "2.2.2.2"],
  @dns=["10.0.0.1", "10.0.0.2:54"],
  @verifier_domain="somedomain.com",
@@ -293,9 +307,11 @@ Truemail.configuration
  @connection_attempts=1,
  @default_validation_type=:mx,
  @validation_type_by_domain={"somedomain.com" => :regex, "otherdomain.com" => :mx},
+ @whitelisted_emails=["user@somedomain1.com", "user@somedomain2.com"],
+ @blacklisted_emails=["user@somedomain3.com", "user@somedomain4.com"],
  @whitelisted_domains=["somedomain1.com", "somedomain2.com"],
- @whitelist_validation=true,
  @blacklisted_domains=["somedomain3.com", "somedomain4.com"],
+ @whitelist_validation=true,
  @blacklisted_mx_ip_addresses=["1.1.1.1", "2.2.2.2"],
  @dns=["10.0.0.1", "10.0.0.2:54"],
  @verifier_domain="somedomain.com",
@@ -339,7 +355,7 @@ Please note, you should have global or custom configuration for use Truemail gem
 
 #### Whitelist/Blacklist check
 
-Whitelist/Blacklist check is zero validation level. You can define white and black list domains. It means that validation of email which contains whitelisted domain always will return `true`, and for blacklisted domain will return `false`.
+Whitelist/Blacklist check is zero validation level. You can define white and black emails/domains lists. It means that validation of email which contains whitelisted email or domain always will return `true`, and for blacklisted email or domain will return `false`.
 
 Please note, other validations will not processed even if it was defined in `validation_type_for`.
 
@@ -356,6 +372,8 @@ require 'truemail'
 
 Truemail.configure do |config|
   config.verifier_email = 'verifier@example.com'
+  config.whitelisted_emails = %w[user@somedomain1.com user@somedomain2.com]
+  config.blacklisted_emails = %w[user@somedomain3.com user@somedomain4.com]
   config.whitelisted_domains = %w[white-domain.com somedomain.com]
   config.blacklisted_domains = %w[black-domain.com somedomain.com]
   config.validation_type_for = { 'somedomain.com' => :mx }
@@ -378,6 +396,8 @@ Truemail.validate('email@white-domain.com')
     errors={},
     smtp_debug=nil>,
     configuration=#<Truemail::Configuration:0x00005629f801bd28
+     @whitelisted_emails=["user@somedomain1.com", "user@somedomain2.com"],
+     @blacklisted_emails=["user@somedomain3.com", "user@somedomain4.com"],
      @blacklisted_domains=["black-domain.com", "somedomain.com"],
      @blacklisted_mx_ip_addresses=[],
      @dns=[],
@@ -428,6 +448,8 @@ Truemail.validate('email@white-domain.com', with: :regex)
     smtp_debug=nil>,
     configuration=
     #<Truemail::Configuration:0x0000563f0d2605c8
+     @whitelisted_emails=[],
+     @blacklisted_emails=[],
      @blacklisted_domains=[],
      @blacklisted_mx_ip_addresses=[],
      @dns=[],
@@ -464,6 +486,8 @@ Truemail.validate('email@domain.com', with: :regex)
     smtp_debug=nil>,
     configuration=
     #<Truemail::Configuration:0x0000563f0cd82ab0
+     @whitelisted_emails=[],
+     @blacklisted_emails=[],
      @blacklisted_domains=[],
      @blacklisted_mx_ip_addresses=[],
      @dns=[],
@@ -502,6 +526,8 @@ Truemail.validate('email@black-domain.com')
     smtp_debug=nil>,
     configuration=
     #<Truemail::Configuration:0x0000563f0d36f4f0
+     @whitelisted_emails=[],
+     @blacklisted_emails=[],
      @blacklisted_domains=[],
      @blacklisted_mx_ip_addresses=[],
      @dns=[],
@@ -540,6 +566,8 @@ Truemail.validate('email@somedomain.com')
     smtp_debug=nil>,
     configuration=
     #<Truemail::Configuration:0x0000563f0d3f8fc0
+     @whitelisted_emails=[],
+     @blacklisted_emails=[],
      @blacklisted_domains=[],
      @blacklisted_mx_ip_addresses=[],
      @dns=[],
@@ -595,6 +623,8 @@ Truemail.validate('email@example.com', with: :regex)
       smtp_debug=nil>,
       configuration=
       #<Truemail::Configuration:0x000055aa56a54d48
+       @whitelisted_emails=[],
+       @blacklisted_emails=[],
        @blacklisted_domains=[],
        @blacklisted_mx_ip_addresses=[],
        @dns=[],
@@ -641,6 +671,8 @@ Truemail.validate('email@example.com', with: :regex)
       smtp_debug=nil>,
       configuration=
       #<Truemail::Configuration:0x0000560e58d80830
+       @whitelisted_emails=[],
+       @blacklisted_emails=[],
        @blacklisted_domains=[],
        @blacklisted_mx_ip_addresses=[],
        @dns=[],
@@ -698,6 +730,8 @@ Truemail.validate('email@example.com', with: :mx)
       smtp_debug=nil>,
       configuration=
       #<Truemail::Configuration:0x0000559b6e44af70
+       @whitelisted_emails=[],
+       @blacklisted_emails=[],
        @blacklisted_domains=[],
        @blacklisted_mx_ip_addresses=[],
        @dns=[],
@@ -746,6 +780,8 @@ Truemail.validate('email@example.com', with: :mx)
       smtp_debug=nil>,
       configuration=
       #<Truemail::Configuration:0x0000559b6e44af70
+       @whitelisted_emails=[],
+       @blacklisted_emails=[],
        @blacklisted_domains=[],
        @blacklisted_mx_ip_addresses=[],
        @dns=[],
@@ -798,6 +834,8 @@ Truemail.validate('email@example.com', with: :mx_blacklist)
    smtp_debug=nil,
    configuration=
     #<Truemail::Configuration:0x00007fca0c8aeb38
+     @whitelisted_emails=[],
+     @blacklisted_emails=[],
      @blacklisted_domains=[],
      @blacklisted_mx_ip_addresses=["127.0.1.2"],
      @connection_attempts=2,
@@ -875,6 +913,8 @@ Truemail.validate('email@example.com')
                 errors={}>>],
         configuration=
           #<Truemail::Configuration:0x00007fdc4504f5c8
+            @whitelisted_emails=[],
+            @blacklisted_emails=[],
             @blacklisted_domains=[],
             @blacklisted_mx_ip_addresses=[],
             @dns=[],
@@ -921,6 +961,8 @@ Truemail.validate('email@example.com')
       smtp_debug=nil>,
       configuration=
       #<Truemail::Configuration:0x00005615e87b9298
+       @whitelisted_emails=[],
+       @blacklisted_emails=[],
        @blacklisted_domains=[],
        @blacklisted_mx_ip_addresses=[],
        @dns=[],
@@ -973,6 +1015,8 @@ Truemail.validate('email@example.com')
                 errors={:rcptto=>"550 User not found\n"}>>]>,
           configuration=
             #<Truemail::Configuration:0x00005615e87b9298
+             @whitelisted_emails=[],
+             @blacklisted_emails=[],
              @blacklisted_domains=[],
              @blacklisted_mx_ip_addresses=[],
              @dns=[],
@@ -1038,6 +1082,8 @@ Truemail.validate('email@example.com')
                 errors={:mailfrom=>"554 5.7.1 Client host blocked\n", :connection=>"server dropped connection after response"}>>,]>,
         configuration=
             #<Truemail::Configuration:0x00005615e87b9298
+             @whitelisted_emails=[],
+             @blacklisted_emails=[],
              @blacklisted_domains=[],
              @blacklisted_mx_ip_addresses=[],
              @dns=[],
@@ -1087,6 +1133,8 @@ Truemail.validate('email@example.com')
               errors={:rcptto=>"550 User not found\n"}>>]>,
       configuration=
             #<Truemail::Configuration:0x00005615e87b9298
+             @whitelisted_emails=[],
+             @blacklisted_emails=[],
              @blacklisted_domains=[],
              @blacklisted_mx_ip_addresses=[],
              @dns=[],
@@ -1138,6 +1186,8 @@ Truemail.host_audit
        warnings={}>,
        configuration=
         #<Truemail::Configuration:0x00005615e86327a8
+         @whitelisted_emails=[],
+         @blacklisted_emails=[],
          @blacklisted_domains=[],
          @blacklisted_mx_ip_addresses=[],
          @dns=[],
@@ -1168,6 +1218,8 @@ Truemail.host_audit
        },
        configuration=
         #<Truemail::Configuration:0x00005615e86327a8
+         @whitelisted_emails=[],
+         @blacklisted_emails=[],
          @blacklisted_domains=[],
          @blacklisted_mx_ip_addresses=[],
          @dns=[],
@@ -1223,6 +1275,8 @@ Truemail::Log::Serializer::AuditorJson.call(Truemail.host_audit)
     "dns": "A-record of verifier domain not refers to current host ip address", "ptr": "PTR-record does not reference to current verifier domain"
   },
  "configuration": {
+    "whitelisted_emails": null,
+    "blacklisted_emails": null,
     "blacklisted_domains": null,
     "blacklisted_mx_ip_addresses": null,
     "dns": null,
@@ -1264,6 +1318,8 @@ Truemail::Log::Serializer::ValidatorJson.call(Truemail.validate('nonexistent_ema
     }
   ],
   "configuration": {
+    "whitelisted_emails": null,
+    "blacklisted_emails": null,
     "blacklisted_domains": null,
     "blacklisted_mx_ip_addresses": null,
     "dns": null,
@@ -1307,6 +1363,8 @@ Truemail.host_audit.as_json
     "dns": "A-record of verifier domain not refers to current host ip address", "ptr": "PTR-record does not reference to current verifier domain"
   },
  "configuration": {
+    "whitelisted_emails": null,
+    "blacklisted_emails": null,
     "blacklisted_domains": null,
     "blacklisted_mx_ip_addresses": null,
     "dns": null,
@@ -1345,6 +1403,8 @@ Truemail.validate('nonexistent_email@bestweb.com.ua').as_json
     }
   ],
   "configuration": {
+    "whitelisted_emails": null,
+    "blacklisted_emails": null,
     "blacklisted_domains": null,
     "blacklisted_mx_ip_addresses": null,
     "dns": null,
@@ -1391,6 +1451,56 @@ Truemail.configure do |config|
 end
 ```
 
+Or you can use end-to-end approach and mock DNS and SMTP services with [`dns_mock`](https://github.com/mocktools/ruby-dns-mock), [`smtp_mock`](https://github.com/mocktools/ruby-smtp-mock) for your test environment like in example below:
+
+```ruby
+# Gemfile
+
+group :test do
+  gem 'dns_mock', require: false
+  gem 'smtp_mock', require: false
+end
+
+# spec/spec_helper.rb
+
+require 'dns_mock/test_framework/rspec'
+require 'smtp_mock/test_framework/rspec'
+
+RSpec.configure do |config|
+  config.include DnsMock::TestFramework::RSpec::Helper
+  config.include SmtpMock::TestFramework::RSpec::Helper
+end
+
+# spec/integration_spec.rb
+
+RSpec.describe 'integration tests' do
+  let(:target_email) { random_email }
+  let(:dns_mock_records) { dns_mock_records_by_email(target_email, dimension: 2) }
+
+  before do
+    dns_mock_server.assign_mocks(dns_mock_records)
+    smtp_mock_server(**smtp_mock_server_options)
+
+    Truemail.configuration.tap do |config|
+      config.dns = %W[127.0.0.1:#{dns_mock_server.port}]
+      config.smtp_port = smtp_mock_server.port
+    end
+  end
+
+  context 'when checks real email' do
+    let(:smtp_mock_server_options) { {} }
+
+    it { expect(Truemail.validate(target_email).result).to be_valid }
+  end
+
+  context 'when checks fake email' do
+    let(:smtp_mock_server_options) { { not_registered_emails: [target_email] } }
+
+    it { expect(Truemail.validate(target_email).result).not_to be_valid }
+  end
+end
+```
+
 ---
 
 ## Truemail family

data/lib/truemail/configuration.rb

@@ -14,6 +14,8 @@ module Truemail
       connection_timeout
       response_timeout
       connection_attempts
+      whitelisted_emails
+      blacklisted_emails
       whitelisted_domains
       blacklisted_domains
       blacklisted_mx_ip_addresses
@@ -100,6 +102,8 @@ module Truemail
         default_validation_type: Truemail::Configuration::DEFAULT_VALIDATION_TYPE,
         smtp_port: Truemail::Configuration::DEFAULT_SMTP_PORT,
         validation_type_by_domain: {},
+        whitelisted_emails: [],
+        blacklisted_emails: [],
         whitelisted_domains: [],
         whitelist_validation: false,
         blacklisted_domains: [],
@@ -131,6 +135,7 @@ module Truemail
     def regex_by_method(method)
       return Truemail::RegexConstant::REGEX_IP_ADDRESS_PATTERN if method.eql?(:blacklisted_mx_ip_addresses)
       return Truemail::RegexConstant::REGEX_DNS_SERVER_ADDRESS_PATTERN if method.eql?(:dns)
+      return Truemail::RegexConstant::REGEX_SIMPLE_EMAIL_PATTERN if method[/email/]
       Truemail::RegexConstant::REGEX_DOMAIN_PATTERN
     end
 

data/lib/truemail/core.rb

@@ -20,6 +20,7 @@ module Truemail
 
   module RegexConstant
     REGEX_DOMAIN = /[\p{L}0-9]+([\-.]{1}[\p{L}0-9]+)*\.\p{L}{2,63}/i.freeze
+    REGEX_SIMPLE_EMAIL_PATTERN = /\w+@\w+/.freeze
     REGEX_EMAIL_PATTERN = %r{(?=\A.{6,255}\z)(\A([\p{L}0-9]+[\w\p{L}.+!~,'&%#*^`{}|\-/?=$]*)@(#{REGEX_DOMAIN})\z)}.freeze
     REGEX_DOMAIN_PATTERN = /(?=\A.{4,255}\z)(\A#{REGEX_DOMAIN}\z)/.freeze
     REGEX_DOMAIN_FROM_EMAIL = /\A.+@(.+)\z/.freeze
@@ -45,7 +46,7 @@ module Truemail
 
   module Validate
     require_relative '../truemail/validate/base'
-    require_relative '../truemail/validate/domain_list_match'
+    require_relative '../truemail/validate/list_match'
     require_relative '../truemail/validate/regex'
     require_relative '../truemail/validate/mx'
     require_relative '../truemail/validate/mx_blacklist'

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

@@ -8,6 +8,8 @@ module Truemail
 
         CONFIGURATION_ARRAY_ATTRS = %i[
           validation_type_by_domain
+          whitelisted_emails
+          blacklisted_emails
           whitelisted_domains
           blacklisted_domains
           blacklisted_mx_ip_addresses
@@ -61,6 +63,8 @@ module Truemail
           {
             validation_type_by_domain: validation_type_by_domain,
             whitelist_validation: executor_configuration.whitelist_validation,
+            whitelisted_emails: whitelisted_emails,
+            blacklisted_emails: blacklisted_emails,
             whitelisted_domains: whitelisted_domains,
             blacklisted_domains: blacklisted_domains,
             blacklisted_mx_ip_addresses: blacklisted_mx_ip_addresses,

data/lib/truemail/validate/list_match.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Truemail
+  module Validate
+    class ListMatch < Truemail::Validate::Base
+      ERROR = 'blacklisted email'
+
+      def run
+        return success(true) if whitelisted? && !whitelist_validation?
+        return unless whitelist_validation_case? || blacklisted?
+        success(false)
+        add_error(Truemail::Validate::ListMatch::ERROR)
+      end
+
+      private
+
+      def email
+        @email ||= result.email
+      end
+
+      def email_domain
+        @email_domain ||=
+          result.domain = email[Truemail::RegexConstant::REGEX_DOMAIN_FROM_EMAIL, 1]
+      end
+
+      def whitelisted?
+        configuration.whitelisted_emails.include?(email) ||
+          configuration.whitelisted_domains.include?(email_domain)
+      end
+
+      def whitelist_validation?
+        configuration.whitelist_validation
+      end
+
+      def whitelist_validation_case?
+        whitelist_validation? && !whitelisted?
+      end
+
+      def blacklisted?
+        configuration.blacklisted_emails.include?(email) ||
+          configuration.blacklisted_domains.include?(email_domain)
+      end
+    end
+  end
+end

data/lib/truemail/validator.rb

@@ -26,7 +26,7 @@ module Truemail
     end
 
     def run
-      Truemail::Validate::DomainListMatch.check(result)
+      Truemail::Validate::ListMatch.check(result)
       result_not_changed? ? Truemail::Validate.const_get(constantize(validation_type)).check(result) : update_validation_type
       logger&.push(self)
       self

data/lib/truemail/version.rb

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

data/truemail.gemspec

@@ -29,15 +29,15 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| ::File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'net-smtp', '~> 0.3.2' if ::RUBY_VERSION >= '3.1.0'
+  spec.add_runtime_dependency 'net-smtp', '~> 0.3.2' if ::Gem::Version.new(::RUBY_VERSION) >= ::Gem::Version.new('3.1.0')
   spec.add_runtime_dependency 'simpleidn', '~> 0.2.1'
 
   spec.add_development_dependency 'dns_mock', '~> 1.5', '>= 1.5.5'
   spec.add_development_dependency 'ffaker', '~> 2.21'
   spec.add_development_dependency 'json_matchers', '~> 0.11.1'
   spec.add_development_dependency 'rake', '~> 13.0', '>= 13.0.6'
-  spec.add_development_dependency 'rspec', '~> 3.11'
+  spec.add_development_dependency 'rspec', '~> 3.12'
   spec.add_development_dependency 'smtp_mock', '~> 1.2', '>= 1.2.2'
-  spec.add_development_dependency 'truemail-rspec', '~> 0.9.2'
+  spec.add_development_dependency 'truemail-rspec', '~> 1.0'
   spec.add_development_dependency 'webmock', '~> 3.18', '>= 3.18.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: truemail
 version: !ruby/object:Gem::Version
-  version: 2.7.5
+  version: 3.0.1
 platform: ruby
 authors:
 - Vladislav Trotsenko
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-10 00:00:00.000000000 Z
+date: 2022-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simpleidn
@@ -98,14 +98,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: smtp_mock
   requirement: !ruby/object:Gem::Requirement
@@ -132,14 +132,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -216,7 +216,7 @@ files:
 - lib/truemail/log/serializer/validator_text.rb
 - lib/truemail/logger.rb
 - lib/truemail/validate/base.rb
-- lib/truemail/validate/domain_list_match.rb
+- lib/truemail/validate/list_match.rb
 - lib/truemail/validate/mx.rb
 - lib/truemail/validate/mx_blacklist.rb
 - lib/truemail/validate/regex.rb

data/lib/truemail/validate/domain_list_match.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-module Truemail
-  module Validate
-    class DomainListMatch < Truemail::Validate::Base
-      ERROR = 'blacklisted email'
-
-      def run
-        return success(true) if whitelisted_domain? && !whitelist_validation?
-        return unless whitelist_validation_case? || blacklisted_domain?
-        success(false)
-        add_error(Truemail::Validate::DomainListMatch::ERROR)
-      end
-
-      private
-
-      def email_domain
-        @email_domain ||=
-          result.domain = result.email[Truemail::RegexConstant::REGEX_DOMAIN_FROM_EMAIL, 1]
-      end
-
-      def whitelisted_domain?
-        configuration.whitelisted_domains.include?(email_domain)
-      end
-
-      def whitelist_validation?
-        configuration.whitelist_validation
-      end
-
-      def whitelist_validation_case?
-        whitelist_validation? && !whitelisted_domain?
-      end
-
-      def blacklisted_domain?
-        configuration.blacklisted_domains.include?(email_domain)
-      end
-    end
-  end
-end