truemail 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2826eb4303d5730ba1cd199cf91d7ef07946d3d167af6b8a3eee704c56127490
-  data.tar.gz: e23c0881d4e066857e51421a511b46e13e61bd6c9e4690223ed83fffc3947249
+  metadata.gz: 1499bcd186c7d733fc168a7167b5e171fb2617a37c041e9372a644fc1ecff09a
+  data.tar.gz: 6c9320d328da028de9f2e4b3241a91457d1984bc6f5b9e4325fe0c52b1a8f2b4
 SHA512:
-  metadata.gz: facbed503237e69db472f8392402e45e04e3fb41bf44cab0048eaee7b8968ae0a68a72da34315d1ebe066001ec253ae5da96adab1b4c2891fa069404afe1db77
-  data.tar.gz: d93dc1d183fbafb6be9a12b35d38ddebff6d5b92d76cb80f559238303f27ce5246caaa271665b0060a0ae340678831ad3bcec949cdd0447085469f223a629a8e
+  metadata.gz: '08e5b9f6fb5d6cc628058925401ea80cfc4f0614f16ffce25044b7c3965cbf5eb6560b88faac0732e80eb09d3711a15b2122c29ce623371cf30cb62477952420'
+  data.tar.gz: 4e18f42b916c4994f48b9cc4742ba80473934e9c15c41ef2d34d40b0e69e5f31058a45d78ffdd350040d25d4346b5e4e5c11e91edba0c34a8433c1e2bafaacf7

data/.reek.yml

@@ -14,6 +14,7 @@ detectors:
       - Truemail::Validate::Mx#hosts_from_cname_records
       - Truemail::Configuration#logger=
       - Truemail::Validate::Smtp::Request#initialize
+      - Truemail::Validate::Smtp::Request::Session#initialize
 
   TooManyInstanceVariables:
     exclude:

data/.rubocop.yml

@@ -374,6 +374,9 @@ Gemspec/DateAssignment:
 Gemspec/RequireMFA:
   Enabled: false
 
+Gemspec/RubyVersionGlobalsUsage:
+  Enabled: false
+
 Security/IoMethods:
   Enabled: true
 

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 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.1] - 2022.01.04
+
+### Fixed
+
+- Fixed redefining builtin implementations caused using stdlib as external dependencies. Thanks [@allard](https://github.com/allard) for report.
+
+### Updated
+
+- Updated `Truemail::Validate::Smtp::Request::Session#initialize`, `Truemail::Validate::Smtp::Request::Session#start`, tests
+- Updated rubocop/reek configs
+- Updated gem docs, version
+
 ## [2.6.0] - 2021.12.28
 
 ### Added
@@ -33,7 +45,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Fixed
 
-- Ruby 3.0 stdlib SMTP client SSL certificate verification issues for cases when IP address uses as MX host. Thanks [@esb](https://github.com/esb) for bug report.
+- Fixed Ruby 3.0 stdlib SMTP client SSL certificate verification issues for cases when IP address uses as MX host. Thanks [@esb](https://github.com/esb) for bug report.
 
 ### Updated
 

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

@@ -55,24 +55,34 @@ module Truemail
         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|
+          UNDEFINED_VERSION = '0.0.0'
+
+          def initialize(host, port, connection_timeout, response_timeout, net_class = ::Net::SMTP)
+            @net_class = net_class
+            @net_smtp_version = resolve_net_smtp_version
+            @net_smtp = (old_net_smtp? ? net_class.new(host, port) : net_class.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?
+            return net_smtp.start(helo_domain, &block) if net_smtp_version < '0.2.0'
+            return net_smtp.start(helo_domain, tls_verify: false, &block) if old_net_smtp?
             net_smtp.start(helo: helo_domain, &block)
           end
 
           private
 
-          attr_reader :net_smtp
+          attr_reader :net_class, :net_smtp_version, :net_smtp
+
+          def resolve_net_smtp_version
+            return net_class::VERSION if net_class.const_defined?(:VERSION)
+            Truemail::Validate::Smtp::Request::Session::UNDEFINED_VERSION
+          end
 
           def old_net_smtp?
-            !::Net::SMTP.const_defined?(:VERSION) || ::Net::SMTP::VERSION < '0.3.0'
+            net_smtp_version < '0.3.0'
           end
         end
 

data/lib/truemail/version.rb

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

data/truemail.gemspec

@@ -31,7 +31,7 @@ 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 'net-smtp', '~> 0.3' if ::RUBY_VERSION >= '3.1.0'
   spec.add_runtime_dependency 'simpleidn', '~> 0.2.1'
 
   spec.add_development_dependency 'bundler-audit', '~> 0.9.0.1'

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: truemail
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Vladislav Trotsenko
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-28 00:00:00.000000000 Z
+date: 2022-01-04 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: net-smtp
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: simpleidn
   requirement: !ruby/object:Gem::Requirement