servactory 2.6.0.rc5 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 644c141dd6e3bdee996ffc4aad56a6e9b472ad964406923cc14fd1185541e2ae
-  data.tar.gz: 4036bed062dd8717f6288c72c498cca4a2a91401154a23266148a42cac2aa10a
+  metadata.gz: 64f8eb059214e69b961c2e6a5c91565eff6372eaa64677a5d7da42f8f301d38b
+  data.tar.gz: c49125a5572e80d044668bcd70b6f45bd9d4c0c0109fe6ce35238fc1b630d405
 SHA512:
-  metadata.gz: '09e7437eedd68dc0c14a98ec4c6c5c922483fc9e3924425a0478bb8d1404c36ef0531fb2adb9d2094ff7fa20633f92fb44fa8bd5588c6d7b28372371fe709af8'
-  data.tar.gz: ac82354cffdb531261d50a12f0a54fb79bca2474fcf00b9851769ebcbe2a08c9c46fbb8edfb07bb8964142adac85e901d6773082001ffc0248746e8c448b77a1
+  metadata.gz: 9c17c8c39353bca7c6efc198472c7c8e088a934ea1e9181522d653580ec3dad9f9046169b38396d1b2508860fe21b3fc1fef1eb0d6d84b7e913b50e78664a8ff
+  data.tar.gz: a3555354a011e24848d9cbace96d5dad5db690d9a07b8cb41318b7e5820e24f04194f55b7faee4e38c8f7a521e13a2022f756802ce49c4168211135263980ba6

data/config/locales/en.yml

@@ -61,7 +61,7 @@ en:
             format:
               default: "[%{service_class_name}] Internal attribute `%{internal_name}` does not match `%{format_name}` format"
               wrong_pattern: "[%{service_class_name}] Internal attribute `%{internal_name}` does not match `%{format_name}` format"
-              unknown: "[%{service_class_name}] Unknown `%{format_name}` format specified for output attribute `%{internal_name}`"
+              unknown: "[%{service_class_name}] Unknown `%{format_name}` format specified for internal attribute `%{internal_name}`"
             min:
               default: "[%{service_class_name}] Internal attribute `%{internal_name}` received value `%{value}`, which is less than `%{option_value}`"
             max:

data/config/locales/ru.yml

@@ -95,6 +95,7 @@ ru:
             max:
               default: "[%{service_class_name}] Выходящий атрибут `%{output_name}` получил значение `%{value}`, которое больше `%{option_value}`"
         type:
-          default: "[%{service_class_name}] Неправильный тип выходящего атрибута `%{output_name}`, ожидалось `%{expected_type}`, получено `%{given_type}`"
-          for_hash:
-            wrong_element_type: "[%{service_class_name}] Неправильный тип в хеше выходящего атрибута `%{output_name}`, для `%{key_name}` ожидалось `%{expected_type}`, получено `%{given_type}`"
+          default_error:
+            default: "[%{service_class_name}] Неправильный тип выходящего атрибута `%{output_name}`, ожидалось `%{expected_type}`, получено `%{given_type}`"
+            for_hash:
+              wrong_element_type: "[%{service_class_name}] Неправильный тип в хеше выходящего атрибута `%{output_name}`, для `%{key_name}` ожидалось `%{expected_type}`, получено `%{given_type}`"

data/lib/generators/servactory/templates/services/application_service/base.rb

@@ -48,6 +48,8 @@ module ApplicationService
       #   ]
       # )
 
+      # collection_mode_class_names [ActiveRecord::Relation]
+
       # hash_mode_class_names [CustomHash]
 
       # action_shortcuts %i[assign build create save]

data/lib/servactory/configuration/actions/aliases/collection.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Servactory
+  module Configuration
+    module Actions
+      module Aliases
+        class Collection
+          extend Forwardable
+          def_delegators :@collection, :<<, :merge, :include?
+
+          def initialize(*)
+            @collection = Set.new
+          end
+        end
+      end
+    end
+  end
+end

data/lib/servactory/configuration/actions/rescue_handlers/collection.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Servactory
+  module Configuration
+    module Actions
+      module RescueHandlers
+        class Collection
+          extend Forwardable
+          def_delegators :@collection, :+, :detect, :reverse_each
+
+          def initialize(*)
+            @collection = Set.new
+          end
+        end
+      end
+    end
+  end
+end

data/lib/servactory/configuration/actions/shortcuts/collection.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Servactory
+  module Configuration
+    module Actions
+      module Shortcuts
+        class Collection
+          extend Forwardable
+          def_delegators :@collection, :<<, :each, :merge, :include?
+
+          def initialize(*)
+            @collection = Set.new
+          end
+        end
+      end
+    end
+  end
+end

data/lib/servactory/configuration/collection_mode/class_names_collection.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Servactory
+  module Configuration
+    module CollectionMode
+      class ClassNamesCollection
+        extend Forwardable
+        def_delegators :@collection, :merge, :intersection
+
+        def initialize(collection)
+          @collection = collection
+        end
+      end
+    end
+  end
+end

data/lib/servactory/{maintenance → configuration}/hash_mode/class_names_collection.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Servactory
-  module Maintenance
+  module Configuration
     module HashMode
       class ClassNamesCollection
         extend Forwardable

data/lib/servactory/{maintenance/attributes → configuration/option_helpers}/option_helpers_collection.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Servactory
-  module Maintenance
-    module Attributes
+  module Configuration
+    module OptionHelpers
       class OptionHelpersCollection
         extend Forwardable
         def_delegators :@collection, :<<, :find, :merge

data/lib/servactory/configuration/setup.rb

@@ -31,23 +31,23 @@ module Servactory
         @result_class = Servactory::Result
 
         @collection_mode_class_names =
-          Servactory::Configuration::ClassNamesCollection.new(default_collection_mode_class_names)
+          Servactory::Configuration::CollectionMode::ClassNamesCollection.new(default_collection_mode_class_names)
 
         @hash_mode_class_names =
-          Servactory::Maintenance::HashMode::ClassNamesCollection.new(default_hash_mode_class_names)
+          Servactory::Configuration::HashMode::ClassNamesCollection.new(default_hash_mode_class_names)
 
         @input_option_helpers =
-          Servactory::Maintenance::Attributes::OptionHelpersCollection.new(default_input_option_helpers)
+          Servactory::Configuration::OptionHelpers::OptionHelpersCollection.new(default_input_option_helpers)
 
         @internal_option_helpers =
-          Servactory::Maintenance::Attributes::OptionHelpersCollection.new(default_internal_option_helpers)
+          Servactory::Configuration::OptionHelpers::OptionHelpersCollection.new(default_internal_option_helpers)
 
         @output_option_helpers =
-          Servactory::Maintenance::Attributes::OptionHelpersCollection.new(default_output_option_helpers)
+          Servactory::Configuration::OptionHelpers::OptionHelpersCollection.new(default_output_option_helpers)
 
-        @action_aliases = Servactory::Actions::Aliases::Collection.new
-        @action_shortcuts = Servactory::Actions::Shortcuts::Collection.new
-        @action_rescue_handlers = Servactory::Actions::RescueHandlers::Collection.new
+        @action_aliases = Servactory::Configuration::Actions::Aliases::Collection.new
+        @action_shortcuts = Servactory::Configuration::Actions::Shortcuts::Collection.new
+        @action_rescue_handlers = Servactory::Configuration::Actions::RescueHandlers::Collection.new
 
         @i18n_root_key = "servactory"
 

data/lib/servactory/info/dsl.rb

@@ -11,14 +11,14 @@ module Servactory
         def info # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
           Servactory::Info::Result.new(
             inputs: collection_of_inputs.to_h do |input|
-              work = input.class::Actor.new(input)
+              actor = input.class::Actor.new(input)
               inclusion = input.collection_of_options.find_by(name: :inclusion)
               must = input.collection_of_options.find_by(name: :must)
 
               [
                 input.name,
                 {
-                  work: work,
+                  actor: actor,
                   types: input.types,
                   required: input.required,
                   default: input.default,
@@ -29,14 +29,14 @@ module Servactory
             end,
 
             internals: collection_of_internals.to_h do |internal|
-              work = internal.class::Actor.new(internal)
+              actor = internal.class::Actor.new(internal)
               inclusion = internal.collection_of_options.find_by(name: :inclusion)
               must = internal.collection_of_options.find_by(name: :must)
 
               [
                 internal.name,
                 {
-                  work: work,
+                  actor: actor,
                   types: internal.types,
                   inclusion: inclusion.body,
                   must: must.body
@@ -45,14 +45,14 @@ module Servactory
             end,
 
             outputs: collection_of_outputs.to_h do |output|
-              work = output.class::Actor.new(output)
+              actor = output.class::Actor.new(output)
               inclusion = output.collection_of_options.find_by(name: :inclusion)
               must = output.collection_of_options.find_by(name: :must)
 
               [
                 output.name,
                 {
-                  work: work,
+                  actor: actor,
                   types: output.types,
                   inclusion: inclusion.body,
                   must: must.body

data/lib/servactory/test_kit/rspec/matchers/have_service_input_matchers/valid_with_matcher.rb

@@ -142,11 +142,14 @@ module Servactory
                   value: wrong_value
                 )
               elsif input_required_message.is_a?(Proc)
-                input_work = attribute_data.fetch(:work)
+                service_class = Struct.new(:class_name, keyword_init: true)
+                service = service_class.new(class_name: described_class.name)
+
+                input_actor = attribute_data.fetch(:actor)
 
                 input_required_message = input_required_message.call(
-                  service_class_name: described_class.name,
-                  input: input_work,
+                  service: service,
+                  input: input_actor,
                   value: wrong_value
                 )
               end

data/lib/servactory/tool_kit/dynamic_options/consists_of.rb

@@ -35,19 +35,10 @@ module Servactory
           validate_for!(attribute: attribute, values: values, option: option)
         end
 
-        # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         def validate_for!(attribute:, values:, option:)
           consists_of_types = Array(option.value)
 
-          if !consists_of_types.include?(NilClass) && !values&.all?(&:present?) &&
-             (
-               (
-                 attribute.input? && (
-                   (values.blank? && attribute.required?) ||
-                   (values.present? && attribute.required?)
-                 )
-               ) || attribute.internal? || attribute.output?
-             )
+          if fails_presence_validation?(attribute: attribute, values: values, consists_of_types: consists_of_types)
             return [false, :required]
           end
 
@@ -59,7 +50,18 @@ module Servactory
 
           [false, :wrong_element_type]
         end
-        # rubocop:enable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+
+        def fails_presence_validation?(attribute:, values:, consists_of_types:)
+          return false if consists_of_types.include?(NilClass)
+
+          check_present = proc { _1 && !values.all?(&:present?) }
+
+          [
+            check_present[attribute.input? && (attribute.required? || (attribute.optional? && values.present?))],
+            check_present[attribute.internal?],
+            check_present[attribute.output?]
+          ].any?
+        end
 
         ########################################################################
 

data/lib/servactory/version.rb

@@ -4,8 +4,8 @@ module Servactory
   module VERSION
     MAJOR = 2
     MINOR = 6
-    PATCH = 0
-    PRE = "rc5"
+    PATCH = 1
+    PRE = nil
 
     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.6.0.rc5
+  version: 2.6.1
 platform: ruby
 authors:
 - Anton Sokolov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-11 00:00:00.000000000 Z
+date: 2024-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -245,20 +245,22 @@ files:
 - lib/generators/servactory/templates/services/application_service/result.rb
 - 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/rescue_handlers/collection.rb
-- lib/servactory/actions/shortcuts/collection.rb
 - lib/servactory/actions/stages/collection.rb
 - lib/servactory/actions/stages/stage.rb
 - lib/servactory/actions/tools/rules.rb
 - lib/servactory/actions/tools/runner.rb
 - lib/servactory/actions/workspace.rb
 - lib/servactory/base.rb
-- lib/servactory/configuration/class_names_collection.rb
+- lib/servactory/configuration/actions/aliases/collection.rb
+- lib/servactory/configuration/actions/rescue_handlers/collection.rb
+- lib/servactory/configuration/actions/shortcuts/collection.rb
+- lib/servactory/configuration/collection_mode/class_names_collection.rb
 - lib/servactory/configuration/dsl.rb
 - lib/servactory/configuration/factory.rb
+- lib/servactory/configuration/hash_mode/class_names_collection.rb
+- lib/servactory/configuration/option_helpers/option_helpers_collection.rb
 - lib/servactory/configuration/setup.rb
 - lib/servactory/context/callable.rb
 - lib/servactory/context/dsl.rb
@@ -299,7 +301,6 @@ files:
 - 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/registrar.rb
 - lib/servactory/maintenance/attributes/options_collection.rb
 - lib/servactory/maintenance/attributes/tools/check_errors.rb
@@ -312,7 +313,6 @@ files:
 - lib/servactory/maintenance/attributes/validations/inclusion.rb
 - lib/servactory/maintenance/attributes/validations/must.rb
 - lib/servactory/maintenance/attributes/validations/type.rb
-- lib/servactory/maintenance/hash_mode/class_names_collection.rb
 - lib/servactory/maintenance/validations/object_schema.rb
 - lib/servactory/maintenance/validations/types.rb
 - lib/servactory/outputs/collection.rb

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

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Actions
-    module Aliases
-      class Collection
-        extend Forwardable
-        def_delegators :@collection, :<<, :merge, :include?
-
-        def initialize(*)
-          @collection = Set.new
-        end
-      end
-    end
-  end
-end

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

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Actions
-    module RescueHandlers
-      class Collection
-        extend Forwardable
-        def_delegators :@collection, :+, :detect, :reverse_each
-
-        def initialize(*)
-          @collection = Set.new
-        end
-      end
-    end
-  end
-end

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

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Actions
-    module Shortcuts
-      class Collection
-        extend Forwardable
-        def_delegators :@collection, :<<, :each, :merge, :include?
-
-        def initialize(*)
-          @collection = Set.new
-        end
-      end
-    end
-  end
-end

data/lib/servactory/configuration/class_names_collection.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Configuration
-    class ClassNamesCollection
-      extend Forwardable
-      def_delegators :@collection, :merge, :intersection
-
-      def initialize(collection)
-        @collection = collection
-      end
-    end
-  end
-end