truemail 2.5.4 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37bf79a8686596bdc9c9f3b3b790af4d2fee50814b9c0c776696c77085a01bb1
-  data.tar.gz: '0927e1e776737834c16db6caea0ab3892686bfb4dc86d1d87b1cb7446b5ec821'
+  metadata.gz: 2826eb4303d5730ba1cd199cf91d7ef07946d3d167af6b8a3eee704c56127490
+  data.tar.gz: e23c0881d4e066857e51421a511b46e13e61bd6c9e4690223ed83fffc3947249
 SHA512:
-  metadata.gz: de69fa4ff5d56639d98eba1c2bd19ade808651dbbdff3eb6ebea66c3e200a371f1fd78ab932b62f865ba0c2b4f413d7842a08d78c46ce7da3aea6f86e1e68e19
-  data.tar.gz: ffa822e760e57bcaf273af04b2fbe6e334f4bba3bd91c2130e6164ec0e580cff3e65af3a771a4409290a8aedfd8d2a5dd85c3aa2c0ff8fb6d6740322d99be810
+  metadata.gz: facbed503237e69db472f8392402e45e04e3fb41bf44cab0048eaee7b8968ae0a68a72da34315d1ebe066001ec253ae5da96adab1b4c2891fa069404afe1db77
+  data.tar.gz: d93dc1d183fbafb6be9a12b35d38ddebff6d5b92d76cb80f559238303f27ce5246caaa271665b0060a0ae340678831ad3bcec949cdd0447085469f223a629a8e

data/.circleci/config.yml

@@ -4,18 +4,11 @@ defaults: &defaults
   working_directory: ~/truemail
   docker:
     - image: cimg/ruby:<< parameters.ruby-version >>
-  environment:
-    CC_TEST_REPORTER_ID: 693272a1328521f6f7c09d7ffd419b21c00410da26e98e94c687fdd38b26e2cb
 
 orbs:
-  ruby: circleci/ruby@1.1.3
+  ruby: circleci/ruby@1.2.0
 
 references:
-  install_bundler: &install_bundler
-    run:
-      name: Installing Bundler
-      command: gem i bundler -v $(tail -1 Gemfile.lock | tr -d ' ')
-
   restore_bundle_cache: &restore_bundle_cache
     restore_cache:
       keys:
@@ -24,7 +17,9 @@ references:
   bundle_install: &bundle_install
     run:
       name: Installing gems
-      command: bundle install --path vendor/bundle
+      command: |
+            bundle config set --local path 'vendor/bundle'
+            bundle install
 
   save_bundle_cache: &save_bundle_cache
     save_cache:
@@ -50,7 +45,6 @@ jobs:
     steps:
       - checkout
 
-      - <<: *install_bundler
       - <<: *restore_bundle_cache
       - <<: *bundle_install
       - <<: *save_bundle_cache
@@ -71,7 +65,6 @@ jobs:
     steps:
       - checkout
 
-      - <<: *install_bundler
       - <<: *restore_bundle_cache
       - <<: *bundle_install
       - <<: *save_bundle_cache
@@ -107,6 +100,7 @@ jobs:
     steps:
       - checkout
       - ruby/install-deps:
+          bundler-version: "2.3.3"
           with-cache: false
           path: './vendor/custom_bundle'
       - run:
@@ -127,4 +121,4 @@ workflows:
       - compatibility-ruby:
           matrix:
             parameters:
-              ruby-version: ["2.6", "2.7", "3.0"]
+              ruby-version: ["2.6", "2.7", "3.0", "3.1"]

data/.codeclimate.yml

@@ -7,7 +7,7 @@ checks:
 plugins:
   rubocop:
     enabled: true
-    channel: rubocop-1-23
+    channel: rubocop-1-24
 
   reek:
     enabled: true

data/.gitignore

@@ -1,3 +1,4 @@
 /.rspec_status
 /pkg
 /coverage/
+Gemfile.lock

data/.reek.yml

@@ -47,6 +47,7 @@ detectors:
       - Truemail::Validate::Mx#null_mx?
       - Truemail::Validate::Mx#a_record
       - Truemail::Validate::Smtp::Request#compose_from
+      - Truemail::Validate::Smtp::Request::Session#old_net_smtp?
 
   ControlParameter:
     exclude:

data/.rubocop.yml

@@ -31,6 +31,9 @@ Naming/RescuedExceptionsVariableName:
 Naming/InclusiveLanguage:
   Enabled: false
 
+Naming/BlockForwarding:
+  Enabled: true
+
 Style/Documentation:
   Enabled: false
 
@@ -181,6 +184,15 @@ Style/SelectByRegexp:
 Style/OpenStructUse:
   Enabled: true
 
+Style/FileRead:
+  Enabled: true
+
+Style/FileWrite:
+  Enabled: true
+
+Style/MapToHash:
+  Enabled: true
+
 Layout/LineLength:
   Max: 140
 
@@ -416,6 +428,9 @@ Performance/MapCompact:
 Performance/ConcurrentMonotonicTime:
   Enabled: true
 
+Performance/StringIdentifierArgument:
+  Enabled: true
+
 RSpec/ExampleLength:
   Enabled: false
 
@@ -457,3 +472,6 @@ RSpec/ExcessiveDocstringSpacing:
 
 RSpec/SubjectDeclaration:
   Enabled: true
+
+RSpec/FactoryBot/SyntaxMethods:
+  Enabled: true

data/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 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).
 
+## [2.6.0] - 2021.12.28
+
+### Added
+
+- Added Ruby 3.1.x compatibility
+- Added `Truemail::Validate::Smtp::Request::Session` - `Net::SMTP` wrapper, tests
+
+### Updated
+
+- Updated `Truemail::Validate::Smtp::Request#session`, `Truemail::Validate::Smtp::Request#run`, tests
+- Updated rubocop/reek/codeclimate/circleci configs
+- Updated gem runtime/development dependencies
+- Updated gem docs, version
+
 ## [2.5.4] - 2021.12.03
 
 ### Fixed

data/README.md

@@ -81,7 +81,6 @@ Also Truemail gem allows performing an audit of the host in which runs.
 ## Features
 
 - Configurable validator, validate only what you need
-- Only one runtime dependency
 - Supporting of internationalized emails ([EAI](https://en.wikipedia.org/wiki/Email_address#Internationalization))
 - Whitelist/blacklist validation layers
 - Ability to configure different MX/SMTP validation flows

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

@@ -4,8 +4,6 @@ module Truemail
   module Validate
     class Smtp
       class Request
-        require 'net/smtp'
-
         SMTP_PORT = 25
         CONNECTION_TIMEOUT_ERROR = 'connection timed out'
         RESPONSE_TIMEOUT_ERROR = 'server response timeout'
@@ -35,7 +33,6 @@ module Truemail
         end
 
         def run
-          return session.start(verifier_domain, tls_verify: false, &session_actions) if ::RUBY_VERSION[/\A3\..+\z/]
           session.start(verifier_domain, &session_actions)
         rescue => error
           retry if attempts_exist?
@@ -55,6 +52,30 @@ module Truemail
           end
         end
 
+        class Session
+          require 'net/smtp'
+
+          def initialize(host, port, connection_timeout, response_timeout)
+            @net_smtp = (old_net_smtp? ? ::Net::SMTP.new(host, port) : ::Net::SMTP.new(host, port, tls_verify: false)).tap do |settings|
+              settings.open_timeout = connection_timeout
+              settings.read_timeout = response_timeout
+            end
+          end
+
+          def start(helo_domain, &block)
+            return net_smtp.start(helo_domain, &block) if old_net_smtp?
+            net_smtp.start(helo: helo_domain, &block)
+          end
+
+          private
+
+          attr_reader :net_smtp
+
+          def old_net_smtp?
+            !::Net::SMTP.const_defined?(:VERSION) || ::Net::SMTP::VERSION < '0.3.0'
+          end
+        end
+
         attr_reader :attempts, :port_open_status
 
         def attempts_exist?
@@ -63,10 +84,12 @@ module Truemail
         end
 
         def session
-          ::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
+          Truemail::Validate::Smtp::Request::Session.new(
+            host,
+            Truemail::Validate::Smtp::Request::SMTP_PORT,
+            configuration.connection_timeout,
+            configuration.response_timeout
+          )
         end
 
         def compose_from(error)
@@ -84,10 +107,7 @@ module Truemail
         end
 
         def session_data
-          {
-            mailfrom: configuration.verifier_email,
-            rcptto: email
-          }
+          { mailfrom: configuration.verifier_email, rcptto: email }
         end
 
         def smtp_resolver(smtp_request, method, value)

data/lib/truemail/version.rb

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

data/truemail.gemspec

@@ -31,9 +31,9 @@ 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'
   spec.add_runtime_dependency 'simpleidn', '~> 0.2.1'
 
-  spec.add_development_dependency 'bundler', '~> 2.2', '>= 2.2.32'
   spec.add_development_dependency 'bundler-audit', '~> 0.9.0.1'
   spec.add_development_dependency 'dns_mock', '~> 1.4', '>= 1.4.4'
   spec.add_development_dependency 'fasterer', '~> 0.9.0'
@@ -44,9 +44,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 13.0', '>= 13.0.6'
   spec.add_development_dependency 'reek', '~> 6.0', '>= 6.0.6'
   spec.add_development_dependency 'rspec', '~> 3.10'
-  spec.add_development_dependency 'rubocop', '~> 1.23'
-  spec.add_development_dependency 'rubocop-performance', '~> 1.12'
-  spec.add_development_dependency 'rubocop-rspec', '~> 2.6'
+  spec.add_development_dependency 'rubocop', '~> 1.24'
+  spec.add_development_dependency 'rubocop-performance', '~> 1.13'
+  spec.add_development_dependency 'rubocop-rspec', '~> 2.7'
   spec.add_development_dependency 'simplecov', '~> 0.17.1'
   spec.add_development_dependency 'truemail-rspec', '~> 0.7.0'
   spec.add_development_dependency 'webmock', '~> 3.14'

metadata

@@ -1,49 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: truemail
 version: !ruby/object:Gem::Version
-  version: 2.5.4
+  version: 2.6.0
 platform: ruby
 authors:
 - Vladislav Trotsenko
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-03 00:00:00.000000000 Z
+date: 2021-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: simpleidn
+  name: net-smtp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: simpleidn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.32
-  type: :development
+        version: 0.2.1
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.32
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -208,42 +202,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.23'
+        version: '1.24'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.23'
+        version: '1.24'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -313,7 +307,6 @@ files:
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile

data/Gemfile.lock

@@ -1,138 +0,0 @@
-PATH
-  remote: .
-  specs:
-    truemail (2.5.4)
-      simpleidn (~> 0.2.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.2)
-    bundler-audit (0.9.0.1)
-      bundler (>= 1.2.0, < 3)
-      thor (~> 1.0)
-    byebug (11.1.3)
-    childprocess (4.1.0)
-    coderay (1.1.3)
-    colorize (0.8.1)
-    crack (0.4.5)
-      rexml
-    diff-lcs (1.4.4)
-    dns_mock (1.4.4)
-      simpleidn (~> 0.2.1)
-    docile (1.4.0)
-    fasterer (0.9.0)
-      colorize (~> 0.7)
-      ruby_parser (>= 3.14.1)
-    ffaker (2.20.0)
-    hashdiff (1.0.1)
-    iniparse (1.5.0)
-    json (2.6.1)
-    json_matchers (0.11.1)
-      json_schema
-    json_schema (0.21.0)
-    kwalify (0.7.2)
-    method_source (1.0.0)
-    overcommit (0.58.0)
-      childprocess (>= 0.6.3, < 5)
-      iniparse (~> 1.4)
-      rexml (~> 3.2)
-    parallel (1.21.0)
-    parser (3.0.3.1)
-      ast (~> 2.4.1)
-    pry (0.13.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    pry-byebug (3.9.0)
-      byebug (~> 11.0)
-      pry (~> 0.13.0)
-    public_suffix (4.0.6)
-    rainbow (3.0.0)
-    rake (13.0.6)
-    reek (6.0.6)
-      kwalify (~> 0.7.0)
-      parser (~> 3.0.0)
-      rainbow (>= 2.0, < 4.0)
-    regexp_parser (2.1.1)
-    rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
-    rubocop (1.23.0)
-      parallel (~> 1.10)
-      parser (>= 3.0.0.0)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.12.0, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.14.0)
-      parser (>= 3.0.1.1)
-    rubocop-performance (1.12.0)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
-    rubocop-rspec (2.6.0)
-      rubocop (~> 1.19)
-    ruby-progressbar (1.11.0)
-    ruby_parser (3.18.1)
-      sexp_processor (~> 4.16)
-    sexp_processor (4.16.0)
-    simplecov (0.17.1)
-      docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    simpleidn (0.2.1)
-      unf (~> 0.1.4)
-    thor (1.1.0)
-    truemail-rspec (0.7.0)
-      ffaker (~> 2.18)
-      rspec (~> 3.10)
-      truemail (>= 2.4)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8)
-    unicode-display_width (2.1.0)
-    webmock (3.14.0)
-      addressable (>= 2.8.0)
-      crack (>= 0.3.2)
-      hashdiff (>= 0.4.0, < 2.0.0)
-
-PLATFORMS
-  x86_64-darwin-20
-
-DEPENDENCIES
-  bundler (~> 2.2, >= 2.2.32)
-  bundler-audit (~> 0.9.0.1)
-  dns_mock (~> 1.4, >= 1.4.4)
-  fasterer (~> 0.9.0)
-  ffaker (~> 2.20)
-  json_matchers (~> 0.11.1)
-  overcommit (~> 0.58.0)
-  pry-byebug (~> 3.9)
-  rake (~> 13.0, >= 13.0.6)
-  reek (~> 6.0, >= 6.0.6)
-  rspec (~> 3.10)
-  rubocop (~> 1.23)
-  rubocop-performance (~> 1.12)
-  rubocop-rspec (~> 2.6)
-  simplecov (~> 0.17.1)
-  truemail!
-  truemail-rspec (~> 0.7.0)
-  webmock (~> 3.14)
-
-BUNDLED WITH
-   2.2.32