servactory 2.5.2 → 2.6.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0eb12b9f0b029bee8f4e2081ecba8c663cf96144dd3de1fbb558015e738875bf
-  data.tar.gz: 873cd09732c52d92000e98bfda0c8419c6c78edb3cb574d0701c05b47446250f
+  metadata.gz: 3f69f28208e5c09f4ddd0e112ca8155ef288af67b5bc2c7035f12082ab968acc
+  data.tar.gz: 97820e7d44399d15b077091e4c7eb3956444a7e456dd6a8e51fd49caa21b7431
 SHA512:
-  metadata.gz: b5cd6c0bfe803edcf12c7b40e90f6660c2aba527ea24e29d87b905a497fe8d3d510ca06cd6c76087e37dc075a545e21516cbd625245133b0443cda2a3b0a8a94
-  data.tar.gz: 581854dc492e0a6bacb139caa50ec8a11a69924d46c6f30fd345f3118df672b6593be06f02a6093b5a0d225062e1d5ec44a4419df70b0cc8537b82a034ba8df2
+  metadata.gz: 4bcf546de124b1d5cae91b2b9288a6a68ce0fcbab0a343166a112505df3671f6f5d33aa5dcd600b8f98f2ef51e7b457bf272ffc43fab6bd5b9c050f938db2e93
+  data.tar.gz: 89022378fefc711217f6ec2176613b4beaa3b16e6afe3ae01f0c73e3462f32f3c50dd746db2abd61eb2cc97ada91f7925001b5492ceacd9a73b0dcfdf7e6ae3a

data/config/locales/en.yml

@@ -18,6 +18,9 @@ en:
           default_error: "[%{service_class_name}] Input `%{input_name}` must \"%{code}\""
           syntax_error: "[%{service_class_name}] Syntax error inside `%{code}` of `%{input_name}` input: %{exception_message}"
           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}`"
             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"
@@ -29,13 +32,9 @@ en:
         required:
           default_error:
             default: "[%{service_class_name}] Required input `%{input_name}` is missing"
-            for_collection: "[%{service_class_name}] Required element in input collection `%{input_name}` is missing"
         type:
           default_error:
             default: "[%{service_class_name}] Wrong type of input `%{input_name}`, expected `%{expected_type}`, got `%{given_type}`"
-            for_collection:
-              wrong_type: "[%{service_class_name}] Wrong input collection type `%{input_name}`, expected `%{expected_type}`, got `%{given_type}`"
-              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:
@@ -54,6 +53,9 @@ en:
           default_error: "[%{service_class_name}] Internal attribute `%{internal_name}` must \"%{code}\""
           syntax_error: "[%{service_class_name}] Syntax error inside `%{code}` of `%{internal_name}` internal attribute: %{exception_message}"
           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}`"
             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"
@@ -65,9 +67,6 @@ en:
         type:
           default_error:
             default: "[%{service_class_name}] Wrong type of internal attribute `%{internal_name}`, expected `%{expected_type}`, got `%{given_type}`"
-            for_collection:
-              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}`"
             for_hash:
               wrong_element_type: "[%{service_class_name}] Wrong type in internal attribute hash `%{internal_name}`, expected `%{expected_type}` for `%{key_name}`, got `%{given_type}`"
     outputs:
@@ -81,6 +80,9 @@ en:
           default_error: "[%{service_class_name}] Output attribute `%{output_name}` must \"%{code}\""
           syntax_error: "[%{service_class_name}] Syntax error inside `%{code}` of `%{output_name}` output attribute: %{exception_message}"
           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}`"
             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"
@@ -92,8 +94,5 @@ en:
         type:
           default_error:
             default: "[%{service_class_name}] Wrong type of output attribute `%{output_name}`, expected `%{expected_type}`, got `%{given_type}`"
-            for_collection:
-              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}`"
             for_hash:
               wrong_element_type: "[%{service_class_name}] Wrong type in output attribute hash `%{output_name}`, expected `%{expected_type}` for `%{key_name}`, got `%{given_type}`"

data/config/locales/ru.yml

@@ -18,6 +18,9 @@ ru:
           default_error: "[%{service_class_name}] Инпут `%{input_name}` должен \"%{code}\""
           syntax_error: "[%{service_class_name}] Синтаксическая ошибка внутри `%{code}` инпута `%{input_name}`: %{exception_message}"
           dynamic_options:
+            consists_of:
+              required: "[%{service_class_name}] Отсутствует обязательный элемент в коллекции инпута `%{input_name}`"
+              wrong_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}`"
@@ -29,16 +32,11 @@ ru:
         required:
           default_error:
             default: "[%{service_class_name}] Обязательный инпут `%{input_name}` отсутствует"
-            for_collection: "[%{service_class_name}] Обязательный элемент в коллекции инпута `%{input_name}` отсутствует"
         type:
           default_error:
             default: "[%{service_class_name}] Неправильный тип инпута `%{input_name}`, ожидалось `%{expected_type}`, получено `%{given_type}`"
-            for_collection:
-              wrong_type: "[%{service_class_name}] Неправильный тип коллекции инпута `%{input_name}`, ожидалось `%{expected_type}`, получено `%{given_type}`"
-              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}`"
-
       tools:
         find_unnecessary:
           error: "[%{service_class_name}] Неожиданные атрибуты: `%{unnecessary_attributes}`"
@@ -55,6 +53,9 @@ ru:
           default_error: "[%{service_class_name}] Внутренний атрибут `%{internal_name}` должен \"%{code}\""
           syntax_error: "[%{service_class_name}] Синтаксическая ошибка внутри `%{code}` внутреннего атрибута `%{internal_name}`: %{exception_message}"
           dynamic_options:
+            consists_of:
+              required: "[%{service_class_name}] Отсутствует обязательный элемент в коллекции внутреннего атрибута `%{internal_name}`"
+              wrong_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}`"
@@ -66,9 +67,6 @@ ru:
         type:
           default_error:
             default: "[%{service_class_name}] Неправильный тип внутреннего атрибута `%{internal_name}`, ожидалось `%{expected_type}`, получено `%{given_type}`"
-            for_collection:
-              wrong_type: "[%{service_class_name}] Неправильный тип коллекции внутреннего атрибута `%{internal_name}`, ожидалось `%{expected_type}`, получено `%{given_type}`"
-              wrong_element_type: "[%{service_class_name}] Неправильный тип элемента в коллекции внутреннего атрибута `%{internal_name}`, ожидалось `%{expected_type}`, получено `%{given_type}`"
             for_hash:
               wrong_element_type: "[%{service_class_name}] Неправильный тип в хеше внутреннего атрибута `%{internal_name}`, для `%{key_name}` ожидалось `%{expected_type}`, получено `%{given_type}`"
     outputs:
@@ -82,6 +80,9 @@ ru:
           default_error: "[%{service_class_name}] Выходящий атрибут `%{output_name}` должен \"%{code}\""
           syntax_error: "[%{service_class_name}] Синтаксическая ошибка внутри `%{code}` выходящего атрибута `%{output_name}`: %{exception_message}"
           dynamic_options:
+            consists_of:
+              required: "[%{service_class_name}] Отсутствует обязательный элемент в коллекции выходящего атрибута `%{output_name}`"
+              wrong_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}`"
@@ -92,8 +93,5 @@ ru:
               default: "[%{service_class_name}] Выходящий атрибут `%{output_name}` получил значение `%{value}`, которое больше `%{option_value}`"
         type:
           default: "[%{service_class_name}] Неправильный тип выходящего атрибута `%{output_name}`, ожидалось `%{expected_type}`, получено `%{given_type}`"
-          for_collection:
-            wrong_type: "[%{service_class_name}] Неправильный тип коллекции выходящего атрибута `%{output_name}`, ожидалось `%{expected_type}`, получено `%{given_type}`"
-            wrong_element_type: "[%{service_class_name}] Неправильный тип элемента в коллекции выходящего атрибута `%{output_name}`, ожидалось `%{expected_type}`, получено `%{given_type}`"
           for_hash:
             wrong_element_type: "[%{service_class_name}] Неправильный тип в хеше выходящего атрибута `%{output_name}`, для `%{key_name}` ожидалось `%{expected_type}`, получено `%{given_type}`"

data/lib/generators/servactory/templates/services/application_service/base.rb

@@ -48,14 +48,14 @@ module ApplicationService
       #   ]
       # )
 
-      # collection_mode_class_names [ActiveRecord::Relation]
-
       # hash_mode_class_names [CustomHash]
 
       # action_shortcuts %i[assign build create save]
 
       # action_aliases %i[do_it!]
 
+      # i18n_root_key :servactory
+
       # predicate_methods_enabled false
     end
   end

data/lib/servactory/actions/tools/rules.rb

@@ -58,9 +58,8 @@ module Servactory
         def raise_message_with!(formatted_text)
           raise @context.class.config.failure_class.new(
             type: :base,
-            message: I18n.t(
-              "servactory.methods.cannot_be_overwritten",
-              service_class_name: @context.class.name,
+            message: @context.send(:servactory_service_info).translate(
+              "methods.cannot_be_overwritten",
               list_of_methods: formatted_text
             )
           )

data/lib/servactory/configuration/dsl.rb

@@ -20,8 +20,6 @@ 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
@@ -30,6 +28,8 @@ module Servactory
           child.config.action_shortcuts = config.action_shortcuts
           child.config.action_rescue_handlers = config.action_rescue_handlers
 
+          child.config.i18n_root_key = config.i18n_root_key
+
           child.config.predicate_methods_enabled = config.predicate_methods_enabled
         end
 

data/lib/servactory/configuration/factory.rb

@@ -2,7 +2,7 @@
 
 module Servactory
   module Configuration
-    class Factory
+    class Factory # rubocop:disable Metrics/ClassLength
       def initialize(config)
         @config = config
       end
@@ -69,10 +69,6 @@ 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
@@ -97,6 +93,12 @@ module Servactory
         @config.action_shortcuts.merge(action_shortcuts)
       end
 
+      def i18n_root_key(value)
+        return @config.i18n_root_key = value.to_s if i18n_key?(value)
+
+        raise_error_about_wrong_i18n_root_key_with(:i18n_root_key, value)
+      end
+
       def predicate_methods_enabled(flag)
         return @config.predicate_methods_enabled = flag if boolean?(flag)
 
@@ -117,6 +119,10 @@ module Servactory
         value.is_a?(Class) && value <= Servactory::Result
       end
 
+      def i18n_key?(value)
+        value.is_a?(Symbol) || (value.is_a?(String) && value.present?)
+      end
+
       def boolean?(value)
         value.is_a?(TrueClass) || value.is_a?(FalseClass)
       end
@@ -137,10 +143,17 @@ module Servactory
               "See configuration example here: https://servactory.com/guide/configuration"
       end
 
+      def raise_error_about_wrong_i18n_root_key_with(config_name, value)
+        raise ArgumentError,
+              "Error in `#{config_name}` configuration. " \
+              "The `#{value.inspect}` value must be `Symbol` or `String`. " \
+              "See configuration example here: https://servactory.com/guide/configuration"
+      end
+
       def raise_error_about_wrong_predicate_methods_enabled_with(config_name, value)
         raise ArgumentError,
               "Error in `#{config_name}` configuration. " \
-              "The `#{value}` value must be `TrueClass` or `FalseClass`. " \
+              "The `#{value.inspect}` value must be `TrueClass` or `FalseClass`. " \
               "See configuration example here: https://servactory.com/guide/configuration"
       end
     end

data/lib/servactory/configuration/setup.rb

@@ -9,7 +9,6 @@ module Servactory
                     :success_class,
                     :failure_class,
                     :result_class,
-                    :collection_mode_class_names,
                     :hash_mode_class_names,
                     :input_option_helpers,
                     :internal_option_helpers,
@@ -17,6 +16,7 @@ module Servactory
                     :action_aliases,
                     :action_shortcuts,
                     :action_rescue_handlers,
+                    :i18n_root_key,
                     :predicate_methods_enabled
 
       def initialize # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
@@ -29,9 +29,6 @@ module Servactory
 
         @result_class = Servactory::Result
 
-        @collection_mode_class_names =
-          Servactory::Maintenance::CollectionMode::ClassNamesCollection.new(default_collection_mode_class_names)
-
         @hash_mode_class_names =
           Servactory::Maintenance::HashMode::ClassNamesCollection.new(default_hash_mode_class_names)
 
@@ -39,15 +36,17 @@ module Servactory
           Servactory::Maintenance::Attributes::OptionHelpersCollection.new(default_input_option_helpers)
 
         @internal_option_helpers =
-          Servactory::Maintenance::Attributes::OptionHelpersCollection.new
+          Servactory::Maintenance::Attributes::OptionHelpersCollection.new(default_internal_option_helpers)
 
         @output_option_helpers =
-          Servactory::Maintenance::Attributes::OptionHelpersCollection.new
+          Servactory::Maintenance::Attributes::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
 
+        @i18n_root_key = "servactory"
+
         @predicate_methods_enabled = true
       end
 
@@ -57,10 +56,6 @@ module Servactory
 
       private
 
-      def default_collection_mode_class_names
-        Set[Array, Set]
-      end
-
       def default_hash_mode_class_names
         Set[Hash]
       end
@@ -68,6 +63,19 @@ module Servactory
       def default_input_option_helpers
         Set[
           Servactory::Maintenance::Attributes::OptionHelper.new(name: :optional, equivalent: { required: false }),
+          Servactory::ToolKit::DynamicOptions::ConsistsOf.setup
+        ]
+      end
+
+      def default_internal_option_helpers
+        Set[
+          Servactory::ToolKit::DynamicOptions::ConsistsOf.setup
+        ]
+      end
+
+      def default_output_option_helpers
+        Set[
+          Servactory::ToolKit::DynamicOptions::ConsistsOf.setup
         ]
       end
     end

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

@@ -99,9 +99,8 @@ module Servactory
         end
 
         def raise_error_for(type, name)
-          message_text = I18n.t(
-            "servactory.inputs.undefined.#{type}",
-            service_class_name: @context.class.name,
+          message_text = @context.send(:servactory_service_info).translate(
+            "inputs.undefined.#{type}",
             input_name: name
           )
 

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

@@ -69,9 +69,8 @@ module Servactory
         end
 
         def raise_error_for(type, name)
-          message_text = I18n.t(
-            "servactory.internals.undefined.#{type}",
-            service_class_name: @context.class.name,
+          message_text = @context.send(:servactory_service_info).translate(
+            "internals.undefined.#{type}",
             internal_name: name
           )
 

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

@@ -69,9 +69,8 @@ module Servactory
         end
 
         def raise_error_for(type, name)
-          message_text = I18n.t(
-            "servactory.outputs.undefined.#{type}",
-            service_class_name: @context.class.name,
+          message_text = @context.send(:servactory_service_info).translate(
+            "outputs.undefined.#{type}",
             output_name: name
           )
 

data/lib/servactory/context/workspace.rb

@@ -3,6 +3,23 @@
 module Servactory
   module Context
     module Workspace
+      class Actor
+        attr_reader :class_name
+
+        def initialize(context)
+          @class_name = context.class.name
+          @i18n_root_key = context.class.config.i18n_root_key
+        end
+
+        def translate(key, **options)
+          I18n.t(
+            "#{@i18n_root_key}.#{key}",
+            service_class_name: class_name,
+            **options
+          )
+        end
+      end
+
       def inputs
         @inputs ||= Inputs.new(
           context: self,
@@ -100,13 +117,16 @@ module Servactory
       def call
         raise self.class.config.failure_class.new(
           type: :base,
-          message: I18n.t(
-            "servactory.methods.call.not_used",
-            service_class_name: self.class.name
+          message: servactory_service_info.translate(
+            "methods.call.not_used"
           )
         )
       end
 
+      def servactory_service_info
+        @servactory_service_info ||= self.class::Actor.new(self)
+      end
+
       def servactory_service_store
         @servactory_service_store ||= Store.new(self)
       end

data/lib/servactory/info/dsl.rb

@@ -11,8 +11,7 @@ module Servactory
         def info # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
           Servactory::Info::Result.new(
             inputs: collection_of_inputs.to_h do |input|
-              work = input.class::Work.new(input)
-              consists_of = input.collection_of_options.find_by(name: :consists_of)
+              work = input.class::Actor.new(input)
               inclusion = input.collection_of_options.find_by(name: :inclusion)
               must = input.collection_of_options.find_by(name: :must)
 
@@ -23,7 +22,6 @@ module Servactory
                   types: input.types,
                   required: input.required,
                   default: input.default,
-                  consists_of: consists_of.body,
                   inclusion: inclusion.body,
                   must: must.body
                 }
@@ -31,8 +29,7 @@ module Servactory
             end,
 
             internals: collection_of_internals.to_h do |internal|
-              work = internal.class::Work.new(internal)
-              consists_of = internal.collection_of_options.find_by(name: :consists_of)
+              work = internal.class::Actor.new(internal)
               inclusion = internal.collection_of_options.find_by(name: :inclusion)
               must = internal.collection_of_options.find_by(name: :must)
 
@@ -41,7 +38,6 @@ module Servactory
                 {
                   work: work,
                   types: internal.types,
-                  consists_of: consists_of.body,
                   inclusion: inclusion.body,
                   must: must.body
                 }
@@ -49,8 +45,7 @@ module Servactory
             end,
 
             outputs: collection_of_outputs.to_h do |output|
-              work = output.class::Work.new(output)
-              consists_of = output.collection_of_options.find_by(name: :consists_of)
+              work = output.class::Actor.new(output)
               inclusion = output.collection_of_options.find_by(name: :inclusion)
               must = output.collection_of_options.find_by(name: :must)
 
@@ -59,7 +54,6 @@ module Servactory
                 {
                   work: work,
                   types: output.types,
-                  consists_of: consists_of.body,
                   inclusion: inclusion.body,
                   must: must.body
                 }

data/lib/servactory/inputs/dsl.rb

@@ -21,7 +21,6 @@ module Servactory
           collection_of_inputs << Input.new(
             name,
             *helpers,
-            collection_mode_class_names: config.collection_mode_class_names,
             hash_mode_class_names: config.hash_mode_class_names,
             option_helpers: config.input_option_helpers,
             **options

data/lib/servactory/inputs/input.rb

@@ -3,7 +3,7 @@
 module Servactory
   module Inputs
     class Input
-      class Work
+      class Actor
         attr_reader :name,
                     :internal_name,
                     :types,
@@ -35,14 +35,12 @@ module Servactory
         name,
         *helpers,
         as: nil,
-        collection_mode_class_names:,
         hash_mode_class_names:,
         option_helpers:,
         **options
       )
         @name = name
         @internal_name = as.present? ? as : name
-        @collection_mode_class_names = collection_mode_class_names
         @hash_mode_class_names = hash_mode_class_names
         @option_helpers = option_helpers
 
@@ -70,14 +68,12 @@ module Servactory
 
         options_registrar = Servactory::Maintenance::Attributes::Options::Registrar.register(
           attribute: self,
-          collection_mode_class_names: @collection_mode_class_names,
           hash_mode_class_names: @hash_mode_class_names,
           options: options,
           features: {
             required: true,
             types: true,
             default: true,
-            collection: true,
             hash: true,
             inclusion: true,
             must: true,
@@ -106,7 +102,7 @@ module Servactory
           prepared_options.deep_merge!(prepared_option)
         end
 
-        options.merge(prepared_options)
+        options.deep_merge(prepared_options)
       end
 
       def options_for_checks

data/lib/servactory/inputs/tools/rules.rb

@@ -28,9 +28,8 @@ module Servactory
         end
 
         def raise_error_for(input)
-          message_text = I18n.t(
-            "servactory.inputs.tools.rules.error",
-            service_class_name: @context.class.name,
+          message_text = @context.send(:servactory_service_info).translate(
+            "inputs.tools.rules.error",
             input_name: input.name,
             conflict_code: input.conflict_code
           )

data/lib/servactory/inputs/tools/unnecessary.rb

@@ -17,9 +17,8 @@ module Servactory
         def find!
           return if unnecessary_attributes.empty?
 
-          message_text = I18n.t(
-            "servactory.inputs.tools.find_unnecessary.error",
-            service_class_name: @context.class.name,
+          message_text = @context.send(:servactory_service_info).translate(
+            "inputs.tools.find_unnecessary.error",
             unnecessary_attributes: unnecessary_attributes.join(", ")
           )
 

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

@@ -7,13 +7,9 @@ module Servactory
         module_function
 
         def default_message
-          lambda do |service_class_name:, input:, value:|
-            i18n_key = "servactory.inputs.validations.required.default_error."
-            i18n_key += input.collection_mode? && value.present? ? "for_collection" : "default"
-
-            I18n.t(
-              i18n_key,
-              service_class_name: service_class_name,
+          lambda do |service:, input:, **|
+            service.translate(
+              "inputs.validations.required.default_error.default",
               input_name: input.name
             )
           end

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

@@ -25,11 +25,7 @@ module Servactory
         end
 
         def check
-          if @input.collection_mode? && Servactory::Utils.value_present?(@value)
-            return if collection_valid?
-          elsif Servactory::Utils.value_present?(@value)
-            return
-          end
+          return if Servactory::Utils.value_present?(@value)
 
           _, message = @input.required.values_at(:is, :message)
 
@@ -38,18 +34,10 @@ module Servactory
 
         private
 
-        def collection_valid?
-          collection_valid_for?(values: @value)
-        end
-
-        def collection_valid_for?(values:)
-          values.respond_to?(:all?) && values.flatten.all?(&:present?)
-        end
-
         def add_error_with(message)
           add_error(
             message: message.presence || Servactory::Inputs::Translator::Required.default_message,
-            service_class_name: @context.class.name,
+            service: @context.send(:servactory_service_info),
             input: @input,
             value: @value
           )

data/lib/servactory/internals/dsl.rb

@@ -20,7 +20,6 @@ module Servactory
           collection_of_internals << Internal.new(
             name,
             *helpers,
-            collection_mode_class_names: config.collection_mode_class_names,
             hash_mode_class_names: config.hash_mode_class_names,
             option_helpers: config.internal_option_helpers,
             **options

data/lib/servactory/internals/internal.rb

@@ -3,7 +3,7 @@
 module Servactory
   module Internals
     class Internal
-      class Work
+      class Actor
         attr_reader :name,
                     :types,
                     :inclusion
@@ -28,13 +28,11 @@ module Servactory
       def initialize(
         name,
         *helpers,
-        collection_mode_class_names:,
         hash_mode_class_names:,
         option_helpers:,
         **options
       )
         @name = name
-        @collection_mode_class_names = collection_mode_class_names
         @hash_mode_class_names = hash_mode_class_names
         @option_helpers = option_helpers
 
@@ -61,12 +59,10 @@ module Servactory
 
         options_registrar = Servactory::Maintenance::Attributes::Options::Registrar.register(
           attribute: self,
-          collection_mode_class_names: @collection_mode_class_names,
           hash_mode_class_names: @hash_mode_class_names,
           options: options,
           features: {
             types: true,
-            collection: true,
             hash: true,
             inclusion: true,
             must: true
@@ -94,7 +90,7 @@ module Servactory
           prepared_options.deep_merge!(prepared_option)
         end
 
-        options.merge(prepared_options)
+        options.deep_merge(prepared_options)
       end
 
       def options_for_checks