truemail 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eaf56f1be4d147276a83807c713461d7bc2d4bedb009a0323fa3a38b7fd82829
-  data.tar.gz: cb914e607e6a0182d7550a0fa0d8de7783c79763809019d4e706a6207daabc39
+  metadata.gz: a285b1759ed0334ca5f0b1e26bf3975bad782629236b7ef8c347d49e3540f63b
+  data.tar.gz: 20f84b22c347aaae67bfda81cadb67406bb0d4f215cee6976269cdc15cdbc9a9
 SHA512:
-  metadata.gz: c2fdf6d58ca54b4c2a25eea14e6769277b16cfc24b32709d0195ef0fa29ac13d71c19717f0f8d4f5626e7c9348815307f7fa7d0238f0feeb5076fd6314fd00e6
-  data.tar.gz: 0a3b9b4ec3fa36fd3a73353d651d5e9af664d5ebd030ab72a3942a24b9e7d1590dddaf569a3b3b83c36a3c83926fef1fb0c3c1fbdab19f7e7de7d1e5827d5ba4
+  metadata.gz: 9c1e73140bbc0304ddcbb6cd68b84f1f3e75bf14237a87a6bd89054253f022e630877c2b478418ee23c7214702eea0fdf1505ead39d84b1b75f9350c4c19cf1c
+  data.tar.gz: 7d99710ab7c9bdc72c37172f7fae87bc6a350d7a2e1befcd31681e2d3bf14ecf150bdbff01b07249904288bd57ea9bbebc007915b7ba5652659d90b99e466c74

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: truemail
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Vladislav Trotsenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-24 00:00:00.000000000 Z
+date: 2024-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simpleidn