servactory 2.0.0.rc3 → 2.0.0.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdc12e7e579fdacbd13a9d7d4997113023dd0f3acb9be1050bf88d3c83c324a9
-  data.tar.gz: dbfb8137159dce0ae2fa37a143b9a7b75d1f6a758852fd580567615aa1081bc3
+  metadata.gz: ecb994c1e8be578cb83edfa20eb4b60efc3b80a36d24439e83e6b0c6208ac3be
+  data.tar.gz: d75f094fd6d07465761b542e7997ac222fcaf1c2e397216c10c768485a5b4250
 SHA512:
-  metadata.gz: d7696c3a4c46fc4dc72980fcb513d39a0a7f69a5e64d4ec2e6244f3c4f950e27cf25faa583c2b1a36dda2d91b33402588a24fc64d294b3fc83bd3f3bc227fcc1
-  data.tar.gz: 0531261cbd2a5e9b0af78c7775cbf08cd45f635b328788510d435bdaf361080931f4f6c7b3d1953e8538288c276fc35a4383e9276bc015ef88600f6591e49593
+  metadata.gz: a0213bf096871d202defff4eab2055bd91c9414c1ebd8bba279b2fda73df0345b1321bcb802a68176cc3b16abdc81c77dd2fd55294f06123a674ed74c2ae2c0f
+  data.tar.gz: 403bc708be4a3cfc9ce73c78f2f14336a8d49b9e9a488b0781b80ee2808cc2217599f3b5cc6f54396239e404e52f8d5719676b491f0adc0019bdb4f31c5b69b4

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/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/maintenance/attributes/option.rb

@@ -75,6 +75,7 @@ module Servactory
           )
         end
 
+        # rubocop:disable Metrics/MethodLength
         def prepare_advanced_for(
           body:,
           body_key:,
@@ -82,17 +83,22 @@ module Servactory
           body_fallback:
         )
           if body.is_a?(Hash)
-            message = body.fetch(:message, nil)
-
-            DEFAULT_BODY.call(
-              key: body_key,
-              body: body.fetch(body_key, message.present? ? body_value : body_fallback),
-              message: message
-            )
+            if @name == :schema && body.fetch(body_key, nil).nil?
+              DEFAULT_BODY.call(key: body_key, body: body)
+            else
+              message = body.fetch(:message, nil)
+
+              DEFAULT_BODY.call(
+                key: body_key,
+                body: body.fetch(body_key, message.present? ? body_value : body_fallback),
+                message: message
+              )
+            end
           else
             DEFAULT_BODY.call(key: body_key, body: body)
           end
         end
+        # rubocop:enable Metrics/MethodLength
 
         def prepare_methods_for(attribute)
           attribute.instance_eval(define_methods_template) if define_methods_template.present?

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

@@ -15,7 +15,7 @@ module Servactory
 
         def initialize(object:, schema:)
           @object = object
-          @schema = schema
+          @schema = schema.fetch(:is)
 
           @errors = []
         end

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

@@ -17,7 +17,11 @@ module Servactory
             collection_message = attribute.consists_of.fetch(:message)
 
             if collection_message.is_a?(Proc)
-              collection_message.call(attribute_system_name => attribute, expected_type: expected_type)
+              collection_message.call(
+                "#{attribute_system_name}_name": attribute.name,
+                expected_type: expected_type,
+                given_type: given_type
+              )
             elsif collection_message.is_a?(String) && collection_message.present?
               collection_message
             elsif value.is_a?(attribute.types.fetch(0, Array))
@@ -38,14 +42,27 @@ module Servactory
               )
             end
           elsif attribute.hash_mode? && key_name.present?
-            I18n.t(
-              "servactory.#{attribute_system_name.to_s.pluralize}.checks.type.default_error.for_hash.wrong_element_type", # rubocop:disable Layout/LineLength
-              service_class_name: service_class_name,
-              "#{attribute_system_name}_name": attribute.name,
-              key_name: key_name,
-              expected_type: expected_type,
-              given_type: given_type
-            )
+            hash_message = attribute.schema.fetch(:message)
+
+            if hash_message.is_a?(Proc)
+              hash_message.call(
+                "#{attribute_system_name}_name": attribute.name,
+                key_name: key_name,
+                expected_type: expected_type,
+                given_type: given_type
+              )
+            elsif hash_message.is_a?(String) && hash_message.present?
+              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
+                service_class_name: service_class_name,
+                "#{attribute_system_name}_name": attribute.name,
+                key_name: key_name,
+                expected_type: expected_type,
+                given_type: given_type
+              )
+            end
           else
             I18n.t(
               "servactory.#{attribute_system_name.to_s.pluralize}.checks.type.default_error.default",

data/lib/servactory/outputs/output.rb

@@ -37,7 +37,7 @@ module Servactory
         # Check Class: Servactory::Outputs::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/version.rb

@@ -5,7 +5,7 @@ module Servactory
     MAJOR = 2
     MINOR = 0
     PATCH = 0
-    PRE = "rc3"
+    PRE = "rc5"
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join(".")
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: servactory
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc3
+  version: 2.0.0.rc5
 platform: ruby
 authors:
 - Anton Sokolov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-19 00:00:00.000000000 Z
+date: 2023-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -114,28 +114,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.50'
+        version: '1.57'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.50'
+        version: '1.57'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '1.19'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '1.19'
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.19'
+        version: '2.24'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.19'
+        version: '2.24'
 - !ruby/object:Gem::Dependency
   name: steep
   requirement: !ruby/object:Gem::Requirement
@@ -204,6 +204,15 @@ files:
 - config/locales/en.yml
 - config/locales/ru.yml
 - lib/servactory.rb
+- lib/servactory/actions/action.rb
+- lib/servactory/actions/aliases/collection.rb
+- lib/servactory/actions/collection.rb
+- lib/servactory/actions/dsl.rb
+- lib/servactory/actions/shortcuts/collection.rb
+- lib/servactory/actions/stages/collection.rb
+- lib/servactory/actions/stages/stage.rb
+- lib/servactory/actions/tools/runner.rb
+- lib/servactory/actions/workspace.rb
 - lib/servactory/base.rb
 - lib/servactory/configuration/dsl.rb
 - lib/servactory/configuration/factory.rb
@@ -254,15 +263,6 @@ files:
 - lib/servactory/maintenance/validations/collection.rb
 - lib/servactory/maintenance/validations/object_schema.rb
 - lib/servactory/maintenance/validations/types.rb
-- lib/servactory/methods/aliases_for_make/collection.rb
-- lib/servactory/methods/dsl.rb
-- lib/servactory/methods/method.rb
-- lib/servactory/methods/method_collection.rb
-- lib/servactory/methods/shortcuts_for_make/collection.rb
-- lib/servactory/methods/stage.rb
-- lib/servactory/methods/stage_collection.rb
-- lib/servactory/methods/tools/runner.rb
-- lib/servactory/methods/workspace.rb
 - lib/servactory/outputs/collection.rb
 - lib/servactory/outputs/dsl.rb
 - lib/servactory/outputs/output.rb

data/lib/servactory/methods/stage.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Methods
-    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 ||= MethodCollection.new
-      end
-    end
-  end
-end

data/lib/servactory/methods/stage_collection.rb

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