servactory 2.2.1 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d6caa4bc22185741274dfaa2482bb254795dfa692f7890de4ec47651fd3a574
-  data.tar.gz: e7852ab4e6edc5be891f3551c5c7daccd7ab90d5e448cae08b4efc115278af0a
+  metadata.gz: a51453d18412c6b59e5bf08eafdc54c5bf30d5f174b3f0bac9f765f86ce571d3
+  data.tar.gz: 2c808474f78bc6de5305768c95ed8da3b235c25f51bdf03b8f88e824aa25ad9d
 SHA512:
-  metadata.gz: e1dad15de09d231e20f79b5fbf0a51b4fb4a7f17f23797bbe1a2adae97e53cb036ed056be687342847897b3bb7e3b7724d399409f270f27d5a2c061fa9c2e33f
-  data.tar.gz: ac7036078315e72298aac49674111adf3d15ccc6c7b643ee75bff9c5ac92078a5915d27b1c560ce33eebbc55ed50ac747306ed6ea9cfd9c76d6e311e64cfe513
+  metadata.gz: 2868a096dd3b76d8bcc5ee718220c7335abbab1b5d9423260b0d0e84e258bf97cf2b737976a625d6bed4ef0dbbfc036bb26f9aadfc7ebf208fedd97c797cad47
+  data.tar.gz: fb248ceeaf20d9d4945b7e0872d3c069416379f650afca902910d324747c03d98dce46330283ae67466a1cc79651225903ef53075b3d5c3295023fd3ac883c84

data/config/locales/en.yml

@@ -1,9 +1,8 @@
 en:
   servactory:
     common:
-      undefined_local_variable_or_method: "[%{service_class_name}] Undefined local variable or method `%{method_name}`"
       undefined_method:
-        missing_name: "[%{service_class_name}] Undefined method `%{method_name}` for `%{missing_name}`"
+        missing_name: "[%{service_class_name}] %{error_text}"
     methods:
       call:
         not_used: "[%{service_class_name}] Nothing to perform. Use `make` or create a `call` method."

data/config/locales/ru.yml

@@ -1,9 +1,8 @@
 ru:
   servactory:
     common:
-      undefined_local_variable_or_method: "[%{service_class_name}] Неопределенная локальная переменная или метод `%{method_name}`"
       undefined_method:
-        missing_name: "[%{service_class_name}] Неопределенный метод `%{method_name}` для `%{missing_name}`"
+        missing_name: "[%{service_class_name}] %{error_text}"
     methods:
       call:
         not_used: "[%{service_class_name}] Нечего выполнять. Используйте `make` или создайте метод `call`."

data/lib/servactory/actions/tools/runner.rb

@@ -57,10 +57,6 @@ module Servactory
 
         def call_method(method)
           @context.send(method.name)
-        rescue NoMethodError => e
-          rescue_no_method_error_with(exception: e)
-        rescue NameError
-          rescue_name_error_with(method: method)
         end
 
         def unnecessary_for_stage?(stage)
@@ -87,37 +83,6 @@ module Servactory
 
           !condition.call(context: @context)
         end
-
-        ########################################################################
-
-        def rescue_no_method_error_with(exception:) # rubocop:disable Metrics/MethodLength
-          raise @context.class.config.failure_class.new(
-            type: :base,
-            message: I18n.t(
-              "servactory.common.undefined_method.missing_name",
-              service_class_name: @context.class.name,
-              method_name: exception.name,
-              missing_name: if exception.missing_name.nil?
-                              exception.missing_name.inspect
-                            elsif exception.missing_name == "NilClass"
-                              nil.inspect
-                            else
-                              exception.missing_name
-                            end
-            )
-          )
-        end
-
-        def rescue_name_error_with(method:)
-          raise @context.class.config.failure_class.new(
-            type: :base,
-            message: I18n.t(
-              "servactory.common.undefined_local_variable_or_method",
-              service_class_name: @context.class.name,
-              method_name: method.name
-            )
-          )
-        end
       end
     end
   end

data/lib/servactory/configuration/dsl.rb

@@ -8,7 +8,7 @@ module Servactory
       end
 
       module ClassMethods
-        def inherited(child) # rubocop:disable Metrics/AbcSize
+        def inherited(child) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
           super
 
           child.config.input_error_class = config.input_error_class
@@ -21,6 +21,8 @@ module Servactory
           child.config.collection_mode_class_names = config.collection_mode_class_names
 
           child.config.input_option_helpers = config.input_option_helpers
+          child.config.internal_option_helpers = config.internal_option_helpers
+          child.config.output_option_helpers = config.output_option_helpers
 
           child.config.action_aliases = config.action_aliases
           child.config.action_shortcuts = config.action_shortcuts

data/lib/servactory/result.rb

@@ -93,7 +93,7 @@ module Servactory
 
     ########################################################################
 
-    def rescue_no_method_error_with(exception:)
+    def rescue_no_method_error_with(exception:) # rubocop:disable Metrics/MethodLength
       raise exception if @context.blank?
 
       raise @context.class.config.failure_class.new(
@@ -101,9 +101,11 @@ module Servactory
         message: I18n.t(
           "servactory.common.undefined_method.missing_name",
           service_class_name: @context.class.name,
-          method_name: exception.name,
-          missing_name: exception.missing_name.inspect
-        )
+          error_text: exception.message
+        ),
+        meta: {
+          original_exception: exception
+        }
       )
     end
   end

data/lib/servactory/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: servactory
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.3
 platform: ruby
 authors:
 - Anton Sokolov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-28 00:00:00.000000000 Z
+date: 2024-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport