servactory 2.6.0 → 2.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0df96b35bd963790408ba89eb4c6d80b7b19c4edc869ceade70f0d9d660f41ce
-  data.tar.gz: 97c287969f8358a77903d17b79624b59a06abd8aa94aa469e5d458f99ae50342
+  metadata.gz: 0ce5565f3e907fc4f2739acfd68389a9d10bfc1a0dbfdcafe81692d631c4ec96
+  data.tar.gz: 2e7dae944a0fd40907dbe2cfdb2593ee6f43e1d4112641643f917c76fbe8a90b
 SHA512:
-  metadata.gz: 57caa41f80f9df2fa40061dad1337839dfba5dcc69b54e44ac8651bb83ec4e4d034870e7cd78f1d23661cd4ab66153904ed9679e78253a91e5532a7c596f4f11
-  data.tar.gz: 9e85fcb8bd9994756b6d9519d1a2bbbc68a7bd13254505ae4930552d377a011eb233d70e7fe9abdb23cc52d0f8812294bfb70ce15b5f34b6861cbf763c918461
+  metadata.gz: c8ff6b069089defb72497b5431ac790a59b019253fc10f2f6c5562184b6f42bb5457a28264efd19f3e1d5f1801c28e068f0c4315ddbaec8e8155cad3e13855b6
+  data.tar.gz: 6552a2df9438f6e7b3c9737ae814d61d835446396ad9ef0777eb805680923aa47e0b90de15662388dcde3baab3ae0640df35d79223f656f1335accbdcde64266

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/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

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

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

@@ -82,11 +82,25 @@ module Servactory
           common_condition_with(...)
         end
 
-        def common_condition_with(value:, option:, **)
+        # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        def common_condition_with(value:, option:, input: nil, internal: nil, output: nil)
           option_value = option.value&.to_sym
 
           return [false, :unknown] unless @formats.key?(option_value)
 
+          attribute = Utils.define_attribute_with(input: input, internal: internal, output: output)
+
+          if value.blank? &&
+             (
+               (attribute.input? && attribute.optional?) ||
+                 (
+                   (attribute.internal? || attribute.output?) &&
+                     attribute.types.include?(NilClass)
+                 )
+             )
+            return true
+          end
+
           format_options = @formats.fetch(option_value)
 
           format_pattern = option.properties.fetch(:pattern, format_options.fetch(:pattern))
@@ -95,6 +109,7 @@ module Servactory
 
           option.properties.fetch(:validator, format_options.fetch(:validator)).call(value: value)
         end
+        # rubocop:enable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
         ########################################################################
 

data/lib/servactory/version.rb

@@ -4,7 +4,7 @@ module Servactory
   module VERSION
     MAJOR = 2
     MINOR = 6
-    PATCH = 0
+    PATCH = 2
     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.6.0
+  version: 2.6.2
 platform: ruby
 authors:
 - Anton Sokolov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-13 00:00:00.000000000 Z
+date: 2024-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport