servactory 2.2.0 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 206566afd8ea64686928cf73cc5900e9a61c931ed6519e4e52305dad0e9845e4
-  data.tar.gz: edf4a6bcc1da04242ee0983dd6097913cb860a720d4dadd53bba5d1974576384
+  metadata.gz: d6c205eaf58dfc9f10040d0b5a60324ee63ed72dfc1643df149646232ce73c46
+  data.tar.gz: b88daadf5ed2d8645eca11d1d4ea9bdd86175b52a3297f57f232b068239a070b
 SHA512:
-  metadata.gz: eb6f14cb003123bea8192676582bea31dad5e9929596adf8929798687f7bad66f1b628a327a6584688572d9b9725ecc5460abd613f3a9818d1b635f877f0806f
-  data.tar.gz: bb35e3efe53a8ef9e386301af595de8250d4d0e8228ce2fd4e80a09c17b1a573abf31154e4848535c3bc048012ea5a1521f48389ff8f0b9533e9919430c21ebe
+  metadata.gz: 4f08e497b7044ab6c6ec5c53d2e87538ef7666cea055cdd3fac5d86c8ff699367ca606b508eebc25c022e9f8ad9c44d70a9bd5ce8d4d0b48634c5268aea88f29
+  data.tar.gz: 5b3bdb880e5251115e21ddf47f66350cd1f1f86ae434080190d04277c8d60d8e9c0d3628c5f84c91d4a31f4c7a3df3266d5f35bfe88fadc842a4c9596d9e4554

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/errors/failure.rb

@@ -7,7 +7,7 @@ module Servactory
                   :message,
                   :meta
 
-      def initialize(type:, message:, meta: nil)
+      def initialize(type: :base, message:, meta: nil) # rubocop:disable Style/KeywordParametersOrder
         @type = type
         @message = message
         @meta = meta

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 = 0
+    PATCH = 2
     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.0
+  version: 2.2.2
 platform: ruby
 authors:
 - Anton Sokolov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-28 00:00:00.000000000 Z
+date: 2024-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport