servactory 2.13.1 → 2.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b763a59ba9addc399da0f21f95c1b48587a49754f2f67ec4c3cff52e3808840d
-  data.tar.gz: 7411b3254bbf61e2754c58432540260077c62f58912d881c716d1fb33d3757f2
+  metadata.gz: 686b37992728c9a55817ad99143cb5920e3534229c61f6d4064815b5f5a29195
+  data.tar.gz: e03438b07981f0c9a9f553c147b52fec9bc51aa78351c8df01ba2e884c758daf
 SHA512:
-  metadata.gz: df8c6ee28efbe777a6a98bdc4bc1641fdc787a16105f9444418ddad6371e7b913ac3a0dc799c1eefb15d99c97e7b06637db4bb77f5432f3629f5a933524229bf
-  data.tar.gz: 58e1676c904cff6ac988fdd2616cb9c44768bde908a6364cc7d86fcbdbac417e4fefb664da6a47e6cdb9bd251c5fa0210b22111e3ae4179fb4810097c2bfc5f5
+  metadata.gz: 7f9c8d95aacf741f565cedd5a56e543b50fbf45427f68a94bf9229e58a5fa029acc0b0fb4ce6391fb3a84e44a248d2c590c4c0c62e080ef8d47f1c8bb51aa851
+  data.tar.gz: bd2234547c977824d2ae7cf9440e60b575441d31558bc3ac5c0dfea46a4be18957cd68b2ffd83615bcc64909a15be284d798a50e39d97e2821fabccab0bc3586

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

@@ -47,10 +47,7 @@ module Servactory
 
           input_value = @context.send(:servactory_service_warehouse).fetch_input(input.name)
 
-          if input.optional? && (
-            (!input_value.is_a?(TrueClass) && !input_value.is_a?(FalseClass) && input_value.blank?) ||
-              input_value.nil?
-          ) # do
+          if input.optional? && !input.default.nil? && !Servactory::Utils.value_present?(input_value)
             input_value = input.default
           end
 

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

@@ -10,14 +10,14 @@ module Servactory
         end
 
         def condition_for_input_with(input:, value:, option:)
-          if input.required? || (
-            input.optional? && !input.default.nil?
-          ) || (
-            input.optional? && !value.nil?
-          ) # do
+          if input.required? || (input.optional? && !value.nil?) # rubocop:disable Style/IfUnlessModifier
             return option.value.include?(value)
           end
 
+          if input.optional? && value.nil? && !input.default.nil? # rubocop:disable Style/IfUnlessModifier
+            return option.value.include?(input.default)
+          end
+
           true
         end
 

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

@@ -127,18 +127,28 @@ module Servactory
 
         ########################################################################
 
-        def prepare_object_with!(object:, schema:) # rubocop:disable Metrics/MethodLength
+        def prepare_object_with!(object:, schema:) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
           schema.map do |schema_key, schema_value|
             attribute_type = schema_value.fetch(:type, String)
+            required = schema_value.fetch(:required, true)
+            object_value = object[schema_key]
 
             if attribute_type == Hash
+              default_value = schema_value.fetch(:default, {})
+
+              if !required && !default_value.nil? && !Servactory::Utils.value_present?(object_value)
+                object[schema_key] = default_value
+              end
+
               prepare_object_with!(
                 object: object.fetch(schema_key, {}),
                 schema: schema_value.except(*RESERVED_OPTIONS)
               )
             else
-              unless (default = schema_value.fetch(:default, nil)).nil?
-                object[schema_key] = default
+              default_value = schema_value.fetch(:default, nil)
+
+              if !required && !default_value.nil? && !Servactory::Utils.value_present?(object_value)
+                object[schema_key] = default_value
               end
 
               unless (input_prepare = schema_value.fetch(:prepare, nil)).nil?

data/lib/servactory/version.rb

@@ -4,7 +4,7 @@ module Servactory
   module VERSION
     MAJOR = 2
     MINOR = 13
-    PATCH = 1
+    PATCH = 3
     PRE = nil
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join(".")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: servactory
 version: !ruby/object:Gem::Version
-  version: 2.13.1
+  version: 2.13.3
 platform: ruby
 authors:
 - Anton Sokolov
 bindir: bin
 cert_chain: []
-date: 2025-03-19 00:00:00.000000000 Z
+date: 2025-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -103,14 +103,14 @@ dependencies:
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.5'
 - !ruby/object:Gem::Dependency
@@ -189,14 +189,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: steep
   requirement: !ruby/object:Gem::Requirement
@@ -347,7 +347,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="