servactory 2.12.0 → 2.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0452d2479f148cd3390a5b6b3801f596687a93fd26f9a2dcdf533c0b4b6eaec9
-  data.tar.gz: ea379698c7a2589e48fbf1eeef5252838808f8fbf8336e00c288adef2c8893e0
+  metadata.gz: effe21494947a824c5ee5f49b022a92157a69906a6b5f41cdf96a02b08bedc55
+  data.tar.gz: 7d52a8e143393e05824426f6c62e2d767191cee35b106fc159f3c2d72bfab50e
 SHA512:
-  metadata.gz: 7122cf6929ed3655a28befe660226f0c0e424febd02c665a3cec2876ac2e1856057bef035e6d017c222b798f691c21b94759203dbfe7b317371d2fc89d3da650
-  data.tar.gz: 8834aa51502c33b07070b1055027fce2a6a99cadbf3b872c97cb62f91ea200c14d11e391cb3a24115fde1e49c3596da40edca4394cbf79278e4b3ee4bb9d7dbf
+  metadata.gz: e10b019ae010c04a64fe28fc0e06b7e10d756ad7f6217e45c9241cc81c421fdbae8e36944de03b3de035aa307ed0b93a73a77e375fa218bfe198ed2a24a3e37a
+  data.tar.gz: 511d7cb765402d1a3b1ce41d30d7abf1964a0070191a10aaa3eb0109089b8a5ad49dde6e6904e539c8a1cc4bfe5343e48a10f13df378b0ab8472ed02d6d584ef

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

@@ -4,9 +4,6 @@ module Servactory
   module Context
     module Workspace
       class Inputs
-        RESERVED_ATTRIBUTES = %i[type required default].freeze
-        private_constant :RESERVED_ATTRIBUTES
-
         def initialize(context:, collection_of_inputs:)
           @context = context
           @collection_of_inputs = collection_of_inputs

data/lib/servactory/test_kit/rspec/matchers/have_service_attribute_matchers/schema_matcher.rb

@@ -29,8 +29,7 @@ module Servactory
             end
 
             def description
-              result = "schema: "
-              result + schema_data
+              "schema: #{schema_data}"
             end
 
             def matches?(subject)
@@ -58,10 +57,20 @@ module Servactory
               schema_data_equal?
             end
 
-            def schema_data_equal?
+            def schema_data_equal? # rubocop:disable Metrics/MethodLength
+              matcher_result =
+                RSpec::Expectations::ExpectationHelper
+                .with_matcher(
+                  RSpec::Expectations::PositiveExpectationHandler,
+                  RSpec::Matchers::BuiltIn::Match.new(schema_data),
+                  nil
+                ) do |matcher|
+                  matcher.matches?(attribute_schema_is)
+                end
+
               @schema_data_equal ||=
                 (
-                  schema_data.present? && schema_data == attribute_schema_is
+                  schema_data.present? && matcher_result
                 ) || schema_data.blank?
             end
 

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

@@ -4,8 +4,8 @@ module Servactory
   module ToolKit
     module DynamicOptions
       class Schema < Must # rubocop:disable Metrics/ClassLength
-        RESERVED_ATTRIBUTES = %i[type required default].freeze
-        private_constant :RESERVED_ATTRIBUTES
+        RESERVED_OPTIONS = %i[type required default payload].freeze
+        private_constant :RESERVED_OPTIONS
 
         def self.use(option_name = :schema, default_hash_mode_class_names:)
           instance = new(option_name, :is, false)
@@ -65,7 +65,7 @@ module Servactory
             if attribute_type == Hash
               validate_for!(
                 object: object.fetch(schema_key, {}),
-                schema: schema_value.except(*RESERVED_ATTRIBUTES),
+                schema: schema_value.except(*RESERVED_OPTIONS),
                 root_schema_key: schema_key
               )
             else
@@ -134,14 +134,18 @@ module Servactory
             if attribute_type == Hash
               prepare_object_with!(
                 object: object.fetch(schema_key, {}),
-                schema: schema_value.except(*RESERVED_ATTRIBUTES)
+                schema: schema_value.except(*RESERVED_OPTIONS)
               )
             else
-              next object unless object[schema_key].nil?
+              unless (default = schema_value.fetch(:default, nil)).nil?
+                object[schema_key] = default
+              end
 
-              next object if (default = schema_value.fetch(:default, nil)).nil?
+              unless (input_prepare = schema_value.fetch(:prepare, nil)).nil?
+                object[schema_key] = input_prepare.call(value: object[schema_key])
+              end
 
-              object[schema_key] = default
+              object
             end
           end
         end

data/lib/servactory/version.rb

@@ -3,7 +3,7 @@
 module Servactory
   module VERSION
     MAJOR = 2
-    MINOR = 12
+    MINOR = 13
     PATCH = 0
     PRE = nil
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: servactory
 version: !ruby/object:Gem::Version
-  version: 2.12.0
+  version: 2.13.0
 platform: ruby
 authors:
 - Anton Sokolov
 bindir: bin
 cert_chain: []
-date: 2025-03-02 00:00:00.000000000 Z
+date: 2025-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport