servactory 2.0.0.rc2 → 2.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7138f6d9bc8c21740306eabe282daf762cefd3e0504c1a40761f7db5c2e904ab
-  data.tar.gz: '09dbc3c8168b68e0db456ba7f0e71242412d05c19fb78d45b25f2161b7b06202'
+  metadata.gz: cdc12e7e579fdacbd13a9d7d4997113023dd0f3acb9be1050bf88d3c83c324a9
+  data.tar.gz: dbfb8137159dce0ae2fa37a143b9a7b75d1f6a758852fd580567615aa1081bc3
 SHA512:
-  metadata.gz: 91f6501df9724f4f116dc03ee57863c7e732f77f8c97b9eae7e9ecf64e85fdb7e5f5c976dcf4c92337711566ea122283013ddc4e3d34b60dd970dc380cc3dd0f
-  data.tar.gz: bf86943b60422743c0b829cce81fc3f753315a5c129edb228a54a42170f352816c8a306cefd53a2c5199dedfd4801a3df10f7d34043d12f924f22db290fd9450
+  metadata.gz: d7696c3a4c46fc4dc72980fcb513d39a0a7f69a5e64d4ec2e6244f3c4f950e27cf25faa583c2b1a36dda2d91b33402588a24fc64d294b3fc83bd3f3bc227fcc1
+  data.tar.gz: 0531261cbd2a5e9b0af78c7775cbf08cd45f635b328788510d435bdaf361080931f4f6c7b3d1953e8538288c276fc35a4383e9276bc015ef88600f6591e49593

data/config/locales/en.yml

@@ -17,7 +17,8 @@ en:
         type:
           default_error:
             default: "[%{service_class_name}] Wrong type of input `%{input_name}`, expected `%{expected_type}`, got `%{given_type}`"
-            for_collection: "[%{service_class_name}] Wrong type in input collection `%{input_name}`, expected `%{expected_type}`"
+            for_collection:
+              wrong_element_type: "[%{service_class_name}] Wrong type in input collection `%{input_name}`, expected `%{expected_type}`, got `%{given_type}`"
             for_hash:
               wrong_element_type: "[%{service_class_name}] Wrong type in input hash `%{input_name}`, expected `%{expected_type}` for `%{key_name}`, got `%{given_type}`"
       tools:

data/config/locales/ru.yml

@@ -17,7 +17,8 @@ ru:
         type:
           default_error:
             default: "[%{service_class_name}] Неправильный тип инпута `%{input_name}`, ожидалось `%{expected_type}`, получено `%{given_type}`"
-            for_collection: "[%{service_class_name}] Неправильный тип в коллекции инпута `%{input_name}`, ожидалось `%{expected_type}`"
+            for_collection:
+              wrong_element_type: "[%{service_class_name}] Неправильный тип в коллекции инпута `%{input_name}`, ожидалось `%{expected_type}`, получено `%{given_type}`"
             for_hash:
               wrong_element_type: "[%{service_class_name}] Неправильный тип в хеше инпута `%{input_name}`, для `%{key_name}` ожидалось `%{expected_type}`, получено `%{given_type}`"
 

data/lib/servactory/inputs/validations/base.rb

@@ -6,7 +6,7 @@ module Servactory
       class Base
         private
 
-        def add_error(message, **attributes)
+        def add_error(message:, **attributes)
           message = message.call(**attributes) if message.is_a?(Proc)
 
           errors << message

data/lib/servactory/inputs/validations/inclusion.rb

@@ -54,7 +54,7 @@ module Servactory
 
         def add_error_with(message)
           add_error(
-            message.presence || DEFAULT_MESSAGE,
+            message: message.presence || DEFAULT_MESSAGE,
             service_class_name: @context.class.name,
             input: @input,
             value: @input.value

data/lib/servactory/inputs/validations/must.rb

@@ -75,7 +75,7 @@ module Servactory
 
         def add_error_with(message, code)
           add_error(
-            message,
+            message: message,
             service_class_name: @context.class.name,
             input: @input,
             value: @input.value,
@@ -85,7 +85,7 @@ module Servactory
 
         def add_syntax_error_with(message, code, exception_message)
           add_error(
-            message,
+            message: message,
             service_class_name: @context.class.name,
             input: @input,
             value: @input.value,

data/lib/servactory/inputs/validations/required.rb

@@ -52,7 +52,7 @@ module Servactory
 
         def add_error_with(message)
           add_error(
-            message.presence || DEFAULT_MESSAGE,
+            message: message.presence || DEFAULT_MESSAGE,
             service_class_name: @context.class.name,
             input: @input,
             value: @input.value

data/lib/servactory/inputs/validations/type.rb

@@ -3,50 +3,11 @@
 module Servactory
   module Inputs
     module Validations
-      class Type < Base # rubocop:disable Metrics/ClassLength
-        DEFAULT_MESSAGE = lambda do |service_class_name:, input:, key_name:, expected_type:, given_type:| # rubocop:disable Metrics/BlockLength
-          if input.collection_mode?
-            collection_message = input.consists_of.fetch(:message)
-
-            if collection_message.is_a?(Proc)
-              collection_message.call(input: input, expected_type: expected_type)
-            elsif collection_message.is_a?(String) && collection_message.present?
-              collection_message
-            else
-              I18n.t(
-                "servactory.inputs.checks.type.default_error.for_collection",
-                service_class_name: service_class_name,
-                input_name: input.name,
-                expected_type: expected_type,
-                given_type: given_type
-              )
-            end
-          elsif input.hash_mode? && key_name.present?
-            I18n.t(
-              "servactory.inputs.checks.type.default_error.for_hash.wrong_element_type",
-              service_class_name: service_class_name,
-              input_name: input.name,
-              key_name: key_name,
-              expected_type: expected_type,
-              given_type: given_type
-            )
-          else
-            I18n.t(
-              "servactory.inputs.checks.type.default_error.default",
-              service_class_name: service_class_name,
-              input_name: input.name,
-              expected_type: expected_type,
-              given_type: given_type
-            )
-          end
-        end
-
-        private_constant :DEFAULT_MESSAGE
-
-        def self.check(context:, input:, check_key:, check_options:)
+      class Type < Base
+        def self.check(context:, input:, check_key:, **)
           return unless should_be_checked_for?(input, check_key)
 
-          new(context: context, input: input, types: check_options).check
+          new(context: context, input: input).check
         end
 
         def self.should_be_checked_for?(input, check_key)
@@ -59,62 +20,24 @@ module Servactory
           )
         end
 
-        ##########################################################################
-
-        def initialize(context:, input:, types:)
+        def initialize(context:, input:)
           super()
 
           @context = context
           @input = input
-          @types = types
-        end
-
-        def check # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-          object_schema_validator = nil
-
-          return if prepared_types.any? do |type|
-            if @input.collection_mode?
-              prepared_value.is_a?(@types.fetch(0, Array)) &&
-              prepared_value.respond_to?(:all?) && prepared_value.all?(type)
-            elsif @input.hash_mode?
-              object_schema_validator = Servactory::Maintenance::Validations::ObjectSchema.validate(
-                object: prepared_value,
-                schema: @input.schema
-              )
-
-              object_schema_validator.valid?
-            else
-              prepared_value.is_a?(type)
-            end
-          end
-
-          if (first_error = object_schema_validator&.errors&.first).present?
-            return add_default_object_error_with(first_error)
-          end
-
-          add_default_error
         end
 
-        ########################################################################
-
-        def prepared_types
-          @prepared_types ||=
-            if @input.collection_mode?
-              prepared_types_from(Array(@input.consists_of.fetch(:type, [])))
-            else
-              prepared_types_from(@types)
-            end
+        def check
+          Servactory::Maintenance::Validations::Types.validate!(
+            context: @context,
+            attribute: @input,
+            types: @input.types,
+            value: prepared_value,
+            error_callback: ->(**args) { add_error(**args) }
+          )
         end
 
-        def prepared_types_from(types)
-          types.map do |type|
-            if type.is_a?(String)
-              Object.const_get(type)
-            else
-              type
-            end
-          end
-        end
+        private
 
         def prepared_value
           @prepared_value ||= if @input.optional? && !@input.default.nil? && @input.value.blank?
@@ -123,30 +46,6 @@ module Servactory
                                 @input.value
                               end
         end
-
-        private
-
-        def add_default_object_error_with(error)
-          add_error(
-            DEFAULT_MESSAGE,
-            service_class_name: @context.class.name,
-            input: @input,
-            key_name: error.fetch(:name),
-            expected_type: error.fetch(:expected_type),
-            given_type: error.fetch(:given_type)
-          )
-        end
-
-        def add_default_error
-          add_error(
-            DEFAULT_MESSAGE,
-            service_class_name: @context.class.name,
-            input: @input,
-            key_name: nil,
-            expected_type: prepared_types.join(", "),
-            given_type: prepared_value.class.name
-          )
-        end
       end
     end
   end

data/lib/servactory/internals/validations/base.rb

@@ -6,7 +6,7 @@ module Servactory
       class Base
         protected
 
-        def raise_error_with(message, **attributes)
+        def raise_error_with(message:, **attributes)
           message = message.call(**attributes) if message.is_a?(Proc)
 
           raise @context.class.config.internal_error_class.new(message: message)

data/lib/servactory/internals/validations/type.rb

@@ -4,65 +4,10 @@ module Servactory
   module Internals
     module Validations
       class Type < Base
-        DEFAULT_MESSAGE = lambda do |service_class_name:, internal:, value:, key_name:, expected_type:, given_type:| # rubocop:disable Metrics/BlockLength
-          if internal.collection_mode?
-            collection_message = internal.consists_of.fetch(:message)
-
-            if collection_message.is_a?(Proc)
-              collection_message.call(internal: internal, expected_type: expected_type)
-            elsif collection_message.is_a?(String) && collection_message.present?
-              collection_message
-            elsif value.is_a?(internal.types.fetch(0, Array))
-              I18n.t(
-                "servactory.internals.checks.type.default_error.for_collection.wrong_element_type",
-                service_class_name: service_class_name,
-                internal_name: internal.name,
-                expected_type: expected_type,
-                given_type: given_type
-              )
-            else
-              I18n.t(
-                "servactory.internals.checks.type.default_error.for_collection.wrong_type",
-                service_class_name: service_class_name,
-                internal_name: internal.name,
-                expected_type: internal.types.fetch(0, Array),
-                given_type: value.class.name
-              )
-            end
-          elsif internal.hash_mode? && key_name.present?
-            I18n.t(
-              "servactory.internals.checks.type.default_error.for_hash.wrong_element_type",
-              service_class_name: service_class_name,
-              internal_name: internal.name,
-              key_name: key_name,
-              expected_type: expected_type,
-              given_type: given_type
-            )
-          else
-            I18n.t(
-              "servactory.internals.checks.type.default_error.default",
-              service_class_name: service_class_name,
-              internal_name: internal.name,
-              expected_type: expected_type,
-              given_type: given_type
-            )
-          end
-        end
-
-        private_constant :DEFAULT_MESSAGE
-
         def self.validate!(...)
-          return unless should_be_checked?
-
           new(...).validate!
         end
 
-        def self.should_be_checked?
-          true
-        end
-
-        ##########################################################################
-
         def initialize(context:, internal:, value:)
           super()
 
@@ -71,76 +16,13 @@ module Servactory
           @value = value
         end
 
-        def validate! # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-          object_schema_validator = nil
-
-          return if prepared_types.any? do |type|
-            if @internal.collection_mode?
-              @value.is_a?(@internal.types.fetch(0, Array)) &&
-              @value.respond_to?(:all?) && @value.all?(type)
-            elsif @internal.hash_mode?
-              object_schema_validator = Servactory::Maintenance::Validations::ObjectSchema.validate(
-                object: @value,
-                schema: @internal.schema
-              )
-
-              object_schema_validator.valid?
-            else
-              @value.is_a?(type)
-            end
-          end
-
-          if (first_error = object_schema_validator&.errors&.first).present?
-            raise_default_object_error_with(first_error)
-          end
-
-          raise_default_error
-        end
-
-        private
-
-        def prepared_types
-          @prepared_types ||=
-            if @internal.collection_mode?
-              prepared_types_from(Array(@internal.consists_of.fetch(:type, [])))
-            else
-              prepared_types_from(@internal.types)
-            end
-        end
-
-        def prepared_types_from(types)
-          types.map do |type|
-            if type.is_a?(String)
-              Object.const_get(type)
-            else
-              type
-            end
-          end
-        end
-
-        ########################################################################
-
-        def raise_default_object_error_with(error)
-          raise_error_with(
-            DEFAULT_MESSAGE,
-            service_class_name: @context.class.name,
-            internal: @internal,
-            value: @value,
-            key_name: error.fetch(:name),
-            expected_type: error.fetch(:expected_type),
-            given_type: error.fetch(:given_type)
-          )
-        end
-
-        def raise_default_error
-          raise_error_with(
-            DEFAULT_MESSAGE,
-            service_class_name: @context.class.name,
-            internal: @internal,
+        def validate!
+          Servactory::Maintenance::Validations::Types.validate!(
+            context: @context,
+            attribute: @internal,
+            types: @internal.types,
             value: @value,
-            key_name: nil,
-            expected_type: prepared_types.join(", "),
-            given_type: @value.class.name
+            error_callback: ->(**args) { raise_error_with(**args) }
           )
         end
       end

data/lib/servactory/maintenance/validations/collection.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+module Servactory
+  module Maintenance
+    module Validations
+      class Collection
+        attr_reader :errors
+
+        def self.validate(...)
+          new(...).validate
+        end
+
+        def initialize(value:, types:, type:)
+          @value = value
+          @types = types
+          @type = type
+
+          @errors = []
+        end
+
+        def validate
+          unless @value.is_a?(prepared_type)
+            add_error(
+              expected_type: prepared_type.name,
+              given_type: @value.class.name
+            )
+
+            return self
+          end
+
+          validate_value!
+
+          self
+        end
+
+        def valid?
+          @errors.empty?
+        end
+
+        private
+
+        def prepared_type
+          @prepared_type ||= @types.fetch(0, Array)
+        end
+
+        def validate_value!
+          @value.each do |value_item|
+            next if value_item.is_a?(@type)
+
+            add_error(
+              expected_type: @type,
+              given_type: value_item.class.name
+            )
+          end
+        end
+
+        def add_error(expected_type:, given_type:)
+          @errors << {
+            expected_type: expected_type,
+            given_type: given_type
+          }
+        end
+      end
+    end
+  end
+end

data/lib/servactory/maintenance/validations/object_schema.rb

@@ -17,29 +17,28 @@ module Servactory
           @object = object
           @schema = schema
 
-          @valid = false
           @errors = []
         end
 
         def validate
-          @valid = validate_for(object: @object, schema: @schema)
+          validate_for(object: @object, schema: @schema)
 
           self
         end
 
         def valid?
-          @valid
+          @errors.empty?
         end
 
         private
 
-        def validate_for(object:, schema:, root_schema_key: nil) # rubocop:disable Metrics/MethodLength
+        def validate_for(object:, schema:, root_schema_key: nil) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
           unless object.respond_to?(:fetch)
-            add_error(name: root_schema_key, expected_type: Hash, given_type: object.class)
-            return false
+            add_error(key_name: root_schema_key, expected_type: Hash.name, given_type: object.class.name)
+            return
           end
 
-          schema.all? do |schema_key, schema_value|
+          schema.each do |schema_key, schema_value|
             attribute_type = schema_value.fetch(:type, String)
 
             if attribute_type == Hash
@@ -57,15 +56,13 @@ module Servactory
                 attribute_required: schema_value.fetch(:required, true)
               )
 
-              unless is_success
-                add_error(
-                  name: schema_key,
-                  expected_type: attribute_type,
-                  given_type: object.fetch(schema_key, nil).class
-                )
-              end
+              next if is_success
 
-              is_success
+              add_error(
+                key_name: schema_key,
+                expected_type: attribute_type,
+                given_type: object.fetch(schema_key, nil).class.name
+              )
             end
           end
         end
@@ -106,9 +103,9 @@ module Servactory
           value.fetch(:default, nil)
         end
 
-        def add_error(name:, expected_type:, given_type:)
+        def add_error(key_name:, expected_type:, given_type:)
           @errors << {
-            name: name,
+            key_name: key_name,
             expected_type: expected_type,
             given_type: given_type
           }

data/lib/servactory/maintenance/validations/types.rb

@@ -0,0 +1,164 @@
+# frozen_string_literal: true
+
+module Servactory
+  module Maintenance
+    module Validations
+      class Types # rubocop:disable Metrics/ClassLength
+        DEFAULT_MESSAGE = lambda do | # rubocop:disable Metrics/BlockLength
+          service_class_name:,
+          attribute_system_name:,
+          attribute:,
+          value:,
+          key_name:,
+          expected_type:,
+          given_type:
+        | # do
+          if attribute.collection_mode?
+            collection_message = attribute.consists_of.fetch(:message)
+
+            if collection_message.is_a?(Proc)
+              collection_message.call(attribute_system_name => attribute, expected_type: expected_type)
+            elsif collection_message.is_a?(String) && collection_message.present?
+              collection_message
+            elsif value.is_a?(attribute.types.fetch(0, Array))
+              I18n.t(
+                "servactory.#{attribute_system_name.to_s.pluralize}.checks.type.default_error.for_collection.wrong_element_type", # rubocop:disable Layout/LineLength
+                service_class_name: service_class_name,
+                "#{attribute_system_name}_name": attribute.name,
+                expected_type: expected_type,
+                given_type: given_type
+              )
+            else
+              I18n.t(
+                "servactory.#{attribute_system_name.to_s.pluralize}.checks.type.default_error.for_collection.wrong_type", # rubocop:disable Layout/LineLength
+                service_class_name: service_class_name,
+                "#{attribute_system_name}_name": attribute.name,
+                expected_type: attribute.types.fetch(0, Array),
+                given_type: value.class.name
+              )
+            end
+          elsif attribute.hash_mode? && key_name.present?
+            I18n.t(
+              "servactory.#{attribute_system_name.to_s.pluralize}.checks.type.default_error.for_hash.wrong_element_type", # rubocop:disable Layout/LineLength
+              service_class_name: service_class_name,
+              "#{attribute_system_name}_name": attribute.name,
+              key_name: key_name,
+              expected_type: expected_type,
+              given_type: given_type
+            )
+          else
+            I18n.t(
+              "servactory.#{attribute_system_name.to_s.pluralize}.checks.type.default_error.default",
+              service_class_name: service_class_name,
+              "#{attribute_system_name}_name": attribute.name,
+              expected_type: expected_type,
+              given_type: given_type
+            )
+          end
+        end
+
+        private_constant :DEFAULT_MESSAGE
+
+        def self.validate!(...)
+          new(...).validate!
+        end
+
+        def initialize(context:, attribute:, types:, value:, error_callback:)
+          @context = context
+          @attribute = attribute
+          @types = types
+          @value = value
+          @error_callback = error_callback
+        end
+
+        def validate! # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+          collection_validator = nil
+          object_schema_validator = nil
+
+          return if prepared_types.any? do |type|
+            if @attribute.collection_mode?
+              collection_validator = Servactory::Maintenance::Validations::Collection.validate(
+                value: @value,
+                types: @attribute.types,
+                type: type
+              )
+
+              collection_validator.valid?
+            elsif @attribute.hash_mode?
+              object_schema_validator = Servactory::Maintenance::Validations::ObjectSchema.validate(
+                object: @value,
+                schema: @attribute.schema
+              )
+
+              object_schema_validator.valid?
+            else
+              @value.is_a?(type)
+            end
+          end
+
+          if (first_error = collection_validator&.errors&.first).present?
+            return @error_callback.call(
+              message: DEFAULT_MESSAGE,
+              service_class_name: @context.class.name,
+              attribute_system_name: attribute_system_name,
+              attribute: @attribute,
+              value: @value,
+              key_name: nil,
+              expected_type: first_error.fetch(:expected_type),
+              given_type: first_error.fetch(:given_type)
+            )
+          end
+
+          if (first_error = object_schema_validator&.errors&.first).present?
+            return @error_callback.call(
+              message: DEFAULT_MESSAGE,
+              service_class_name: @context.class.name,
+              attribute_system_name: attribute_system_name,
+              attribute: @attribute,
+              value: @value,
+              key_name: first_error.fetch(:key_name),
+              expected_type: first_error.fetch(:expected_type),
+              given_type: first_error.fetch(:given_type)
+            )
+          end
+
+          @error_callback.call(
+            message: DEFAULT_MESSAGE,
+            service_class_name: @context.class.name,
+            attribute_system_name: attribute_system_name,
+            attribute: @attribute,
+            value: @value,
+            key_name: nil,
+            expected_type: prepared_types.join(", "),
+            given_type: @value.class.name
+          )
+        end
+
+        private
+
+        def attribute_system_name
+          @attribute.class.name.demodulize.downcase.to_sym
+        end
+
+        def prepared_types
+          @prepared_types ||=
+            if @attribute.collection_mode?
+              prepared_types_from(Array(@attribute.consists_of.fetch(:type, [])))
+            else
+              prepared_types_from(@types)
+            end
+        end
+
+        def prepared_types_from(types)
+          types.map do |type|
+            if type.is_a?(String)
+              Object.const_get(type)
+            else
+              type
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/servactory/outputs/validations/base.rb

@@ -6,7 +6,7 @@ module Servactory
       class Base
         protected
 
-        def raise_error_with(message, **attributes)
+        def raise_error_with(message:, **attributes)
           message = message.call(**attributes) if message.is_a?(Proc)
 
           raise @context.class.config.output_error_class.new(message: message)

data/lib/servactory/outputs/validations/type.rb

@@ -4,65 +4,10 @@ module Servactory
   module Outputs
     module Validations
       class Type < Base
-        DEFAULT_MESSAGE = lambda do |service_class_name:, output:, value:, key_name:, expected_type:, given_type:| # rubocop:disable Metrics/BlockLength
-          if output.collection_mode?
-            collection_message = output.consists_of.fetch(:message)
-
-            if collection_message.is_a?(Proc)
-              collection_message.call(output: output, expected_type: expected_type)
-            elsif collection_message.is_a?(String) && collection_message.present?
-              collection_message
-            elsif value.is_a?(output.types.fetch(0, Array))
-              I18n.t(
-                "servactory.outputs.checks.type.default_error.for_collection.wrong_element_type",
-                service_class_name: service_class_name,
-                output_name: output.name,
-                expected_type: expected_type,
-                given_type: given_type
-              )
-            else
-              I18n.t(
-                "servactory.outputs.checks.type.default_error.for_collection.wrong_type",
-                service_class_name: service_class_name,
-                output_name: output.name,
-                expected_type: output.types.fetch(0, Array),
-                given_type: value.class.name
-              )
-            end
-          elsif output.hash_mode? && key_name.present?
-            I18n.t(
-              "servactory.outputs.checks.type.default_error.for_hash.wrong_element_type",
-              service_class_name: service_class_name,
-              output_name: output.name,
-              key_name: key_name,
-              expected_type: expected_type,
-              given_type: given_type
-            )
-          else
-            I18n.t(
-              "servactory.outputs.checks.type.default_error.default",
-              service_class_name: service_class_name,
-              output_name: output.name,
-              expected_type: expected_type,
-              given_type: given_type
-            )
-          end
-        end
-
-        private_constant :DEFAULT_MESSAGE
-
         def self.validate!(...)
-          return unless should_be_checked?
-
           new(...).validate!
         end
 
-        def self.should_be_checked?
-          true
-        end
-
-        ##########################################################################
-
         def initialize(context:, output:, value:)
           super()
 
@@ -71,76 +16,13 @@ module Servactory
           @value = value
         end
 
-        def validate! # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-          object_schema_validator = nil
-
-          return if prepared_types.any? do |type|
-            if @output.collection_mode?
-              @value.is_a?(@output.types.fetch(0, Array)) &&
-              @value.respond_to?(:all?) && @value.all?(type)
-            elsif @output.hash_mode?
-              object_schema_validator = Servactory::Maintenance::Validations::ObjectSchema.validate(
-                object: @value,
-                schema: @output.schema
-              )
-
-              object_schema_validator.valid?
-            else
-              @value.is_a?(type)
-            end
-          end
-
-          if (first_error = object_schema_validator&.errors&.first).present?
-            raise_default_object_error_with(first_error)
-          end
-
-          raise_default_error
-        end
-
-        private
-
-        def prepared_types
-          @prepared_types ||=
-            if @output.collection_mode?
-              prepared_types_from(Array(@output.consists_of.fetch(:type, [])))
-            else
-              prepared_types_from(@output.types)
-            end
-        end
-
-        def prepared_types_from(types)
-          types.map do |type|
-            if type.is_a?(String)
-              Object.const_get(type)
-            else
-              type
-            end
-          end
-        end
-
-        ########################################################################
-
-        def raise_default_object_error_with(error)
-          raise_error_with(
-            DEFAULT_MESSAGE,
-            service_class_name: @context.class.name,
-            output: @output,
-            value: @value,
-            key_name: error.fetch(:name),
-            expected_type: error.fetch(:expected_type),
-            given_type: error.fetch(:given_type)
-          )
-        end
-
-        def raise_default_error
-          raise_error_with(
-            DEFAULT_MESSAGE,
-            service_class_name: @context.class.name,
-            output: @output,
+        def validate!
+          Servactory::Maintenance::Validations::Types.validate!(
+            context: @context,
+            attribute: @output,
+            types: @output.types,
             value: @value,
-            key_name: nil,
-            expected_type: prepared_types.join(", "),
-            given_type: @value.class.name
+            error_callback: ->(**args) { raise_error_with(**args) }
           )
         end
       end

data/lib/servactory/version.rb

@@ -5,7 +5,7 @@ module Servactory
     MAJOR = 2
     MINOR = 0
     PATCH = 0
-    PRE = "rc2"
+    PRE = "rc3"
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join(".")
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: servactory
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc2
+  version: 2.0.0.rc3
 platform: ruby
 authors:
 - Anton Sokolov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-17 00:00:00.000000000 Z
+date: 2023-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -251,7 +251,9 @@ files:
 - lib/servactory/maintenance/attributes/options_collection.rb
 - lib/servactory/maintenance/collection_mode/class_names_collection.rb
 - lib/servactory/maintenance/hash_mode/class_names_collection.rb
+- lib/servactory/maintenance/validations/collection.rb
 - lib/servactory/maintenance/validations/object_schema.rb
+- lib/servactory/maintenance/validations/types.rb
 - lib/servactory/methods/aliases_for_make/collection.rb
 - lib/servactory/methods/dsl.rb
 - lib/servactory/methods/method.rb