servactory 1.9.1 → 1.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e2700452d86edebc82fa3ee39440d45e145a60ce29100beb2e60e7a8fc8421e
-  data.tar.gz: 12247104874465f4feb387201f52afb45ee941fce8cb18f9a303e08af117a3a7
+  metadata.gz: 026f0a67d02ac1eb1053768585e80684a7bbaa4acbf3b381213d145cfbefe4ae
+  data.tar.gz: 362040a5cfe9b33d28b1a83bedb21efa7d2fa701272c7b30f739c6a8f025af42
 SHA512:
-  metadata.gz: 3f2a24c468da16bcc97e1e2cbbb86adf99c9e1a37b352e7e5e99e574a15333f8ca1cbf22b675fbc4387e4dfd2c6e52dc3e07bd3365569957385d4889195f02cb
-  data.tar.gz: e3d2122b3438fb9c5fbc637535a8450771879cde90291978bb111a0e94a4c4f9440269f2c6b253fb7d2360581166a793a12498f77544d627287eae0d56927dd5
+  metadata.gz: 449c7dd9083b99629621e0cd04bcbd07e3b01b3081fc64cc36042922d3c8fa603a8f2efb6d14fe53b8b233ec9437bf82d994831e5cbc002b4ccad5829775ea1d
+  data.tar.gz: 932159f75fb820fd9adad6f0f2bb6bae88e2ac74d87d9e2293caab4c5a5cb691a6d161bfe4ac4e3f89527b2f106ff52d36119cbb765ccbed2767cb70ab1b8b2d

data/config/locales/en.yml

@@ -1,6 +1,9 @@
 en:
   servactory:
     inputs:
+      undefined:
+        getter: "[%{service_class_name}] Undefined input attribute `%{input_name}`"
+        setter: "[%{service_class_name}] Undefined input attribute `%{input_name}`"
       checks:
         inclusion:
           default_error: "[%{service_class_name}] Wrong value in `%{input_name}`, must be one of `%{input_inclusion}`"
@@ -21,10 +24,16 @@ en:
         rules:
           error: "[%{service_class_name}] Conflict in `%{input_name}` input options: `%{conflict_code}`"
     internals:
+      undefined:
+        getter: "[%{service_class_name}] Undefined internal attribute `%{internal_name}`"
+        setter: "[%{service_class_name}] Undefined internal attribute `%{internal_name}`"
       checks:
         type:
           default_error: "[%{service_class_name}] Wrong type of internal attribute `%{internal_name}`, expected `%{expected_type}`, got `%{given_type}`"
     outputs:
+      undefined:
+        getter: "[%{service_class_name}] Undefined output attribute `%{output_name}`"
+        setter: "[%{service_class_name}] Undefined output attribute `%{output_name}`"
       checks:
         type:
           default_error: "[%{service_class_name}] Wrong type of output attribute `%{output_name}`, expected `%{expected_type}`, got `%{given_type}`"

data/config/locales/ru.yml

@@ -1,6 +1,9 @@
 ru:
   servactory:
     inputs:
+      undefined:
+        getter: "[%{service_class_name}] Неизвестный входящий атрибут `%{input_name}`"
+        setter: "[%{service_class_name}] Неизвестный входящий атрибут `%{input_name}`"
       checks:
         inclusion:
           default_error: "[%{service_class_name}] Неверное значение в `%{input_name}`, должно быть одним из `%{input_inclusion}`"
@@ -21,10 +24,16 @@ ru:
         rules:
           error: "[%{service_class_name}] Конфликт в опциях инпута `%{input_name}`: `%{conflict_code}`"
     internals:
+      undefined:
+        getter: "[%{service_class_name}] Неизвестный внутренний атрибут `%{internal_name}`"
+        setter: "[%{service_class_name}] Неизвестный внутренний атрибут `%{internal_name}`"
       checks:
         type:
           default_error: "[%{service_class_name}] Неверный тип внутреннего атрибута `%{internal_name}`, ожидалось `%{expected_type}`, получено `%{given_type}`"
     outputs:
+      undefined:
+        getter: "[%{service_class_name}] Неизвестный выходящий атрибут `%{output_name}`"
+        setter: "[%{service_class_name}] Неизвестный выходящий атрибут `%{output_name}`"
       checks:
         type:
           default_error: "[%{service_class_name}] Неверный тип выходящего атрибута `%{output_name}`, ожидалось `%{expected_type}`, получено `%{given_type}`"

data/lib/servactory/context/callable.rb

@@ -8,7 +8,7 @@ module Servactory
 
         context.send(
           :_call!,
-          incoming_arguments: arguments,
+          incoming_arguments: arguments.symbolize_keys,
           collection_of_inputs: collection_of_inputs,
           collection_of_internals: collection_of_internals,
           collection_of_outputs: collection_of_outputs,

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

@@ -11,10 +11,12 @@ module Servactory
         end
 
         def method_missing(name, *args, &block)
+          prepared_name = name.to_s.delete("=").to_sym
+
           if name.to_s.end_with?("=")
-            super
+            raise_error_for(:setter, prepared_name)
           else
-            getter_with(name: name) { super }
+            getter_with(name: name) { raise_error_for(:getter, name) }
           end
         end
 
@@ -42,6 +44,16 @@ module Servactory
             input_value
           end
         end
+
+        def raise_error_for(type, name)
+          message_text = I18n.t(
+            "servactory.inputs.undefined.#{type}",
+            service_class_name: @context.class.name,
+            input_name: name
+          )
+
+          raise @context.class.config.input_error_class.new(message: message_text, input_name: name)
+        end
       end
     end
   end

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

@@ -10,10 +10,12 @@ module Servactory
         end
 
         def method_missing(name, *args, &block)
+          prepared_name = name.to_s.delete("=").to_sym
+
           if name.to_s.end_with?("=")
-            setter_with(name: name, value: args.pop) { super }
+            setter_with(prepared_name: prepared_name, value: args.pop) { raise_error_for(:setter, prepared_name) }
           else
-            getter_with(name: name) { super }
+            getter_with(name: name) { raise_error_for(:getter, prepared_name) }
           end
         end
 
@@ -23,9 +25,7 @@ module Servactory
 
         private
 
-        def setter_with(name:, value:, &block) # rubocop:disable Lint/UnusedMethodArgument
-          prepared_name = name.to_s.delete("=").to_sym
-
+        def setter_with(prepared_name:, value:, &block) # rubocop:disable Lint/UnusedMethodArgument
           return yield unless @collection_of_internals.names.include?(prepared_name)
 
           internal = @collection_of_internals.find_by(name: prepared_name) # ::Servactory::Internals::Internal
@@ -55,6 +55,16 @@ module Servactory
             internal_value
           end
         end
+
+        def raise_error_for(type, name)
+          message_text = I18n.t(
+            "servactory.internals.undefined.#{type}",
+            service_class_name: @context.class.name,
+            internal_name: name
+          )
+
+          raise @context.class.config.input_error_class.new(message: message_text)
+        end
       end
     end
   end

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

@@ -10,10 +10,12 @@ module Servactory
         end
 
         def method_missing(name, *args, &block)
+          prepared_name = name.to_s.delete("=").to_sym
+
           if name.to_s.end_with?("=")
-            setter_with(name: name, value: args.pop) { super }
+            setter_with(prepared_name: prepared_name, value: args.pop) { raise_error_for(:setter, prepared_name) }
           else
-            getter_with(name: name) { super }
+            getter_with(name: name) { raise_error_for(:getter, prepared_name) }
           end
         end
 
@@ -23,9 +25,7 @@ module Servactory
 
         private
 
-        def setter_with(name:, value:, &block) # rubocop:disable Lint/UnusedMethodArgument
-          prepared_name = name.to_s.delete("=").to_sym
-
+        def setter_with(prepared_name:, value:, &block) # rubocop:disable Lint/UnusedMethodArgument
           return yield unless @collection_of_outputs.names.include?(prepared_name)
 
           output = @collection_of_outputs.find_by(name: prepared_name) # ::Servactory::Outputs::Output
@@ -55,6 +55,16 @@ module Servactory
             output_value
           end
         end
+
+        def raise_error_for(type, name)
+          message_text = I18n.t(
+            "servactory.outputs.undefined.#{type}",
+            service_class_name: @context.class.name,
+            output_name: name
+          )
+
+          raise @context.class.config.output_error_class.new(message: message_text)
+        end
       end
     end
   end

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

@@ -10,7 +10,7 @@ module Servactory
 
         def initialize(context, incoming_arguments, collection_of_inputs)
           @context = context
-          @incoming_arguments = incoming_arguments.symbolize_keys
+          @incoming_arguments = incoming_arguments
           @collection_of_inputs = collection_of_inputs
         end
 

data/lib/servactory/version.rb

@@ -4,7 +4,7 @@ module Servactory
   module VERSION
     MAJOR = 1
     MINOR = 9
-    PATCH = 1
+    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.9.1
+  version: 1.9.3
 platform: ruby
 authors:
 - Anton Sokolov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-24 00:00:00.000000000 Z
+date: 2023-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport