servactory 2.12.0.rc1 → 2.12.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42d8f2391ba24198b46219e80408d7bf1d304faca0dfd5a99e89ac841d246fe4
-  data.tar.gz: 93748b84e352a85641a18e2f50f7fbc1668c7d037a613b95f8ed47fe02fce079
+  metadata.gz: 8d25dddc86ece8552d4644707ec8ed928d743287e7b6d8cac5b6651c2f4376b4
+  data.tar.gz: 75954babfecf8c47e89961b6a3795b66264d34c09a9362e6ea30891d2453b156
 SHA512:
-  metadata.gz: 45895d6e4182f0ccdb4fd0c37e030232d809d8fb14d6117f793c5abac5292ceb172d5cd1aeb1fc48cb3cbda70e0ce4ba08a8752744f4776f431136b2c7b1dc8e
-  data.tar.gz: 97e972f65d377eec5eb1224d54c440e7cca90c66a32fd2fd398e87c482f355110fbc39453cfdca799b45e59af259bf5e393c039181e23f59ecb41bbfe5d478aa
+  metadata.gz: 3d5e14c6eed833a4e2181cbf68d87a69b869a7b98479402a26feb1b1ab2404cb5d74ec3e9cfa6a858a1b059980d3164bcf6c63c4faaddbf57925363a2cd3588b
+  data.tar.gz: cf7f8c2c6fd19d0f743e610a8de747f00fe0e885aa0c62ff392be27522a2d8d7dc88a8cbdd3916099ca4f21f8efcc5132d0ef3f995e37f8c5993bbca9dc207d6

data/config/locales/en.yml

@@ -12,8 +12,6 @@ en:
         for_fetch: "[%{service_class_name}] Undefined input attribute `%{input_name}`"
         for_assign: "[%{service_class_name}] Undefined input attribute `%{input_name}`"
       validations:
-        inclusion:
-          default_error: "[%{service_class_name}] Wrong value in `%{input_name}`, must be one of `%{input_inclusion}`"
         must:
           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}"
@@ -26,6 +24,8 @@ en:
               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"
               unknown: "[%{service_class_name}] Unknown `%{format_name}` format specified for input `%{input_name}`"
+            inclusion:
+              default: "[%{service_class_name}] Wrong value in `%{input_name}`, must be one of `%{input_inclusion}`, got `%{value}`"
             min:
               default: "[%{service_class_name}] Input `%{input_name}` received value `%{value}`, which is less than `%{option_value}`"
             max:
@@ -52,8 +52,6 @@ en:
         for_fetch: "[%{service_class_name}] Undefined internal attribute `%{internal_name}`"
         for_assign: "[%{service_class_name}] Undefined internal attribute `%{internal_name}`"
       validations:
-        inclusion:
-          default_error: "[%{service_class_name}] Wrong value in `%{internal_name}`, must be one of `%{internal_inclusion}`"
         must:
           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}"
@@ -66,6 +64,8 @@ en:
               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"
               unknown: "[%{service_class_name}] Unknown `%{format_name}` format specified for internal attribute `%{internal_name}`"
+            inclusion:
+              default: "[%{service_class_name}] Wrong value in `%{internal_name}`, must be one of `%{internal_inclusion}`, got `%{value}`"
             min:
               default: "[%{service_class_name}] Internal attribute `%{internal_name}` received value `%{value}`, which is less than `%{option_value}`"
             max:
@@ -84,8 +84,6 @@ en:
         for_fetch: "[%{service_class_name}] Undefined output attribute `%{output_name}`"
         for_assign: "[%{service_class_name}] Undefined output attribute `%{output_name}`"
       validations:
-        inclusion:
-          default_error: "[%{service_class_name}] Wrong value in `%{output_name}`, must be one of `%{output_inclusion}`"
         must:
           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}"
@@ -98,6 +96,8 @@ en:
               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"
               unknown: "[%{service_class_name}] Unknown `%{format_name}` format specified for output attribute `%{output_name}`"
+            inclusion:
+              default: "[%{service_class_name}] Wrong value in `%{output_name}`, must be one of `%{output_inclusion}`, got `%{value}`"
             min:
               default: "[%{service_class_name}] Output attribute `%{output_name}` received value `%{value}`, which is less than `%{option_value}`"
             max:

data/config/locales/ru.yml

@@ -12,8 +12,6 @@ ru:
         for_fetch: "[%{service_class_name}] Неизвестный входящий атрибут `%{input_name}`"
         for_assign: "[%{service_class_name}] Неизвестный входящий атрибут `%{input_name}`"
       validations:
-        inclusion:
-          default_error: "[%{service_class_name}] Неправильное значение в `%{input_name}`, должно быть одним из `%{input_inclusion}`"
         must:
           default_error: "[%{service_class_name}] Инпут `%{input_name}` должен \"%{code}\""
           syntax_error: "[%{service_class_name}] Синтаксическая ошибка внутри `%{code}` инпута `%{input_name}`: %{exception_message}"
@@ -26,6 +24,8 @@ ru:
               default: "[%{service_class_name}] Инпут `%{input_name}` не соответствует формату `%{format_name}`"
               wrong_pattern: "[%{service_class_name}] Инпут `%{input_name}` не соответствует формату `%{format_name}`"
               unknown: "[%{service_class_name}] Указан неизвестный формат `%{format_name}` у инпута `%{input_name}`"
+            inclusion:
+              default: "[%{service_class_name}] Неправильное значение в `%{input_name}`, должно быть одним из `%{input_inclusion}`, получено `%{value}`"
             min:
               default: "[%{service_class_name}] Инпут `%{input_name}` получил значение `%{value}`, которое меньше `%{option_value}`"
             max:
@@ -52,8 +52,6 @@ ru:
         for_fetch: "[%{service_class_name}] Неизвестный внутренний атрибут `%{internal_name}`"
         for_assign: "[%{service_class_name}] Неизвестный внутренний атрибут `%{internal_name}`"
       validations:
-        inclusion:
-          default_error: "[%{service_class_name}] Неправильное значение в `%{internal_name}`, должно быть одним из `%{internal_inclusion}`"
         must:
           default_error: "[%{service_class_name}] Внутренний атрибут `%{internal_name}` должен \"%{code}\""
           syntax_error: "[%{service_class_name}] Синтаксическая ошибка внутри `%{code}` внутреннего атрибута `%{internal_name}`: %{exception_message}"
@@ -66,6 +64,8 @@ ru:
               default: "[%{service_class_name}] Внутренний атрибут `%{internal_name}` не соответствует формату `%{format_name}`"
               wrong_pattern: "[%{service_class_name}] Внутренний атрибут `%{internal_name}` не соответствует формату `%{format_name}`"
               unknown: "[%{service_class_name}] Указан неизвестный формат `%{format_name}` у внутреннего атрибута `%{internal_name}`"
+            inclusion:
+              default: "[%{service_class_name}] Неправильное значение в `%{internal_name}`, должно быть одним из `%{internal_inclusion}`, получено `%{value}`"
             min:
               default: "[%{service_class_name}] Внутренний атрибут `%{internal_name}` получил значение `%{value}`, которое меньше `%{option_value}`"
             max:
@@ -84,8 +84,6 @@ ru:
         for_fetch: "[%{service_class_name}] Неизвестный выходящий атрибут `%{output_name}`"
         for_assign: "[%{service_class_name}] Неизвестный выходящий атрибут `%{output_name}`"
       validations:
-        inclusion:
-          default_error: "[%{service_class_name}] Неправильное значение в `%{output_name}`, должно быть одним из `%{output_inclusion}`"
         must:
           default_error: "[%{service_class_name}] Выходящий атрибут `%{output_name}` должен \"%{code}\""
           syntax_error: "[%{service_class_name}] Синтаксическая ошибка внутри `%{code}` выходящего атрибута `%{output_name}`: %{exception_message}"
@@ -98,6 +96,8 @@ ru:
               default: "[%{service_class_name}] Выходящий атрибут `%{output_name}` не соответствует формату `%{format_name}`"
               wrong_pattern: "[%{service_class_name}] Выходящий атрибут `%{output_name}` не соответствует формату `%{format_name}`"
               unknown: "[%{service_class_name}] Указан неизвестный формат `%{format_name}` у выходящего атрибута `%{output_name}`"
+            inclusion:
+              default: "[%{service_class_name}] Неправильное значение в `%{output_name}`, должно быть одним из `%{output_inclusion}`, получено `%{value}`"
             min:
               default: "[%{service_class_name}] Выходящий атрибут `%{output_name}` получил значение `%{value}`, которое меньше `%{option_value}`"
             max:

data/lib/servactory/configuration/option_helpers/option_helpers_collection.rb

@@ -5,12 +5,16 @@ module Servactory
     module OptionHelpers
       class OptionHelpersCollection
         extend Forwardable
-        def_delegators :@collection, :<<, :find, :merge
+        def_delegators :@collection, :<<, :filter, :map, :find, :merge
 
         def initialize(collection = Set.new)
           @collection = collection
         end
 
+        def dynamic_options
+          OptionHelpersCollection.new(filter(&:dynamic_option?))
+        end
+
         def find_by(name:)
           find { |helper| helper.name == name }
         end

data/lib/servactory/configuration/setup.rb

@@ -71,19 +71,22 @@ module Servactory
       def default_input_option_helpers
         Set[
           Servactory::Maintenance::Attributes::OptionHelper.new(name: :optional, equivalent: { required: false }),
-          Servactory::ToolKit::DynamicOptions::ConsistsOf.use(collection_mode_class_names:)
+          Servactory::ToolKit::DynamicOptions::ConsistsOf.use(collection_mode_class_names:),
+          Servactory::ToolKit::DynamicOptions::Inclusion.use
         ]
       end
 
       def default_internal_option_helpers
         Set[
-          Servactory::ToolKit::DynamicOptions::ConsistsOf.use(collection_mode_class_names:)
+          Servactory::ToolKit::DynamicOptions::ConsistsOf.use(collection_mode_class_names:),
+          Servactory::ToolKit::DynamicOptions::Inclusion.use
         ]
       end
 
       def default_output_option_helpers
         Set[
-          Servactory::ToolKit::DynamicOptions::ConsistsOf.use(collection_mode_class_names:)
+          Servactory::ToolKit::DynamicOptions::ConsistsOf.use(collection_mode_class_names:),
+          Servactory::ToolKit::DynamicOptions::Inclusion.use
         ]
       end
     end

data/lib/servactory/info/builder.rb

@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+module Servactory
+  module Info
+    class Builder
+      attr_reader :inputs,
+                  :internals,
+                  :outputs
+
+      def self.build(...)
+        new.build(...)
+      end
+
+      def build(collection_of_inputs:, collection_of_internals:, collection_of_outputs:, config:)
+        dynamic_options = config.input_option_helpers.dynamic_options
+
+        build_inputs_with(collection_of_inputs:, dynamic_options:)
+        build_internals_with(collection_of_internals:, dynamic_options:)
+        build_outputs_with(collection_of_outputs:, dynamic_options:)
+
+        self
+      end
+
+      private
+
+      def build_inputs_with(collection_of_inputs:, dynamic_options:)
+        @inputs = collection_of_inputs.to_h do |input|
+          options = build_options_for(input, dynamic_options)
+          options = enrich_options_for(input, options)
+
+          options[:required] = input.required
+          options[:default] = input.default
+
+          [
+            input.name,
+            options
+          ]
+        end
+      end
+
+      def build_internals_with(collection_of_internals:, dynamic_options:)
+        @internals = collection_of_internals.to_h do |internal|
+          options = build_options_for(internal, dynamic_options)
+          options = enrich_options_for(internal, options)
+
+          [
+            internal.name,
+            options
+          ]
+        end
+      end
+
+      def build_outputs_with(collection_of_outputs:, dynamic_options:)
+        @outputs = collection_of_outputs.to_h do |output|
+          options = build_options_for(output, dynamic_options)
+          options = enrich_options_for(output, options)
+
+          [
+            output.name,
+            options
+          ]
+        end
+      end
+
+      ##########################################################################
+
+      def build_options_for(attribute, dynamic_options)
+        attribute.options.to_h do |key, value|
+          dynamic_option = dynamic_options.find_by(name: key)
+
+          next [nil, nil] if dynamic_option.nil?
+
+          body_key = dynamic_option.meta.fetch(:body_key)
+
+          option = build_option_from(body_key:, value:)
+
+          [
+            dynamic_option.name,
+            option
+          ]
+        end.compact
+      end
+
+      def build_option_from(body_key:, value:)
+        {
+          body_key => value.is_a?(Hash) ? value.fetch(body_key, value) : value,
+          message: value.is_a?(Hash) ? value.fetch(:message, nil) : nil
+        }
+      end
+
+      def enrich_options_for(attribute, options)
+        actor = attribute.class::Actor.new(attribute)
+        must = attribute.collection_of_options.find_by(name: :must)
+
+        options.merge(
+          actor:,
+          types: attribute.types,
+          must: must.body
+        )
+      end
+    end
+  end
+end

data/lib/servactory/info/dsl.rb

@@ -8,58 +8,15 @@ module Servactory
       end
 
       module ClassMethods
-        def info # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-          Servactory::Info::Result.new(
-            inputs: collection_of_inputs.to_h do |input|
-              actor = input.class::Actor.new(input)
-              inclusion = input.collection_of_options.find_by(name: :inclusion)
-              must = input.collection_of_options.find_by(name: :must)
-
-              [
-                input.name,
-                {
-                  actor:,
-                  types: input.types,
-                  required: input.required,
-                  default: input.default,
-                  inclusion: inclusion.body,
-                  must: must.body
-                }
-              ]
-            end,
-
-            internals: collection_of_internals.to_h do |internal|
-              actor = internal.class::Actor.new(internal)
-              inclusion = internal.collection_of_options.find_by(name: :inclusion)
-              must = internal.collection_of_options.find_by(name: :must)
-
-              [
-                internal.name,
-                {
-                  actor:,
-                  types: internal.types,
-                  inclusion: inclusion.body,
-                  must: must.body
-                }
-              ]
-            end,
-
-            outputs: collection_of_outputs.to_h do |output|
-              actor = output.class::Actor.new(output)
-              inclusion = output.collection_of_options.find_by(name: :inclusion)
-              must = output.collection_of_options.find_by(name: :must)
-
-              [
-                output.name,
-                {
-                  actor:,
-                  types: output.types,
-                  inclusion: inclusion.body,
-                  must: must.body
-                }
-              ]
-            end
+        def info
+          builder = Builder.build(
+            collection_of_inputs:,
+            collection_of_internals:,
+            collection_of_outputs:,
+            config:
           )
+
+          Result.new(builder)
         end
       end
     end

data/lib/servactory/info/result.rb

@@ -7,10 +7,10 @@ module Servactory
                   :internals,
                   :outputs
 
-      def initialize(inputs:, internals:, outputs:)
-        @inputs = inputs
-        @internals = internals
-        @outputs = outputs
+      def initialize(builder)
+        @inputs = builder.inputs
+        @internals = builder.internals
+        @outputs = builder.outputs
       end
     end
   end

data/lib/servactory/inputs/input.rb

@@ -7,13 +7,15 @@ module Servactory
         attr_reader :name,
                     :internal_name,
                     :types,
-                    :inclusion
+                    :default,
+                    :options
 
-        def initialize(input) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+        def initialize(input) # rubocop:disable Metrics/MethodLength
           @name = input.name
           @internal_name = input.internal_name
           @types = input.types
-          @inclusion = input.inclusion.slice(:in) if input.inclusion_present?
+          @default = input.default
+          @options = input.options
 
           define_singleton_method(:system_name) { input.system_name }
           define_singleton_method(:i18n_name) { input.i18n_name }
@@ -28,7 +30,8 @@ module Servactory
 
       attr_reader :name,
                   :internal_name,
-                  :collection_of_options
+                  :collection_of_options,
+                  :options
 
       # rubocop:disable Style/KeywordParametersOrder
       def initialize(
@@ -75,12 +78,12 @@ module Servactory
             types: true,
             default: true,
             hash: true,
-            inclusion: true,
             must: true,
             prepare: true
           }
         )
 
+        @options = options
         @collection_of_options = options_registrar.collection
       end
 

data/lib/servactory/internals/internal.rb

@@ -6,12 +6,12 @@ module Servactory
       class Actor
         attr_reader :name,
                     :types,
-                    :inclusion
+                    :options
 
         def initialize(internal)
           @name = internal.name
           @types = internal.types
-          @inclusion = internal.inclusion.slice(:in) if internal.inclusion_present?
+          @options = internal.options
 
           define_singleton_method(:system_name) { internal.system_name }
           define_singleton_method(:i18n_name) { internal.i18n_name }
@@ -23,7 +23,8 @@ module Servactory
       end
 
       attr_reader :name,
-                  :collection_of_options
+                  :collection_of_options,
+                  :options
 
       def initialize(
         name,
@@ -64,11 +65,11 @@ module Servactory
           features: {
             types: true,
             hash: true,
-            inclusion: true,
             must: true
           }
         )
 
+        @options = options
         @collection_of_options = options_registrar.collection
       end
 

data/lib/servactory/maintenance/attributes/option_helper.rb

@@ -5,11 +5,17 @@ module Servactory
     module Attributes
       class OptionHelper
         attr_reader :name,
-                    :equivalent
+                    :equivalent,
+                    :meta
 
-        def initialize(name:, equivalent:)
+        def initialize(name:, equivalent:, meta: {})
           @name = name
           @equivalent = equivalent
+          @meta = meta
+        end
+
+        def dynamic_option?
+          meta[:type] == :dynamic_option
         end
       end
     end

data/lib/servactory/maintenance/attributes/options/registrar.rb

@@ -11,7 +11,6 @@ module Servactory
             default
             collection
             hash
-            inclusion
             must
             prepare
           ].freeze
@@ -21,7 +20,6 @@ module Servactory
             types: false,
             default: false,
             hash: false,
-            inclusion: false,
             must: false,
             prepare: false
           }.freeze
@@ -41,7 +39,7 @@ module Servactory
 
           ########################################################################
 
-          def register # rubocop:disable Metrics/CyclomaticComplexity
+          def register
             # Validation Class: Servactory::Inputs::Validations::Required
             register_required_option if @features.fetch(:required)
 
@@ -50,9 +48,6 @@ module Servactory
             register_default_option if @features.fetch(:default)
             register_hash_option if @features.fetch(:hash)
 
-            # Validation Class: Servactory::Maintenance::Attributes::Validations::Inclusion
-            register_inclusion_option if @features.fetch(:inclusion)
-
             # Validation Class: Servactory::Maintenance::Attributes::Validations::Must
             register_must_option if @features.fetch(:must)
 
@@ -132,11 +127,6 @@ module Servactory
                   content: ->(**) { @hash_mode_class_names.include?(@options.fetch(:type)) }
                 )
               ],
-              define_conflicts: [
-                Servactory::Maintenance::Attributes::DefineConflict.new(
-                  content: -> { :object_vs_inclusion if @attribute.hash_mode? && @attribute.inclusion_present? }
-                )
-              ],
               need_for_checks: false,
               body_key: :is,
               body_fallback: {},
@@ -144,24 +134,6 @@ module Servactory
             )
           end
 
-          def register_inclusion_option # rubocop:disable Metrics/MethodLength
-            collection << Servactory::Maintenance::Attributes::Option.new(
-              name: :inclusion,
-              attribute: @attribute,
-              validation_class: Servactory::Maintenance::Attributes::Validations::Inclusion,
-              define_methods: [
-                Servactory::Maintenance::Attributes::DefineMethod.new(
-                  name: :inclusion_present?,
-                  content: ->(option:) { option[:in].is_a?(Array) && option[:in].present? }
-                )
-              ],
-              need_for_checks: true,
-              body_key: :in,
-              body_fallback: nil,
-              **@options
-            )
-          end
-
           def register_must_option # rubocop:disable Metrics/MethodLength
             collection << Servactory::Maintenance::Attributes::Option.new(
               name: :must,
@@ -192,11 +164,6 @@ module Servactory
                   content: ->(option:) { option[:in].present? }
                 )
               ],
-              define_conflicts: [
-                Servactory::Maintenance::Attributes::DefineConflict.new(
-                  content: -> { :prepare_vs_inclusion if @attribute.prepare_present? && @attribute.inclusion_present? }
-                )
-              ],
               need_for_checks: false,
               body_key: :in,
               body_fallback: false,

data/lib/servactory/outputs/output.rb

@@ -6,12 +6,12 @@ module Servactory
       class Actor
         attr_reader :name,
                     :types,
-                    :inclusion
+                    :options
 
         def initialize(output)
           @name = output.name
           @types = output.types
-          @inclusion = output.inclusion.slice(:in) if output.inclusion_present?
+          @options = output.options
 
           define_singleton_method(:system_name) { output.system_name }
           define_singleton_method(:i18n_name) { output.i18n_name }
@@ -23,7 +23,8 @@ module Servactory
       end
 
       attr_reader :name,
-                  :collection_of_options
+                  :collection_of_options,
+                  :options
 
       def initialize(
         name,
@@ -64,11 +65,11 @@ module Servactory
           features: {
             types: true,
             hash: true,
-            inclusion: true,
             must: true
           }
         )
 
+        @options = options
         @collection_of_options = options_registrar.collection
       end
 

data/lib/servactory/test_kit/rspec/matchers/have_service_attribute_matchers/consists_of_matcher.rb

@@ -49,17 +49,29 @@ module Servactory
                         :custom_message,
                         :attribute_data
 
-            def submatcher_passes?(_subject)
-              attribute_must = attribute_data.fetch(:must)
+            def submatcher_passes?(_subject) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/PerceivedComplexity
+              attribute_consists_of = attribute_data.fetch(:consists_of)
+              attribute_consists_of_types = Array(attribute_consists_of.fetch(:type))
+              attribute_consists_of_message = attribute_consists_of.fetch(:message)
 
-              attribute_must_keys = attribute_must.keys
+              matched = attribute_consists_of_types.difference(consists_of_types).empty? &&
+                        consists_of_types.difference(attribute_consists_of_types).empty?
 
-              expected_keys = %i[consists_of]
-
-              attribute_must_keys = attribute_must_keys.select { |key| expected_keys.include?(key) }
+              if custom_message.present? && !attribute_consists_of_message.nil?
+                if custom_message.is_a?(RSpec::Matchers::BuiltIn::BaseMatcher)
+                  RSpec::Expectations::ValueExpectationTarget
+                    .new(attribute_consists_of_message)
+                    .to(custom_message)
+                else
+                  matched &&= if attribute_consists_of_message.is_a?(Proc)
+                                attribute_consists_of_message.call.casecmp(custom_message).zero?
+                              else
+                                attribute_consists_of_message.casecmp(custom_message).zero?
+                              end
+                end
+              end
 
-              attribute_must_keys.difference(expected_keys).empty? &&
-                expected_keys.difference(attribute_must_keys).empty?
+              matched
             end
 
             def build_missing_option

data/lib/servactory/test_kit/rspec/matchers/have_service_attribute_matchers/inclusion_matcher.rb

@@ -8,12 +8,13 @@ module Servactory
           class InclusionMatcher
             attr_reader :missing_option
 
-            def initialize(described_class, attribute_type, attribute_name, values)
+            def initialize(described_class, attribute_type, attribute_name, values, custom_message)
               @described_class = described_class
               @attribute_type = attribute_type
               @attribute_type_plural = attribute_type.to_s.pluralize.to_sym
               @attribute_name = attribute_name
               @values = values
+              @custom_message = custom_message
 
               @attribute_data = described_class.info.public_send(attribute_type_plural).fetch(attribute_name)
 
@@ -41,14 +42,32 @@ module Servactory
                         :attribute_type_plural,
                         :attribute_name,
                         :values,
+                        :custom_message,
                         :attribute_data
 
-            def submatcher_passes?(_subject)
+            def submatcher_passes?(_subject) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/PerceivedComplexity
               attribute_inclusion = attribute_data.fetch(:inclusion)
               attribute_inclusion_in = attribute_inclusion.fetch(:in)
+              attribute_inclusion_message = attribute_inclusion.fetch(:message)
 
-              attribute_inclusion_in.difference(values).empty? &&
-                values.difference(attribute_inclusion_in).empty?
+              matched = attribute_inclusion_in.difference(values).empty? &&
+                        values.difference(attribute_inclusion_in).empty?
+
+              if custom_message.present? && !attribute_inclusion_message.nil?
+                if custom_message.is_a?(RSpec::Matchers::BuiltIn::BaseMatcher)
+                  RSpec::Expectations::ValueExpectationTarget
+                    .new(attribute_inclusion_message)
+                    .to(custom_message)
+                else
+                  matched &&= if attribute_inclusion_message.is_a?(Proc)
+                                attribute_inclusion_message.call.casecmp(custom_message).zero?
+                              else
+                                attribute_inclusion_message.casecmp(custom_message).zero?
+                              end
+                end
+              end
+
+              matched
             end
 
             def build_missing_option

data/lib/servactory/test_kit/rspec/matchers/have_service_input_matcher.rb

@@ -100,12 +100,15 @@ module Servactory
           end
 
           def inclusion(values)
+            message = block_given? ? yield : nil
+
             add_submatcher(
               HaveServiceAttributeMatchers::InclusionMatcher,
               described_class,
               :input,
               input_name,
-              Array(values)
+              Array(values),
+              message
             )
             self
           end

data/lib/servactory/test_kit/rspec/matchers/have_service_input_matchers/valid_with_matcher.rb

@@ -5,6 +5,7 @@ module Servactory
     module Rspec
       module Matchers
         module HaveServiceInputMatchers
+          # DEPRECATED: This chain is planned to be decommissioned.
           class ValidWithMatcher # rubocop:disable Metrics/ClassLength
             attr_reader :missing_option
 
@@ -122,7 +123,7 @@ module Servactory
             end
 
             def failure_inclusion_passes? # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-              input_inclusion_in = attribute_data.fetch(:inclusion).fetch(:in)
+              input_inclusion_in = attribute_data.fetch(:inclusion, {}).fetch(:in, nil)
 
               return true if input_inclusion_in.blank?
 
@@ -135,11 +136,11 @@ module Servactory
 
               if input_required_message.nil?
                 input_required_message = I18n.t(
-                  "#{i18n_root_key}.#{attribute_type_plural}.validations.inclusion.default_error",
+                  "#{i18n_root_key}.#{attribute_type_plural}.validations.must.dynamic_options.inclusion.default",
                   service_class_name: described_class.name,
                   "#{attribute_type}_name": attribute_name,
-                  "#{attribute_type}_inclusion": input_inclusion_in,
-                  value: wrong_value
+                  "#{attribute_type}_inclusion": input_inclusion_in.inspect,
+                  value: wrong_value.inspect
                 )
               elsif input_required_message.is_a?(Proc)
                 service_class = Struct.new(:class_name, keyword_init: true)

data/lib/servactory/test_kit/rspec/matchers/have_service_internal_matcher.rb

@@ -66,12 +66,15 @@ module Servactory
           end
 
           def inclusion(values)
+            message = block_given? ? yield : nil
+
             add_submatcher(
               HaveServiceAttributeMatchers::InclusionMatcher,
               described_class,
               :internal,
               internal_name,
-              Array(values)
+              Array(values),
+              message
             )
             self
           end

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

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+module Servactory
+  module ToolKit
+    module DynamicOptions
+      class Inclusion < Must
+        def self.use(option_name = :inclusion)
+          instance = new(option_name, :in)
+          instance.must(:be_inclusion)
+        end
+
+        def condition_for_input_with(input:, value:, option:)
+          if input.required? || (
+            input.optional? && !input.default.nil?
+          ) || (
+            input.optional? && !value.nil?
+          ) # do
+            return option.value.include?(value)
+          end
+
+          true
+        end
+
+        def condition_for_internal_with(value:, option:, **)
+          option.value.include?(value)
+        end
+
+        def condition_for_output_with(value:, option:, **)
+          option.value.include?(value)
+        end
+
+        ########################################################################
+
+        def message_for_input_with(service:, input:, value:, option_value:, **)
+          service.translate(
+            "inputs.validations.must.dynamic_options.inclusion.default",
+            input_name: input.name,
+            value: value.inspect,
+            input_inclusion: option_value.inspect
+          )
+        end
+
+        def message_for_internal_with(service:, internal:, value:, option_value:, **)
+          service.translate(
+            "internals.validations.must.dynamic_options.inclusion.default",
+            internal_name: internal.name,
+            value: value.inspect,
+            internal_inclusion: option_value.inspect
+          )
+        end
+
+        def message_for_output_with(service:, output:, value:, option_value:, **)
+          service.translate(
+            "outputs.validations.must.dynamic_options.inclusion.default",
+            output_name: output.name,
+            value: value.inspect,
+            output_inclusion: option_value.inspect
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -34,7 +34,11 @@ module Servactory
         def must(name)
           Servactory::Maintenance::Attributes::OptionHelper.new(
             name: @option_name,
-            equivalent: equivalent_with(name)
+            equivalent: equivalent_with(name),
+            meta: {
+              type: :dynamic_option,
+              body_key: @body_key
+            }
           )
         end
 

data/lib/servactory/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: servactory
 version: !ruby/object:Gem::Version
-  version: 2.12.0.rc1
+  version: 2.12.0.rc2
 platform: ruby
 authors:
 - Anton Sokolov
 bindir: bin
 cert_chain: []
-date: 2025-02-08 00:00:00.000000000 Z
+date: 2025-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -266,6 +266,7 @@ files:
 - lib/servactory/exceptions/internal.rb
 - lib/servactory/exceptions/output.rb
 - lib/servactory/exceptions/success.rb
+- lib/servactory/info/builder.rb
 - lib/servactory/info/dsl.rb
 - lib/servactory/info/result.rb
 - lib/servactory/inputs/collection.rb
@@ -291,12 +292,10 @@ files:
 - lib/servactory/maintenance/attributes/options_collection.rb
 - lib/servactory/maintenance/attributes/tools/check_errors.rb
 - lib/servactory/maintenance/attributes/tools/validation.rb
-- lib/servactory/maintenance/attributes/translator/inclusion.rb
 - lib/servactory/maintenance/attributes/translator/must.rb
 - lib/servactory/maintenance/attributes/translator/type.rb
 - lib/servactory/maintenance/attributes/validations/base.rb
 - lib/servactory/maintenance/attributes/validations/errors.rb
-- lib/servactory/maintenance/attributes/validations/inclusion.rb
 - lib/servactory/maintenance/attributes/validations/must.rb
 - lib/servactory/maintenance/attributes/validations/type.rb
 - lib/servactory/maintenance/validations/object_schema.rb
@@ -322,6 +321,7 @@ files:
 - lib/servactory/test_kit/utils/faker.rb
 - lib/servactory/tool_kit/dynamic_options/consists_of.rb
 - lib/servactory/tool_kit/dynamic_options/format.rb
+- lib/servactory/tool_kit/dynamic_options/inclusion.rb
 - lib/servactory/tool_kit/dynamic_options/max.rb
 - lib/servactory/tool_kit/dynamic_options/min.rb
 - lib/servactory/tool_kit/dynamic_options/multiple_of.rb

data/lib/servactory/maintenance/attributes/translator/inclusion.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Maintenance
-    module Attributes
-      module Translator
-        module Inclusion
-          module_function
-
-          def default_message
-            lambda do |service:, value:, input: nil, internal: nil, output: nil|
-              attribute = Servactory::Utils.define_attribute_with(input:, internal:, output:)
-
-              service.translate(
-                "#{attribute.i18n_name}.validations.inclusion.default_error",
-                "#{attribute.system_name}_name": attribute.name,
-                "#{attribute.system_name}_inclusion": attribute.inclusion[:in],
-                value:
-              )
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/servactory/maintenance/attributes/validations/inclusion.rb

@@ -1,63 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Maintenance
-    module Attributes
-      module Validations
-        class Inclusion < Base
-          def self.check(context:, attribute:, value:, check_key:, **)
-            return unless should_be_checked_for?(attribute, value, check_key)
-
-            new(context:, attribute:, value:).check
-          end
-
-          # rubocop:disable Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-          def self.should_be_checked_for?(attribute, value, check_key)
-            check_key == :inclusion && (
-              (
-                attribute.input? && (
-                  attribute.required? || (
-                    attribute.optional? && !attribute.default.nil?
-                  ) || (
-                    attribute.optional? && !value.nil?
-                  )
-                )
-              ) || attribute.internal? || attribute.output?
-            )
-          end
-          # rubocop:enable Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-
-          ##########################################################################
-
-          def initialize(context:, attribute:, value:)
-            super()
-
-            @context = context
-            @attribute = attribute
-            @value = value
-          end
-
-          def check
-            inclusion_in, message = @attribute.inclusion.values_at(:in, :message)
-
-            return if inclusion_in.nil?
-            return if inclusion_in.include?(@value)
-
-            add_error_with(message)
-          end
-
-          private
-
-          def add_error_with(message)
-            add_error(
-              message: message.presence || Servactory::Maintenance::Attributes::Translator::Inclusion.default_message,
-              service: @context.send(:servactory_service_info),
-              **Servactory::Utils.fetch_hash_with_desired_attribute(@attribute),
-              value: @value
-            )
-          end
-        end
-      end
-    end
-  end
-end