servactory 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20ac0dd1681f9d793073d7431a4532fa7776cb42bd547d7cb5be494b8f8916ee
-  data.tar.gz: 29d031bfae1c5ddd205540549ea4a98f23eb4195a2da27184300546d3b45602a
+  metadata.gz: 321c1d5afff2d05fca47c222254ed759bcab36acce61f346d4a141f936e25fa7
+  data.tar.gz: 9820d66f4f2985665b3552583c2f84eddeb6860cb588c5444da7f32d32bf6c89
 SHA512:
-  metadata.gz: a3ab392a96e2c2b583dfdf9de499b80308eae14f012a6f086118fa174eb9a2a7bf6d3760ae2c8ca6bca7bb62855ca491210ee995517886ad3939a8b0865db958
-  data.tar.gz: ac463a3a4fa01a93bbb42b7e1b326168fa9954bcc4a06e035fa804619cb45e497882a6bcb18385a1614b1d197f174353286aa3d92d02e1726c043c55ee942391
+  metadata.gz: 3db3d15d89132bcb65afe6d25f278cb59e3c40f1cae70a02bb9f8af681356dc2aa14e05017c03088a10baf6b1de22833aaa3b70fb6f3138027cb283a279b77cb
+  data.tar.gz: 1d01c55aba13762649115010a8cb3ca99489773abc8d48236529139318f9f12e636de08b8b66c417157918ff44b7223d0d9bd9a0f9faa9663aef1e908a869d79

data/lib/servactory/context/callable.rb

@@ -16,7 +16,7 @@ module Servactory
 
         prepare_data
 
-        inputs_workbench.check!
+        inputs_workbench.validate!
 
         methods_workbench.run!
 
@@ -41,7 +41,7 @@ module Servactory
 
         prepare_data
 
-        inputs_workbench.check!
+        inputs_workbench.validate!
 
         methods_workbench.run!
 

data/lib/servactory/context/workspace.rb

@@ -3,8 +3,6 @@
 module Servactory
   module Context
     module Workspace
-      attr_reader :inputs
-
       def errors
         @errors ||= Servactory::Errors::Collection.new
       end
@@ -13,6 +11,16 @@ module Servactory
         @inputs = inputs
       end
 
+      def raise_first_fail
+        return if (tmp_errors = errors.for_fails.not_blank).empty?
+
+        raise tmp_errors.first
+      end
+
+      protected
+
+      attr_reader :inputs
+
       def fail_input!(input_name, message:)
         raise Servactory.configuration.input_error_class.new(
           input_name: input_name,
@@ -23,12 +31,6 @@ module Servactory
       def fail!(message:, meta: nil)
         errors << Servactory.configuration.failure_class.new(message: message, meta: meta)
       end
-
-      def raise_first_fail
-        return if (tmp_errors = errors.for_fails.not_blank).empty?
-
-        raise tmp_errors.first
-      end
     end
   end
 end

data/lib/servactory/inputs/input.rb

@@ -29,18 +29,18 @@ module Servactory
       # rubocop:enable Style/KeywordParametersOrder
 
       def add_basic_options_with(type:, options:)
-        # Check Class: Servactory::Inputs::Checks::Required
+        # Check Class: Servactory::Inputs::Validations::Required
         add_required_option_with(options)
 
-        # Check Class: Servactory::Inputs::Checks::Type
+        # Check Class: Servactory::Inputs::Validations::Type
         add_types_option_with(type)
         add_default_option_with(options)
         add_array_option_with(options)
 
-        # Check Class: Servactory::Inputs::Checks::Inclusion
+        # Check Class: Servactory::Inputs::Validations::Inclusion
         add_inclusion_option_with(options)
 
-        # Check Class: Servactory::Inputs::Checks::Must
+        # Check Class: Servactory::Inputs::Validations::Must
         add_must_option_with(options)
 
         # Check Class: nil
@@ -51,15 +51,15 @@ module Servactory
         collection_of_options << Option.new(
           name: :required,
           input: self,
-          check_class: Servactory::Inputs::Checks::Required,
+          validation_class: Servactory::Inputs::Validations::Required,
           define_input_methods: [
             DefineInputMethod.new(
               name: :required?,
-              content: ->(value:) { Servactory::Utils.boolean?(value[:is]) }
+              content: ->(value:) { Servactory::Utils.true?(value[:is]) }
             ),
             DefineInputMethod.new(
               name: :optional?,
-              content: ->(value:) { !Servactory::Utils.boolean?(value[:is]) }
+              content: ->(value:) { !Servactory::Utils.true?(value[:is]) }
             )
           ],
           define_input_conflicts: [
@@ -76,7 +76,7 @@ module Servactory
         collection_of_options << Option.new(
           name: :types,
           input: self,
-          check_class: Servactory::Inputs::Checks::Type,
+          validation_class: Servactory::Inputs::Validations::Type,
           original_value: Array(type),
           need_for_checks: true,
           value_fallback: nil,
@@ -88,7 +88,7 @@ module Servactory
         collection_of_options << Option.new(
           name: :default,
           input: self,
-          check_class: Servactory::Inputs::Checks::Type,
+          validation_class: Servactory::Inputs::Validations::Type,
           define_input_methods: [
             DefineInputMethod.new(
               name: :default_value_present?,
@@ -106,11 +106,11 @@ module Servactory
         collection_of_options << Option.new(
           name: :array,
           input: self,
-          check_class: Servactory::Inputs::Checks::Type,
+          validation_class: Servactory::Inputs::Validations::Type,
           define_input_methods: [
             DefineInputMethod.new(
               name: :array?,
-              content: ->(value:) { Servactory::Utils.boolean?(value[:is]) }
+              content: ->(value:) { Servactory::Utils.true?(value[:is]) }
             )
           ],
           define_input_conflicts: [
@@ -128,7 +128,7 @@ module Servactory
         collection_of_options << Option.new(
           name: :inclusion,
           input: self,
-          check_class: Servactory::Inputs::Checks::Inclusion,
+          validation_class: Servactory::Inputs::Validations::Inclusion,
           define_input_methods: [
             DefineInputMethod.new(
               name: :inclusion_present?,
@@ -146,7 +146,7 @@ module Servactory
         collection_of_options << Option.new(
           name: :must,
           input: self,
-          check_class: Servactory::Inputs::Checks::Must,
+          validation_class: Servactory::Inputs::Validations::Must,
           define_input_methods: [
             DefineInputMethod.new(
               name: :must_present?,
@@ -165,11 +165,11 @@ module Servactory
         collection_of_options << Option.new(
           name: :internal,
           input: self,
-          check_class: nil,
+          validation_class: nil,
           define_input_methods: [
             DefineInputMethod.new(
               name: :internal?,
-              content: ->(value:) { Servactory::Utils.boolean?(value[:is]) }
+              content: ->(value:) { Servactory::Utils.true?(value[:is]) }
             )
           ],
           need_for_checks: false,

data/lib/servactory/inputs/option.rb

@@ -8,7 +8,7 @@ module Servactory
       private_constant :DEFAULT_VALUE
 
       attr_reader :name,
-                  :check_class,
+                  :validation_class,
                   :define_input_methods,
                   :define_input_conflicts,
                   :need_for_checks,
@@ -19,7 +19,7 @@ module Servactory
       def initialize(
         name:,
         input:,
-        check_class:,
+        validation_class:,
         need_for_checks:,
         value_fallback:,
         original_value: nil,
@@ -30,7 +30,7 @@ module Servactory
         **options
       ) # do
         @name = name.to_sym
-        @check_class = check_class
+        @validation_class = validation_class
         @define_input_methods = define_input_methods
         @define_input_conflicts = define_input_conflicts
         @need_for_checks = need_for_checks

data/lib/servactory/inputs/options_collection.rb

@@ -11,8 +11,8 @@ module Servactory
         @collection = Set.new
       end
 
-      def check_classes
-        filter { |option| option.check_class.present? }.map(&:check_class).uniq
+      def validation_classes
+        filter { |option| option.validation_class.present? }.map(&:validation_class).uniq
       end
 
       def options_for_checks

data/lib/servactory/inputs/tools/find_unnecessary.rb

@@ -4,8 +4,8 @@ module Servactory
   module Inputs
     module Tools
       class FindUnnecessary
-        def self.check!(...)
-          new(...).check!
+        def self.validate!(...)
+          new(...).validate!
         end
 
         def initialize(context, incoming_arguments, collection_of_inputs)
@@ -14,7 +14,7 @@ module Servactory
           @collection_of_inputs = collection_of_inputs
         end
 
-        def check!
+        def validate!
           return if unnecessary_attributes.empty?
 
           message_text = I18n.t(

data/lib/servactory/inputs/tools/prepare.rb

@@ -31,11 +31,11 @@ module Servactory
           input_value = @incoming_arguments.fetch(input.name, nil)
           input_value = input.default if input.optional? && input_value.blank?
 
-          @inputs_variables[input.internal_name] = input_value
-
-          return unless input.internal?
-
-          @internal_variables[input.name] = input_value
+          if input.internal?
+            @internal_variables[input.name] = input_value
+          else
+            @inputs_variables[input.internal_name] = input_value
+          end
         end
 
         def create_instance_variables

data/lib/servactory/inputs/tools/rules.rb

@@ -4,8 +4,8 @@ module Servactory
   module Inputs
     module Tools
       class Rules
-        def self.check!(...)
-          new(...).check!
+        def self.validate!(...)
+          new(...).validate!
         end
 
         def initialize(context, collection_of_inputs)
@@ -13,7 +13,7 @@ module Servactory
           @collection_of_inputs = collection_of_inputs
         end
 
-        def check!
+        def validate!
           @collection_of_inputs.each do |input|
             check_for!(input)
           end

data/lib/servactory/inputs/tools/{check.rb → validation.rb}

@@ -3,9 +3,9 @@
 module Servactory
   module Inputs
     module Tools
-      class Check
-        def self.check!(...)
-          new(...).check!
+      class Validation
+        def self.validate!(...)
+          new(...).validate!
         end
 
         def initialize(context, incoming_arguments, collection_of_inputs)
@@ -14,7 +14,7 @@ module Servactory
           @collection_of_inputs = collection_of_inputs
         end
 
-        def check!
+        def validate!
           @collection_of_inputs.each do |input|
             process_input(input)
           end
@@ -31,9 +31,9 @@ module Servactory
         end
 
         def process_option(check_key, check_options, input:)
-          check_classes_from(input).each do |check_class|
-            errors_from_checks = process_check_class(
-              check_class,
+          validation_classes_from(input).each do |validation_class|
+            errors_from_checks = process_validation_classes(
+              validation_class,
               input: input,
               check_key: check_key,
               check_options: check_options
@@ -43,8 +43,8 @@ module Servactory
           end
         end
 
-        def process_check_class(check_class, input:, check_key:, check_options:)
-          check_class.check(
+        def process_validation_classes(validation_class, input:, check_key:, check_options:)
+          validation_class.check(
             context: @context,
             input: input,
             value: @incoming_arguments.fetch(input.name, nil),
@@ -55,8 +55,8 @@ module Servactory
 
         ########################################################################
 
-        def check_classes_from(input)
-          input.collection_of_options.check_classes
+        def validation_classes_from(input)
+          input.collection_of_options.validation_classes
         end
 
         ########################################################################

data/lib/servactory/inputs/{checks → validations}/base.rb

@@ -2,9 +2,9 @@
 
 module Servactory
   module Inputs
-    module Checks
+    module Validations
       class Base
-        protected
+        private
 
         def add_error(message, **attributes)
           message = message.call(**attributes) if message.is_a?(Proc)
@@ -12,8 +12,6 @@ module Servactory
           errors << message
         end
 
-        private
-
         def errors
           @errors ||= Errors.new
         end

data/lib/servactory/inputs/{checks → validations}/errors.rb

@@ -2,7 +2,7 @@
 
 module Servactory
   module Inputs
-    module Checks
+    module Validations
       class Errors
         # NOTE: http://words.steveklabnik.com/beware-subclassing-ruby-core-classes
         extend Forwardable

data/lib/servactory/inputs/{checks → validations}/inclusion.rb

@@ -2,7 +2,7 @@
 
 module Servactory
   module Inputs
-    module Checks
+    module Validations
       class Inclusion < Base
         DEFAULT_MESSAGE = lambda do |service_class_name:, input:, value:|
           I18n.t(

data/lib/servactory/inputs/{checks → validations}/must.rb

@@ -2,7 +2,7 @@
 
 module Servactory
   module Inputs
-    module Checks
+    module Validations
       class Must < Base
         DEFAULT_MESSAGE = lambda do |service_class_name:, input:, value:, code:|
           I18n.t(

data/lib/servactory/inputs/{checks → validations}/required.rb

@@ -2,7 +2,7 @@
 
 module Servactory
   module Inputs
-    module Checks
+    module Validations
       class Required < Base
         DEFAULT_MESSAGE = lambda do |service_class_name:, input:, value:|
           i18n_key = "servactory.inputs.checks.required.default_error."

data/lib/servactory/inputs/{checks → validations}/type.rb

@@ -2,7 +2,7 @@
 
 module Servactory
   module Inputs
-    module Checks
+    module Validations
       class Type < Base
         DEFAULT_MESSAGE = lambda do |service_class_name:, input:, expected_type:, given_type:|
           if input.array?

data/lib/servactory/inputs/workbench.rb

@@ -17,19 +17,19 @@ module Servactory
       end
 
       def find_unnecessary!
-        Tools::FindUnnecessary.check!(context, @incoming_arguments, collection_of_inputs)
+        Tools::FindUnnecessary.validate!(context, @incoming_arguments, collection_of_inputs)
       end
 
       def check_rules!
-        Tools::Rules.check!(context, collection_of_inputs)
+        Tools::Rules.validate!(context, collection_of_inputs)
       end
 
       def prepare
         Tools::Prepare.prepare(context, @incoming_arguments, collection_of_inputs)
       end
 
-      def check!
-        Tools::Check.check!(context, @incoming_arguments, collection_of_inputs)
+      def validate!
+        Tools::Validation.validate!(context, @incoming_arguments, collection_of_inputs)
       end
 
       private

data/lib/servactory/internals/tools/prepare.rb

@@ -30,7 +30,7 @@ module Servactory
         # EXAMPLE:
         #
         #   define_method(:user=) do |value|
-        #     Servactory::Internals::Checks::Type.check!( context: self, internal:, value: )
+        #     Servactory::Internals::Validations::Type.validate!( context: self, internal:, value: )
         #
         #     instance_variable_set(:@user, value)
         #   end
@@ -40,7 +40,7 @@ module Servactory
         def context_internal_template_for(internal)
           <<-RUBY
             define_method(:#{internal.name}=) do |value|
-              Servactory::Internals::Checks::Type.check!(
+              Servactory::Internals::Validations::Type.validate!(
                 context: self,
                 internal: internal,
                 value: value

data/lib/servactory/internals/{checks → validations}/base.rb

@@ -2,7 +2,7 @@
 
 module Servactory
   module Internals
-    module Checks
+    module Validations
       class Base
         protected
 

data/lib/servactory/internals/{checks → validations}/type.rb

@@ -2,7 +2,7 @@
 
 module Servactory
   module Internals
-    module Checks
+    module Validations
       class Type < Base
         DEFAULT_MESSAGE = lambda do |service_class_name:, internal:, expected_type:, given_type:|
           I18n.t(
@@ -16,8 +16,8 @@ module Servactory
 
         private_constant :DEFAULT_MESSAGE
 
-        def self.check!(...)
-          new(...).check!
+        def self.validate!(...)
+          new(...).validate!
         end
 
         ##########################################################################
@@ -30,7 +30,7 @@ module Servactory
           @value = value
         end
 
-        def check!
+        def validate!
           return if prepared_types.any? { |type| @value.is_a?(type) }
 
           raise_error_with(

data/lib/servactory/methods/collection.rb

@@ -5,7 +5,7 @@ module Servactory
     class Collection
       # NOTE: http://words.steveklabnik.com/beware-subclassing-ruby-core-classes
       extend Forwardable
-      def_delegators :@collection, :<<, :each, :merge
+      def_delegators :@collection, :<<, :each, :merge, :empty?
 
       def initialize(*)
         @collection = Set.new

data/lib/servactory/methods/method.rb

@@ -4,12 +4,20 @@ module Servactory
   module Methods
     class Method
       attr_reader :name,
-                  :condition
+                  :condition,
+                  :is_condition_opposite
 
       def initialize(name, **options)
         @name = name
 
+        @is_condition_opposite = false
         @condition = options.fetch(:if, nil)
+
+        return unless @condition.nil?
+
+        @condition = options.fetch(:unless, nil)
+
+        @is_condition_opposite = true unless @condition.nil?
       end
     end
   end

data/lib/servactory/methods/workbench.rb

@@ -16,6 +16,8 @@ module Servactory
       end
 
       def run!
+        return try_to_use_call if collection_of_methods.empty?
+
         collection_of_methods.each do |make_method|
           next if unnecessary_for?(make_method)
 
@@ -28,11 +30,22 @@ module Servactory
       attr_reader :context,
                   :collection_of_methods
 
+      def try_to_use_call
+        context.try(:send, :call)
+      end
+
       def unnecessary_for?(make_method)
         condition = make_method.condition
+        is_condition_opposite = make_method.is_condition_opposite
+
+        result = prepare_condition_for(condition)
+
+        is_condition_opposite ? !result : result
+      end
 
-        return false if condition.blank?
-        return !Servactory::Utils.boolean?(condition) unless condition.is_a?(Proc)
+      def prepare_condition_for(condition)
+        return false if condition.nil?
+        return !Servactory::Utils.true?(condition) unless condition.is_a?(Proc)
 
         !condition.call(context: context)
       end

data/lib/servactory/outputs/output.rb

@@ -25,7 +25,7 @@ module Servactory
       end
 
       def required?
-        Servactory::Utils.boolean?(required)
+        Servactory::Utils.true?(required)
       end
 
       def optional?

data/lib/servactory/outputs/tools/conflicts.rb

@@ -4,8 +4,8 @@ module Servactory
   module Outputs
     module Tools
       class Conflicts
-        def self.check!(...)
-          new(...).check!
+        def self.validate!(...)
+          new(...).validate!
         end
 
         def initialize(context, collection_of_outputs, collection_of_internals)
@@ -14,7 +14,7 @@ module Servactory
           @collection_of_internals = collection_of_internals
         end
 
-        def check!
+        def validate!
           return if overlapping_attributes.empty?
 
           message_text = I18n.t(

data/lib/servactory/outputs/tools/prepare.rb

@@ -30,7 +30,7 @@ module Servactory
         # EXAMPLE:
         #
         #   define_method(:user=) do |value|
-        #     Servactory::Internals::Checks::Type.check!( context: self, output:, value: )
+        #     Servactory::Internals::Validations::Type.validate!( context: self, output:, value: )
         #
         #     instance_variable_set(:@user, value)
         #   end
@@ -42,7 +42,7 @@ module Servactory
         def context_output_template_for(output)
           <<-RUBY
             define_method(:#{output.name}=) do |value|
-              Servactory::Outputs::Checks::Type.check!(
+              Servactory::Outputs::Validations::Type.validate!(
                 context: self,
                 output: output,
                 value: value

data/lib/servactory/outputs/{checks → validations}/base.rb

@@ -2,7 +2,7 @@
 
 module Servactory
   module Outputs
-    module Checks
+    module Validations
       class Base
         protected
 

data/lib/servactory/outputs/{checks → validations}/type.rb

@@ -2,7 +2,7 @@
 
 module Servactory
   module Outputs
-    module Checks
+    module Validations
       class Type < Base
         DEFAULT_MESSAGE = lambda do |service_class_name:, output:, expected_type:, given_type:|
           I18n.t(
@@ -16,8 +16,8 @@ module Servactory
 
         private_constant :DEFAULT_MESSAGE
 
-        def self.check!(...)
-          new(...).check!
+        def self.validate!(...)
+          new(...).validate!
         end
 
         ##########################################################################
@@ -30,7 +30,7 @@ module Servactory
           @value = value
         end
 
-        def check!
+        def validate!
           return if prepared_types.any? { |type| @value.is_a?(type) }
 
           raise_error_with(

data/lib/servactory/outputs/workbench.rb

@@ -16,7 +16,7 @@ module Servactory
       end
 
       def find_conflicts_in!(collection_of_internals:)
-        Tools::Conflicts.check!(context, collection_of_outputs, collection_of_internals)
+        Tools::Conflicts.validate!(context, collection_of_outputs, collection_of_internals)
       end
 
       def prepare

data/lib/servactory/utils.rb

@@ -6,7 +6,7 @@ module Servactory
 
     # @param value [#to_s]
     # @return [Boolean]
-    def boolean?(value)
+    def true?(value)
       value.to_s.casecmp("true").to_i.zero?
     end
   end

data/lib/servactory/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: servactory
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
 platform: ruby
 authors:
 - Anton Sokolov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-27 00:00:00.000000000 Z
+date: 2023-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -205,12 +205,6 @@ files:
 - lib/servactory/errors/input_error.rb
 - lib/servactory/errors/internal_error.rb
 - lib/servactory/errors/output_error.rb
-- lib/servactory/inputs/checks/base.rb
-- lib/servactory/inputs/checks/errors.rb
-- lib/servactory/inputs/checks/inclusion.rb
-- lib/servactory/inputs/checks/must.rb
-- lib/servactory/inputs/checks/required.rb
-- lib/servactory/inputs/checks/type.rb
 - lib/servactory/inputs/collection.rb
 - lib/servactory/inputs/define_input_conflict.rb
 - lib/servactory/inputs/define_input_method.rb
@@ -218,31 +212,37 @@ files:
 - lib/servactory/inputs/input.rb
 - lib/servactory/inputs/option.rb
 - lib/servactory/inputs/options_collection.rb
-- lib/servactory/inputs/tools/check.rb
 - lib/servactory/inputs/tools/check_errors.rb
 - lib/servactory/inputs/tools/find_unnecessary.rb
 - lib/servactory/inputs/tools/prepare.rb
 - lib/servactory/inputs/tools/rules.rb
+- lib/servactory/inputs/tools/validation.rb
+- lib/servactory/inputs/validations/base.rb
+- lib/servactory/inputs/validations/errors.rb
+- lib/servactory/inputs/validations/inclusion.rb
+- lib/servactory/inputs/validations/must.rb
+- lib/servactory/inputs/validations/required.rb
+- lib/servactory/inputs/validations/type.rb
 - lib/servactory/inputs/workbench.rb
-- lib/servactory/internals/checks/base.rb
-- lib/servactory/internals/checks/type.rb
 - lib/servactory/internals/collection.rb
 - lib/servactory/internals/dsl.rb
 - lib/servactory/internals/internal.rb
 - lib/servactory/internals/tools/prepare.rb
+- lib/servactory/internals/validations/base.rb
+- lib/servactory/internals/validations/type.rb
 - lib/servactory/internals/workbench.rb
 - lib/servactory/methods/collection.rb
 - lib/servactory/methods/dsl.rb
 - lib/servactory/methods/method.rb
 - lib/servactory/methods/shortcuts/collection.rb
 - lib/servactory/methods/workbench.rb
-- lib/servactory/outputs/checks/base.rb
-- lib/servactory/outputs/checks/type.rb
 - lib/servactory/outputs/collection.rb
 - lib/servactory/outputs/dsl.rb
 - lib/servactory/outputs/output.rb
 - lib/servactory/outputs/tools/conflicts.rb
 - lib/servactory/outputs/tools/prepare.rb
+- lib/servactory/outputs/validations/base.rb
+- lib/servactory/outputs/validations/type.rb
 - lib/servactory/outputs/workbench.rb
 - lib/servactory/result.rb
 - lib/servactory/utils.rb