servactory 2.11.0 → 2.12.0.rc2

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

@@ -51,7 +51,7 @@ module Servactory
           validation_class.check(
             context: @context,
             attribute: input,
-            value: @context.send(:servactory_service_store).fetch_input(input.name),
+            value: @context.send(:servactory_service_warehouse).fetch_input(input.name),
             check_key:,
             check_options:
           )

data/lib/servactory/inputs/tools/{store.rb → warehouse.rb}

@@ -3,7 +3,7 @@
 module Servactory
   module Inputs
     module Tools
-      class Store
+      class Warehouse
         def self.assign(...)
           new(...).assign
         end
@@ -14,7 +14,7 @@ module Servactory
         end
 
         def assign
-          @context.send(:servactory_service_store).assign_inputs(adapted_arguments)
+          @context.send(:servactory_service_warehouse).assign_inputs(adapted_arguments)
         end
 
         private

data/lib/servactory/inputs/workspace.rb

@@ -8,7 +8,7 @@ module Servactory
       def call!(incoming_arguments:, **)
         super
 
-        Tools::Store.assign(self, incoming_arguments)
+        Tools::Warehouse.assign(self, incoming_arguments)
 
         Tools::Unnecessary.find!(self, collection_of_inputs)
         Tools::Rules.check!(self, collection_of_inputs)

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/result.rb

@@ -116,7 +116,7 @@ module Servactory
 
     def outputs
       @outputs ||= Outputs.new(
-        outputs: @context.send(:servactory_service_store).outputs,
+        outputs: @context.send(:servactory_service_warehouse).outputs,
         predicate_methods_enabled: if @context.is_a?(Servactory::TestKit::Result)
                                      true
                                    else

data/lib/servactory/test_kit/result.rb

@@ -17,7 +17,7 @@ module Servactory
 
       def initialize(attributes = {})
         attributes.each_pair do |name, value|
-          servactory_service_store.assign_output(name, value)
+          servactory_service_warehouse.assign_output(name, value)
         end
       end
 
@@ -25,8 +25,8 @@ module Servactory
 
       private
 
-      def servactory_service_store
-        @servactory_service_store ||= Servactory::Context::Store.new(self)
+      def servactory_service_warehouse
+        @servactory_service_warehouse ||= Servactory::Context::Warehouse::Setup.new(self)
       end
     end
   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

@@ -3,9 +3,9 @@
 module Servactory
   module VERSION
     MAJOR = 2
-    MINOR = 11
+    MINOR = 12
     PATCH = 0
-    PRE = nil
+    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.11.0
+  version: 2.12.0.rc2
 platform: ruby
 authors:
 - Anton Sokolov
 bindir: bin
 cert_chain: []
-date: 2025-01-01 00:00:00.000000000 Z
+date: 2025-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -189,14 +189,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: steep
   requirement: !ruby/object:Gem::Requirement
@@ -249,7 +249,11 @@ files:
 - lib/servactory/configuration/setup.rb
 - lib/servactory/context/callable.rb
 - lib/servactory/context/dsl.rb
-- lib/servactory/context/store.rb
+- lib/servactory/context/warehouse/base.rb
+- lib/servactory/context/warehouse/inputs.rb
+- lib/servactory/context/warehouse/internals.rb
+- lib/servactory/context/warehouse/outputs.rb
+- lib/servactory/context/warehouse/setup.rb
 - lib/servactory/context/workspace.rb
 - lib/servactory/context/workspace/inputs.rb
 - lib/servactory/context/workspace/internals.rb
@@ -262,15 +266,16 @@ 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
 - lib/servactory/inputs/dsl.rb
 - lib/servactory/inputs/input.rb
 - lib/servactory/inputs/tools/rules.rb
-- lib/servactory/inputs/tools/store.rb
 - lib/servactory/inputs/tools/unnecessary.rb
 - lib/servactory/inputs/tools/validation.rb
+- lib/servactory/inputs/tools/warehouse.rb
 - lib/servactory/inputs/translator/required.rb
 - lib/servactory/inputs/validations/base.rb
 - lib/servactory/inputs/validations/errors.rb
@@ -287,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
@@ -318,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/context/store.rb

@@ -1,71 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Context
-    class Store
-      def initialize(context)
-        @context = context
-      end
-
-      def assign_inputs(arguments)
-        context_data[:inputs].merge!(arguments)
-      end
-
-      def fetch_input(name)
-        inputs.fetch(name, nil)
-      end
-
-      def assign_internal(name, value)
-        assign_attribute(:internals, name, value)
-      end
-
-      def fetch_internal(name)
-        internals.fetch(name, nil)
-      end
-
-      def assign_output(name, value)
-        assign_attribute(:outputs, name, value)
-      end
-
-      def fetch_output(name)
-        outputs.fetch(name, nil)
-      end
-
-      def inputs
-        @inputs ||= context_data.fetch(:inputs)
-      end
-
-      def internals
-        @internals ||= context_data.fetch(:internals)
-      end
-
-      def outputs
-        @outputs ||= context_data.fetch(:outputs)
-      end
-
-      private
-
-      def assign_attribute(section, name, value)
-        context_data[section].merge!({ name => value })
-      end
-
-      def context_data
-        @context_data ||= state.fetch(context_id)
-      end
-
-      def state
-        {
-          context_id => {
-            inputs: {},
-            internals: {},
-            outputs: {}
-          }
-        }
-      end
-
-      def context_id
-        @context_id ||= "context_#{@context.object_id}"
-      end
-    end
-  end
-end

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