servactory 2.5.1 → 2.6.0.rc1

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

@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+module Servactory
+  module ToolKit
+    module DynamicOptions
+      class ConsistsOf < Must
+        COLLECTION_CLASS_NAMES = [Array, Set].freeze
+        private_constant :COLLECTION_CLASS_NAMES
+
+        def self.setup(option_name = :consists_of)
+          new(option_name, :type, false).must(:consists_of)
+        end
+
+        def condition_for_input_with(input:, value:, option:)
+          common_condition_with(attribute: input, value: value, option: option)
+        end
+
+        def condition_for_internal_with(internal:, value:, option:)
+          common_condition_with(attribute: internal, value: value, option: option)
+        end
+
+        def condition_for_output_with(output:, value:, option:)
+          common_condition_with(attribute: output, value: value, option: option)
+        end
+
+        def common_condition_with(attribute:, value:, option:)
+          return true if option.value == false
+          return false if COLLECTION_CLASS_NAMES.intersection(attribute.types).empty?
+
+          validate_for!(values: value, option: option)
+        end
+
+        def validate_for!(values:, option:)
+          consists_of_types = Array(option.value)
+
+          return [false, :required] if !consists_of_types.include?(NilClass) && !values.flatten.all?(&:present?)
+
+          return true if values.flatten.all? do |value|
+            consists_of_types.include?(value.class)
+          end
+
+          [false, :wrong_type]
+        end
+
+        ########################################################################
+
+        def message_for_input_with(service:, input:, value:, option_value:, reason:, **)
+          i18n_key = "servactory.inputs.validations.must.dynamic_options.consists_of"
+          i18n_key += reason.present? ? ".#{reason}" : ".default"
+
+          I18n.t(
+            i18n_key,
+            service_class_name: service.class_name,
+            input_name: input.name,
+            expected_type: Array(option_value).uniq.join(", "),
+            given_type: given_type_for(values: value, option_value: option_value)
+          )
+        end
+
+        def message_for_internal_with(service:, internal:, value:, option_value:, reason:, **)
+          i18n_key = "servactory.internals.validations.must.dynamic_options.consists_of"
+          i18n_key += reason.present? ? ".#{reason}" : ".default"
+
+          I18n.t(
+            i18n_key,
+            service_class_name: service.class_name,
+            internal_name: internal.name,
+            expected_type: Array(option_value).uniq.join(", "),
+            given_type: given_type_for(values: value, option_value: option_value)
+          )
+        end
+
+        def message_for_output_with(service:, output:, value:, option_value:, reason:, **)
+          i18n_key = "servactory.outputs.validations.must.dynamic_options.consists_of"
+          i18n_key += reason.present? ? ".#{reason}" : ".default"
+
+          I18n.t(
+            i18n_key,
+            service_class_name: service.class_name,
+            output_name: output.name,
+            expected_type: Array(option_value).uniq.join(", "),
+            given_type: given_type_for(values: value, option_value: option_value)
+          )
+        end
+
+        def given_type_for(values:, option_value:)
+          values.flatten.filter { |value| Array(option_value).exclude?(value.class) }.map(&:class).uniq.join(", ")
+        end
+      end
+    end
+  end
+end

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

@@ -98,39 +98,36 @@ module Servactory
 
         ########################################################################
 
-        def message_for_input_with(service_class_name:, input:, value:, option_value:, reason:, **)
-          i18n_key = "servactory.inputs.validations.must.dynamic_options.format"
+        def message_for_input_with(service:, input:, value:, option_value:, reason:, **)
+          i18n_key = "inputs.validations.must.dynamic_options.format"
           i18n_key += reason.present? ? ".#{reason}" : ".default"
 
-          I18n.t(
+          service.translate(
             i18n_key,
-            service_class_name: service_class_name,
             input_name: input.name,
             value: value,
             format_name: option_value.present? ? option_value : option_value.inspect
           )
         end
 
-        def message_for_internal_with(service_class_name:, internal:, value:, option_value:, reason:, **)
-          i18n_key = "servactory.internals.validations.must.dynamic_options.format"
+        def message_for_internal_with(service:, internal:, value:, option_value:, reason:, **)
+          i18n_key = "internals.validations.must.dynamic_options.format"
           i18n_key += reason.present? ? ".#{reason}" : ".default"
 
-          I18n.t(
+          service.translate(
             i18n_key,
-            service_class_name: service_class_name,
             internal_name: internal.name,
             value: value,
             format_name: option_value.present? ? option_value : option_value.inspect
           )
         end
 
-        def message_for_output_with(service_class_name:, output:, value:, option_value:, reason:, **)
-          i18n_key = "servactory.outputs.validations.must.dynamic_options.format"
+        def message_for_output_with(service:, output:, value:, option_value:, reason:, **)
+          i18n_key = "outputs.validations.must.dynamic_options.format"
           i18n_key += reason.present? ? ".#{reason}" : ".default"
 
-          I18n.t(
+          service.translate(
             i18n_key,
-            service_class_name: service_class_name,
             output_name: output.name,
             value: value,
             format_name: option_value.present? ? option_value : option_value.inspect

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

@@ -33,30 +33,27 @@ module Servactory
 
         ########################################################################
 
-        def message_for_input_with(service_class_name:, input:, value:, option_value:, **)
-          I18n.t(
-            "servactory.inputs.validations.must.dynamic_options.max.default",
-            service_class_name: service_class_name,
+        def message_for_input_with(service:, input:, value:, option_value:, **)
+          service.translate(
+            "inputs.validations.must.dynamic_options.max.default",
             input_name: input.name,
             value: value,
             option_value: option_value
           )
         end
 
-        def message_for_internal_with(service_class_name:, internal:, value:, option_value:, **)
-          I18n.t(
-            "servactory.internals.validations.must.dynamic_options.max.default",
-            service_class_name: service_class_name,
+        def message_for_internal_with(service:, internal:, value:, option_value:, **)
+          service.translate(
+            "internals.validations.must.dynamic_options.max.default",
             internal_name: internal.name,
             value: value,
             option_value: option_value
           )
         end
 
-        def message_for_output_with(service_class_name:, output:, value:, option_value:, **)
-          I18n.t(
-            "servactory.outputs.validations.must.dynamic_options.max.default",
-            service_class_name: service_class_name,
+        def message_for_output_with(service:, output:, value:, option_value:, **)
+          service.translate(
+            "outputs.validations.must.dynamic_options.max.default",
             output_name: output.name,
             value: value,
             option_value: option_value

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

@@ -33,30 +33,27 @@ module Servactory
 
         ########################################################################
 
-        def message_for_input_with(service_class_name:, input:, value:, option_value:, **)
-          I18n.t(
-            "servactory.inputs.validations.must.dynamic_options.min.default",
-            service_class_name: service_class_name,
+        def message_for_input_with(service:, input:, value:, option_value:, **)
+          service.translate(
+            "inputs.validations.must.dynamic_options.min.default",
             input_name: input.name,
             value: value,
             option_value: option_value
           )
         end
 
-        def message_for_internal_with(service_class_name:, internal:, value:, option_value:, **)
-          I18n.t(
-            "servactory.internals.validations.must.dynamic_options.min.default",
-            service_class_name: service_class_name,
+        def message_for_internal_with(service:, internal:, value:, option_value:, **)
+          service.translate(
+            "internals.validations.must.dynamic_options.min.default",
             internal_name: internal.name,
             value: value,
             option_value: option_value
           )
         end
 
-        def message_for_output_with(service_class_name:, output:, value:, option_value:, **)
-          I18n.t(
-            "servactory.outputs.validations.must.dynamic_options.min.default",
-            service_class_name: service_class_name,
+        def message_for_output_with(service:, output:, value:, option_value:, **)
+          service.translate(
+            "outputs.validations.must.dynamic_options.min.default",
             output_name: output.name,
             value: value,
             option_value: option_value

data/lib/servactory/utils.rb

@@ -5,9 +5,9 @@ module Servactory
     module_function
 
     def fetch_hash_with_desired_attribute(attribute)
-      return { input: attribute.class::Work.new(attribute) } if really_input?(attribute)
-      return { internal: attribute.class::Work.new(attribute) } if really_internal?(attribute)
-      return { output: attribute.class::Work.new(attribute) } if really_output?(attribute)
+      return { input: attribute.class::Actor.new(attribute) } if really_input?(attribute)
+      return { internal: attribute.class::Actor.new(attribute) } if really_internal?(attribute)
+      return { output: attribute.class::Actor.new(attribute) } if really_output?(attribute)
 
       raise ArgumentError, "Failed to define attribute"
     end

data/lib/servactory/version.rb

@@ -3,9 +3,9 @@
 module Servactory
   module VERSION
     MAJOR = 2
-    MINOR = 5
-    PATCH = 1
-    PRE = nil
+    MINOR = 6
+    PATCH = 0
+    PRE = "rc1"
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join(".")
   end

data/lib/servactory.rb

@@ -8,6 +8,7 @@ require "uri"
 
 loader = Zeitwerk::Loader.for_gem
 loader.ignore("#{__dir__}/generators")
+loader.ignore("#{__dir__}/servactory/test_kit/rspec")
 loader.inflector.inflect(
   "dsl" => "DSL"
 )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: servactory
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.6.0.rc1
 platform: ruby
 authors:
 - Anton Sokolov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-01 00:00:00.000000000 Z
+date: 2024-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -311,9 +311,7 @@ files:
 - lib/servactory/maintenance/attributes/validations/inclusion.rb
 - lib/servactory/maintenance/attributes/validations/must.rb
 - lib/servactory/maintenance/attributes/validations/type.rb
-- lib/servactory/maintenance/collection_mode/class_names_collection.rb
 - lib/servactory/maintenance/hash_mode/class_names_collection.rb
-- lib/servactory/maintenance/validations/collection.rb
 - lib/servactory/maintenance/validations/object_schema.rb
 - lib/servactory/maintenance/validations/types.rb
 - lib/servactory/outputs/collection.rb
@@ -335,6 +333,7 @@ files:
 - lib/servactory/test_kit/rspec/matchers/have_service_input_matchers/valid_with_matcher.rb
 - lib/servactory/test_kit/rspec/matchers/have_service_internal_matcher.rb
 - lib/servactory/test_kit/utils/faker.rb
+- lib/servactory/tool_kit/dynamic_options/consists_of.rb
 - lib/servactory/tool_kit/dynamic_options/format.rb
 - lib/servactory/tool_kit/dynamic_options/max.rb
 - lib/servactory/tool_kit/dynamic_options/min.rb

data/lib/servactory/maintenance/collection_mode/class_names_collection.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Maintenance
-    module CollectionMode
-      class ClassNamesCollection
-        extend Forwardable
-        def_delegators :@collection, :merge, :include?
-
-        def initialize(collection)
-          @collection = collection
-        end
-      end
-    end
-  end
-end

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

@@ -1,86 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Maintenance
-    module Validations
-      class Collection
-        attr_reader :errors
-
-        def self.validate(...)
-          new(...).validate
-        end
-
-        def initialize(types:, value:, consists_of:)
-          @types = types
-          @value = value
-          @consists_of = consists_of
-
-          @errors = []
-        end
-
-        def validate
-          unless @value.is_a?(prepared_type)
-            add_error(
-              expected_type: prepared_type.name,
-              given_type: @value.class.name
-            )
-
-            return self
-          end
-
-          validate_for!(values: @value)
-
-          self
-        end
-
-        def valid?
-          @errors.empty?
-        end
-
-        private
-
-        def validate_for!(values:) # rubocop:disable Metrics/MethodLength
-          values.each do |value|
-            value_type = value.class
-
-            if value_type == Array
-              validate_for!(values: value)
-            else
-              next if attribute_consists_of_types.include?(value_type)
-
-              add_error(
-                expected_type: attribute_consists_of_types.join(", "),
-                given_type: value_type.name
-              )
-            end
-          end
-        end
-
-        ########################################################################
-
-        def prepared_type
-          @prepared_type ||= @types.fetch(0, Array)
-        end
-
-        def attribute_consists_of_types
-          @attribute_consists_of_types ||= prepared_types_from(Array(@consists_of.fetch(:type, [])))
-        end
-
-        def prepared_types_from(types)
-          types.map do |type|
-            Servactory::Utils.constantize_class(type)
-          end
-        end
-
-        ########################################################################
-
-        def add_error(expected_type:, given_type:)
-          @errors << {
-            expected_type: expected_type,
-            given_type: given_type
-          }
-        end
-      end
-    end
-  end
-end