servactory 2.6.0.rc4 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53d70d5438c6e58daf86d416c2910eabe04727880af9189b7813da17bd3bb777
-  data.tar.gz: cbab6d80c1d012d80d72f5f76eaa3fd17d01af568961d0eaf16a80abfc61591a
+  metadata.gz: 0df96b35bd963790408ba89eb4c6d80b7b19c4edc869ceade70f0d9d660f41ce
+  data.tar.gz: 97c287969f8358a77903d17b79624b59a06abd8aa94aa469e5d458f99ae50342
 SHA512:
-  metadata.gz: 2ec8ed69eaa089a441280c3f0650b842509175f9d14b25a2f838fd61e4e60ca622e24e65a76d7303f8b041f070eb6cd17f51cb959b1ceef9f809cadbe8e4d492
-  data.tar.gz: d96fd4a4a3864a4654e80802451ee003cffc5e3d609d368667790fea4c1511162de0f06491906d9e7e49e3f878c72cda870b28848150b01c84a6eb92df2d325f
+  metadata.gz: 57caa41f80f9df2fa40061dad1337839dfba5dcc69b54e44ac8651bb83ec4e4d034870e7cd78f1d23661cd4ab66153904ed9679e78253a91e5532a7c596f4f11
+  data.tar.gz: 9e85fcb8bd9994756b6d9519d1a2bbbc68a7bd13254505ae4930552d377a011eb233d70e7fe9abdb23cc52d0f8812294bfb70ce15b5f34b6861cbf763c918461

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/actions/aliases/collection.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Servactory
+  module Configuration
+    module Actions
+      module Aliases
+        class Collection
+          extend Forwardable
+          def_delegators :@collection, :<<, :merge, :include?
+
+          def initialize(*)
+            @collection = Set.new
+          end
+        end
+      end
+    end
+  end
+end

data/lib/servactory/configuration/actions/rescue_handlers/collection.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Servactory
+  module Configuration
+    module Actions
+      module RescueHandlers
+        class Collection
+          extend Forwardable
+          def_delegators :@collection, :+, :detect, :reverse_each
+
+          def initialize(*)
+            @collection = Set.new
+          end
+        end
+      end
+    end
+  end
+end

data/lib/servactory/configuration/actions/shortcuts/collection.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Servactory
+  module Configuration
+    module Actions
+      module Shortcuts
+        class Collection
+          extend Forwardable
+          def_delegators :@collection, :<<, :each, :merge, :include?
+
+          def initialize(*)
+            @collection = Set.new
+          end
+        end
+      end
+    end
+  end
+end

data/lib/servactory/configuration/collection_mode/class_names_collection.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Servactory
+  module Configuration
+    module CollectionMode
+      class ClassNamesCollection
+        extend Forwardable
+        def_delegators :@collection, :merge, :intersection
+
+        def initialize(collection)
+          @collection = collection
+        end
+      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/{maintenance → configuration}/hash_mode/class_names_collection.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Servactory
-  module Maintenance
+  module Configuration
     module HashMode
       class ClassNamesCollection
         extend Forwardable

data/lib/servactory/{maintenance/attributes → configuration/option_helpers}/option_helpers_collection.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Servactory
-  module Maintenance
-    module Attributes
+  module Configuration
+    module OptionHelpers
       class OptionHelpersCollection
         extend Forwardable
         def_delegators :@collection, :<<, :find, :merge

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,21 +30,24 @@ module Servactory
 
         @result_class = Servactory::Result
 
+        @collection_mode_class_names =
+          Servactory::Configuration::CollectionMode::ClassNamesCollection.new(default_collection_mode_class_names)
+
         @hash_mode_class_names =
-          Servactory::Maintenance::HashMode::ClassNamesCollection.new(default_hash_mode_class_names)
+          Servactory::Configuration::HashMode::ClassNamesCollection.new(default_hash_mode_class_names)
 
         @input_option_helpers =
-          Servactory::Maintenance::Attributes::OptionHelpersCollection.new(default_input_option_helpers)
+          Servactory::Configuration::OptionHelpers::OptionHelpersCollection.new(default_input_option_helpers)
 
         @internal_option_helpers =
-          Servactory::Maintenance::Attributes::OptionHelpersCollection.new(default_internal_option_helpers)
+          Servactory::Configuration::OptionHelpers::OptionHelpersCollection.new(default_internal_option_helpers)
 
         @output_option_helpers =
-          Servactory::Maintenance::Attributes::OptionHelpersCollection.new(default_output_option_helpers)
+          Servactory::Configuration::OptionHelpers::OptionHelpersCollection.new(default_output_option_helpers)
 
-        @action_aliases = Servactory::Actions::Aliases::Collection.new
-        @action_shortcuts = Servactory::Actions::Shortcuts::Collection.new
-        @action_rescue_handlers = Servactory::Actions::RescueHandlers::Collection.new
+        @action_aliases = Servactory::Configuration::Actions::Aliases::Collection.new
+        @action_shortcuts = Servactory::Configuration::Actions::Shortcuts::Collection.new
+        @action_rescue_handlers = Servactory::Configuration::Actions::RescueHandlers::Collection.new
 
         @i18n_root_key = "servactory"
 
@@ -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/test_kit/rspec/matchers/have_service_input_matchers/valid_with_matcher.rb

@@ -142,10 +142,13 @@ module Servactory
                   value: wrong_value
                 )
               elsif input_required_message.is_a?(Proc)
+                service_class = Struct.new(:class_name, keyword_init: true)
+                service = service_class.new(class_name: described_class.name)
+
                 input_work = attribute_data.fetch(:work)
 
                 input_required_message = input_required_message.call(
-                  service_class_name: described_class.name,
+                  service: service,
                   input: input_work,
                   value: wrong_value
                 )

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,39 @@ 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 true if attribute.input? && attribute.optional? && value.blank?
+          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
+        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 fails_presence_validation?(attribute: attribute, values: values, consists_of_types: consists_of_types)
+            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
+
+        def fails_presence_validation?(attribute:, values:, consists_of_types:)
+          return false if consists_of_types.include?(NilClass)
+
+          check_present = proc { _1 && !values.all?(&:present?) }
+
+          [
+            check_present[attribute.input? && (attribute.required? || (attribute.optional? && values.present?))],
+            check_present[attribute.internal?],
+            check_present[attribute.output?]
+          ].any?
         end
 
         ########################################################################
@@ -85,9 +105,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 = "rc4"
+    PRE = nil
 
     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.6.0.rc4
+  version: 2.6.0
 platform: ruby
 authors:
 - Anton Sokolov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-11 00:00:00.000000000 Z
+date: 2024-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -245,19 +245,22 @@ files:
 - lib/generators/servactory/templates/services/application_service/result.rb
 - lib/servactory.rb
 - lib/servactory/actions/action.rb
-- lib/servactory/actions/aliases/collection.rb
 - lib/servactory/actions/collection.rb
 - lib/servactory/actions/dsl.rb
-- lib/servactory/actions/rescue_handlers/collection.rb
-- lib/servactory/actions/shortcuts/collection.rb
 - lib/servactory/actions/stages/collection.rb
 - lib/servactory/actions/stages/stage.rb
 - lib/servactory/actions/tools/rules.rb
 - lib/servactory/actions/tools/runner.rb
 - lib/servactory/actions/workspace.rb
 - lib/servactory/base.rb
+- lib/servactory/configuration/actions/aliases/collection.rb
+- lib/servactory/configuration/actions/rescue_handlers/collection.rb
+- lib/servactory/configuration/actions/shortcuts/collection.rb
+- lib/servactory/configuration/collection_mode/class_names_collection.rb
 - lib/servactory/configuration/dsl.rb
 - lib/servactory/configuration/factory.rb
+- lib/servactory/configuration/hash_mode/class_names_collection.rb
+- lib/servactory/configuration/option_helpers/option_helpers_collection.rb
 - lib/servactory/configuration/setup.rb
 - lib/servactory/context/callable.rb
 - lib/servactory/context/dsl.rb
@@ -298,7 +301,6 @@ files:
 - lib/servactory/maintenance/attributes/define_method.rb
 - lib/servactory/maintenance/attributes/option.rb
 - lib/servactory/maintenance/attributes/option_helper.rb
-- lib/servactory/maintenance/attributes/option_helpers_collection.rb
 - lib/servactory/maintenance/attributes/options/registrar.rb
 - lib/servactory/maintenance/attributes/options_collection.rb
 - lib/servactory/maintenance/attributes/tools/check_errors.rb
@@ -311,7 +313,6 @@ files:
 - lib/servactory/maintenance/attributes/validations/inclusion.rb
 - lib/servactory/maintenance/attributes/validations/must.rb
 - lib/servactory/maintenance/attributes/validations/type.rb
-- lib/servactory/maintenance/hash_mode/class_names_collection.rb
 - lib/servactory/maintenance/validations/object_schema.rb
 - lib/servactory/maintenance/validations/types.rb
 - lib/servactory/outputs/collection.rb

data/lib/servactory/actions/aliases/collection.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Actions
-    module Aliases
-      class Collection
-        extend Forwardable
-        def_delegators :@collection, :<<, :merge, :include?
-
-        def initialize(*)
-          @collection = Set.new
-        end
-      end
-    end
-  end
-end

data/lib/servactory/actions/rescue_handlers/collection.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Actions
-    module RescueHandlers
-      class Collection
-        extend Forwardable
-        def_delegators :@collection, :+, :detect, :reverse_each
-
-        def initialize(*)
-          @collection = Set.new
-        end
-      end
-    end
-  end
-end

data/lib/servactory/actions/shortcuts/collection.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Actions
-    module Shortcuts
-      class Collection
-        extend Forwardable
-        def_delegators :@collection, :<<, :each, :merge, :include?
-
-        def initialize(*)
-          @collection = Set.new
-        end
-      end
-    end
-  end
-end