truemail 2.6.0 → 2.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2826eb4303d5730ba1cd199cf91d7ef07946d3d167af6b8a3eee704c56127490
-  data.tar.gz: e23c0881d4e066857e51421a511b46e13e61bd6c9e4690223ed83fffc3947249
+  metadata.gz: 86e5ae8e40f56907c2d936d2d862e811e999590f8311c1500b373f4db5d833c4
+  data.tar.gz: 11be656f6ac87bb0a8867a6e6b38af1685f1115a3f3c7cd071249d32389d1321
 SHA512:
-  metadata.gz: facbed503237e69db472f8392402e45e04e3fb41bf44cab0048eaee7b8968ae0a68a72da34315d1ebe066001ec253ae5da96adab1b4c2891fa069404afe1db77
-  data.tar.gz: d93dc1d183fbafb6be9a12b35d38ddebff6d5b92d76cb80f559238303f27ce5246caaa271665b0060a0ae340678831ad3bcec949cdd0447085469f223a629a8e
+  metadata.gz: 3858e258ea5240db0002b78ecdf67717cd6e445ea6d6590b939a98d532fa7f34453c026816b30ccc9e953d6089d7e94aca48571c85d46465b1b01d4a97695a01
+  data.tar.gz: c8195912550d91c624bb000c941988a4766ef10a564acd3d46da45671aab5ab33d0473e5140e936d2cb284e4171b6ba2148f7ca32a87cbd0dc0bb27ecf05b963

data/.circleci/config.yml

@@ -6,7 +6,7 @@ defaults: &defaults
     - image: cimg/ruby:<< parameters.ruby-version >>
 
 orbs:
-  ruby: circleci/ruby@1.2.0
+  ruby: circleci/ruby@1.4.0
 
 references:
   restore_bundle_cache: &restore_bundle_cache
@@ -27,6 +27,12 @@ references:
       paths:
         - vendor/bundle
 
+  system_dependencies: &system_dependencies
+    run:
+      name: Installing system requirements
+      command: |
+            bundle exec smtp_mock -s -i ~
+
   install_codeclimate_reporter: &install_codeclimate_reporter
     run:
       name: Installing CodeClimate test reporter
@@ -34,6 +40,12 @@ references:
             curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
             chmod +x ./cc-test-reporter
 
+  use_compatible_gemspec: &use_compatible_gemspec
+    run:
+      name: Use compatible gemspec
+      command: |
+            cp .circleci/gemspec_compatible truemail.gemspec
+
 jobs:
   linters-ruby:
     parameters:
@@ -68,6 +80,7 @@ jobs:
       - <<: *restore_bundle_cache
       - <<: *bundle_install
       - <<: *save_bundle_cache
+      - <<: *system_dependencies
       - <<: *install_codeclimate_reporter
 
       - run:
@@ -99,10 +112,12 @@ jobs:
       - image: cimg/ruby:<< parameters.ruby-version >>
     steps:
       - checkout
+      - <<: *use_compatible_gemspec
       - ruby/install-deps:
-          bundler-version: "2.3.3"
+          bundler-version: "2.3.5"
           with-cache: false
           path: './vendor/custom_bundle'
+      - <<: *system_dependencies
       - run:
           name: Running compatibility tests
           command: bundle exec rspec
@@ -113,12 +128,12 @@ workflows:
       - linters-ruby:
           matrix:
             parameters:
-              ruby-version: ["2.5"]
+              ruby-version: ["3.1"]
       - tests-ruby:
           matrix:
             parameters:
-              ruby-version: ["2.5"]
+              ruby-version: ["3.1"]
       - compatibility-ruby:
           matrix:
             parameters:
-              ruby-version: ["2.6", "2.7", "3.0", "3.1"]
+              ruby-version: ["2.5", "2.6", "2.7", "3.0"]

data/.circleci/gemspec_compatible

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'truemail/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = 'truemail'
+  spec.version       = Truemail::VERSION
+  spec.authors       = ['Vladislav Trotsenko']
+  spec.email         = ['admin@bestweb.com.ua']
+
+  spec.summary       = %(truemail)
+  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'
+
+  spec.metadata = {
+    'homepage_uri' => 'https://truemail-rb.org',
+    'changelog_uri' => 'https://github.com/truemail-rb/truemail/blob/master/CHANGELOG.md',
+    'source_code_uri' => 'https://github.com/truemail-rb/truemail',
+    'documentation_uri' => 'https://truemail-rb.org/truemail-gem',
+    'bug_tracker_uri' => 'https://github.com/truemail-rb/truemail/issues'
+  }
+
+  spec.required_ruby_version = '>= 2.5.0'
+
+  spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir        = 'exe'
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| ::File.basename(f) }
+  spec.require_paths = ['lib']
+
+  spec.add_runtime_dependency 'simpleidn', '~> 0.2.1'
+
+  spec.add_development_dependency 'dns_mock', '~> 1.5'
+  spec.add_development_dependency 'ffaker', '~> 2.20'
+  spec.add_development_dependency 'json_matchers', '~> 0.11.1'
+  spec.add_development_dependency 'pry-byebug', '~> 3.9'
+  spec.add_development_dependency 'rake', '~> 13.0', '>= 13.0.6'
+  spec.add_development_dependency 'rspec', '~> 3.10'
+  spec.add_development_dependency 'smtp_mock', '~> 1.0'
+  spec.add_development_dependency 'truemail-rspec', '~> 0.7.0'
+  spec.add_development_dependency 'webmock', '~> 3.14'
+end

data/.codeclimate.yml

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

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
 
@@ -475,3 +478,6 @@ RSpec/SubjectDeclaration:
 
 RSpec/FactoryBot/SyntaxMethods:
   Enabled: true
+
+RSpec/SubjectStub:
+  Enabled: false

data/.ruby-version

@@ -1 +1 @@
-ruby-2.5.0
+ruby-3.1.0

data/CHANGELOG.md

@@ -2,6 +2,40 @@
 
 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.4] - 2022.02.09
+
+### Fixed
+
+- Fixed redefining builtin implementations caused using stdlib as external dependencies. Thanks [@adzap](https://github.com/adzap) for report.
+
+## [2.6.3] - 2022.02.07
+
+### Updated
+
+- Updated gem `net-smtp` runtime dependency
+- Updated gem development dependencies
+- Updated gem version
+
+## [2.6.2] - 2022.01.19
+
+### Updated
+
+- Updated tests
+- Updated gem development dependencies
+- Updated gem version
+
+## [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 +67,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/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019-2021 Vladislav Trotsenko
+Copyright (c) 2019-2022 Vladislav Trotsenko
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1387,7 +1387,7 @@ All Truemail solutions: https://truemail-rb.org
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/truemail-rb/truemail. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct. Please check the [open tikets](https://github.com/truemail-rb/truemail/issues). Be shure to follow Contributor Code of Conduct below and our [Contributing Guidelines](CONTRIBUTING.md).
+Bug reports and pull requests are welcome on GitHub at https://github.com/truemail-rb/truemail. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct. Please check the [open tickets](https://github.com/truemail-rb/truemail/issues). Be sure to follow Contributor Code of Conduct below and our [Contributing Guidelines](CONTRIBUTING.md).
 
 ## License
 

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.4'
 end

data/truemail.gemspec

@@ -31,23 +31,24 @@ 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'
-  spec.add_development_dependency 'dns_mock', '~> 1.4', '>= 1.4.4'
+  spec.add_development_dependency 'dns_mock', '~> 1.5', '>= 1.5.1'
   spec.add_development_dependency 'fasterer', '~> 0.9.0'
   spec.add_development_dependency 'ffaker', '~> 2.20'
   spec.add_development_dependency 'json_matchers', '~> 0.11.1'
   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.6'
-  spec.add_development_dependency 'reek', '~> 6.0', '>= 6.0.6'
+  spec.add_development_dependency 'reek', '~> 6.1'
   spec.add_development_dependency 'rspec', '~> 3.10'
-  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 'rubocop', '~> 1.25', '>= 1.25.1'
+  spec.add_development_dependency 'rubocop-performance', '~> 1.13', '>= 1.13.2'
+  spec.add_development_dependency 'rubocop-rspec', '~> 2.8'
+  spec.add_development_dependency 'simplecov', '~> 0.21.2'
+  spec.add_development_dependency 'smtp_mock', '~> 1.0'
   spec.add_development_dependency 'truemail-rspec', '~> 0.7.0'
   spec.add_development_dependency 'webmock', '~> 3.14'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: truemail
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.4
 platform: ruby
 authors:
 - Vladislav Trotsenko
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-28 00:00:00.000000000 Z
+date: 2022-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-smtp
@@ -58,20 +58,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: 1.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: fasterer
   requirement: !ruby/object:Gem::Requirement
@@ -168,20 +168,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 6.0.6
+        version: '6.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 6.0.6
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -202,14 +196,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.24'
+        version: '1.25'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.25.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.24'
+        version: '1.25'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.25.1
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -217,6 +217,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.13'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.13.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -224,34 +227,51 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.13'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.13.2
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: 0.21.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.21.2
+- !ruby/object:Gem::Dependency
+  name: smtp_mock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: truemail-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -289,6 +309,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
+- ".circleci/gemspec_compatible"
 - ".codeclimate.yml"
 - ".github/BRANCH_NAMING_CONVENTION.md"
 - ".github/ISSUE_TEMPLATE/bug_report.md"
@@ -368,7 +389,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.20
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: truemail