servactory 2.6.0.rc3 → 2.6.0.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3681e7c5a5e02756f7df77333a0974264548b6060605073f02cdbe8a2c3d9f55
-  data.tar.gz: 63b0ea14ade5b473b44173832c3411a3ac0d12e52e87539b8c7a5200f4a86915
+  metadata.gz: 644c141dd6e3bdee996ffc4aad56a6e9b472ad964406923cc14fd1185541e2ae
+  data.tar.gz: 4036bed062dd8717f6288c72c498cca4a2a91401154a23266148a42cac2aa10a
 SHA512:
-  metadata.gz: cd344cbcfa248de3a6974b8fa28e5544678851a2d7bf11fa3964087fbf80bc54551450d654624477ff5cfd9f7d7705b69507e2ee6e2ab46450adf7616c331ebd
-  data.tar.gz: dfefd697f5808b020e0507748f97c96e2a674dbf8a04707943a39f6a220a26f1002a6eb47fee727e4cb04ee042b23b87e4cf98804b52b2a22859eea73ac59037
+  metadata.gz: '09e7437eedd68dc0c14a98ec4c6c5c922483fc9e3924425a0478bb8d1404c36ef0531fb2adb9d2094ff7fa20633f92fb44fa8bd5588c6d7b28372371fe709af8'
+  data.tar.gz: ac82354cffdb531261d50a12f0a54fb79bca2474fcf00b9851769ebcbe2a08c9c46fbb8edfb07bb8964142adac85e901d6773082001ffc0248746e8c448b77a1

data/config/locales/en.yml

@@ -20,7 +20,8 @@ en:
           dynamic_options:
             consists_of:
               required: "[%{service_class_name}] Required element in input collection `%{input_name}` is missing"
-              wrong_type: "[%{service_class_name}] Wrong element type in input collection `%{input_name}`, expected `%{expected_type}`, got `%{given_type}`"
+              wrong_type: "[%{service_class_name}] Wrong input collection type `%{input_name}`, expected `%{expected_type}`, got `%{given_type}`"
+              wrong_element_type: "[%{service_class_name}] Wrong element type in input collection `%{input_name}`, expected `%{expected_type}`, got `%{given_type}`"
             format:
               default: "[%{service_class_name}] Input `%{input_name}` does not match `%{format_name}` format"
               wrong_pattern: "[%{service_class_name}] Input `%{input_name}` does not match `%{format_name}` format"
@@ -55,7 +56,8 @@ en:
           dynamic_options:
             consists_of:
               required: "[%{service_class_name}] Required element in internal attribute collection `%{internal_name}` is missing"
-              wrong_type: "[%{service_class_name}] Wrong element type in internal attribute collection `%{internal_name}`, expected `%{expected_type}`, got `%{given_type}`"
+              wrong_type: "[%{service_class_name}] Wrong internal attribute collection type `%{internal_name}`, expected `%{expected_type}`, got `%{given_type}`"
+              wrong_element_type: "[%{service_class_name}] Wrong element type in internal attribute collection `%{internal_name}`, expected `%{expected_type}`, got `%{given_type}`"
             format:
               default: "[%{service_class_name}] Internal attribute `%{internal_name}` does not match `%{format_name}` format"
               wrong_pattern: "[%{service_class_name}] Internal attribute `%{internal_name}` does not match `%{format_name}` format"
@@ -82,7 +84,8 @@ en:
           dynamic_options:
             consists_of:
               required: "[%{service_class_name}] Required element in output attribute collection `%{output_name}` is missing"
-              wrong_type: "[%{service_class_name}] Wrong element type in output attribute collection `%{output_name}`, expected `%{expected_type}`, got `%{given_type}`"
+              wrong_type: "[%{service_class_name}] Wrong output attribute collection type `%{output_name}`, expected `%{expected_type}`, got `%{given_type}`"
+              wrong_element_type: "[%{service_class_name}] Wrong element type in output attribute collection `%{output_name}`, expected `%{expected_type}`, got `%{given_type}`"
             format:
               default: "[%{service_class_name}] Output attribute `%{output_name}` does not match `%{format_name}` format"
               wrong_pattern: "[%{service_class_name}] Output attribute `%{output_name}` does not match `%{format_name}` format"

data/config/locales/ru.yml

@@ -20,7 +20,8 @@ ru:
           dynamic_options:
             consists_of:
               required: "[%{service_class_name}] Отсутствует обязательный элемент в коллекции инпута `%{input_name}`"
-              wrong_type: "[%{service_class_name}] Неправильный тип элемента в коллекции инпута `%{input_name}`, ожидалось `%{expected_type}`, получено `%{given_type}`"
+              wrong_type: "[%{service_class_name}] Неправильный тип коллекции инпута `%{input_name}`, ожидалось `%{expected_type}`, получено `%{given_type}`"
+              wrong_element_type: "[%{service_class_name}] Неправильный тип элемента в коллекции инпута `%{input_name}`, ожидалось `%{expected_type}`, получено `%{given_type}`"
             format:
               default: "[%{service_class_name}] Инпут `%{input_name}` не соответствует формату `%{format_name}`"
               wrong_pattern: "[%{service_class_name}] Инпут `%{input_name}` не соответствует формату `%{format_name}`"
@@ -55,7 +56,8 @@ ru:
           dynamic_options:
             consists_of:
               required: "[%{service_class_name}] Отсутствует обязательный элемент в коллекции внутреннего атрибута `%{internal_name}`"
-              wrong_type: "[%{service_class_name}] Неправильный тип элемента в коллекции внутреннего атрибута `%{internal_name}`, ожидалось `%{expected_type}`, получено `%{given_type}`"
+              wrong_type: "[%{service_class_name}] Неправильный тип коллекции внутреннего атрибута `%{internal_name}`, ожидалось `%{expected_type}`, получено `%{given_type}`"
+              wrong_element_type: "[%{service_class_name}] Неправильный тип элемента в коллекции внутреннего атрибута `%{internal_name}`, ожидалось `%{expected_type}`, получено `%{given_type}`"
             format:
               default: "[%{service_class_name}] Внутренний атрибут `%{internal_name}` не соответствует формату `%{format_name}`"
               wrong_pattern: "[%{service_class_name}] Внутренний атрибут `%{internal_name}` не соответствует формату `%{format_name}`"
@@ -82,7 +84,8 @@ ru:
           dynamic_options:
             consists_of:
               required: "[%{service_class_name}] Отсутствует обязательный элемент в коллекции выходящего атрибута `%{output_name}`"
-              wrong_type: "[%{service_class_name}] Неправильный тип элемента в коллекции выходящего атрибута `%{output_name}`, ожидалось `%{expected_type}`, получено `%{given_type}`"
+              wrong_type: "[%{service_class_name}] Неправильный тип коллекции выходящего атрибута `%{output_name}`, ожидалось `%{expected_type}`, получено `%{given_type}`"
+              wrong_element_type: "[%{service_class_name}] Неправильный тип элемента в коллекции выходящего атрибута `%{output_name}`, ожидалось `%{expected_type}`, получено `%{given_type}`"
             format:
               default: "[%{service_class_name}] Выходящий атрибут `%{output_name}` не соответствует формату `%{format_name}`"
               wrong_pattern: "[%{service_class_name}] Выходящий атрибут `%{output_name}` не соответствует формату `%{format_name}`"

data/lib/servactory/configuration/class_names_collection.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Servactory
+  module Configuration
+    class ClassNamesCollection
+      extend Forwardable
+      def_delegators :@collection, :merge, :intersection
+
+      def initialize(collection)
+        @collection = collection
+      end
+    end
+  end
+end

data/lib/servactory/configuration/dsl.rb

@@ -20,6 +20,8 @@ module Servactory
 
           child.config.result_class = config.result_class
 
+          child.config.collection_mode_class_names = config.collection_mode_class_names
+
           child.config.input_option_helpers = config.input_option_helpers
           child.config.internal_option_helpers = config.internal_option_helpers
           child.config.output_option_helpers = config.output_option_helpers

data/lib/servactory/configuration/factory.rb

@@ -69,6 +69,10 @@ module Servactory
         raise_error_about_wrong_result_class_with(:result_class, result_class)
       end
 
+      def collection_mode_class_names(collection_mode_class_names)
+        @config.collection_mode_class_names.merge(collection_mode_class_names)
+      end
+
       def hash_mode_class_names(hash_mode_class_names)
         @config.hash_mode_class_names.merge(hash_mode_class_names)
       end

data/lib/servactory/configuration/setup.rb

@@ -9,6 +9,7 @@ module Servactory
                     :success_class,
                     :failure_class,
                     :result_class,
+                    :collection_mode_class_names,
                     :hash_mode_class_names,
                     :input_option_helpers,
                     :internal_option_helpers,
@@ -29,6 +30,9 @@ module Servactory
 
         @result_class = Servactory::Result
 
+        @collection_mode_class_names =
+          Servactory::Configuration::ClassNamesCollection.new(default_collection_mode_class_names)
+
         @hash_mode_class_names =
           Servactory::Maintenance::HashMode::ClassNamesCollection.new(default_hash_mode_class_names)
 
@@ -56,6 +60,10 @@ module Servactory
 
       private
 
+      def default_collection_mode_class_names
+        Set[Array, Set]
+      end
+
       def default_hash_mode_class_names
         Set[Hash]
       end
@@ -63,19 +71,19 @@ module Servactory
       def default_input_option_helpers
         Set[
           Servactory::Maintenance::Attributes::OptionHelper.new(name: :optional, equivalent: { required: false }),
-          Servactory::ToolKit::DynamicOptions::ConsistsOf.setup
+          Servactory::ToolKit::DynamicOptions::ConsistsOf.use(collection_mode_class_names: collection_mode_class_names)
         ]
       end
 
       def default_internal_option_helpers
         Set[
-          Servactory::ToolKit::DynamicOptions::ConsistsOf.setup
+          Servactory::ToolKit::DynamicOptions::ConsistsOf.use(collection_mode_class_names: collection_mode_class_names)
         ]
       end
 
       def default_output_option_helpers
         Set[
-          Servactory::ToolKit::DynamicOptions::ConsistsOf.setup
+          Servactory::ToolKit::DynamicOptions::ConsistsOf.use(collection_mode_class_names: collection_mode_class_names)
         ]
       end
     end

data/lib/servactory/tool_kit/dynamic_options/consists_of.rb

@@ -4,11 +4,14 @@ module Servactory
   module ToolKit
     module DynamicOptions
       class ConsistsOf < Must
-        COLLECTION_CLASS_NAMES = [Array, Set].freeze
-        private_constant :COLLECTION_CLASS_NAMES
+        def self.use(option_name = :consists_of, collection_mode_class_names:)
+          instance = new(option_name, :type, false)
+          instance.assign(collection_mode_class_names)
+          instance.must(:consists_of)
+        end
 
-        def self.setup(option_name = :consists_of)
-          new(option_name, :type, false).must(:consists_of)
+        def assign(collection_mode_class_names)
+          @collection_mode_class_names = collection_mode_class_names
         end
 
         def condition_for_input_with(input:, value:, option:)
@@ -25,22 +28,38 @@ module Servactory
 
         def common_condition_with(attribute:, value:, option:)
           return true if option.value == false
-          return false if COLLECTION_CLASS_NAMES.intersection(attribute.types).empty?
+          return [false, :wrong_type] if @collection_mode_class_names.intersection(attribute.types).empty?
+
+          values = value.respond_to?(:flatten) ? value&.flatten : value
 
-          validate_for!(values: value, option: option)
+          validate_for!(attribute: attribute, values: values, option: option)
         end
 
-        def validate_for!(values:, option:) # rubocop:disable Metrics/CyclomaticComplexity
+        # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        def validate_for!(attribute:, values:, option:)
           consists_of_types = Array(option.value)
 
-          return [false, :required] if !consists_of_types.include?(NilClass) && !values&.flatten&.all?(&:present?)
+          if !consists_of_types.include?(NilClass) && !values&.all?(&:present?) &&
+             (
+               (
+                 attribute.input? && (
+                   (values.blank? && attribute.required?) ||
+                   (values.present? && attribute.required?)
+                 )
+               ) || attribute.internal? || attribute.output?
+             )
+            return [false, :required]
+          end
 
-          return true if values.flatten.all? do |value|
+          return true if values.blank? && attribute.input? && attribute.optional?
+
+          return true if values.all? do |value|
             consists_of_types.include?(value.class)
           end
 
-          [false, :wrong_type]
+          [false, :wrong_element_type]
         end
+        # rubocop:enable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
         ########################################################################
 
@@ -84,9 +103,11 @@ module Servactory
         end
 
         def given_type_for(values:, option_value:)
-          return nil if values.nil?
+          return "NilClass" if values.nil?
+
+          values = values&.flatten if values.respond_to?(:flatten)
 
-          values.flatten.filter { |value| Array(option_value).exclude?(value.class) }.map(&:class).uniq.join(", ")
+          values.filter { |value| Array(option_value).exclude?(value.class) }.map(&:class).uniq.join(", ")
         end
       end
     end

data/lib/servactory/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: servactory
 version: !ruby/object:Gem::Version
-  version: 2.6.0.rc3
+  version: 2.6.0.rc5
 platform: ruby
 authors:
 - Anton Sokolov
@@ -256,6 +256,7 @@ files:
 - lib/servactory/actions/tools/runner.rb
 - lib/servactory/actions/workspace.rb
 - lib/servactory/base.rb
+- lib/servactory/configuration/class_names_collection.rb
 - lib/servactory/configuration/dsl.rb
 - lib/servactory/configuration/factory.rb
 - lib/servactory/configuration/setup.rb