servactory 3.1.0.rc3 → 3.1.0.rc4

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

@@ -129,7 +129,7 @@ module Servactory
         # @param option_name [Symbol] The option name (default: :schema)
         # @param default_hash_mode_class_names [Servactory::Configuration::HashMode::ClassNamesCollection]
         #   Valid Hash-like types
-        # @return [Servactory::Maintenance::Attributes::OptionHelper]
+        # @return [Servactory::Maintenance::Options::Helper]
         def self.use(option_name = :schema, default_hash_mode_class_names:)
           instance = new(option_name, :is, false)
           instance.assign(default_hash_mode_class_names)
@@ -181,13 +181,15 @@ module Servactory
         # @param value [Object] Hash value to validate
         # @param option [WorkOption] Schema configuration
         # @return [Boolean, Array] true if valid, or [false, reason, meta]
-        # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        # rubocop:disable-next Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         def common_condition_with(attribute:, value:, option:)
           # Schema disabled, skip validation.
           return true if option.value == false
 
           # Attribute type must be Hash-compatible.
-          return [false, :wrong_type] unless @default_hash_mode_class_names.intersect?(attribute.types)
+          unless @default_hash_mode_class_names.intersect?(attribute.types)
+            return [false, :wrong_type, wrong_type_meta_for(attribute:)]
+          end
 
           # Skip validation for blank optional values.
           if value.blank? && ((attribute.input? && attribute.optional?) || attribute.internal? || attribute.output?)
@@ -208,7 +210,19 @@ module Servactory
 
           [is_success, reason, meta]
         end
-        # rubocop:enable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+
+        # Builds failure metadata for an attribute whose type is not Hash-compatible.
+        #
+        # @param attribute [Object] The attribute being validated
+        # @return [Hash] Metadata with the Hash-compatible types as expected
+        #   and the declared attribute types as given
+        def wrong_type_meta_for(attribute:)
+          {
+            key_name: nil,
+            expected_type: @default_hash_mode_class_names.to_a.join(", "),
+            given_type: attribute.types.join(", ")
+          }
+        end
 
         # Recursively validates object against schema definition.
         #
@@ -231,16 +245,18 @@ module Servactory
           end
 
           # Validate each schema field.
-          errors = schema.map do |schema_key, schema_value|
+          schema.each do |schema_key, schema_value|
             attribute_type = schema_value.fetch(:type, String)
 
             if attribute_type == Hash
               # Recursively validate nested Hash.
-              validate_for!(
+              result = validate_for!(
                 object: object.fetch(schema_key, {}),
                 schema: schema_value.except(*RESERVED_OPTIONS),
                 root_schema_key: schema_key
               )
+
+              return result unless result == true
             else
               is_success, given_type = validate_with(
                 object:,
@@ -252,12 +268,11 @@ module Servactory
 
               next if is_success
 
-              [false, :wrong_element_type, { key_name: schema_key, expected_type: attribute_type, given_type: }]
+              return [false, :wrong_element_type, { key_name: schema_key, expected_type: attribute_type, given_type: }]
             end
           end
 
-          # Return first error or true.
-          errors.compact.first || true
+          true
         end
 
         # Validates a single field against its type specification.
@@ -279,11 +294,11 @@ module Servactory
             return true
           end
 
-          value = object[schema_key]
+          value = object.fetch(schema_key, nil)
           prepared_value = prepare_value_from(schema_value:, value:, required: attribute_required)
 
           [
-            Array(attribute_type).uniq.any? { |type| prepared_value.is_a?(type) },
+            Array(attribute_type).any? { |type| prepared_value.is_a?(type) },
             prepared_value.class.name
           ]
         end
@@ -299,7 +314,7 @@ module Servactory
           required || (
             !required && !fetch_default_from(schema_value).nil?
           ) || (
-            !required && !object[schema_key].nil?
+            !required && !object.fetch(schema_key, nil).nil?
           )
         end
 
@@ -332,19 +347,18 @@ module Servactory
         # @param object [Hash] Object to modify
         # @param schema [Hash] Schema definition
         # @return [void]
-        # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        # rubocop:disable-next Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         def prepare_object_with!(object:, schema:)
-          schema.map do |schema_key, schema_value|
+          schema.each do |schema_key, schema_value|
             attribute_type = schema_value.fetch(:type, String)
             required = schema_value.fetch(:required, true)
-            object_value = object[schema_key]
+            object_value = object.fetch(schema_key, nil)
 
             if attribute_type == Hash
               # Apply nested Hash defaults.
-              default_value = schema_value.fetch(:default, {})
-
-              if !required && !default_value.nil? && !Servactory::Utils.value_present?(object_value)
-                object[schema_key] = default_value
+              if !required && !Servactory::Utils.value_present?(object_value)
+                default_value = schema_value.key?(:default) ? schema_value[:default].deep_dup : {}
+                object[schema_key] = default_value unless default_value.nil?
               end
 
               # Recursively prepare nested objects.
@@ -362,14 +376,13 @@ module Servactory
 
               # Execute prepare callback if defined.
               unless (input_prepare = schema_value[:prepare]).nil?
-                object[schema_key] = input_prepare.call(value: object[schema_key])
+                object[schema_key] = input_prepare.call(value: object.fetch(schema_key, nil))
               end
 
               object
             end
           end
         end
-        # rubocop:enable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
         ########################################################################
         ########################################################################

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

@@ -100,7 +100,7 @@ module Servactory
         # Creates a Target validator instance.
         #
         # @param option_name [Symbol] The option name (default: :target)
-        # @return [Servactory::Maintenance::Attributes::OptionHelper]
+        # @return [Servactory::Maintenance::Options::Helper]
         def self.use(option_name = :target)
           instance = new(option_name, :in)
           instance.must(:"be_#{option_name}")

data/lib/servactory/utils.rb

@@ -5,13 +5,17 @@ module Servactory
     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 = instance_variables_to_hash_from(data) if datory?(data)
 
       data.symbolize_keys
     end
 
+    # @param data [Object]
+    # @return [Boolean] True if #adapt accepts the data as service arguments
+    def adaptable?(data)
+      data.is_a?(Hash) || datory?(data)
+    end
+
     def define_attribute_with(input: nil, internal: nil, output: nil)
       return input if really_input?(input)
       return internal if really_internal?(internal)
@@ -108,6 +112,12 @@ module Servactory
 
     private
 
+    def datory?(data)
+      return false unless defined?(Datory::Base)
+
+      data.is_a?(Datory::Base)
+    end
+
     def instance_variables_to_hash_from(data) # rubocop:disable Metrics/MethodLength
       data.instance_variables.to_h do |key|
         value = data.instance_variable_get(key)

data/lib/servactory/version.rb

@@ -5,7 +5,7 @@ module Servactory
     MAJOR = 3
     MINOR = 1
     PATCH = 0
-    PRE = "rc3"
+    PRE = "rc4"
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join(".")
   end

data/lib/servactory.rb

@@ -2,6 +2,8 @@
 
 require "zeitwerk"
 
+require "forwardable"
+
 require "stroma"
 
 require "active_support/all"
@@ -10,6 +12,7 @@ require "uri"
 
 loader = Zeitwerk::Loader.for_gem
 loader.ignore("#{__dir__}/generators")
+loader.ignore("#{__dir__}/servactory/engine.rb")
 loader.ignore("#{__dir__}/servactory/test_kit/rspec")
 loader.inflector.inflect(
   "dsl" => "DSL"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: servactory
 version: !ruby/object:Gem::Version
-  version: 3.1.0.rc3
+  version: 3.1.0.rc4
 platform: ruby
 authors:
 - Anton Sokolov
@@ -298,20 +298,28 @@ files:
 - lib/servactory/test_kit/rspec/helpers/argument_matchers.rb
 - lib/servactory/test_kit/rspec/helpers/concerns/error_messages.rb
 - lib/servactory/test_kit/rspec/helpers/concerns/service_class_validation.rb
+- lib/servactory/test_kit/rspec/helpers/exception_validator.rb
 - lib/servactory/test_kit/rspec/helpers/fluent.rb
 - lib/servactory/test_kit/rspec/helpers/input_validator.rb
 - lib/servactory/test_kit/rspec/helpers/legacy.rb
 - lib/servactory/test_kit/rspec/helpers/mock_executor.rb
 - lib/servactory/test_kit/rspec/helpers/output_validator.rb
+- lib/servactory/test_kit/rspec/helpers/service_inputs_guard.rb
+- lib/servactory/test_kit/rspec/helpers/service_inputs_matcher.rb
 - lib/servactory/test_kit/rspec/helpers/service_mock_builder.rb
 - lib/servactory/test_kit/rspec/helpers/service_mock_config.rb
+- lib/servactory/test_kit/rspec/helpers/wrap_block_adapter.rb
 - lib/servactory/test_kit/rspec/matchers.rb
 - lib/servactory/test_kit/rspec/matchers/base/attribute_matcher.rb
+- lib/servactory/test_kit/rspec/matchers/base/message_expectation.rb
 - lib/servactory/test_kit/rspec/matchers/base/submatcher.rb
 - lib/servactory/test_kit/rspec/matchers/base/submatcher_context.rb
 - lib/servactory/test_kit/rspec/matchers/base/submatcher_registry.rb
 - lib/servactory/test_kit/rspec/matchers/concerns/attribute_data_access.rb
 - lib/servactory/test_kit/rspec/matchers/concerns/error_message_builder.rb
+- lib/servactory/test_kit/rspec/matchers/concerns/option_helper_rules.rb
+- lib/servactory/test_kit/rspec/matchers/concerns/proc_message.rb
+- lib/servactory/test_kit/rspec/matchers/concerns/required_message.rb
 - lib/servactory/test_kit/rspec/matchers/concerns/value_comparison.rb
 - lib/servactory/test_kit/rspec/matchers/have_service_input_matcher.rb
 - lib/servactory/test_kit/rspec/matchers/have_service_internal_matcher.rb
@@ -365,7 +373,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 4.0.21
 specification_version: 4
 summary: A set of tools for building reliable services of any complexity
 test_files: []