servactory 1.9.5 → 2.0.0.rc2

data/lib/servactory/outputs/output.rb

@@ -4,36 +4,97 @@ module Servactory
   module Outputs
     class Output
       attr_reader :name,
-                  :types,
-                  :required,
-                  :default
+                  :collection_mode_class_names,
+                  :hash_mode_class_names
 
-      def initialize(name, type:, **options)
+      def initialize(
+        name,
+        type:,
+        collection_mode_class_names:,
+        hash_mode_class_names:,
+        **options
+      )
         @name = name
-        @types = Array(type)
+        @collection_mode_class_names = collection_mode_class_names
+        @hash_mode_class_names = hash_mode_class_names
 
-        @required = options.fetch(:required, true)
-        @default = required? ? nil : options.fetch(:default, nil)
+        add_basic_options_with(type: type, options: options)
       end
 
-      def options_for_checks
-        {
-          types: types,
-          required: required,
-          default: default
-        }
+      def method_missing(name, *args, &block)
+        option = collection_of_options.find_by(name: name)
+
+        return super if option.nil?
+
+        option.body
+      end
+
+      def respond_to_missing?(name, *)
+        collection_of_options.names.include?(name) || super
+      end
+
+      def add_basic_options_with(type:, options:)
+        # Check Class: Servactory::Outputs::Validations::Type
+        add_types_option_with(type)
+        add_collection_option_with(type, options)
+        add_object_option_with(type, options)
+      end
+
+      def add_types_option_with(type)
+        collection_of_options << Servactory::Maintenance::Attributes::Option.new(
+          name: :types,
+          attribute: self,
+          validation_class: Servactory::Internals::Validations::Type,
+          original_value: Array(type),
+          need_for_checks: true,
+          body_fallback: nil,
+          with_advanced_mode: false
+        )
       end
 
-      def required?
-        Servactory::Utils.true?(required)
+      def add_collection_option_with(type, options) # rubocop:disable Metrics/MethodLength
+        collection_of_options << Servactory::Maintenance::Attributes::Option.new(
+          name: :consists_of,
+          attribute: self,
+          validation_class: Servactory::Internals::Validations::Type,
+          define_methods: [
+            Servactory::Maintenance::Attributes::DefineMethod.new(
+              name: :collection_mode?,
+              content: ->(**) { collection_mode_class_names.include?(type) }
+            )
+          ],
+          need_for_checks: false,
+          body_key: :type,
+          body_value: String,
+          body_fallback: String,
+          **options
+        )
       end
 
-      def optional?
-        !required?
+      def add_object_option_with(type, 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?(type) }
+            )
+          ],
+          need_for_checks: false,
+          body_fallback: {},
+          with_advanced_mode: false,
+          **options
+        )
       end
 
-      def default_value_present?
-        !default.nil?
+      def collection_of_options
+        @collection_of_options ||= Servactory::Maintenance::Attributes::OptionsCollection.new
+      end
+
+      def options_for_checks
+        collection_of_options.options_for_checks
       end
     end
   end

data/lib/servactory/outputs/validations/type.rb

@@ -4,22 +4,63 @@ module Servactory
   module Outputs
     module Validations
       class Type < Base
-        DEFAULT_MESSAGE = lambda do |service_class_name:, output:, expected_type:, given_type:|
-          I18n.t(
-            "servactory.outputs.checks.type.default_error",
-            service_class_name: service_class_name,
-            output_name: output.name,
-            expected_type: expected_type,
-            given_type: given_type
-          )
+        DEFAULT_MESSAGE = lambda do |service_class_name:, output:, value:, key_name:, expected_type:, given_type:| # rubocop:disable Metrics/BlockLength
+          if output.collection_mode?
+            collection_message = output.consists_of.fetch(:message)
+
+            if collection_message.is_a?(Proc)
+              collection_message.call(output: output, expected_type: expected_type)
+            elsif collection_message.is_a?(String) && collection_message.present?
+              collection_message
+            elsif value.is_a?(output.types.fetch(0, Array))
+              I18n.t(
+                "servactory.outputs.checks.type.default_error.for_collection.wrong_element_type",
+                service_class_name: service_class_name,
+                output_name: output.name,
+                expected_type: expected_type,
+                given_type: given_type
+              )
+            else
+              I18n.t(
+                "servactory.outputs.checks.type.default_error.for_collection.wrong_type",
+                service_class_name: service_class_name,
+                output_name: output.name,
+                expected_type: output.types.fetch(0, Array),
+                given_type: value.class.name
+              )
+            end
+          elsif output.hash_mode? && key_name.present?
+            I18n.t(
+              "servactory.outputs.checks.type.default_error.for_hash.wrong_element_type",
+              service_class_name: service_class_name,
+              output_name: output.name,
+              key_name: key_name,
+              expected_type: expected_type,
+              given_type: given_type
+            )
+          else
+            I18n.t(
+              "servactory.outputs.checks.type.default_error.default",
+              service_class_name: service_class_name,
+              output_name: output.name,
+              expected_type: expected_type,
+              given_type: given_type
+            )
+          end
         end
 
         private_constant :DEFAULT_MESSAGE
 
         def self.validate!(...)
+          return unless should_be_checked?
+
           new(...).validate!
         end
 
+        def self.should_be_checked?
+          true
+        end
+
         ##########################################################################
 
         def initialize(context:, output:, value:)
@@ -30,40 +71,78 @@ module Servactory
           @value = value
         end
 
-        def validate!
-          return unless should_be_checked?
+        def validate! # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+          object_schema_validator = nil
+
+          return if prepared_types.any? do |type|
+            if @output.collection_mode?
+              @value.is_a?(@output.types.fetch(0, Array)) &&
+              @value.respond_to?(:all?) && @value.all?(type)
+            elsif @output.hash_mode?
+              object_schema_validator = Servactory::Maintenance::Validations::ObjectSchema.validate(
+                object: @value,
+                schema: @output.schema
+              )
+
+              object_schema_validator.valid?
+            else
+              @value.is_a?(type)
+            end
+          end
+
+          if (first_error = object_schema_validator&.errors&.first).present?
+            raise_default_object_error_with(first_error)
+          end
+
+          raise_default_error
+        end
+
+        private
 
-          return if prepared_types.any? { |type| @value.is_a?(type) }
+        def prepared_types
+          @prepared_types ||=
+            if @output.collection_mode?
+              prepared_types_from(Array(@output.consists_of.fetch(:type, [])))
+            else
+              prepared_types_from(@output.types)
+            end
+        end
 
+        def prepared_types_from(types)
+          types.map do |type|
+            if type.is_a?(String)
+              Object.const_get(type)
+            else
+              type
+            end
+          end
+        end
+
+        ########################################################################
+
+        def raise_default_object_error_with(error)
           raise_error_with(
             DEFAULT_MESSAGE,
             service_class_name: @context.class.name,
             output: @output,
-            expected_type: prepared_types.join(", "),
-            given_type: @value.class.name
+            value: @value,
+            key_name: error.fetch(:name),
+            expected_type: error.fetch(:expected_type),
+            given_type: error.fetch(:given_type)
           )
         end
 
-        private
-
-        def should_be_checked?
-          @output.required? || (
-            @output.optional? && !@output.default.nil?
-          ) || (
-            @output.optional? && !@value.nil?
+        def raise_default_error
+          raise_error_with(
+            DEFAULT_MESSAGE,
+            service_class_name: @context.class.name,
+            output: @output,
+            value: @value,
+            key_name: nil,
+            expected_type: prepared_types.join(", "),
+            given_type: @value.class.name
           )
         end
-
-        def prepared_types
-          @prepared_types ||=
-            Array(@output.types).map do |type|
-              if type.is_a?(String)
-                Object.const_get(type)
-              else
-                type
-              end
-            end
-        end
       end
     end
   end

data/lib/servactory/version.rb

@@ -2,10 +2,11 @@
 
 module Servactory
   module VERSION
-    MAJOR = 1
-    MINOR = 9
-    PATCH = 5
+    MAJOR = 2
+    MINOR = 0
+    PATCH = 0
+    PRE = "rc2"
 
-    STRING = [MAJOR, MINOR, PATCH].join(".")
+    STRING = [MAJOR, MINOR, PATCH, PRE].compact.join(".")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: servactory
 version: !ruby/object:Gem::Version
-  version: 1.9.5
+  version: 2.0.0.rc2
 platform: ruby
 authors:
 - Anton Sokolov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-19 00:00:00.000000000 Z
+date: 2023-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: 7.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: 7.0.8
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: rbs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -210,17 +224,12 @@ files:
 - lib/servactory/info/dsl.rb
 - lib/servactory/info/result.rb
 - lib/servactory/inputs/collection.rb
-- lib/servactory/inputs/define_input_conflict.rb
-- lib/servactory/inputs/define_input_method.rb
 - lib/servactory/inputs/dsl.rb
 - lib/servactory/inputs/input.rb
-- lib/servactory/inputs/option.rb
-- lib/servactory/inputs/option_helper.rb
-- lib/servactory/inputs/option_helpers_collection.rb
-- lib/servactory/inputs/options_collection.rb
 - lib/servactory/inputs/tools/check_errors.rb
-- lib/servactory/inputs/tools/find_unnecessary.rb
+- lib/servactory/inputs/tools/distributor.rb
 - lib/servactory/inputs/tools/rules.rb
+- lib/servactory/inputs/tools/unnecessary.rb
 - lib/servactory/inputs/tools/validation.rb
 - lib/servactory/inputs/validations/base.rb
 - lib/servactory/inputs/validations/errors.rb
@@ -234,6 +243,15 @@ files:
 - lib/servactory/internals/internal.rb
 - lib/servactory/internals/validations/base.rb
 - lib/servactory/internals/validations/type.rb
+- lib/servactory/maintenance/attributes/define_conflict.rb
+- lib/servactory/maintenance/attributes/define_method.rb
+- lib/servactory/maintenance/attributes/option.rb
+- lib/servactory/maintenance/attributes/option_helper.rb
+- lib/servactory/maintenance/attributes/option_helpers_collection.rb
+- lib/servactory/maintenance/attributes/options_collection.rb
+- lib/servactory/maintenance/collection_mode/class_names_collection.rb
+- lib/servactory/maintenance/hash_mode/class_names_collection.rb
+- lib/servactory/maintenance/validations/object_schema.rb
 - lib/servactory/methods/aliases_for_make/collection.rb
 - lib/servactory/methods/dsl.rb
 - lib/servactory/methods/method.rb
@@ -274,9 +292,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.4.17
 signing_key:

data/lib/servactory/inputs/define_input_conflict.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Inputs
-    class DefineInputConflict
-      attr_reader :content
-
-      def initialize(content:)
-        @content = content
-      end
-    end
-  end
-end

data/lib/servactory/inputs/define_input_method.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Inputs
-    class DefineInputMethod
-      attr_reader :name,
-                  :content
-
-      def initialize(name:, content:)
-        @name = name.to_sym
-        @content = content
-      end
-    end
-  end
-end

data/lib/servactory/inputs/option.rb

@@ -1,98 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Inputs
-    class Option
-      DEFAULT_VALUE = ->(key:, value:, message: nil) { { key => value, message: message } }
-
-      private_constant :DEFAULT_VALUE
-
-      attr_reader :name,
-                  :validation_class,
-                  :define_input_methods,
-                  :define_input_conflicts,
-                  :need_for_checks,
-                  :value_key,
-                  :value
-
-      # rubocop:disable Metrics/MethodLength
-      def initialize(
-        name:,
-        input:,
-        validation_class:,
-        need_for_checks:,
-        value_fallback:,
-        original_value: nil,
-        value_key: nil,
-        define_input_methods: nil,
-        define_input_conflicts: nil,
-        with_advanced_mode: true,
-        **options
-      ) # do
-        @name = name.to_sym
-        @validation_class = validation_class
-        @define_input_methods = define_input_methods
-        @define_input_conflicts = define_input_conflicts
-        @need_for_checks = need_for_checks
-        @value_key = value_key
-
-        @value = prepare_value_for(
-          original_value: original_value,
-          options: options,
-          value_fallback: value_fallback,
-          with_advanced_mode: with_advanced_mode
-        )
-
-        prepare_input_methods_for(input)
-      end
-      # rubocop:enable Metrics/MethodLength
-
-      def need_for_checks?
-        need_for_checks
-      end
-
-      private
-
-      def prepare_value_for(original_value:, options:, value_fallback:, with_advanced_mode:)
-        return original_value if original_value.present?
-
-        return options.fetch(@name, value_fallback) unless with_advanced_mode
-
-        prepare_advanced_for(
-          value: options.fetch(@name, DEFAULT_VALUE.call(key: value_key, value: value_fallback)),
-          value_fallback: value_fallback
-        )
-      end
-
-      def prepare_advanced_for(value:, value_fallback:)
-        if value.is_a?(Hash)
-          message = value.fetch(:message, nil)
-
-          DEFAULT_VALUE.call(
-            key: value_key,
-            value: value.fetch(value_key, message.present? ? true : value_fallback),
-            message: message
-          )
-        else
-          DEFAULT_VALUE.call(key: value_key, value: value)
-        end
-      end
-
-      def prepare_input_methods_for(input)
-        input.instance_eval(define_input_methods_template) if define_input_methods_template.present?
-      end
-
-      def define_input_methods_template
-        return if @define_input_methods.blank?
-
-        @define_input_methods_template ||= @define_input_methods.map do |define_input_method|
-          <<-RUBY
-            def #{define_input_method.name}
-              #{define_input_method.content.call(value: @value)}
-            end
-          RUBY
-        end.join("\n")
-      end
-    end
-  end
-end

data/lib/servactory/inputs/option_helper.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Inputs
-    class OptionHelper
-      attr_reader :name,
-                  :equivalent
-
-      def initialize(name:, equivalent:)
-        @name = name
-        @equivalent = equivalent
-      end
-    end
-  end
-end

data/lib/servactory/inputs/option_helpers_collection.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Inputs
-    class OptionHelpersCollection
-      extend Forwardable
-      def_delegators :@collection, :<<, :find, :merge
-
-      def initialize(collection)
-        @collection = collection
-      end
-
-      def find_by(name:)
-        find { |helper| helper.name == name }
-      end
-    end
-  end
-end

data/lib/servactory/inputs/options_collection.rb

@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Inputs
-    class OptionsCollection
-      extend Forwardable
-      def_delegators :@collection, :<<, :filter, :each, :map, :flat_map, :find
-
-      def initialize(*)
-        @collection = Set.new
-      end
-
-      def names
-        map(&:name)
-      end
-
-      def validation_classes
-        filter { |option| option.validation_class.present? }.map(&:validation_class).uniq
-      end
-
-      def options_for_checks
-        filter(&:need_for_checks?).to_h do |option|
-          value = if option.value.is_a?(Hash)
-                    option.value.key?(:is) ? option.value.fetch(:is) : option.value
-                  else
-                    option.value
-                  end
-
-          [option.name, value]
-        end
-      end
-
-      def defined_conflict_code
-        flat_map do |option|
-          option.define_input_conflicts&.map do |define_input_conflict|
-            define_input_conflict.content.call
-          end
-        end.reject(&:blank?).first
-      end
-
-      def find_by(name:)
-        find { |option| option.name == name }
-      end
-    end
-  end
-end