truemail 1.7.1 → 2.0.0

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

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Truemail
+  module Log
+    module Serializer
+      class ValidatorBase < Truemail::Log::Serializer::Base
+        def initialize(executor_instance)
+          @validation_type = executor_instance.validation_type
+          super
+        end
+
+        private
+
+        attr_reader :validation_type
+
+        def smtp_debug
+          validation_smtp_debug = executor_result.smtp_debug
+          return unless validation_smtp_debug
+          validation_smtp_debug.map do |smtp_request|
+            smtp_response = smtp_request.response
+            {
+              mail_host: smtp_request.host,
+              port_opened: smtp_response.port_opened,
+              connection: smtp_response.connection,
+              errors: smtp_response.errors
+            }
+          end
+        end
+
+        def result
+          @result ||=
+            {
+              date: Time.now,
+              email: executor_result.email,
+              validation_type: validation_type,
+              success: executor_result.success,
+              errors: errors(executor_result.errors),
+              smtp_debug: smtp_debug,
+              configuration: configuration
+            }
+        end
+      end
+    end
+  end
+end

data/lib/truemail/log/serializer/{json.rb → validator_json.rb}

@@ -3,7 +3,7 @@
 module Truemail
   module Log
     module Serializer
-      class Json < Truemail::Log::Serializer::Base
+      class ValidatorJson < Truemail::Log::Serializer::ValidatorBase
         def serialize
           result.to_json
         end

data/lib/truemail/log/serializer/{text.rb → validator_text.rb}

@@ -3,7 +3,7 @@
 module Truemail
   module Log
     module Serializer
-      class Text < Truemail::Log::Serializer::Base
+      class ValidatorText < Truemail::Log::Serializer::ValidatorBase
         ATTEMPT = 'ATTEMPT #'
 
         def serialize
@@ -30,7 +30,7 @@ module Truemail
 
         def collection_printer(collection)
           collection.inject([]) { |array, hash| array << printer(hash) }.map.with_index do |item, index|
-            "\n#{Truemail::Log::Serializer::Text::ATTEMPT}#{index + 1}:\n#{item}\n"
+            "\n#{Truemail::Log::Serializer::ValidatorText::ATTEMPT}#{index + 1}:\n#{item}\n"
           end
         end
 

data/lib/truemail/logger.rb

@@ -15,7 +15,7 @@ module Truemail
     def push(validator_instance)
       current_event = Truemail::Log::Event.new(event, validator_instance)
       return unless current_event.valid?
-      create_logs(current_event.log_level, Truemail::Log::Serializer::Text.call(validator_instance))
+      create_logs(current_event.log_level, Truemail::Log::Serializer::ValidatorText.call(validator_instance))
     end
 
     private

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

@@ -31,8 +31,8 @@ module Truemail
         end
 
         def run
-          session.start do |smtp_request|
-            response.connection = true
+          session.start(configuration.verifier_domain) do |smtp_request|
+            response.connection = response.helo = true
             smtp_handshakes(smtp_request, response)
           end
         rescue => error
@@ -83,7 +83,6 @@ module Truemail
 
         def session_data
           {
-            helo: configuration.verifier_domain,
             mailfrom: configuration.verifier_email,
             rcptto: email
           }

data/lib/truemail/validator.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Truemail
-  class Validator
+  class Validator < Truemail::Executor
     RESULT_ATTRS = %i[success email domain mail_servers errors smtp_debug configuration].freeze
     VALIDATION_TYPES = %i[regex mx smtp].freeze
 
@@ -16,9 +16,9 @@ module Truemail
       alias_method :valid?, :success
     end
 
-    attr_reader :validation_type, :result
+    attr_reader :validation_type
 
-    def initialize(email, with: nil, configuration:)
+    def initialize(email, configuration:, with: nil)
       with ||= configuration.default_validation_type
       raise Truemail::ArgumentError.new(with, :argument) unless Truemail::Validator::VALIDATION_TYPES.include?(with)
       @result = Truemail::Validator::Result.new(email: email, configuration: configuration)
@@ -33,7 +33,7 @@ module Truemail
     end
 
     def as_json
-      Truemail::Log::Serializer::Json.call(self)
+      Truemail::Log::Serializer::ValidatorJson.call(self)
     end
 
     private

data/lib/truemail/version.rb

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

data/truemail.gemspec

@@ -13,9 +13,17 @@ Gem::Specification.new do |spec|
   spec.summary       = %(truemail)
   spec.description   = %(Configurable framework agnostic plain Ruby email validator. Verify email via Regex, DNS and SMTP.)
 
-  spec.homepage      = 'https://github.com/rubygarage/truemail'
+  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)/}) }
@@ -26,18 +34,18 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'simpleidn', '~> 0.1.1'
 
   spec.add_development_dependency 'bundler', '~> 1.16'
-  spec.add_development_dependency 'bundler-audit', '~> 0.6.1'
+  spec.add_development_dependency 'bundler-audit', '~> 0.7.0.1'
   spec.add_development_dependency 'fasterer', '~> 0.8.3'
-  spec.add_development_dependency 'ffaker', '~> 2.14'
+  spec.add_development_dependency 'ffaker', '~> 2.17'
   spec.add_development_dependency 'json_matchers', '~> 0.11.1'
-  spec.add_development_dependency 'overcommit', '~> 0.53.0'
+  spec.add_development_dependency 'overcommit', '~> 0.55.0'
   spec.add_development_dependency 'pry-byebug', '~> 3.9'
   spec.add_development_dependency 'rake', '~> 13.0', '>= 13.0.1'
-  spec.add_development_dependency 'reek', '~> 6.0'
+  spec.add_development_dependency 'reek', '~> 6.0', '>= 6.0.1'
   spec.add_development_dependency 'rspec', '~> 3.9'
-  spec.add_development_dependency 'rubocop', '~> 0.79.0'
-  spec.add_development_dependency 'rubocop-performance', '~> 1.5', '>= 1.5.2'
-  spec.add_development_dependency 'rubocop-rspec', '~> 1.39'
+  spec.add_development_dependency 'rubocop', '~> 0.91.0'
+  spec.add_development_dependency 'rubocop-performance', '~> 1.8', '>= 1.8.1'
+  spec.add_development_dependency 'rubocop-rspec', '~> 1.43', '>= 1.43.2'
   spec.add_development_dependency 'simplecov', '~> 0.17.1'
-  spec.add_development_dependency 'truemail-rspec', '~> 0.1.2'
+  spec.add_development_dependency 'truemail-rspec', '~> 0.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: truemail
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Vladislav Trotsenko
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-05-10 00:00:00.000000000 Z
+date: 2020-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simpleidn
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.7.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.7.0.1
 - !ruby/object:Gem::Dependency
   name: fasterer
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '2.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '2.17'
 - !ruby/object:Gem::Dependency
   name: json_matchers
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.53.0
+        version: 0.55.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.53.0
+        version: 0.55.0
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -149,6 +149,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -156,6 +159,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -176,48 +182,54 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: 0.91.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: 0.91.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.39'
+        version: '1.43'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.43.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.39'
+        version: '1.43'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.43.2
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -238,14 +250,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.2.1
 description: Configurable framework agnostic plain Ruby email validator. Verify email
   via Regex, DNS and SMTP.
 email:
@@ -277,14 +289,19 @@ files:
 - bin/setup
 - lib/truemail.rb
 - lib/truemail/audit/base.rb
+- lib/truemail/audit/dns.rb
+- lib/truemail/audit/ip.rb
 - lib/truemail/audit/ptr.rb
 - lib/truemail/auditor.rb
 - lib/truemail/configuration.rb
 - lib/truemail/core.rb
+- lib/truemail/executor.rb
 - lib/truemail/log/event.rb
+- lib/truemail/log/serializer/auditor_json.rb
 - lib/truemail/log/serializer/base.rb
-- lib/truemail/log/serializer/json.rb
-- lib/truemail/log/serializer/text.rb
+- lib/truemail/log/serializer/validator_base.rb
+- lib/truemail/log/serializer/validator_json.rb
+- lib/truemail/log/serializer/validator_text.rb
 - lib/truemail/logger.rb
 - lib/truemail/validate/base.rb
 - lib/truemail/validate/domain_list_match.rb
@@ -298,11 +315,16 @@ files:
 - lib/truemail/worker.rb
 - lib/truemail/wrapper.rb
 - truemail.gemspec
-homepage: https://github.com/rubygarage/truemail
+homepage: https://github.com/truemail-rb/truemail
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+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
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -317,9 +339,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.3
+signing_key:
 specification_version: 4
 summary: truemail
 test_files: []