servactory 1.5.0 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 417ec054ab2d314d3a54167a81ee92408cc3f631fea88220d85d06838dcb86db
-  data.tar.gz: 4e49086ca53660fd8e7e7cddce9734092703278f6da7f3880b43922ae053fe49
+  metadata.gz: 2f9511d2fb9a463c46f04ba4e6f005b14f9048039524a1aed476ee1a4fa997ef
+  data.tar.gz: f5e03fa8943d3a5fd4735ec3817528202ce3b2e06106d81f0ad08fde2e4e4baf
 SHA512:
-  metadata.gz: b511278027c0384d1643b46b3b88a48e17f1f2b5685824f06190f98c07f5e4398a5494b9da8c2c75250ed14c1f3b3123b2c917bb00fa0a9159b5ccecc1fc2117
-  data.tar.gz: '0865a04061268ae4e582a499728b4b881d41d398cf322c9a91f10d24f14588904b1c65dca2f81750bd5bd912ac04384344216d73aed6f5699499c50531a884f6'
+  metadata.gz: 406a99f8386dc97033fd28231e8b11438aa8827878ee332b11efa43747b92f7fcc993b547413733651a93bc0d1f59f6799f4b7e70778038f685d91206ff35be9
+  data.tar.gz: 2895de4a4fc256dcec75cddaddc0ff92b70e9cf42de13309acde95447b0466d4afa8103d52b6ec66e219109065f7f9ffea022c7c41789e88383f32cf08a5e8bb

data/lib/servactory/context/callable.rb

@@ -58,8 +58,7 @@ module Servactory
       def assign_data_with(arguments)
         input_arguments_workbench.assign(
           context: context_store.context,
-          arguments: arguments,
-          collection_of_input_options: collection_of_input_options
+          arguments: arguments
         )
 
         internal_arguments_workbench.assign(context: context_store.context)

data/lib/servactory/input_arguments/checks/inclusion.rb

@@ -37,10 +37,13 @@ module Servactory
         end
 
         def check
-          return if @input.inclusion[:in].include?(@value)
+          inclusion_in, message = @input.inclusion.values_at(:in, :message)
+
+          return if inclusion_in.nil?
+          return if inclusion_in.include?(@value)
 
           add_error(
-            DEFAULT_MESSAGE,
+            message.presence || DEFAULT_MESSAGE,
             service_class_name: @context.class.name,
             input: @input,
             value: @value

data/lib/servactory/input_arguments/dsl.rb

@@ -19,7 +19,6 @@ module Servactory
         def input(name, **options)
           collection_of_input_arguments << InputArgument.new(
             name,
-            collection_of_options: collection_of_input_options,
             **options
           )
         end
@@ -28,10 +27,6 @@ module Servactory
           @collection_of_input_arguments ||= Collection.new
         end
 
-        def collection_of_input_options
-          @collection_of_input_options ||= OptionsCollection.new
-        end
-
         def input_arguments_workbench
           @input_arguments_workbench ||= Workbench.work_with(collection_of_input_arguments)
         end

data/lib/servactory/input_arguments/input_argument.rb

@@ -6,24 +6,21 @@ module Servactory
       ARRAY_DEFAULT_VALUE = ->(is: false, message: nil) { { is: is, message: message } }
 
       attr_reader :name,
-                  :internal_name,
-                  :collection_of_options
+                  :internal_name
 
       # rubocop:disable Style/KeywordParametersOrder
       def initialize(
         name,
         as: nil,
-        collection_of_options:,
         type:,
         **options
       )
         @name = name
         @internal_name = as.present? ? as : name
-        @collection_of_options = collection_of_options
 
         add_basic_options_with(type: type, options: options)
 
-        @collection_of_options.each do |option|
+        collection_of_options.each do |option|
           self.class.attr_reader(:"#{option.name}")
 
           instance_variable_set(:"@#{option.name}", option.value)
@@ -182,6 +179,10 @@ module Servactory
         )
       end
 
+      def collection_of_options
+        @collection_of_options ||= OptionsCollection.new
+      end
+
       def options_for_checks
         collection_of_options.options_for_checks
       end

data/lib/servactory/input_arguments/tools/check.rb

@@ -8,11 +8,10 @@ module Servactory
           new(...).check!
         end
 
-        def initialize(context, incoming_arguments, collection_of_input_arguments, collection_of_input_options)
+        def initialize(context, incoming_arguments, collection_of_input_arguments)
           @context = context
           @incoming_arguments = incoming_arguments
           @collection_of_input_arguments = collection_of_input_arguments
-          @collection_of_input_options = collection_of_input_options
         end
 
         def check!
@@ -32,7 +31,7 @@ module Servactory
         end
 
         def process_option(check_key, check_options, input:)
-          check_classes.each do |check_class|
+          check_classes_from(input).each do |check_class|
             errors_from_checks = process_check_class(
               check_class,
               input: input,
@@ -56,8 +55,8 @@ module Servactory
 
         ########################################################################
 
-        def check_classes
-          @collection_of_input_options.check_classes
+        def check_classes_from(input)
+          input.collection_of_options.check_classes
         end
 
         ########################################################################

data/lib/servactory/input_arguments/workbench.rb

@@ -11,10 +11,9 @@ module Servactory
         @collection_of_input_arguments = collection_of_input_arguments
       end
 
-      def assign(context:, arguments:, collection_of_input_options:)
+      def assign(context:, arguments:)
         @context = context
         @incoming_arguments = arguments
-        @collection_of_input_options = collection_of_input_options
       end
 
       def find_unnecessary!
@@ -30,14 +29,13 @@ module Servactory
       end
 
       def check!
-        Tools::Check.check!(context, @incoming_arguments, collection_of_input_arguments, collection_of_input_options)
+        Tools::Check.check!(context, @incoming_arguments, collection_of_input_arguments)
       end
 
       private
 
       attr_reader :context,
-                  :collection_of_input_arguments,
-                  :collection_of_input_options
+                  :collection_of_input_arguments
     end
   end
 end

data/lib/servactory/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: servactory
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.2
 platform: ruby
 authors:
 - Anton Sokolov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-20 00:00:00.000000000 Z
+date: 2023-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport