servactory 2.0.3 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4c3af571fde0fe1cc117e71ed04c7b13ab3d212f5524ad684382e905462fc8d
-  data.tar.gz: 95c2ad162f85d874eb250aa1db1104e8aae685e1f738ea9b37d94f19ebc6c92a
+  metadata.gz: 1fd508e1e2a77b4d74acb00666dbc5149009fdb11f927144554f3d4d66a63887
+  data.tar.gz: ac3cd518c70d56f1089e2975afffedca41983555e4c54fc5d815d94ea0d1fa4c
 SHA512:
-  metadata.gz: 4a1385bd8a58e5931523772619812f53168593ab5135b2c9e92f6eda4ed90097a37bd7665e56669fca6e99303d406ad9ebe68684713f63ed0b8c530cf7f5bfb9
-  data.tar.gz: a720e57fece727a1374802a6b419c40eca107be60325a7282aa34559b9b6e519f8891f210c0c2185ea614c70b343b881803c24a5662dc9c863100f3a2cefdb22
+  metadata.gz: bcf0363a0d2d83cfd6ddffd4ea19254a51c2cf93eb33b83f79ee6129f7e38a8fe1bbedfc19cde97d3cfc78ee3d48d8550afa39c7d1d78488a10bfb8d7be609e8
+  data.tar.gz: 5ad30d0c89119bd1a9ccfc6b536c14276cd6197f28ef2d449f0f38a3ce3c962bba6bea7a60c4b365ff76adaa1bd284a8ddc0908b6319dc3bd895458f5d7d8ddd

data/config/locales/en.yml

@@ -4,7 +4,7 @@ en:
       undefined:
         getter: "[%{service_class_name}] Undefined input attribute `%{input_name}`"
         setter: "[%{service_class_name}] Undefined input attribute `%{input_name}`"
-      checks:
+      validations:
         inclusion:
           default_error: "[%{service_class_name}] Wrong value in `%{input_name}`, must be one of `%{input_inclusion}`"
         must:
@@ -30,7 +30,7 @@ en:
       undefined:
         getter: "[%{service_class_name}] Undefined internal attribute `%{internal_name}`"
         setter: "[%{service_class_name}] Undefined internal attribute `%{internal_name}`"
-      checks:
+      validations:
         type:
           default_error:
             default: "[%{service_class_name}] Wrong type of internal attribute `%{internal_name}`, expected `%{expected_type}`, got `%{given_type}`"
@@ -43,7 +43,7 @@ en:
       undefined:
         getter: "[%{service_class_name}] Undefined output attribute `%{output_name}`"
         setter: "[%{service_class_name}] Undefined output attribute `%{output_name}`"
-      checks:
+      validations:
         type:
           default_error:
             default: "[%{service_class_name}] Wrong type of output attribute `%{output_name}`, expected `%{expected_type}`, got `%{given_type}`"

data/config/locales/ru.yml

@@ -4,7 +4,7 @@ ru:
       undefined:
         getter: "[%{service_class_name}] Неизвестный входящий атрибут `%{input_name}`"
         setter: "[%{service_class_name}] Неизвестный входящий атрибут `%{input_name}`"
-      checks:
+      validations:
         inclusion:
           default_error: "[%{service_class_name}] Неправильное значение в `%{input_name}`, должно быть одним из `%{input_inclusion}`"
         must:
@@ -31,7 +31,7 @@ ru:
       undefined:
         getter: "[%{service_class_name}] Неизвестный внутренний атрибут `%{internal_name}`"
         setter: "[%{service_class_name}] Неизвестный внутренний атрибут `%{internal_name}`"
-      checks:
+      validations:
         type:
           default_error:
             default: "[%{service_class_name}] Неправильный тип внутреннего атрибута `%{internal_name}`, ожидалось `%{expected_type}`, получено `%{given_type}`"
@@ -44,7 +44,7 @@ ru:
       undefined:
         getter: "[%{service_class_name}] Неизвестный выходящий атрибут `%{output_name}`"
         setter: "[%{service_class_name}] Неизвестный выходящий атрибут `%{output_name}`"
-      checks:
+      validations:
         type:
           default: "[%{service_class_name}] Неправильный тип выходящего атрибута `%{output_name}`, ожидалось `%{expected_type}`, получено `%{given_type}`"
           for_collection:

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

@@ -44,9 +44,9 @@ module Servactory
 
           return yield if internal.nil?
 
-          Servactory::Internals::Validations::Type.validate!(
+          Servactory::Maintenance::Attributes::Tools::Validation.validate!(
             context: @context,
-            internal: internal,
+            attribute: internal,
             value: value
           )
 

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

@@ -44,9 +44,9 @@ module Servactory
 
           return yield if output.nil?
 
-          Servactory::Outputs::Validations::Type.validate!(
+          Servactory::Maintenance::Attributes::Tools::Validation.validate!(
             context: @context,
-            output: output,
+            attribute: output,
             value: value
           )
 

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
@@ -35,6 +36,10 @@ module Servactory
         raise self.class.config.failure_class.new(message: message, meta: meta)
       end
 
+      def fail_result!(service_result)
+        fail!(message: service_result.error.message, meta: service_result.error.meta)
+      end
+
       private
 
       attr_reader :incoming_arguments,

data/lib/servactory/inputs/input.rb

@@ -3,8 +3,6 @@
 module Servactory
   module Inputs
     class Input
-      attr_accessor :value
-
       attr_reader :name,
                   :internal_name,
                   :collection_of_options
@@ -86,9 +84,29 @@ module Servactory
         @collection_of_options.defined_conflict_code
       end
 
+      def system_name
+        self.class.name.demodulize.downcase.to_sym
+      end
+
+      def i18n_name
+        system_name.to_s.pluralize
+      end
+
       def with_conflicts?
         conflict_code.present?
       end
+
+      def input?
+        true
+      end
+
+      def internal?
+        false
+      end
+
+      def output?
+        false
+      end
     end
   end
 end

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

@@ -8,8 +8,9 @@ module Servactory
           new(...).validate!
         end
 
-        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
 
@@ -50,7 +51,8 @@ module Servactory
         )
           validation_class.check(
             context: @context,
-            input: input,
+            attribute: input,
+            value: @incoming_arguments.fetch(input.name, nil),
             check_key: check_key,
             check_options: check_options
           )
@@ -65,7 +67,7 @@ module Servactory
         ########################################################################
 
         def errors
-          @errors ||= CheckErrors.new
+          @errors ||= Servactory::Maintenance::Attributes::Tools::CheckErrors.new
         end
 
         def raise_errors

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

@@ -5,7 +5,7 @@ module Servactory
     module Validations
       class Required < Base
         DEFAULT_MESSAGE = lambda do |service_class_name:, input:, value:|
-          i18n_key = "servactory.inputs.checks.required.default_error."
+          i18n_key = "servactory.inputs.validations.required.default_error."
           i18n_key += input.collection_mode? && value.present? ? "for_collection" : "default"
 
           I18n.t(
@@ -17,10 +17,10 @@ module Servactory
 
         private_constant :DEFAULT_MESSAGE
 
-        def self.check(context:, input:, check_key:, **)
-          return unless should_be_checked_for?(input, check_key)
+        def self.check(context:, attribute:, value:, check_key:, **)
+          return unless should_be_checked_for?(attribute, check_key)
 
-          new(context: context, input: input).check
+          new(context: context, input: attribute, value: value).check
         end
 
         def self.should_be_checked_for?(input, check_key)
@@ -29,17 +29,18 @@ module Servactory
 
         ##########################################################################
 
-        def initialize(context:, input:)
+        def initialize(context:, input:, value:)
           super()
 
           @context = context
           @input = input
+          @value = value
         end
 
         def check
-          if @input.collection_mode? && Servactory::Utils.value_present?(@input.value)
-            return if @input.value.respond_to?(:all?) && @input.value.all?(&:present?)
-          elsif Servactory::Utils.value_present?(@input.value)
+          if @input.collection_mode? && Servactory::Utils.value_present?(@value)
+            return if @value.respond_to?(:all?) && @value.all?(&:present?)
+          elsif Servactory::Utils.value_present?(@value)
             return
           end
 
@@ -55,7 +56,7 @@ module Servactory
             message: message.presence || DEFAULT_MESSAGE,
             service_class_name: @context.class.name,
             input: @input,
-            value: @input.value
+            value: @value
           )
         end
       end

data/lib/servactory/inputs/workspace.rb

@@ -9,9 +9,8 @@ module Servactory
         super
 
         Tools::Unnecessary.find!(self, incoming_arguments, collection_of_inputs)
-        Tools::Distributor.assign!(incoming_arguments, collection_of_inputs)
         Tools::Rules.check!(self, collection_of_inputs)
-        Tools::Validation.validate!(self, collection_of_inputs)
+        Tools::Validation.validate!(self, incoming_arguments, collection_of_inputs)
       end
     end
   end

data/lib/servactory/internals/internal.rb

@@ -3,7 +3,8 @@
 module Servactory
   module Internals
     class Internal
-      attr_reader :name
+      attr_reader :name,
+                  :collection_of_options
 
       def initialize(
         name,
@@ -49,6 +50,26 @@ module Servactory
       def options_for_checks
         @collection_of_options.options_for_checks
       end
+
+      def system_name
+        self.class.name.demodulize.downcase.to_sym
+      end
+
+      def i18n_name
+        system_name.to_s.pluralize
+      end
+
+      def input?
+        false
+      end
+
+      def internal?
+        true
+      end
+
+      def output?
+        false
+      end
     end
   end
 end

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

@@ -33,22 +33,22 @@ module Servactory
           ########################################################################
 
           def register # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-            # Check Class: Servactory::Inputs::Validations::Required
+            # Validation Class: Servactory::Inputs::Validations::Required
             register_required_option if @features.fetch(:required)
 
-            # Check Class: Servactory::Inputs::Validations::Type
+            # Validation Class: Servactory::Maintenance::Attributes::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
+            # Validation Class: Servactory::Maintenance::Attributes::Validations::Inclusion
             register_inclusion_option if @features.fetch(:inclusion)
 
-            # Check Class: Servactory::Inputs::Validations::Must
+            # Validation Class: Servactory::Maintenance::Attributes::Validations::Must
             register_must_option if @features.fetch(:must)
 
-            # Check Class: nil
+            # Validation Class: nil
             register_prepare_option if @features.fetch(:prepare)
 
             self
@@ -87,7 +87,7 @@ module Servactory
             collection << Servactory::Maintenance::Attributes::Option.new(
               name: :types,
               attribute: @attribute,
-              validation_class: Servactory::Inputs::Validations::Type,
+              validation_class: Servactory::Maintenance::Attributes::Validations::Type,
               original_value: Array(@options.fetch(:type)),
               need_for_checks: true,
               body_fallback: nil,
@@ -99,7 +99,7 @@ module Servactory
             collection << Servactory::Maintenance::Attributes::Option.new(
               name: :default,
               attribute: @attribute,
-              validation_class: Servactory::Inputs::Validations::Type,
+              validation_class: Servactory::Maintenance::Attributes::Validations::Type,
               define_methods: [
                 Servactory::Maintenance::Attributes::DefineMethod.new(
                   name: :default_value_present?,
@@ -117,7 +117,7 @@ module Servactory
             collection << Servactory::Maintenance::Attributes::Option.new(
               name: :consists_of,
               attribute: @attribute,
-              validation_class: Servactory::Inputs::Validations::Type,
+              validation_class: Servactory::Maintenance::Attributes::Validations::Type,
               define_methods: [
                 Servactory::Maintenance::Attributes::DefineMethod.new(
                   name: :collection_mode?,
@@ -143,7 +143,7 @@ module Servactory
             collection << Servactory::Maintenance::Attributes::Option.new(
               name: :schema,
               attribute: @attribute,
-              validation_class: Servactory::Inputs::Validations::Type,
+              validation_class: Servactory::Maintenance::Attributes::Validations::Type,
               define_methods: [
                 Servactory::Maintenance::Attributes::DefineMethod.new(
                   name: :hash_mode?,
@@ -166,7 +166,7 @@ module Servactory
             collection << Servactory::Maintenance::Attributes::Option.new(
               name: :inclusion,
               attribute: @attribute,
-              validation_class: Servactory::Inputs::Validations::Inclusion,
+              validation_class: Servactory::Maintenance::Attributes::Validations::Inclusion,
               define_methods: [
                 Servactory::Maintenance::Attributes::DefineMethod.new(
                   name: :inclusion_present?,
@@ -184,7 +184,7 @@ module Servactory
             collection << Servactory::Maintenance::Attributes::Option.new(
               name: :must,
               attribute: @attribute,
-              validation_class: Servactory::Inputs::Validations::Must,
+              validation_class: Servactory::Maintenance::Attributes::Validations::Must,
               define_methods: [
                 Servactory::Maintenance::Attributes::DefineMethod.new(
                   name: :must_present?,

data/lib/servactory/maintenance/attributes/tools/check_errors.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Servactory
+  module Maintenance
+    module Attributes
+      module Tools
+        class CheckErrors
+          extend Forwardable
+          def_delegators :@collection, :merge, :reject, :first, :empty?
+
+          def initialize(collection = Set.new)
+            @collection = collection
+          end
+
+          def not_blank
+            CheckErrors.new(reject(&:blank?))
+          end
+        end
+      end
+    end
+  end
+end

data/lib/servactory/maintenance/attributes/tools/validation.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+module Servactory
+  module Maintenance
+    module Attributes
+      module Tools
+        class Validation
+          def self.validate!(...)
+            new(...).validate!
+          end
+
+          def initialize(context:, attribute:, value:)
+            @context = context
+            @attribute = attribute
+            @value = value
+          end
+
+          def validate!
+            process
+
+            raise_errors
+          end
+
+          private
+
+          def process
+            @attribute.options_for_checks.each do |check_key, check_options|
+              process_option(check_key, check_options)
+            end
+          end
+
+          def process_option(check_key, check_options)
+            validation_classes.each do |validation_class|
+              errors_from_checks = process_validation_class(
+                validation_class: validation_class,
+                check_key: check_key,
+                check_options: check_options
+              )
+
+              errors.merge(errors_from_checks.to_a)
+            end
+          end
+
+          def process_validation_class(
+            validation_class:,
+            check_key:,
+            check_options:
+          )
+            validation_class.check(
+              context: @context,
+              attribute: @attribute,
+              value: @value,
+              check_key: check_key,
+              check_options: check_options
+            )
+          end
+
+          ########################################################################
+
+          def validation_classes
+            @attribute.collection_of_options.validation_classes
+          end
+
+          ########################################################################
+
+          def errors
+            @errors ||= Servactory::Maintenance::Attributes::Tools::CheckErrors.new
+          end
+
+          def raise_errors
+            return if (tmp_errors = errors.not_blank).empty?
+
+            raise @context.class.config
+                          .public_send(:"#{@attribute.system_name}_error_class")
+                          .new(message: tmp_errors.first)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Servactory
+  module Maintenance
+    module Attributes
+      module Validations
+        class Base
+          private
+
+          def add_error(message:, **attributes)
+            message = message.call(**attributes) if message.is_a?(Proc)
+
+            errors << message
+          end
+
+          def errors
+            @errors ||= Errors.new
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Servactory
+  module Maintenance
+    module Attributes
+      module Validations
+        class Errors
+          extend Forwardable
+          def_delegators :@collection, :<<, :to_a
+
+          def initialize(*)
+            @collection = Set.new
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+module Servactory
+  module Maintenance
+    module Attributes
+      module Validations
+        class Inclusion < Base
+          DEFAULT_MESSAGE = lambda do |service_class_name:, input:, value:|
+            I18n.t(
+              "servactory.#{input.i18n_name}.validations.inclusion.default_error",
+              service_class_name: service_class_name,
+              "#{input.system_name}_name": input.name,
+              input_inclusion: input.inclusion[:in],
+              value: value
+            )
+          end
+
+          private_constant :DEFAULT_MESSAGE
+
+          def self.check(context:, attribute:, value:, check_key:, **)
+            return unless should_be_checked_for?(attribute, value, check_key)
+
+            new(context: context, attribute: attribute, value: 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 || DEFAULT_MESSAGE,
+              service_class_name: @context.class.name,
+              "#{@attribute.system_name}": @attribute,
+              value: @value
+            )
+          end
+        end
+      end
+    end
+  end
+end