servactory 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a360afbf0c2646c3509ad3f37cb49e4a59453ded9f741a012965d962565285e4
-  data.tar.gz: 47a2bca86fc7622a7fa5e8a70bbb9cac4c179e3a43ee67ee050e6c5dd7b0cb21
+  metadata.gz: 1c804a894a51f06d11d05d6b60e539d2d1540959312330726010327dab9a40ed
+  data.tar.gz: ab85a273c813f528a596d79efe571d3916f694b1daff5d556d652f28dcab2c98
 SHA512:
-  metadata.gz: d6e1c489135e42759ee1bae986ed590aaf01164f8243a77b24a8a0b13d37056f4f5de3b86c1b741a94bbee8abe87656be6ad351818de32cc01a255af68d4db7e
-  data.tar.gz: 379633b8ddee7e378eafabacc9b97ced01375daa8612ce6b162c054674a6aac825093670602a92e2b03594c76f4f5dc22de9cbec25dcfa3770b0e73f102860fa
+  metadata.gz: a47f20f6976c843de99822ae9b7cd0ba17a9fc59e0d940776f8a2fe66f9145668507ba4bddb21c8a994994eab765d49f0ee656156aa4394e69c768ec831eff60
+  data.tar.gz: 8141c47cd8912dccc02c354cb8c8fa9026238b4c4867de25e1f32c2998aaaf2eb6e4c0ff35e765fced2d585b99f0e458993ac9dfa473674cc07007d2b2ea4033

data/lib/servactory/context/workspace/inputs.rb

@@ -40,7 +40,8 @@ module Servactory
 
         private
 
-        def getter_with(name:, &block) # rubocop:disable Metrics/MethodLength, Lint/UnusedMethodArgument, Metrics/AbcSize
+        # rubocop:disable Metrics/MethodLength, Metrics/AbcSize,  Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Lint/UnusedMethodArgument
+        def getter_with(name:, &block)
           input_name = name.to_s.chomp("?").to_sym
           input = @collection_of_inputs.find_by(name: input_name)
 
@@ -61,6 +62,7 @@ module Servactory
             input.value
           end
         end
+        # rubocop:enable Metrics/MethodLength, Metrics/AbcSize,  Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Lint/UnusedMethodArgument
 
         def prepare_hash_values_inside(object:, schema:) # rubocop:disable Metrics/MethodLength
           return object unless object.respond_to?(:fetch)

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

@@ -10,10 +10,10 @@ module Servactory
           new(...).validate
         end
 
-        def initialize(value:, types:, type:)
-          @value = value
+        def initialize(attribute:, types:, value:)
+          @attribute = attribute
           @types = types
-          @type = type
+          @value = value
 
           @errors = []
         end
@@ -39,21 +39,41 @@ module Servactory
 
         private
 
+        def validate_value!
+          return if unnecessary_types.empty?
+
+          add_error(
+            expected_type: attribute_consists_of_types.join(", "),
+            given_type: unnecessary_types.join(", ")
+          )
+        end
+
+        ########################################################################
+
         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)
+        def attribute_consists_of_types
+          @attribute_consists_of_types ||= prepared_types_from(Array(@attribute.consists_of.fetch(:type, [])))
+        end
 
-            add_error(
-              expected_type: @type,
-              given_type: value_item.class.name
-            )
+        def unnecessary_types
+          @unnecessary_types ||= @value&.map(&:class)&.difference(attribute_consists_of_types).presence || []
+        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 add_error(expected_type:, given_type:)
           @errors << {
             expected_type: expected_type,

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

@@ -92,23 +92,23 @@ module Servactory
           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
-              )
+          if @attribute.collection_mode?
+            collection_validator = Servactory::Maintenance::Validations::Collection.validate(
+              attribute: @attribute,
+              types: @types,
+              value: @value
+            )
 
-              collection_validator.valid?
-            elsif @attribute.hash_mode?
-              object_schema_validator = Servactory::Maintenance::Validations::ObjectSchema.validate(
-                object: @value,
-                schema: @attribute.schema
-              )
+            return if 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
+            return if object_schema_validator.valid?
+          else
+            return if prepared_types.any? do |type| # rubocop:disable Style/IfInsideElse
               @value.is_a?(type)
             end
           end

data/lib/servactory/version.rb

@@ -4,7 +4,7 @@ module Servactory
   module VERSION
     MAJOR = 2
     MINOR = 0
-    PATCH = 1
+    PATCH = 2
     PRE = nil
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join(".")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: servactory
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Anton Sokolov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-05 00:00:00.000000000 Z
+date: 2023-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport