servactory 2.0.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f2faba7bb024470613b92cccd026889f07744afa108b02308995332850bcf87
-  data.tar.gz: c6cd5f199e95e2c104b65778125017a62347e216e97d0cf2f2337fb081fc85ba
+  metadata.gz: 1c804a894a51f06d11d05d6b60e539d2d1540959312330726010327dab9a40ed
+  data.tar.gz: ab85a273c813f528a596d79efe571d3916f694b1daff5d556d652f28dcab2c98
 SHA512:
-  metadata.gz: a46461312794bbee6b5a38b164377a5fb10fd258315936b89f6118f489b4fa66b3b8e75c518a7cc1e32d2827c10844f085d7fa38123eb8c2781177fcdced77fd
-  data.tar.gz: cf285f17d88fa7034b349b0e22c3bf6649fce0d525a75d49ac22a692a75cd2048e2894065a3e4d83a2241abfafc7fc65390fc690b7d716d54e96d97dd825734e
+  metadata.gz: a47f20f6976c843de99822ae9b7cd0ba17a9fc59e0d940776f8a2fe66f9145668507ba4bddb21c8a994994eab765d49f0ee656156aa4394e69c768ec831eff60
+  data.tar.gz: 8141c47cd8912dccc02c354cb8c8fa9026238b4c4867de25e1f32c2998aaaf2eb6e4c0ff35e765fced2d585b99f0e458993ac9dfa473674cc07007d2b2ea4033

data/lib/servactory/actions/dsl.rb

@@ -68,14 +68,14 @@ module Servactory
         end
 
         def method_missing(name, *args, &block)
-          return method_missing_for_aliases_for_make(name, *args, &block) if config.action_aliases.include?(name)
+          return method_missing_for_action_aliases(name, *args, &block) if config.action_aliases.include?(name)
 
           return method_missing_for_shortcuts_for_make(name, *args, &block) if config.action_shortcuts.include?(name)
 
           super
         end
 
-        def method_missing_for_aliases_for_make(_alias_name, *args, &block) # rubocop:disable Lint/UnusedMethodArgument
+        def method_missing_for_action_aliases(_alias_name, *args, &block) # rubocop:disable Lint/UnusedMethodArgument
           method_name = args.first
           method_options = args.last.is_a?(Hash) ? args.pop : {}
 

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 = 0
+    PATCH = 2
     PRE = nil
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join(".")

data/lib/servactory.rb

@@ -2,7 +2,7 @@
 
 require "zeitwerk"
 
-require "active_support/core_ext/string"
+require "active_support/all"
 
 loader = Zeitwerk::Loader.for_gem
 loader.inflector.inflect(

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: servactory
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  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
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 7.0.8
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 7.0.8
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +58,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement