servactory 2.8.0 → 2.9.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fd2afd31c63b79469991b78c2c30728aa2d268eeaf9deac3ea0e72c06db6614
-  data.tar.gz: e11af49a2bc836b3f265c4dc48957106550b905c05682cb837099ed53a62c24a
+  metadata.gz: 3a295d5b65040b9767438b436911e505ba6fa55adc08eff17b4519ca590821fb
+  data.tar.gz: b822546868d45ea6d96af38844992346d291328f7fc45479d07885b96cbe2bde
 SHA512:
-  metadata.gz: 7d22e4e63465bcc22943d6eb90085081ba299ea571cea5393fabc22dae15d434e05b51f78f7fd26d27d93d3775419d89c24a47c492c2a8808565e5a8d6f0bfc4
-  data.tar.gz: cb529f9e8c66ef9de222ae4a66b0884635f1dda2435020a67d024c61686f6ffa1434e80b773e71a66c84776e55e305240bbc4e26c5cd4cfc22b5483500b8bff7
+  metadata.gz: b13d1f7b5e0ffc8d315a4b4c4749ac71f06d75a271d40158945d227f0dd5b9258bd28afbb7cf020a4432cf1976a8253f9a0983593a6358600a280064fc4a725c
+  data.tar.gz: f82304135dff9cc2030b6946f0b7b30b10fb919f24170215f76488eb534920cd818716b15464b180ec8e3a67f9dc8934056c6e3b18f94f92af646935a3f8265d

data/config/locales/en.yml

@@ -9,8 +9,8 @@ en:
       cannot_be_overwritten: "[%{service_class_name}] The following methods cannot be overwritten: %{list_of_methods}"
     inputs:
       undefined:
-        getter: "[%{service_class_name}] Undefined input attribute `%{input_name}`"
-        setter: "[%{service_class_name}] Undefined input attribute `%{input_name}`"
+        for_fetch: "[%{service_class_name}] Undefined input attribute `%{input_name}`"
+        for_assign: "[%{service_class_name}] Undefined input attribute `%{input_name}`"
       validations:
         inclusion:
           default_error: "[%{service_class_name}] Wrong value in `%{input_name}`, must be one of `%{input_inclusion}`"
@@ -49,8 +49,8 @@ en:
           error: "[%{service_class_name}] Conflict in `%{input_name}` input options: `%{conflict_code}`"
     internals:
       undefined:
-        getter: "[%{service_class_name}] Undefined internal attribute `%{internal_name}`"
-        setter: "[%{service_class_name}] Undefined internal attribute `%{internal_name}`"
+        for_fetch: "[%{service_class_name}] Undefined internal attribute `%{internal_name}`"
+        for_assign: "[%{service_class_name}] Undefined internal attribute `%{internal_name}`"
       validations:
         inclusion:
           default_error: "[%{service_class_name}] Wrong value in `%{internal_name}`, must be one of `%{internal_inclusion}`"
@@ -81,8 +81,8 @@ en:
               wrong_element_type: "[%{service_class_name}] Wrong type in internal attribute hash `%{internal_name}`, expected `%{expected_type}` for `%{key_name}`, got `%{given_type}`"
     outputs:
       undefined:
-        getter: "[%{service_class_name}] Undefined output attribute `%{output_name}`"
-        setter: "[%{service_class_name}] Undefined output attribute `%{output_name}`"
+        for_fetch: "[%{service_class_name}] Undefined output attribute `%{output_name}`"
+        for_assign: "[%{service_class_name}] Undefined output attribute `%{output_name}`"
       validations:
         inclusion:
           default_error: "[%{service_class_name}] Wrong value in `%{output_name}`, must be one of `%{output_inclusion}`"

data/config/locales/ru.yml

@@ -9,8 +9,8 @@ ru:
       cannot_be_overwritten: "[%{service_class_name}] Нельзя перезаписать следующие методы: %{list_of_methods}"
     inputs:
       undefined:
-        getter: "[%{service_class_name}] Неизвестный входящий атрибут `%{input_name}`"
-        setter: "[%{service_class_name}] Неизвестный входящий атрибут `%{input_name}`"
+        for_fetch: "[%{service_class_name}] Неизвестный входящий атрибут `%{input_name}`"
+        for_assign: "[%{service_class_name}] Неизвестный входящий атрибут `%{input_name}`"
       validations:
         inclusion:
           default_error: "[%{service_class_name}] Неправильное значение в `%{input_name}`, должно быть одним из `%{input_inclusion}`"
@@ -49,8 +49,8 @@ ru:
           error: "[%{service_class_name}] Конфликт в опциях инпута `%{input_name}`: `%{conflict_code}`"
     internals:
       undefined:
-        getter: "[%{service_class_name}] Неизвестный внутренний атрибут `%{internal_name}`"
-        setter: "[%{service_class_name}] Неизвестный внутренний атрибут `%{internal_name}`"
+        for_fetch: "[%{service_class_name}] Неизвестный внутренний атрибут `%{internal_name}`"
+        for_assign: "[%{service_class_name}] Неизвестный внутренний атрибут `%{internal_name}`"
       validations:
         inclusion:
           default_error: "[%{service_class_name}] Неправильное значение в `%{internal_name}`, должно быть одним из `%{internal_inclusion}`"
@@ -81,8 +81,8 @@ ru:
               wrong_element_type: "[%{service_class_name}] Неправильный тип в хеше внутреннего атрибута `%{internal_name}`, для `%{key_name}` ожидалось `%{expected_type}`, получено `%{given_type}`"
     outputs:
       undefined:
-        getter: "[%{service_class_name}] Неизвестный выходящий атрибут `%{output_name}`"
-        setter: "[%{service_class_name}] Неизвестный выходящий атрибут `%{output_name}`"
+        for_fetch: "[%{service_class_name}] Неизвестный выходящий атрибут `%{output_name}`"
+        for_assign: "[%{service_class_name}] Неизвестный выходящий атрибут `%{output_name}`"
       validations:
         inclusion:
           default_error: "[%{service_class_name}] Неправильное значение в `%{output_name}`, должно быть одним из `%{output_inclusion}`"

data/lib/servactory/context/callable.rb

@@ -6,7 +6,7 @@ module Servactory
       def call!(arguments = {})
         context = send(:new)
 
-        _call!(context, **arguments)
+        _call!(context, arguments)
 
         config.result_class.success_for(context:)
       rescue config.success_class => e
@@ -16,7 +16,7 @@ module Servactory
       def call(arguments = {})
         context = send(:new)
 
-        _call!(context, **arguments)
+        _call!(context, arguments)
 
         config.result_class.success_for(context:)
       rescue config.success_class => e
@@ -27,10 +27,12 @@ module Servactory
 
       private
 
-      def _call!(context, **arguments)
+      def _call!(context, incoming_arguments)
+        incoming_arguments = Servactory::Utils.adapt(incoming_arguments)
+
         context.send(
           :_call!,
-          incoming_arguments: arguments.symbolize_keys,
+          incoming_arguments:,
           collection_of_inputs:,
           collection_of_internals:,
           collection_of_outputs:,

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

@@ -29,9 +29,9 @@ module Servactory
           if name.to_s.end_with?("=")
             prepared_name = name.to_s.delete("=").to_sym
 
-            raise_error_for(:setter, prepared_name)
+            raise_error_for(:assign, prepared_name)
           else
-            getter_with(name:) { raise_error_for(:getter, name) }
+            fetch_with(name:) { raise_error_for(:fetch, name) }
           end
         end
 
@@ -42,7 +42,7 @@ module Servactory
         private
 
         # rubocop:disable Metrics/MethodLength, Metrics/AbcSize,  Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Lint/UnusedMethodArgument
-        def getter_with(name:, &block)
+        def fetch_with(name:, &block)
           input_name = @context.class.config.predicate_methods_enabled? ? name.to_s.chomp("?").to_sym : name
 
           input = @collection_of_inputs.find_by(name: input_name)
@@ -100,11 +100,15 @@ module Servactory
 
         def raise_error_for(type, name)
           message_text = @context.send(:servactory_service_info).translate(
-            "inputs.undefined.#{type}",
+            "inputs.undefined.for_#{type}",
             input_name: name
           )
 
-          raise @context.class.config.input_exception_class.new(message: message_text, input_name: name)
+          raise @context.class.config.input_exception_class.new(
+            context: @context,
+            message: message_text,
+            input_name: name
+          )
         end
       end
     end

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

@@ -25,9 +25,9 @@ module Servactory
           if name.to_s.end_with?("=")
             prepared_name = name.to_s.delete("=").to_sym
 
-            setter_with(prepared_name:, value: args.pop) { raise_error_for(:setter, prepared_name) }
+            assign_with(prepared_name:, value: args.pop) { raise_error_for(:assign, prepared_name) }
           else
-            getter_with(name:) { raise_error_for(:getter, name) }
+            fetch_with(name:) { raise_error_for(:fetch, name) }
           end
         end
 
@@ -37,7 +37,7 @@ module Servactory
 
         private
 
-        def setter_with(prepared_name:, value:, &block) # rubocop:disable Lint/UnusedMethodArgument
+        def assign_with(prepared_name:, value:, &block) # rubocop:disable Lint/UnusedMethodArgument
           return yield unless @collection_of_internals.names.include?(prepared_name)
 
           internal = @collection_of_internals.find_by(name: prepared_name) # ::Servactory::Internals::Internal
@@ -53,7 +53,7 @@ module Servactory
           @context.send(:servactory_service_store).assign_internal(internal.name, value)
         end
 
-        def getter_with(name:, &block) # rubocop:disable Metrics/AbcSize, Lint/UnusedMethodArgument
+        def fetch_with(name:, &block) # rubocop:disable Metrics/AbcSize, Lint/UnusedMethodArgument
           internal_name = @context.class.config.predicate_methods_enabled? ? name.to_s.chomp("?").to_sym : name
           internal = @collection_of_internals.find_by(name: internal_name)
 
@@ -70,11 +70,14 @@ module Servactory
 
         def raise_error_for(type, name)
           message_text = @context.send(:servactory_service_info).translate(
-            "internals.undefined.#{type}",
+            "internals.undefined.for_#{type}",
             internal_name: name
           )
 
-          raise @context.class.config.internal_exception_class.new(message: message_text)
+          raise @context.class.config.internal_exception_class.new(
+            context: @context,
+            message: message_text
+          )
         end
       end
     end

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

@@ -25,9 +25,9 @@ module Servactory
           if name.to_s.end_with?("=")
             prepared_name = name.to_s.delete("=").to_sym
 
-            setter_with(prepared_name:, value: args.pop) { raise_error_for(:setter, prepared_name) }
+            assign_with(prepared_name:, value: args.pop) { raise_error_for(:assign, prepared_name) }
           else
-            getter_with(name:) { raise_error_for(:getter, name) }
+            fetch_with(name:) { raise_error_for(:fetch, name) }
           end
         end
 
@@ -37,7 +37,7 @@ module Servactory
 
         private
 
-        def setter_with(prepared_name:, value:, &block) # rubocop:disable Lint/UnusedMethodArgument
+        def assign_with(prepared_name:, value:, &block) # rubocop:disable Lint/UnusedMethodArgument
           return yield unless @collection_of_outputs.names.include?(prepared_name)
 
           output = @collection_of_outputs.find_by(name: prepared_name)
@@ -53,7 +53,7 @@ module Servactory
           @context.send(:servactory_service_store).assign_output(output.name, value)
         end
 
-        def getter_with(name:, &block) # rubocop:disable Metrics/AbcSize, Lint/UnusedMethodArgument
+        def fetch_with(name:, &block) # rubocop:disable Metrics/AbcSize, Lint/UnusedMethodArgument
           output_name = @context.class.config.predicate_methods_enabled? ? name.to_s.chomp("?").to_sym : name
           output = @collection_of_outputs.find_by(name: output_name)
 
@@ -70,11 +70,14 @@ module Servactory
 
         def raise_error_for(type, name)
           message_text = @context.send(:servactory_service_info).translate(
-            "outputs.undefined.#{type}",
+            "outputs.undefined.for_#{type}",
             output_name: name
           )
 
-          raise @context.class.config.output_exception_class.new(message: message_text)
+          raise @context.class.config.output_exception_class.new(
+            context: @context,
+            message: message_text
+          )
         end
       end
     end

data/lib/servactory/context/workspace.rb

@@ -48,6 +48,7 @@ module Servactory
 
       def fail_input!(input_name, message:, meta: nil)
         raise self.class.config.input_exception_class.new(
+          context: self,
           input_name:,
           message:,
           meta:
@@ -56,6 +57,7 @@ module Servactory
 
       def fail_internal!(internal_name, message:, meta: nil)
         raise self.class.config.internal_exception_class.new(
+          context: self,
           internal_name:,
           message:,
           meta:
@@ -64,6 +66,7 @@ module Servactory
 
       def fail_output!(output_name, message:, meta: nil)
         raise self.class.config.output_exception_class.new(
+          context: self,
           output_name:,
           message:,
           meta:

data/lib/servactory/exceptions/input.rb

@@ -3,11 +3,13 @@
 module Servactory
   module Exceptions
     class Input < Base
-      attr_reader :message,
+      attr_reader :service,
+                  :message,
                   :input_name,
                   :meta
 
-      def initialize(message:, input_name: nil, meta: nil)
+      def initialize(context:, message:, input_name: nil, meta: nil)
+        @service = context.send(:servactory_service_info)
         @message = message
         @input_name = input_name&.to_sym
         @meta = meta

data/lib/servactory/exceptions/internal.rb

@@ -3,11 +3,13 @@
 module Servactory
   module Exceptions
     class Internal < Base
-      attr_reader :message,
+      attr_reader :service,
+                  :message,
                   :internal_name,
                   :meta
 
-      def initialize(message:, internal_name: nil, meta: nil)
+      def initialize(context:, message:, internal_name: nil, meta: nil)
+        @service = context.send(:servactory_service_info)
         @message = message
         @internal_name = internal_name&.to_sym
         @meta = meta

data/lib/servactory/exceptions/output.rb

@@ -3,11 +3,13 @@
 module Servactory
   module Exceptions
     class Output < Base
-      attr_reader :message,
+      attr_reader :service,
+                  :message,
                   :output_name,
                   :meta
 
-      def initialize(message:, output_name: nil, meta: nil)
+      def initialize(context:, message:, output_name: nil, meta: nil)
+        @service = context.send(:servactory_service_info)
         @message = message
         @output_name = output_name&.to_sym
         @meta = meta

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

@@ -35,6 +35,7 @@ module Servactory
           )
 
           raise @context.class.config.input_exception_class.new(
+            context: @context,
             message: message_text,
             input_name: input.name
           )

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

@@ -22,7 +22,10 @@ module Servactory
             unnecessary_attributes: unnecessary_attributes.join(", ")
           )
 
-          raise @context.class.config.input_exception_class.new(message: message_text)
+          raise @context.class.config.input_exception_class.new(
+            context: @context,
+            message: message_text
+          )
         end
 
         private

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

@@ -73,7 +73,10 @@ module Servactory
         def raise_errors
           return if (tmp_errors = errors.not_blank).empty?
 
-          raise @context.class.config.input_exception_class.new(message: tmp_errors.first)
+          raise @context.class.config.input_exception_class.new(
+            context: @context,
+            message: tmp_errors.first
+          )
         end
       end
     end

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

@@ -96,7 +96,7 @@ module Servactory
               name: :types,
               attribute: @attribute,
               validation_class: Servactory::Maintenance::Attributes::Validations::Type,
-              original_value: Array(@options.fetch(:type)),
+              original_value: Array(@options.fetch(:type)).uniq,
               need_for_checks: true,
               body_fallback: nil,
               with_advanced_mode: false

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

@@ -72,7 +72,7 @@ module Servactory
 
             raise @context.class.config
                           .public_send(:"#{@attribute.system_name}_exception_class")
-                          .new(message: tmp_errors.first)
+                          .new(context: @context, message: tmp_errors.first)
           end
         end
       end

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

@@ -80,7 +80,7 @@ module Servactory
           value = object.fetch(schema_key, nil)
           prepared_value = prepare_value_from(schema_value:, value:, required: attribute_required)
 
-          Array(attribute_type).any? { |type| prepared_value.is_a?(type) }
+          Array(attribute_type).uniq.any? { |type| prepared_value.is_a?(type) }
         end
 
         def should_be_checked_for?(object:, schema_key:, schema_value:, required:)

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

@@ -13,7 +13,7 @@ module Servactory
               @attribute_type = attribute_type
               @attribute_type_plural = attribute_type.to_s.pluralize.to_sym
               @attribute_name = attribute_name
-              @attributes = attributes
+              @attributes = attributes.is_a?(FalseClass) ? attributes : Servactory::Utils.adapt(attributes)
 
               @attribute_data = described_class.info.public_send(attribute_type_plural).fetch(attribute_name)
 

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

@@ -36,7 +36,7 @@ module Servactory
         end
 
         def validate_for!(attribute:, values:, option:)
-          consists_of_types = Array(option.value)
+          consists_of_types = Array(option.value).uniq
 
           return [false, :required] if fails_presence_validation?(attribute:, values:, consists_of_types:)
 
@@ -110,7 +110,7 @@ module Servactory
 
           values = values&.flatten if values.respond_to?(:flatten)
 
-          values.filter { |value| Array(option_value).exclude?(value.class) }.map(&:class).uniq.join(", ")
+          values.filter { |value| Array(option_value).uniq.exclude?(value.class) }.map(&:class).uniq.join(", ")
         end
       end
     end

data/lib/servactory/utils.rb

@@ -2,7 +2,15 @@
 
 module Servactory
   module Utils
-    module_function
+    extend self
+
+    def adapt(data)
+      if defined?(Datory::Base) && data.is_a?(Datory::Base)
+        data = Servactory::Utils.send(:instance_variables_to_hash_from, data)
+      end
+
+      data.symbolize_keys
+    end
 
     def fetch_hash_with_desired_attribute(attribute)
       return { input: attribute.class::Actor.new(attribute) } if really_input?(attribute)
@@ -97,5 +105,24 @@ module Servactory
         class_or_name
       end
     end
+
+    private
+
+    def instance_variables_to_hash_from(data) # rubocop:disable Metrics/MethodLength
+      data.instance_variables.to_h do |key|
+        value = data.instance_variable_get(key)
+
+        value =
+          if value.is_a?(Set) || value.is_a?(Array)
+            value.map { |item| instance_variables_to_hash_from(item) }
+          elsif value.is_a?(Datory::Base)
+            instance_variables_to_hash_from(value)
+          else
+            value
+          end
+
+        [key.to_s.delete_prefix("@"), value]
+      end
+    end
   end
 end

data/lib/servactory/version.rb

@@ -3,9 +3,9 @@
 module Servactory
   module VERSION
     MAJOR = 2
-    MINOR = 8
+    MINOR = 9
     PATCH = 0
-    PRE = nil
+    PRE = "rc2"
 
     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.8.0
+  version: 2.9.0.rc2
 platform: ruby
 authors:
 - Anton Sokolov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-28 00:00:00.000000000 Z
+date: 2024-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -86,6 +86,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.31'
+- !ruby/object:Gem::Dependency
+  name: datory
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement