servactory 2.0.4 → 2.1.1

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

@@ -0,0 +1,102 @@
+# frozen_string_literal: true
+
+module Servactory
+  module Maintenance
+    module Attributes
+      module Validations
+        class Must < Base
+          DEFAULT_MESSAGE = lambda do |service_class_name:, input:, value:, code:|
+            I18n.t(
+              "servactory.#{input.i18n_name}.validations.must.default_error",
+              service_class_name: service_class_name,
+              "#{input.system_name}_name": input.name,
+              value: value,
+              code: code
+            )
+          end
+
+          SYNTAX_ERROR_MESSAGE = lambda do |service_class_name:, input:, value:, code:, exception_message:|
+            I18n.t(
+              "servactory.#{input.i18n_name}.validations.must.syntax_error",
+              service_class_name: service_class_name,
+              "#{input.system_name}_name": input.name,
+              value: value,
+              code: code,
+              exception_message: exception_message
+            )
+          end
+
+          private_constant :DEFAULT_MESSAGE, :SYNTAX_ERROR_MESSAGE
+
+          def self.check(context:, attribute:, value:, check_key:, check_options:)
+            return unless should_be_checked_for?(attribute, check_key)
+
+            new(context: context, attribute: attribute, value: value, check_options: check_options).check
+          end
+
+          def self.should_be_checked_for?(attribute, check_key)
+            check_key == :must && attribute.must_present?
+          end
+
+          ##########################################################################
+
+          def initialize(context:, attribute:, value:, check_options:)
+            super()
+
+            @context = context
+            @attribute = attribute
+            @value = value
+            @check_options = check_options
+          end
+
+          def check
+            @check_options.each do |code, options|
+              message = call_or_fetch_message_from(code, options)
+
+              next if message.blank?
+
+              add_error_with(message, code)
+            end
+
+            errors
+          end
+
+          private
+
+          def call_or_fetch_message_from(code, options)
+            check, message = options.values_at(:is, :message)
+
+            return if check.call(value: @value)
+
+            message.presence || DEFAULT_MESSAGE
+          rescue StandardError => e
+            add_syntax_error_with(SYNTAX_ERROR_MESSAGE, code, e.message)
+          end
+
+          ########################################################################
+
+          def add_error_with(message, code)
+            add_error(
+              message: message,
+              service_class_name: @context.class.name,
+              "#{@attribute.system_name}": @attribute,
+              value: @value,
+              code: code
+            )
+          end
+
+          def add_syntax_error_with(message, code, exception_message)
+            add_error(
+              message: message,
+              service_class_name: @context.class.name,
+              "#{@attribute.system_name}": @attribute,
+              value: @value,
+              code: code,
+              exception_message: exception_message
+            )
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+module Servactory
+  module Maintenance
+    module Attributes
+      module Validations
+        class Type < Base
+          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 == :types && (
+              (
+                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
+            Servactory::Maintenance::Validations::Types.validate!(
+              context: @context,
+              attribute: @attribute,
+              types: @attribute.types,
+              value: prepared_value,
+              error_callback: ->(**args) { add_error(**args) }
+            )
+          end
+
+          private
+
+          def prepared_value
+            @prepared_value ||=
+              if @attribute.input? && @attribute.optional? && !@attribute.default.nil? && @value.blank?
+                @attribute.default
+              else
+                @value
+              end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/servactory/maintenance/validations/types.rb

@@ -6,7 +6,6 @@ module Servactory
       class Types # rubocop:disable Metrics/ClassLength
         DEFAULT_MESSAGE = lambda do | # rubocop:disable Metrics/BlockLength
           service_class_name:,
-          attribute_system_name:,
           attribute:,
           value:,
           key_name:,
@@ -18,7 +17,7 @@ module Servactory
 
             if collection_message.is_a?(Proc)
               collection_message.call(
-                "#{attribute_system_name}_name": attribute.name,
+                "#{attribute.system_name}_name": attribute.name,
                 expected_type: expected_type,
                 given_type: given_type
               )
@@ -26,17 +25,17 @@ module Servactory
               collection_message
             elsif value.is_a?(attribute.types.fetch(0, Array))
               I18n.t(
-                "servactory.#{attribute_system_name.to_s.pluralize}.checks.type.default_error.for_collection.wrong_element_type", # rubocop:disable Layout/LineLength
+                "servactory.#{attribute.i18n_name}.validations.type.default_error.for_collection.wrong_element_type",
                 service_class_name: service_class_name,
-                "#{attribute_system_name}_name": attribute.name,
+                "#{attribute.system_name}_name": attribute.name,
                 expected_type: expected_type,
                 given_type: given_type
               )
             else
               I18n.t(
-                "servactory.#{attribute_system_name.to_s.pluralize}.checks.type.default_error.for_collection.wrong_type", # rubocop:disable Layout/LineLength
+                "servactory.#{attribute.i18n_name}.validations.type.default_error.for_collection.wrong_type",
                 service_class_name: service_class_name,
-                "#{attribute_system_name}_name": attribute.name,
+                "#{attribute.system_name}_name": attribute.name,
                 expected_type: attribute.types.fetch(0, Array),
                 given_type: value.class.name
               )
@@ -46,7 +45,7 @@ module Servactory
 
             if hash_message.is_a?(Proc)
               hash_message.call(
-                "#{attribute_system_name}_name": attribute.name,
+                "#{attribute.system_name}_name": attribute.name,
                 key_name: key_name,
                 expected_type: expected_type,
                 given_type: given_type
@@ -55,9 +54,9 @@ module Servactory
               hash_message
             else
               I18n.t(
-                "servactory.#{attribute_system_name.to_s.pluralize}.checks.type.default_error.for_hash.wrong_element_type", # rubocop:disable Layout/LineLength
+                "servactory.#{attribute.i18n_name}.validations.type.default_error.for_hash.wrong_element_type",
                 service_class_name: service_class_name,
-                "#{attribute_system_name}_name": attribute.name,
+                "#{attribute.system_name}_name": attribute.name,
                 key_name: key_name,
                 expected_type: expected_type,
                 given_type: given_type
@@ -65,9 +64,9 @@ module Servactory
             end
           else
             I18n.t(
-              "servactory.#{attribute_system_name.to_s.pluralize}.checks.type.default_error.default",
+              "servactory.#{attribute.i18n_name}.validations.type.default_error.default",
               service_class_name: service_class_name,
-              "#{attribute_system_name}_name": attribute.name,
+              "#{attribute.system_name}_name": attribute.name,
               expected_type: expected_type,
               given_type: given_type
             )
@@ -117,7 +116,6 @@ module Servactory
             return @error_callback.call(
               message: DEFAULT_MESSAGE,
               service_class_name: @context.class.name,
-              attribute_system_name: attribute_system_name,
               attribute: @attribute,
               value: @value,
               key_name: nil,
@@ -130,7 +128,6 @@ module Servactory
             return @error_callback.call(
               message: DEFAULT_MESSAGE,
               service_class_name: @context.class.name,
-              attribute_system_name: attribute_system_name,
               attribute: @attribute,
               value: @value,
               key_name: first_error.fetch(:key_name),
@@ -142,7 +139,6 @@ module Servactory
           @error_callback.call(
             message: DEFAULT_MESSAGE,
             service_class_name: @context.class.name,
-            attribute_system_name: attribute_system_name,
             attribute: @attribute,
             value: @value,
             key_name: nil,
@@ -153,10 +149,6 @@ module Servactory
 
         private
 
-        def attribute_system_name
-          @attribute.class.name.demodulize.downcase.to_sym
-        end
-
         def prepared_types
           @prepared_types ||=
             if @attribute.collection_mode?

data/lib/servactory/outputs/output.rb

@@ -3,7 +3,8 @@
 module Servactory
   module Outputs
     class Output
-      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?
+        false
+      end
+
+      def output?
+        true
+      end
     end
   end
 end

data/lib/servactory/version.rb

@@ -3,8 +3,8 @@
 module Servactory
   module VERSION
     MAJOR = 2
-    MINOR = 0
-    PATCH = 4
+    MINOR = 1
+    PATCH = 1
     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.4
+  version: 2.1.1
 platform: ruby
 authors:
 - Anton Sokolov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-18 00:00:00.000000000 Z
+date: 2024-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -255,23 +255,16 @@ files:
 - lib/servactory/inputs/collection.rb
 - lib/servactory/inputs/dsl.rb
 - lib/servactory/inputs/input.rb
-- lib/servactory/inputs/tools/check_errors.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
-- lib/servactory/inputs/validations/inclusion.rb
-- lib/servactory/inputs/validations/must.rb
 - lib/servactory/inputs/validations/required.rb
-- lib/servactory/inputs/validations/type.rb
 - lib/servactory/inputs/workspace.rb
 - lib/servactory/internals/collection.rb
 - lib/servactory/internals/dsl.rb
 - 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
@@ -279,6 +272,13 @@ files:
 - 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/attributes/tools/check_errors.rb
+- lib/servactory/maintenance/attributes/tools/validation.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/collection_mode/class_names_collection.rb
 - lib/servactory/maintenance/hash_mode/class_names_collection.rb
 - lib/servactory/maintenance/validations/collection.rb
@@ -287,8 +287,6 @@ files:
 - lib/servactory/outputs/collection.rb
 - lib/servactory/outputs/dsl.rb
 - lib/servactory/outputs/output.rb
-- lib/servactory/outputs/validations/base.rb
-- lib/servactory/outputs/validations/type.rb
 - lib/servactory/result.rb
 - lib/servactory/test_kit/fake_type.rb
 - lib/servactory/test_kit/result.rb

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

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Inputs
-    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

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

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Inputs
-    module Tools
-      class Distributor
-        def self.assign!(...)
-          new(...).assign!
-        end
-
-        def initialize(incoming_arguments, collection_of_inputs)
-          @incoming_arguments = incoming_arguments
-          @collection_of_inputs = collection_of_inputs
-        end
-
-        def assign!
-          @collection_of_inputs.map do |input|
-            input.value = @incoming_arguments.fetch(input.name, nil)
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,66 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Inputs
-    module Validations
-      class Inclusion < Base
-        DEFAULT_MESSAGE = lambda do |service_class_name:, input:, value:|
-          I18n.t(
-            "servactory.inputs.checks.inclusion.default_error",
-            service_class_name: service_class_name,
-            input_name: input.name,
-            input_inclusion: input.inclusion[:in],
-            value: value
-          )
-        end
-
-        private_constant :DEFAULT_MESSAGE
-
-        def self.check(context:, input:, check_key:, **)
-          return unless should_be_checked_for?(input, check_key)
-
-          new(context: context, input: input).check
-        end
-
-        def self.should_be_checked_for?(input, check_key)
-          check_key == :inclusion && (
-            input.required? || (
-              input.optional? && !input.default.nil?
-            ) || (
-              input.optional? && !input.value.nil?
-            )
-          )
-        end
-
-        ##########################################################################
-
-        def initialize(context:, input:)
-          super()
-
-          @context = context
-          @input = input
-        end
-
-        def check
-          inclusion_in, message = @input.inclusion.values_at(:in, :message)
-
-          return if inclusion_in.nil?
-          return if inclusion_in.include?(@input.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,
-            input: @input,
-            value: @input.value
-          )
-        end
-      end
-    end
-  end
-end

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

@@ -1,99 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Inputs
-    module Validations
-      class Must < Base
-        DEFAULT_MESSAGE = lambda do |service_class_name:, input:, value:, code:|
-          I18n.t(
-            "servactory.inputs.checks.must.default_error",
-            service_class_name: service_class_name,
-            input_name: input.name,
-            value: value,
-            code: code
-          )
-        end
-
-        SYNTAX_ERROR_MESSAGE = lambda do |service_class_name:, input:, value:, code:, exception_message:|
-          I18n.t(
-            "servactory.inputs.checks.must.syntax_error",
-            service_class_name: service_class_name,
-            input_name: input.name,
-            value: value,
-            code: code,
-            exception_message: exception_message
-          )
-        end
-
-        private_constant :DEFAULT_MESSAGE, :SYNTAX_ERROR_MESSAGE
-
-        def self.check(context:, input:, check_key:, check_options:)
-          return unless should_be_checked_for?(input, check_key)
-
-          new(context: context, input: input, check_options: check_options).check
-        end
-
-        def self.should_be_checked_for?(input, check_key)
-          check_key == :must && input.must_present?
-        end
-
-        ##########################################################################
-
-        def initialize(context:, input:, check_options:)
-          super()
-
-          @context = context
-          @input = input
-          @check_options = check_options
-        end
-
-        def check
-          @check_options.each do |code, options|
-            message = call_or_fetch_message_from(code, options)
-
-            next if message.blank?
-
-            add_error_with(message, code)
-          end
-
-          errors
-        end
-
-        private
-
-        def call_or_fetch_message_from(code, options)
-          check, message = options.values_at(:is, :message)
-
-          return if check.call(value: @input.value)
-
-          message.presence || DEFAULT_MESSAGE
-        rescue StandardError => e
-          add_syntax_error_with(SYNTAX_ERROR_MESSAGE, code, e.message)
-        end
-
-        ########################################################################
-
-        def add_error_with(message, code)
-          add_error(
-            message: message,
-            service_class_name: @context.class.name,
-            input: @input,
-            value: @input.value,
-            code: code
-          )
-        end
-
-        def add_syntax_error_with(message, code, exception_message)
-          add_error(
-            message: message,
-            service_class_name: @context.class.name,
-            input: @input,
-            value: @input.value,
-            code: code,
-            exception_message: exception_message
-          )
-        end
-      end
-    end
-  end
-end

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

@@ -1,52 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Inputs
-    module Validations
-      class Type < Base
-        def self.check(context:, input:, check_key:, **)
-          return unless should_be_checked_for?(input, check_key)
-
-          new(context: context, input: input).check
-        end
-
-        def self.should_be_checked_for?(input, check_key)
-          check_key == :types && (
-            input.required? || (
-              input.optional? && !input.default.nil?
-            ) || (
-              input.optional? && !input.value.nil?
-            )
-          )
-        end
-
-        def initialize(context:, input:)
-          super()
-
-          @context = context
-          @input = input
-        end
-
-        def check
-          Servactory::Maintenance::Validations::Types.validate!(
-            context: @context,
-            attribute: @input,
-            types: @input.types,
-            value: prepared_value,
-            error_callback: ->(**args) { add_error(**args) }
-          )
-        end
-
-        private
-
-        def prepared_value
-          @prepared_value ||= if @input.optional? && !@input.default.nil? && @input.value.blank?
-                                @input.default
-                              else
-                                @input.value
-                              end
-        end
-      end
-    end
-  end
-end

data/lib/servactory/internals/validations/base.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Internals
-    module Validations
-      class Base
-        protected
-
-        def raise_error_with(message:, **attributes)
-          message = message.call(**attributes) if message.is_a?(Proc)
-
-          raise @context.class.config.internal_error_class.new(message: message)
-        end
-      end
-    end
-  end
-end