servactory 2.0.0.rc2 → 2.0.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7138f6d9bc8c21740306eabe282daf762cefd3e0504c1a40761f7db5c2e904ab
-  data.tar.gz: '09dbc3c8168b68e0db456ba7f0e71242412d05c19fb78d45b25f2161b7b06202'
+  metadata.gz: 83987eae2d3539d8eb196d0dd08d13ffee8449050d297794577933e8e5735e98
+  data.tar.gz: e35002ff20d061cc257c9e8ff99a8fd258f784ac19abce0d7c8f5c7a2c46f683
 SHA512:
-  metadata.gz: 91f6501df9724f4f116dc03ee57863c7e732f77f8c97b9eae7e9ecf64e85fdb7e5f5c976dcf4c92337711566ea122283013ddc4e3d34b60dd970dc380cc3dd0f
-  data.tar.gz: bf86943b60422743c0b829cce81fc3f753315a5c129edb228a54a42170f352816c8a306cefd53a2c5199dedfd4801a3df10f7d34043d12f924f22db290fd9450
+  metadata.gz: 43268e0c7630e1eacd10efaf852eb0d26cbb5e30b4a4e5395202e67b4e9246dd2b92775da9318ced39cbd407aa714e4b89f151b6f2bc6164dab7bda722d84085
+  data.tar.gz: 999194eaeb288a7919d1177a46acac0ad35d07c039b7feb088140141ae9c34eb069cce39c5aaa22033bae0f9df7dc7981a8eb9c78bededfe0df540d97e7bb649

data/config/locales/en.yml

@@ -17,7 +17,8 @@ en:
         type:
           default_error:
             default: "[%{service_class_name}] Wrong type of input `%{input_name}`, expected `%{expected_type}`, got `%{given_type}`"
-            for_collection: "[%{service_class_name}] Wrong type in input collection `%{input_name}`, expected `%{expected_type}`"
+            for_collection:
+              wrong_element_type: "[%{service_class_name}] Wrong type in input collection `%{input_name}`, expected `%{expected_type}`, got `%{given_type}`"
             for_hash:
               wrong_element_type: "[%{service_class_name}] Wrong type in input hash `%{input_name}`, expected `%{expected_type}` for `%{key_name}`, got `%{given_type}`"
       tools:

data/config/locales/ru.yml

@@ -17,7 +17,8 @@ ru:
         type:
           default_error:
             default: "[%{service_class_name}] Неправильный тип инпута `%{input_name}`, ожидалось `%{expected_type}`, получено `%{given_type}`"
-            for_collection: "[%{service_class_name}] Неправильный тип в коллекции инпута `%{input_name}`, ожидалось `%{expected_type}`"
+            for_collection:
+              wrong_element_type: "[%{service_class_name}] Неправильный тип в коллекции инпута `%{input_name}`, ожидалось `%{expected_type}`, получено `%{given_type}`"
             for_hash:
               wrong_element_type: "[%{service_class_name}] Неправильный тип в хеше инпута `%{input_name}`, для `%{key_name}` ожидалось `%{expected_type}`, получено `%{given_type}`"
 

data/lib/servactory/{methods/method.rb → actions/action.rb}

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Servactory
-  module Methods
-    class Method
+  module Actions
+    class Action
       attr_reader :name,
                   :position,
                   :condition,

data/lib/servactory/{methods/aliases_for_make → actions/aliases}/collection.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Servactory
-  module Methods
-    module AliasesForMake
+  module Actions
+    module Aliases
       class Collection
         extend Forwardable
         def_delegators :@collection, :<<, :merge, :include?

data/lib/servactory/{methods/method_collection.rb → actions/collection.rb}

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Servactory
-  module Methods
-    class MethodCollection
+  module Actions
+    class Collection
       extend Forwardable
       def_delegators :@collection, :<<, :each, :sort_by
 
@@ -11,7 +11,7 @@ module Servactory
       end
 
       def sorted_by_position
-        MethodCollection.new(sort_by(&:position))
+        Collection.new(sort_by(&:position))
       end
     end
   end

data/lib/servactory/{methods → actions}/dsl.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Servactory
-  module Methods
+  module Actions
     module DSL
       def self.included(base)
         base.extend(ClassMethods)
@@ -18,7 +18,7 @@ module Servactory
         private
 
         def stage(&block)
-          @current_stage = Stage.new(position: next_position)
+          @current_stage = Stages::Stage.new(position: next_position)
 
           instance_eval(&block)
 
@@ -56,9 +56,9 @@ module Servactory
         def make(name, position: nil, **options)
           position = position.presence || next_position
 
-          current_stage = @current_stage.presence || Stage.new(position: position)
+          current_stage = @current_stage.presence || Stages::Stage.new(position: position)
 
-          current_stage.methods << Method.new(
+          current_stage.methods << Action.new(
             name,
             position: position,
             **options
@@ -68,9 +68,9 @@ module Servactory
         end
 
         def method_missing(name, *args, &block)
-          return method_missing_for_aliases_for_make(name, *args, &block) if config.aliases_for_make.include?(name)
+          return method_missing_for_aliases_for_make(name, *args, &block) if config.action_aliases.include?(name)
 
-          return method_missing_for_shortcuts_for_make(name, *args, &block) if config.shortcuts_for_make.include?(name)
+          return method_missing_for_shortcuts_for_make(name, *args, &block) if config.action_shortcuts.include?(name)
 
           super
         end
@@ -93,7 +93,7 @@ module Servactory
         end
 
         def respond_to_missing?(name, *)
-          config.aliases_for_make.include?(name) || config.shortcuts_for_make.include?(name) || super
+          config.action_aliases.include?(name) || config.action_shortcuts.include?(name) || super
         end
 
         def next_position
@@ -101,7 +101,7 @@ module Servactory
         end
 
         def collection_of_stages
-          @collection_of_stages ||= StageCollection.new
+          @collection_of_stages ||= Stages::Collection.new
         end
       end
     end

data/lib/servactory/{methods/shortcuts_for_make → actions/shortcuts}/collection.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Servactory
-  module Methods
-    module ShortcutsForMake
+  module Actions
+    module Shortcuts
       class Collection
         extend Forwardable
         def_delegators :@collection, :<<, :each, :merge, :include?

data/lib/servactory/actions/stages/collection.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Servactory
+  module Actions
+    module Stages
+      class Collection
+        extend Forwardable
+        def_delegators :@collection, :<<, :each, :merge, :sort_by, :size, :empty?
+
+        def initialize(collection = Set.new)
+          @collection = collection
+        end
+
+        def sorted_by_position
+          Collection.new(sort_by(&:position))
+        end
+      end
+    end
+  end
+end

data/lib/servactory/actions/stages/stage.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Servactory
+  module Actions
+    module Stages
+      class Stage
+        attr_accessor :position,
+                      :wrapper,
+                      :rollback,
+                      :condition,
+                      :is_condition_opposite
+
+        def initialize(position:, wrapper: nil, rollback: nil, condition: nil)
+          @position = position
+          @wrapper = wrapper
+          @rollback = rollback
+          @condition = condition
+        end
+
+        def next_method_position
+          methods.size + 1
+        end
+
+        def methods
+          @methods ||= Collection.new
+        end
+      end
+    end
+  end
+end

data/lib/servactory/{methods → actions}/tools/runner.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Servactory
-  module Methods
+  module Actions
     module Tools
       class Runner
         def self.run!(...)

data/lib/servactory/{methods → actions}/workspace.rb

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
 module Servactory
-  module Methods
+  module Actions
     module Workspace
       private
 
       def call!(collection_of_stages:, **)
         super
 
-        Servactory::Methods::Tools::Runner.run!(self, collection_of_stages)
+        Servactory::Actions::Tools::Runner.run!(self, collection_of_stages)
       end
     end
   end

data/lib/servactory/base.rb

@@ -8,7 +8,7 @@ module Servactory
     include Inputs::DSL
     include Internals::DSL
     include Outputs::DSL
-    include Methods::DSL
+    include Actions::DSL
 
     private_class_method :new
   end

data/lib/servactory/configuration/dsl.rb

@@ -21,8 +21,8 @@ module Servactory
 
           child.config.input_option_helpers = config.input_option_helpers
 
-          child.config.aliases_for_make = config.aliases_for_make
-          child.config.shortcuts_for_make = config.shortcuts_for_make
+          child.config.action_aliases = config.action_aliases
+          child.config.action_shortcuts = config.action_shortcuts
         end
 
         def config

data/lib/servactory/configuration/factory.rb

@@ -28,19 +28,19 @@ module Servactory
       end
 
       def hash_mode_class_names(hash_mode_class_names)
-        @config.collection_mode_class_names.merge(hash_mode_class_names)
+        @config.hash_mode_class_names.merge(hash_mode_class_names)
       end
 
       def input_option_helpers(input_option_helpers)
         @config.input_option_helpers.merge(input_option_helpers)
       end
 
-      def aliases_for_make(aliases_for_make)
-        @config.aliases_for_make.merge(aliases_for_make)
+      def action_aliases(action_aliases)
+        @config.action_aliases.merge(action_aliases)
       end
 
-      def shortcuts_for_make(shortcuts_for_make)
-        @config.shortcuts_for_make.merge(shortcuts_for_make)
+      def action_shortcuts(action_shortcuts)
+        @config.action_shortcuts.merge(action_shortcuts)
       end
     end
   end

data/lib/servactory/configuration/setup.rb

@@ -10,8 +10,8 @@ module Servactory
                     :collection_mode_class_names,
                     :hash_mode_class_names,
                     :input_option_helpers,
-                    :aliases_for_make,
-                    :shortcuts_for_make
+                    :action_aliases,
+                    :action_shortcuts
 
       def initialize # rubocop:disable Metrics/MethodLength
         @input_error_class = Servactory::Errors::InputError
@@ -29,8 +29,8 @@ module Servactory
         @input_option_helpers =
           Servactory::Maintenance::Attributes::OptionHelpersCollection.new(default_input_option_helpers)
 
-        @aliases_for_make = Servactory::Methods::AliasesForMake::Collection.new
-        @shortcuts_for_make = Servactory::Methods::ShortcutsForMake::Collection.new
+        @action_aliases = Servactory::Actions::Aliases::Collection.new
+        @action_shortcuts = Servactory::Actions::Shortcuts::Collection.new
       end
 
       private

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

@@ -48,7 +48,9 @@ module Servactory
 
           input.value = input.default if input.optional? && input.value.blank?
 
-          input.value = prepare_object_values_inside(object: input.value, schema: input.schema) if input.hash_mode?
+          if input.hash_mode?
+            input.value = prepare_hash_values_inside(object: input.value, schema: input.schema.fetch(:is))
+          end
 
           input_prepare = input.prepare.fetch(:in, nil)
           input.value = input_prepare.call(value: input.value) if input_prepare.present?
@@ -60,7 +62,7 @@ module Servactory
           end
         end
 
-        def prepare_object_values_inside(object:, schema:) # rubocop:disable Metrics/MethodLength
+        def prepare_hash_values_inside(object:, schema:) # rubocop:disable Metrics/MethodLength
           return object unless object.respond_to?(:fetch)
 
           schema.to_h do |schema_key, schema_value|
@@ -68,12 +70,12 @@ module Servactory
 
             result =
               if attribute_type == Hash
-                prepare_object_values_inside(
+                prepare_hash_values_inside(
                   object: object.fetch(schema_key, {}),
                   schema: schema_value.except(*RESERVED_ATTRIBUTES)
                 )
               else
-                fetch_object_values_from(
+                fetch_hash_values_from(
                   value: object.fetch(schema_key, {}),
                   schema_value: schema_value,
                   attribute_required: schema_value.fetch(:required, true)
@@ -84,7 +86,7 @@ module Servactory
           end
         end
 
-        def fetch_object_values_from(value:, schema_value:, attribute_required:)
+        def fetch_hash_values_from(value:, schema_value:, attribute_required:)
           return value if attribute_required
           return value if value.present?
 

data/lib/servactory/dsl.rb

@@ -14,7 +14,7 @@ module Servactory
 
       extensions.each { |extension| base.include(extension) }
 
-      base.include(Methods::DSL)
+      base.include(Actions::DSL)
     end
 
     def self.with_extensions(*extensions)

data/lib/servactory/inputs/input.rb

@@ -68,7 +68,7 @@ module Servactory
         add_types_option_with(type)
         add_default_option_with(options)
         add_collection_option_with(type, options)
-        add_object_option_with(type, options)
+        add_hash_option_with(type, options)
 
         # Check Class: Servactory::Inputs::Validations::Inclusion
         add_inclusion_option_with(options)
@@ -161,7 +161,7 @@ module Servactory
         )
       end
 
-      def add_object_option_with(type, options) # rubocop:disable Metrics/MethodLength
+      def add_hash_option_with(type, options) # rubocop:disable Metrics/MethodLength
         collection_of_options << Servactory::Maintenance::Attributes::Option.new(
           name: :schema,
           attribute: self,
@@ -178,8 +178,8 @@ module Servactory
             )
           ],
           need_for_checks: false,
+          body_key: :is,
           body_fallback: {},
-          with_advanced_mode: false,
           **options
         )
       end

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

@@ -6,7 +6,7 @@ module Servactory
       class Base
         private
 
-        def add_error(message, **attributes)
+        def add_error(message:, **attributes)
           message = message.call(**attributes) if message.is_a?(Proc)
 
           errors << message

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

@@ -54,7 +54,7 @@ module Servactory
 
         def add_error_with(message)
           add_error(
-            message.presence || DEFAULT_MESSAGE,
+            message: message.presence || DEFAULT_MESSAGE,
             service_class_name: @context.class.name,
             input: @input,
             value: @input.value

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

@@ -75,7 +75,7 @@ module Servactory
 
         def add_error_with(message, code)
           add_error(
-            message,
+            message: message,
             service_class_name: @context.class.name,
             input: @input,
             value: @input.value,
@@ -85,7 +85,7 @@ module Servactory
 
         def add_syntax_error_with(message, code, exception_message)
           add_error(
-            message,
+            message: message,
             service_class_name: @context.class.name,
             input: @input,
             value: @input.value,

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

@@ -52,7 +52,7 @@ module Servactory
 
         def add_error_with(message)
           add_error(
-            message.presence || DEFAULT_MESSAGE,
+            message: message.presence || DEFAULT_MESSAGE,
             service_class_name: @context.class.name,
             input: @input,
             value: @input.value

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

@@ -3,50 +3,11 @@
 module Servactory
   module Inputs
     module Validations
-      class Type < Base # rubocop:disable Metrics/ClassLength
-        DEFAULT_MESSAGE = lambda do |service_class_name:, input:, key_name:, expected_type:, given_type:| # rubocop:disable Metrics/BlockLength
-          if input.collection_mode?
-            collection_message = input.consists_of.fetch(:message)
-
-            if collection_message.is_a?(Proc)
-              collection_message.call(input: input, expected_type: expected_type)
-            elsif collection_message.is_a?(String) && collection_message.present?
-              collection_message
-            else
-              I18n.t(
-                "servactory.inputs.checks.type.default_error.for_collection",
-                service_class_name: service_class_name,
-                input_name: input.name,
-                expected_type: expected_type,
-                given_type: given_type
-              )
-            end
-          elsif input.hash_mode? && key_name.present?
-            I18n.t(
-              "servactory.inputs.checks.type.default_error.for_hash.wrong_element_type",
-              service_class_name: service_class_name,
-              input_name: input.name,
-              key_name: key_name,
-              expected_type: expected_type,
-              given_type: given_type
-            )
-          else
-            I18n.t(
-              "servactory.inputs.checks.type.default_error.default",
-              service_class_name: service_class_name,
-              input_name: input.name,
-              expected_type: expected_type,
-              given_type: given_type
-            )
-          end
-        end
-
-        private_constant :DEFAULT_MESSAGE
-
-        def self.check(context:, input:, check_key:, check_options:)
+      class Type < Base
+        def self.check(context:, input:, check_key:, **)
           return unless should_be_checked_for?(input, check_key)
 
-          new(context: context, input: input, types: check_options).check
+          new(context: context, input: input).check
         end
 
         def self.should_be_checked_for?(input, check_key)
@@ -59,62 +20,24 @@ module Servactory
           )
         end
 
-        ##########################################################################
-
-        def initialize(context:, input:, types:)
+        def initialize(context:, input:)
           super()
 
           @context = context
           @input = input
-          @types = types
-        end
-
-        def check # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-          object_schema_validator = nil
-
-          return if prepared_types.any? do |type|
-            if @input.collection_mode?
-              prepared_value.is_a?(@types.fetch(0, Array)) &&
-              prepared_value.respond_to?(:all?) && prepared_value.all?(type)
-            elsif @input.hash_mode?
-              object_schema_validator = Servactory::Maintenance::Validations::ObjectSchema.validate(
-                object: prepared_value,
-                schema: @input.schema
-              )
-
-              object_schema_validator.valid?
-            else
-              prepared_value.is_a?(type)
-            end
-          end
-
-          if (first_error = object_schema_validator&.errors&.first).present?
-            return add_default_object_error_with(first_error)
-          end
-
-          add_default_error
         end
 
-        ########################################################################
-
-        def prepared_types
-          @prepared_types ||=
-            if @input.collection_mode?
-              prepared_types_from(Array(@input.consists_of.fetch(:type, [])))
-            else
-              prepared_types_from(@types)
-            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
 
-        def prepared_types_from(types)
-          types.map do |type|
-            if type.is_a?(String)
-              Object.const_get(type)
-            else
-              type
-            end
-          end
-        end
+        private
 
         def prepared_value
           @prepared_value ||= if @input.optional? && !@input.default.nil? && @input.value.blank?
@@ -123,30 +46,6 @@ module Servactory
                                 @input.value
                               end
         end
-
-        private
-
-        def add_default_object_error_with(error)
-          add_error(
-            DEFAULT_MESSAGE,
-            service_class_name: @context.class.name,
-            input: @input,
-            key_name: error.fetch(:name),
-            expected_type: error.fetch(:expected_type),
-            given_type: error.fetch(:given_type)
-          )
-        end
-
-        def add_default_error
-          add_error(
-            DEFAULT_MESSAGE,
-            service_class_name: @context.class.name,
-            input: @input,
-            key_name: nil,
-            expected_type: prepared_types.join(", "),
-            given_type: prepared_value.class.name
-          )
-        end
       end
     end
   end

data/lib/servactory/internals/internal.rb

@@ -37,7 +37,7 @@ module Servactory
         # Check Class: Servactory::Internals::Validations::Type
         add_types_option_with(type)
         add_collection_option_with(type, options)
-        add_object_option_with(type, options)
+        add_hash_option_with(type, options)
       end
 
       def add_types_option_with(type)
@@ -71,7 +71,7 @@ module Servactory
         )
       end
 
-      def add_object_option_with(type, options) # rubocop:disable Metrics/MethodLength
+      def add_hash_option_with(type, options) # rubocop:disable Metrics/MethodLength
         collection_of_options << Servactory::Maintenance::Attributes::Option.new(
           name: :schema,
           attribute: self,
@@ -83,8 +83,8 @@ module Servactory
             )
           ],
           need_for_checks: false,
+          body_key: :is,
           body_fallback: {},
-          with_advanced_mode: false,
           **options
         )
       end

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

@@ -6,7 +6,7 @@ module Servactory
       class Base
         protected
 
-        def raise_error_with(message, **attributes)
+        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)