servactory 2.0.2 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c804a894a51f06d11d05d6b60e539d2d1540959312330726010327dab9a40ed
-  data.tar.gz: ab85a273c813f528a596d79efe571d3916f694b1daff5d556d652f28dcab2c98
+  metadata.gz: 1f3edad8d15393a6541eee430383fcd03da3ddf339bf6215ddf95d391487dde6
+  data.tar.gz: 7143c15722e8d1183f523126dbf265315f182588b193f233a6f140612c532af0
 SHA512:
-  metadata.gz: a47f20f6976c843de99822ae9b7cd0ba17a9fc59e0d940776f8a2fe66f9145668507ba4bddb21c8a994994eab765d49f0ee656156aa4394e69c768ec831eff60
-  data.tar.gz: 8141c47cd8912dccc02c354cb8c8fa9026238b4c4867de25e1f32c2998aaaf2eb6e4c0ff35e765fced2d585b99f0e458993ac9dfa473674cc07007d2b2ea4033
+  metadata.gz: 0f2f96d3707a5ea5787a837e90e4c3a45ccf0464499525259e357d918ea6173b3e4318ff1f3fc70841f04bfbc2971e2f66fd378bdaf733d82e0237b5dff242ad
+  data.tar.gz: 5aae275ca976e9a4b5d3db1bec44e2a9bcfac18ef53c7b6e6fbd15a874d89970d066073eea09369d80bacc0ce81d6a6190883178d58c92b9965def62f3be809f

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

@@ -7,8 +7,9 @@ module Servactory
         RESERVED_ATTRIBUTES = %i[type required default].freeze
         private_constant :RESERVED_ATTRIBUTES
 
-        def initialize(context:, collection_of_inputs:)
+        def initialize(context:, incoming_arguments:, collection_of_inputs:)
           @context = context
+          @incoming_arguments = incoming_arguments
           @collection_of_inputs = collection_of_inputs
         end
 
@@ -47,19 +48,20 @@ module Servactory
 
           return yield if input.nil?
 
-          input.value = input.default if input.optional? && input.value.blank?
+          input_value = @incoming_arguments.fetch(input.name, nil)
+          input_value = input.default if input.optional? && input_value.blank?
 
           if input.hash_mode? && (tmp_schema = input.schema.fetch(:is)).present?
-            input.value = prepare_hash_values_inside(object: input.value, schema: tmp_schema)
+            input_value = prepare_hash_values_inside(object: input_value, schema: tmp_schema)
           end
 
           input_prepare = input.prepare.fetch(:in, nil)
-          input.value = input_prepare.call(value: input.value) if input_prepare.present?
+          input_value = input_prepare.call(value: input_value) if input_prepare.present?
 
           if name.to_s.end_with?("?")
-            Servactory::Utils.query_attribute(input.value)
+            Servactory::Utils.query_attribute(input_value)
           else
-            input.value
+            input_value
           end
         end
         # rubocop:enable Metrics/MethodLength, Metrics/AbcSize,  Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Lint/UnusedMethodArgument

data/lib/servactory/context/workspace.rb

@@ -6,6 +6,7 @@ module Servactory
       def inputs
         @inputs ||= Inputs.new(
           context: self,
+          incoming_arguments: incoming_arguments,
           collection_of_inputs: collection_of_inputs
         )
       end

data/lib/servactory/inputs/input.rb

@@ -2,14 +2,12 @@
 
 module Servactory
   module Inputs
-    class Input # rubocop:disable Metrics/ClassLength
+    class Input
       attr_accessor :value
 
       attr_reader :name,
                   :internal_name,
-                  :collection_mode_class_names,
-                  :hash_mode_class_names,
-                  :option_helpers
+                  :collection_of_options
 
       # rubocop:disable Style/KeywordParametersOrder
       def initialize(
@@ -27,14 +25,12 @@ module Servactory
         @hash_mode_class_names = hash_mode_class_names
         @option_helpers = option_helpers
 
-        options = apply_helpers_for_options(helpers: helpers, options: options) if helpers.present?
-
-        add_basic_options_with(options)
+        register_options(helpers: helpers, options: options)
       end
       # rubocop:enable Style/KeywordParametersOrder
 
       def method_missing(name, *args, &block)
-        option = collection_of_options.find_by(name: name)
+        option = @collection_of_options.find_by(name: name)
 
         return super if option.nil?
 
@@ -42,14 +38,37 @@ module Servactory
       end
 
       def respond_to_missing?(name, *)
-        collection_of_options.names.include?(name) || super
+        @collection_of_options.names.include?(name) || super
+      end
+
+      def register_options(helpers:, options:) # rubocop:disable Metrics/MethodLength
+        options = apply_helpers_for_options(helpers: helpers, options: options) if helpers.present?
+
+        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,
+            prepare: true
+          }
+        )
+
+        @collection_of_options = options_registrar.collection
       end
 
       def apply_helpers_for_options(helpers:, options:)
         prepared_options = {}
 
         helpers.each do |helper|
-          found_helper = option_helpers.find_by(name: helper)
+          found_helper = @option_helpers.find_by(name: helper)
 
           next if found_helper.blank?
 
@@ -59,206 +78,12 @@ module Servactory
         options.merge(prepared_options)
       end
 
-      def add_basic_options_with(options)
-        # Check Class: Servactory::Inputs::Validations::Required
-        add_required_option_with(options)
-
-        # Check Class: Servactory::Inputs::Validations::Type
-        add_types_option_with(options)
-        add_default_option_with(options)
-        add_collection_option_with(options)
-        add_hash_option_with(options)
-
-        # Check Class: Servactory::Inputs::Validations::Inclusion
-        add_inclusion_option_with(options)
-
-        # Check Class: Servactory::Inputs::Validations::Must
-        add_must_option_with(options)
-
-        # Check Class: nil
-        add_prepare_option_with(options)
-      end
-
-      def add_required_option_with(options) # rubocop:disable Metrics/MethodLength
-        collection_of_options << Servactory::Maintenance::Attributes::Option.new(
-          name: :required,
-          attribute: self,
-          validation_class: Servactory::Inputs::Validations::Required,
-          define_methods: [
-            Servactory::Maintenance::Attributes::DefineMethod.new(
-              name: :required?,
-              content: ->(option:) { Servactory::Utils.true?(option[:is]) }
-            ),
-            Servactory::Maintenance::Attributes::DefineMethod.new(
-              name: :optional?,
-              content: ->(option:) { !Servactory::Utils.true?(option[:is]) }
-            )
-          ],
-          define_conflicts: [
-            Servactory::Maintenance::Attributes::DefineConflict.new(
-              content: -> { :required_vs_default if required? && default_value_present? }
-            )
-          ],
-          need_for_checks: true,
-          body_key: :is,
-          body_fallback: true,
-          **options
-        )
-      end
-
-      def add_types_option_with(options)
-        collection_of_options << Servactory::Maintenance::Attributes::Option.new(
-          name: :types,
-          attribute: self,
-          validation_class: Servactory::Inputs::Validations::Type,
-          original_value: Array(options.fetch(:type)),
-          need_for_checks: true,
-          body_fallback: nil,
-          with_advanced_mode: false
-        )
-      end
-
-      def add_default_option_with(options) # rubocop:disable Metrics/MethodLength
-        collection_of_options << Servactory::Maintenance::Attributes::Option.new(
-          name: :default,
-          attribute: self,
-          validation_class: Servactory::Inputs::Validations::Type,
-          define_methods: [
-            Servactory::Maintenance::Attributes::DefineMethod.new(
-              name: :default_value_present?,
-              content: ->(option:) { !option.nil? }
-            )
-          ],
-          need_for_checks: true,
-          body_fallback: nil,
-          with_advanced_mode: false,
-          **options
-        )
-      end
-
-      def add_collection_option_with(options) # rubocop:disable Metrics/MethodLength
-        collection_of_options << Servactory::Maintenance::Attributes::Option.new(
-          name: :consists_of,
-          attribute: self,
-          validation_class: Servactory::Inputs::Validations::Type,
-          define_methods: [
-            Servactory::Maintenance::Attributes::DefineMethod.new(
-              name: :collection_mode?,
-              content: ->(**) { collection_mode_class_names.include?(options.fetch(:type)) }
-            )
-          ],
-          define_conflicts: [
-            Servactory::Maintenance::Attributes::DefineConflict.new(
-              content: -> { :collection_vs_inclusion if collection_mode? && inclusion_present? }
-            )
-          ],
-          need_for_checks: false,
-          body_key: :type,
-          body_value: String,
-          body_fallback: String,
-          **options
-        )
-      end
-
-      def add_hash_option_with(options) # rubocop:disable Metrics/MethodLength
-        collection_of_options << Servactory::Maintenance::Attributes::Option.new(
-          name: :schema,
-          attribute: self,
-          validation_class: Servactory::Inputs::Validations::Type,
-          define_methods: [
-            Servactory::Maintenance::Attributes::DefineMethod.new(
-              name: :hash_mode?,
-              content: ->(**) { hash_mode_class_names.include?(options.fetch(:type)) }
-            )
-          ],
-          define_conflicts: [
-            Servactory::Maintenance::Attributes::DefineConflict.new(
-              content: -> { :object_vs_inclusion if hash_mode? && inclusion_present? }
-            )
-          ],
-          need_for_checks: false,
-          body_key: :is,
-          body_fallback: {},
-          **options
-        )
-      end
-
-      def add_inclusion_option_with(options) # rubocop:disable Metrics/MethodLength
-        collection_of_options << Servactory::Maintenance::Attributes::Option.new(
-          name: :inclusion,
-          attribute: self,
-          validation_class: Servactory::Inputs::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 add_must_option_with(options) # rubocop:disable Metrics/MethodLength
-        collection_of_options << Servactory::Maintenance::Attributes::Option.new(
-          name: :must,
-          attribute: self,
-          validation_class: Servactory::Inputs::Validations::Must,
-          define_methods: [
-            Servactory::Maintenance::Attributes::DefineMethod.new(
-              name: :must_present?,
-              content: ->(option:) { option.present? }
-            )
-          ],
-          need_for_checks: true,
-          body_key: :is,
-          body_fallback: nil,
-          with_advanced_mode: false,
-          **options
-        )
-      end
-
-      def add_prepare_option_with(options) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-        collection_of_options << Servactory::Maintenance::Attributes::Option.new(
-          name: :prepare,
-          attribute: self,
-          validation_class: nil,
-          define_methods: [
-            Servactory::Maintenance::Attributes::DefineMethod.new(
-              name: :prepare_present?,
-              content: ->(option:) { option[:in].present? }
-            )
-          ],
-          define_conflicts: [
-            Servactory::Maintenance::Attributes::DefineConflict.new(
-              content: -> { :prepare_vs_collection if prepare_present? && collection_mode? }
-            ),
-            Servactory::Maintenance::Attributes::DefineConflict.new(
-              content: -> { :prepare_vs_inclusion if prepare_present? && inclusion_present? }
-            ),
-            Servactory::Maintenance::Attributes::DefineConflict.new(
-              content: -> { :prepare_vs_must if prepare_present? && must_present? }
-            )
-          ],
-          need_for_checks: false,
-          body_key: :in,
-          body_fallback: false,
-          **options
-        )
-      end
-
-      def collection_of_options
-        @collection_of_options ||= Servactory::Maintenance::Attributes::OptionsCollection.new
-      end
-
       def options_for_checks
-        collection_of_options.options_for_checks
+        @collection_of_options.options_for_checks
       end
 
       def conflict_code
-        collection_of_options.defined_conflict_code
+        @collection_of_options.defined_conflict_code
       end
 
       def with_conflicts?

data/lib/servactory/internals/internal.rb

@@ -3,9 +3,7 @@
 module Servactory
   module Internals
     class Internal
-      attr_reader :name,
-                  :collection_mode_class_names,
-                  :hash_mode_class_names
+      attr_reader :name
 
       def initialize(
         name,
@@ -17,11 +15,11 @@ module Servactory
         @collection_mode_class_names = collection_mode_class_names
         @hash_mode_class_names = hash_mode_class_names
 
-        add_basic_options_with(options)
+        register_options(options: options)
       end
 
       def method_missing(name, *args, &block)
-        option = collection_of_options.find_by(name: name)
+        option = @collection_of_options.find_by(name: name)
 
         return super if option.nil?
 
@@ -29,71 +27,27 @@ module Servactory
       end
 
       def respond_to_missing?(name, *)
-        collection_of_options.names.include?(name) || super
+        @collection_of_options.names.include?(name) || super
       end
 
-      def add_basic_options_with(options)
-        # Check Class: Servactory::Internals::Validations::Type
-        add_types_option_with(options)
-        add_collection_option_with(options)
-        add_hash_option_with(options)
-      end
-
-      def add_types_option_with(options)
-        collection_of_options << Servactory::Maintenance::Attributes::Option.new(
-          name: :types,
-          attribute: self,
-          validation_class: Servactory::Internals::Validations::Type,
-          original_value: Array(options.fetch(:type)),
-          need_for_checks: true,
-          body_fallback: nil,
-          with_advanced_mode: false
-        )
-      end
-
-      def add_collection_option_with(options) # rubocop:disable Metrics/MethodLength
-        collection_of_options << Servactory::Maintenance::Attributes::Option.new(
-          name: :consists_of,
+      def register_options(options:) # rubocop:disable Metrics/MethodLength
+        options_registrar = Servactory::Maintenance::Attributes::Options::Registrar.register(
           attribute: self,
-          validation_class: Servactory::Internals::Validations::Type,
-          define_methods: [
-            Servactory::Maintenance::Attributes::DefineMethod.new(
-              name: :collection_mode?,
-              content: ->(**) { collection_mode_class_names.include?(options.fetch(:type)) }
-            )
-          ],
-          need_for_checks: false,
-          body_key: :type,
-          body_value: String,
-          body_fallback: String,
-          **options
+          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
+          }
         )
-      end
-
-      def add_hash_option_with(options) # rubocop:disable Metrics/MethodLength
-        collection_of_options << Servactory::Maintenance::Attributes::Option.new(
-          name: :schema,
-          attribute: self,
-          validation_class: Servactory::Inputs::Validations::Type,
-          define_methods: [
-            Servactory::Maintenance::Attributes::DefineMethod.new(
-              name: :hash_mode?,
-              content: ->(**) { hash_mode_class_names.include?(options.fetch(:type)) }
-            )
-          ],
-          need_for_checks: false,
-          body_key: :is,
-          body_fallback: {},
-          **options
-        )
-      end
 
-      def collection_of_options
-        @collection_of_options ||= Servactory::Maintenance::Attributes::OptionsCollection.new
+        @collection_of_options = options_registrar.collection
       end
 
       def options_for_checks
-        collection_of_options.options_for_checks
+        @collection_of_options.options_for_checks
       end
     end
   end

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

@@ -0,0 +1,240 @@
+# frozen_string_literal: true
+
+module Servactory
+  module Maintenance
+    module Attributes
+      module Options
+        class Registrar # rubocop:disable Metrics/ClassLength
+          DEFAULT_FEATURES = {
+            required: false,
+            types: false,
+            default: false,
+            collection: false,
+            hash: false,
+            inclusion: false,
+            must: false,
+            prepare: false
+          }.freeze
+
+          private_constant :DEFAULT_FEATURES
+
+          def self.register(...)
+            new(...).register
+          end
+
+          def initialize(attribute:, collection_mode_class_names:, hash_mode_class_names:, options:, features:)
+            @attribute = attribute
+            @collection_mode_class_names = collection_mode_class_names
+            @hash_mode_class_names = hash_mode_class_names
+            @options = options
+            @features = DEFAULT_FEATURES.merge(features)
+          end
+
+          ########################################################################
+
+          def register # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+            # Check Class: Servactory::Inputs::Validations::Required
+            register_required_option if @features.fetch(:required)
+
+            # Check Class: Servactory::Inputs::Validations::Type
+            register_types_option if @features.fetch(:types)
+            register_default_option if @features.fetch(:default)
+            register_collection_option if @features.fetch(:collection)
+            register_hash_option if @features.fetch(:hash)
+
+            # Check Class: Servactory::Inputs::Validations::Inclusion
+            register_inclusion_option if @features.fetch(:inclusion)
+
+            # Check Class: Servactory::Inputs::Validations::Must
+            register_must_option if @features.fetch(:must)
+
+            # Check Class: nil
+            register_prepare_option if @features.fetch(:prepare)
+
+            self
+          end
+
+          ########################################################################
+
+          def register_required_option # rubocop:disable Metrics/MethodLength
+            collection << Servactory::Maintenance::Attributes::Option.new(
+              name: :required,
+              attribute: @attribute,
+              validation_class: Servactory::Inputs::Validations::Required,
+              define_methods: [
+                Servactory::Maintenance::Attributes::DefineMethod.new(
+                  name: :required?,
+                  content: ->(option:) { Servactory::Utils.true?(option[:is]) }
+                ),
+                Servactory::Maintenance::Attributes::DefineMethod.new(
+                  name: :optional?,
+                  content: ->(option:) { !Servactory::Utils.true?(option[:is]) }
+                )
+              ],
+              define_conflicts: [
+                Servactory::Maintenance::Attributes::DefineConflict.new(
+                  content: -> { :required_vs_default if @attribute.required? && @attribute.default_value_present? }
+                )
+              ],
+              need_for_checks: true,
+              body_key: :is,
+              body_fallback: true,
+              **@options
+            )
+          end
+
+          def register_types_option
+            collection << Servactory::Maintenance::Attributes::Option.new(
+              name: :types,
+              attribute: @attribute,
+              validation_class: Servactory::Inputs::Validations::Type,
+              original_value: Array(@options.fetch(:type)),
+              need_for_checks: true,
+              body_fallback: nil,
+              with_advanced_mode: false
+            )
+          end
+
+          def register_default_option # rubocop:disable Metrics/MethodLength
+            collection << Servactory::Maintenance::Attributes::Option.new(
+              name: :default,
+              attribute: @attribute,
+              validation_class: Servactory::Inputs::Validations::Type,
+              define_methods: [
+                Servactory::Maintenance::Attributes::DefineMethod.new(
+                  name: :default_value_present?,
+                  content: ->(option:) { !option.nil? }
+                )
+              ],
+              need_for_checks: true,
+              body_fallback: nil,
+              with_advanced_mode: false,
+              **@options
+            )
+          end
+
+          def register_collection_option # rubocop:disable Metrics/MethodLength
+            collection << Servactory::Maintenance::Attributes::Option.new(
+              name: :consists_of,
+              attribute: @attribute,
+              validation_class: Servactory::Inputs::Validations::Type,
+              define_methods: [
+                Servactory::Maintenance::Attributes::DefineMethod.new(
+                  name: :collection_mode?,
+                  content: ->(**) { @collection_mode_class_names.include?(@options.fetch(:type)) }
+                )
+              ],
+              define_conflicts: [
+                Servactory::Maintenance::Attributes::DefineConflict.new(
+                  content: lambda {
+                             :collection_vs_inclusion if @attribute.collection_mode? && @attribute.inclusion_present?
+                           }
+                )
+              ],
+              need_for_checks: false,
+              body_key: :type,
+              body_value: String,
+              body_fallback: String,
+              **@options
+            )
+          end
+
+          def register_hash_option # rubocop:disable Metrics/MethodLength
+            collection << Servactory::Maintenance::Attributes::Option.new(
+              name: :schema,
+              attribute: @attribute,
+              validation_class: Servactory::Inputs::Validations::Type,
+              define_methods: [
+                Servactory::Maintenance::Attributes::DefineMethod.new(
+                  name: :hash_mode?,
+                  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: {},
+              **@options
+            )
+          end
+
+          def register_inclusion_option # rubocop:disable Metrics/MethodLength
+            collection << Servactory::Maintenance::Attributes::Option.new(
+              name: :inclusion,
+              attribute: @attribute,
+              validation_class: Servactory::Inputs::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,
+              attribute: @attribute,
+              validation_class: Servactory::Inputs::Validations::Must,
+              define_methods: [
+                Servactory::Maintenance::Attributes::DefineMethod.new(
+                  name: :must_present?,
+                  content: ->(option:) { option.present? }
+                )
+              ],
+              need_for_checks: true,
+              body_key: :is,
+              body_fallback: nil,
+              with_advanced_mode: false,
+              **@options
+            )
+          end
+
+          def register_prepare_option # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+            collection << Servactory::Maintenance::Attributes::Option.new(
+              name: :prepare,
+              attribute: @attribute,
+              validation_class: nil,
+              define_methods: [
+                Servactory::Maintenance::Attributes::DefineMethod.new(
+                  name: :prepare_present?,
+                  content: ->(option:) { option[:in].present? }
+                )
+              ],
+              define_conflicts: [
+                Servactory::Maintenance::Attributes::DefineConflict.new(
+                  content: -> { :prepare_vs_collection if @attribute.prepare_present? && @attribute.collection_mode? }
+                ),
+                Servactory::Maintenance::Attributes::DefineConflict.new(
+                  content: -> { :prepare_vs_inclusion if @attribute.prepare_present? && @attribute.inclusion_present? }
+                ),
+                Servactory::Maintenance::Attributes::DefineConflict.new(
+                  content: -> { :prepare_vs_must if @attribute.prepare_present? && @attribute.must_present? }
+                )
+              ],
+              need_for_checks: false,
+              body_key: :in,
+              body_fallback: false,
+              **@options
+            )
+          end
+
+          ########################################################################
+
+          def collection
+            @collection ||= Servactory::Maintenance::Attributes::OptionsCollection.new
+          end
+        end
+      end
+    end
+  end
+end

data/lib/servactory/outputs/output.rb

@@ -3,9 +3,7 @@
 module Servactory
   module Outputs
     class Output
-      attr_reader :name,
-                  :collection_mode_class_names,
-                  :hash_mode_class_names
+      attr_reader :name
 
       def initialize(
         name,
@@ -17,11 +15,11 @@ module Servactory
         @collection_mode_class_names = collection_mode_class_names
         @hash_mode_class_names = hash_mode_class_names
 
-        add_basic_options_with(options)
+        register_options(options: options)
       end
 
       def method_missing(name, *args, &block)
-        option = collection_of_options.find_by(name: name)
+        option = @collection_of_options.find_by(name: name)
 
         return super if option.nil?
 
@@ -29,71 +27,27 @@ module Servactory
       end
 
       def respond_to_missing?(name, *)
-        collection_of_options.names.include?(name) || super
+        @collection_of_options.names.include?(name) || super
       end
 
-      def add_basic_options_with(options)
-        # Check Class: Servactory::Outputs::Validations::Type
-        add_types_option_with(options)
-        add_collection_option_with(options)
-        add_hash_option_with(options)
-      end
-
-      def add_types_option_with(options)
-        collection_of_options << Servactory::Maintenance::Attributes::Option.new(
-          name: :types,
-          attribute: self,
-          validation_class: Servactory::Internals::Validations::Type,
-          original_value: Array(options.fetch(:type)),
-          need_for_checks: true,
-          body_fallback: nil,
-          with_advanced_mode: false
-        )
-      end
-
-      def add_collection_option_with(options) # rubocop:disable Metrics/MethodLength
-        collection_of_options << Servactory::Maintenance::Attributes::Option.new(
-          name: :consists_of,
+      def register_options(options:) # rubocop:disable Metrics/MethodLength
+        options_registrar = Servactory::Maintenance::Attributes::Options::Registrar.register(
           attribute: self,
-          validation_class: Servactory::Internals::Validations::Type,
-          define_methods: [
-            Servactory::Maintenance::Attributes::DefineMethod.new(
-              name: :collection_mode?,
-              content: ->(**) { collection_mode_class_names.include?(options.fetch(:type)) }
-            )
-          ],
-          need_for_checks: false,
-          body_key: :type,
-          body_value: String,
-          body_fallback: String,
-          **options
+          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
+          }
         )
-      end
-
-      def add_hash_option_with(options) # rubocop:disable Metrics/MethodLength
-        collection_of_options << Servactory::Maintenance::Attributes::Option.new(
-          name: :schema,
-          attribute: self,
-          validation_class: Servactory::Inputs::Validations::Type,
-          define_methods: [
-            Servactory::Maintenance::Attributes::DefineMethod.new(
-              name: :hash_mode?,
-              content: ->(**) { hash_mode_class_names.include?(options.fetch(:type)) }
-            )
-          ],
-          need_for_checks: false,
-          body_key: :is,
-          body_fallback: {},
-          **options
-        )
-      end
 
-      def collection_of_options
-        @collection_of_options ||= Servactory::Maintenance::Attributes::OptionsCollection.new
+        @collection_of_options = options_registrar.collection
       end
 
       def options_for_checks
-        collection_of_options.options_for_checks
+        @collection_of_options.options_for_checks
       end
     end
   end

data/lib/servactory/version.rb

@@ -4,7 +4,7 @@ module Servactory
   module VERSION
     MAJOR = 2
     MINOR = 0
-    PATCH = 2
+    PATCH = 4
     PRE = nil
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join(".")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: servactory
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.4
 platform: ruby
 authors:
 - Anton Sokolov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-13 00:00:00.000000000 Z
+date: 2023-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -277,6 +277,7 @@ files:
 - lib/servactory/maintenance/attributes/option.rb
 - lib/servactory/maintenance/attributes/option_helper.rb
 - lib/servactory/maintenance/attributes/option_helpers_collection.rb
+- lib/servactory/maintenance/attributes/options/registrar.rb
 - lib/servactory/maintenance/attributes/options_collection.rb
 - lib/servactory/maintenance/collection_mode/class_names_collection.rb
 - lib/servactory/maintenance/hash_mode/class_names_collection.rb
@@ -318,7 +319,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.17
+rubygems_version: 3.5.1
 signing_key:
 specification_version: 4
 summary: A set of tools for building reliable services of any complexity