truemail 3.2.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eaf56f1be4d147276a83807c713461d7bc2d4bedb009a0323fa3a38b7fd82829
-  data.tar.gz: cb914e607e6a0182d7550a0fa0d8de7783c79763809019d4e706a6207daabc39
+  metadata.gz: '0797d29fafe171b61130e9f81d0d9ad7365e137a71674905e7ed8b1acbe65336'
+  data.tar.gz: 05d19c7528dda2c16c681c9f250f3e7e2873c3490f53dcfc1800f93a3ab0135c
 SHA512:
-  metadata.gz: c2fdf6d58ca54b4c2a25eea14e6769277b16cfc24b32709d0195ef0fa29ac13d71c19717f0f8d4f5626e7c9348815307f7fa7d0238f0feeb5076fd6314fd00e6
-  data.tar.gz: 0a3b9b4ec3fa36fd3a73353d651d5e9af664d5ebd030ab72a3942a24b9e7d1590dddaf569a3b3b83c36a3c83926fef1fb0c3c1fbdab19f7e7de7d1e5827d5ba4
+  metadata.gz: 2e29878b8a69ea38bb8b56b6fcdb89f33d7924a0b14dc43364bd5d69234cd2778ababc9e09c92891711ddc3b872b06560d31db4d0555df1974f14c79b341af63
+  data.tar.gz: 3fc0dbb8c39045fc86c0427a0fc98ac33540f6bd69c468adb48303718449df6684cb86dd6dde1c834c3dad1752d011075abff97742f750233cd61cf354e47386

data/lib/truemail/configuration.rb

@@ -2,15 +2,12 @@
 
 module Truemail
   class Configuration
-    require 'logger'
-
     DEFAULT_CONNECTION_TIMEOUT = 2
     DEFAULT_RESPONSE_TIMEOUT = 2
     DEFAULT_CONNECTION_ATTEMPTS = 2
     DEFAULT_VALIDATION_TYPE = :smtp
     DEFAULT_SMTP_PORT = 25
     DEFAULT_LOGGER_OPTIONS = {
-      logger_class: ::Logger,
       tracking_event: :error,
       stdout: false,
       log_absolute_path: nil
@@ -82,17 +79,9 @@ module Truemail
       end
     end
 
-    def logger=(options) # rubocop:disable Metrics/AbcSize
+    def logger=(options)
       raise_unless(options, __method__, options.is_a?(::Hash))
-      logger_class, tracking_event, stdout, log_absolute_path = logger_options(options)
-      raise_unless(logger_class, __method__, logger_class.is_a?(::Class))
-      valid_event = Truemail::Log::Event::TRACKING_EVENTS.key?(tracking_event)
-      stdout_only = stdout && log_absolute_path.nil?
-      file_only = log_absolute_path.is_a?(::String)
-      both_types = stdout && file_only
-      argument_info = valid_event ? log_absolute_path : tracking_event
-      raise_unless(argument_info, __method__, valid_event && (stdout_only || file_only || both_types))
-      @logger = Truemail::Logger.new(logger_class, tracking_event, stdout, log_absolute_path)
+      @logger = Truemail::Logger::Builder.call(Truemail::Configuration::DEFAULT_LOGGER_OPTIONS, **options)
     end
 
     def complete?
@@ -163,9 +152,5 @@ module Truemail
         check_validation_type(validation_type)
       end
     end
-
-    def logger_options(current_options)
-      Truemail::Configuration::DEFAULT_LOGGER_OPTIONS.merge(current_options).values
-    end
   end
 end

data/lib/truemail/logger.rb

@@ -2,13 +2,67 @@
 
 module Truemail
   class Logger
-    attr_reader :logger_class, :event, :stdout, :file
+    require 'logger'
 
-    def initialize(logger_class, event, error_stdout, log_absolute_path)
-      @logger_class = logger_class
+    BUILDER_ATTRS = %i[tracking_event stdout log_absolute_path custom_logger].freeze
+
+    Builder = ::Struct.new(*BUILDER_ATTRS, keyword_init: true) do
+      private_class_method :new
+
+      def self.call(default_settings, **logger_attributes)
+        new(default_settings, **logger_attributes).validate_attributes.build_instance
+      end
+
+      def initialize(default_settings, **args)
+        super(**default_settings.merge(**args))
+      end
+
+      def validate_attributes
+        validate_logger_event
+        return validate_logger_instance if custom_logger
+        validate_logger_output
+        self
+      end
+
+      def build_instance
+        Truemail::Logger.new(tracking_event, stdout, log_absolute_path, custom_logger)
+      end
+
+      private
+
+      def raise_unless(argument_context, argument_name, condition)
+        raise Truemail::ArgumentError.new(argument_context, argument_name) unless condition
+      end
+
+      def validate_logger_instance
+        raise_unless(custom_logger, :custom_logger=, custom_logger && custom_logger.respond_to?(:add))
+        self
+      end
+
+      def validate_logger_event
+        raise_unless(tracking_event, :tracking_event=, Truemail::Log::Event::TRACKING_EVENTS.key?(tracking_event))
+      end
+
+      def validate_logger_output
+        stdout_only = stdout && log_absolute_path.nil?
+        file_only = log_absolute_path.is_a?(::String)
+        both_types = stdout && file_only
+        raise_unless(
+          { stdout: stdout, log_absolute_path: log_absolute_path },
+          'stdout=, log_absolute_path=',
+          both_types || stdout_only || file_only
+        )
+      end
+    end
+
+    attr_reader :event, :stdout, :file, :custom_logger, :stdout_logger, :file_logger
+
+    def initialize(event, error_stdout, log_absolute_path, custom_logger)
       @event = event
       @stdout = error_stdout
       @file = log_absolute_path
+      @custom_logger = custom_logger
+      init_builtin_loggers
     end
 
     def push(validator_instance)
@@ -26,10 +80,22 @@ module Truemail
       output_file
     end
 
-    def create_logs(log_level, serialized_object)
+    def init_builtin_loggers
+      return if custom_logger
       %i[stdout file].each do |output_type|
         next unless public_send(output_type)
-        logger_class.new(output_type.eql?(:stdout) ? $stdout : init_log_file).add(log_level) { serialized_object }
+        instance_variable_set(
+          :"@#{output_type}_logger",
+          ::Logger.new(output_type.eql?(:stdout) ? $stdout : init_log_file)
+        )
+      end
+    end
+
+    def create_logs(log_level, serialized_object)
+      %i[custom_logger stdout_logger file_logger].each do |getter|
+        logger_instance = public_send(getter)
+        next unless logger_instance
+        logger_instance.add(log_level) { serialized_object }
       end
     end
   end

data/lib/truemail/version.rb

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

data/truemail.gemspec

@@ -29,15 +29,15 @@ Gem::Specification.new do |spec|
   spec.files = `git ls-files -z`.split("\x0").select { |f| f.match(%r{^(bin|lib)/|.ruby-version|truemail.gemspec|LICENSE}) }
   spec.require_paths = %w[lib]
 
-  spec.add_runtime_dependency 'net-smtp', '~> 0.4.0.1' if current_ruby_version >= ::Gem::Version.new('3.1.0')
+  spec.add_runtime_dependency 'net-smtp', '~> 0.5.0' if current_ruby_version >= ::Gem::Version.new('3.1.0')
   spec.add_runtime_dependency 'simpleidn', '~> 0.2.1'
 
-  spec.add_development_dependency 'dns_mock', '~> 1.6', '>= 1.6.2'
+  spec.add_development_dependency 'dns_mock', '~> 1.7', '>= 1.7.1'
   spec.add_development_dependency 'ffaker', ffaker_version
   spec.add_development_dependency 'json_matchers', '~> 0.11.1'
-  spec.add_development_dependency 'rake', '~> 13.1'
+  spec.add_development_dependency 'rake', '~> 13.2', '>= 13.2.1'
   spec.add_development_dependency 'rspec', '~> 3.13'
-  spec.add_development_dependency 'smtp_mock', '~> 1.4'
+  spec.add_development_dependency 'smtp_mock', '~> 1.4', '>= 1.4.1'
   spec.add_development_dependency 'truemail-rspec', '~> 1.3', '>= 1.3.1'
-  spec.add_development_dependency 'webmock', '~> 3.20'
+  spec.add_development_dependency 'webmock', '~> 3.23'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: truemail
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Vladislav Trotsenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-24 00:00:00.000000000 Z
+date: 2024-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simpleidn
@@ -30,20 +30,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 1.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 1.7.1
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +78,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.1'
+        version: '13.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 13.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.1'
+        version: '13.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 13.2.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -107,6 +113,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -114,6 +123,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: truemail-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -140,14 +152,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.20'
+        version: '3.23'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.20'
+        version: '3.23'
 description: Configurable framework agnostic plain Ruby email validator. Verify email
   via Regex, DNS, SMTP and even more.
 email: