toolx 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab4f3af6bd6512a1a0db4eb3f0d24b0ab12d07b46150bf481862fd7c0b0a76ee
-  data.tar.gz: d1f3c32d678d96285cb683c146372437ae2a00000483019876bec3e0d53cc3a1
+  metadata.gz: b226bf96b643cb84becf9703ed3089a2fd3fb6d5dd7c48ca854f6e5afaae214a
+  data.tar.gz: a7592f19082757e2b4d9a623b4c3f2c0ec3464d73c58fab50106f396ccff2bb2
 SHA512:
-  metadata.gz: 91a3d2d5726133924461dadcde633c1121b94b694c94f7b27842edf7acbea8bc2549fe1c0232df5484c59a13cfa1687a43eb86b55153a5bb1c9c3f8afd8139af
-  data.tar.gz: 06ac13ddeebfb93c702daf6e809f76a248622ed1d9036561f4927b19439ef9553493c2850bf015a90aa5b265ea2c31402d8150b1db5fcecd0774cec250218e0e
+  metadata.gz: 9ec23d6768ccbe3c019f711eca31f9b2d6642284d882593a3e3e02d10a263a3402738c5faef494efaad55124ba2377134f5ed929d16205e4c708f75e54bbbc32
+  data.tar.gz: 8c1ad828692754eac3d1fef3fd4f38b1d9f9c3b002bca3d11805e7fe2f1ffe8720c74ac563cbd20393145c45ccde132712daa0f6bf3e1d7c172114751ae82ce2

data/lib/toolx/core/operation/callbacks_wrapper.rb

@@ -1,4 +1,5 @@
 module Toolx::Core::Operation::CallbacksWrapper
+  # When class is loaded twice all callbacks are duplicated.
   def perform(...)
     run_callbacks :perform do
       super

data/lib/toolx/core/operation/flow.rb

@@ -17,9 +17,19 @@ module Toolx::Core::Operation::Flow
   end
 
   class Executor
+    include ::ActiveSupport::Rescuable
     ExecutorError = Class.new(::Toolx::Core::Errors::NestedStandardError)
     OperationAlreadyInitialized = Class.new(ExecutorError)
     OperationNotInitialized = Class.new(ExecutorError)
+    ActionException = Class.new(::Toolx::Core::Errors::NestedStandardError)
+    OnSuccessException = Class.new(ActionException)
+    OnFailException = Class.new(ActionException) do
+      attr_reader :operation_exception
+      def initialize(msg = nil, nested = $ERROR_INFO, operation_exception = nil)
+        super(msg, nested)
+        @operation_exception = operation_exception
+      end
+    end
 
     def initialize(operation_class)
       @operation_class = operation_class
@@ -175,7 +185,9 @@ module Toolx::Core::Operation::Flow
       execute_actions
       self
     rescue => exception
-      raise if exception.is_a?(ExecutorError)
+      # TODO: Rethink
+      raise if exception.is_a?(ExecutorError) || exception.is_a?(OnSuccessException)
+      # rescue_with_handler(exception) || raise
       @exception = exception
       execute_actions
       self
@@ -214,7 +226,19 @@ module Toolx::Core::Operation::Flow
     end
 
     def execute_actions
-      success? ? execute_action_kind(:success) : execute_action_kind(:fail)
+      if success?
+        begin
+          execute_action_kind(:success)
+        rescue => e
+          raise OnSuccessException, "Error in success action: #{e.message}", e.backtrace
+        end
+      else
+        begin
+          execute_action_kind(:fail)
+        rescue => e
+          raise OnFailException.new("Error in fail action: #{e.message}", e, exception)
+        end
+      end
       self
     end
   end

data/lib/toolx/core/operation/params_wrapper.rb

@@ -1,18 +1,21 @@
 require 'dry-struct'
+require_relative '../errors/nested_standard_error'
 
 module Toolx::Core::Operation::ParamsWrapper
+  ParamsArgumentError = Class.new(::Toolx::Core::Errors::NestedStandardError)
+
   def initialize(*args, **kwargs)
     params = args.first.nil? ? kwargs : args.first
     if self.class.const_defined?(:Params, false) && !params.is_a?(self.class.const_get(:Params, false))
       begin
         params = self.class.const_get(:Params, false).new(params.deep_symbolize_keys)
       rescue Dry::Struct::Error => e
-        err = ArgumentError.new <<~MSG
-          #{e.message}
-          Provided: #{params.inspect}\n
+        message = <<~MSG
+          Expected #{self.class.name} keyword args: #{self.class.const_get(:Params, false)}
+          Got: #{params.inspect}
+          Message: #{e.message}
         MSG
-        err.set_backtrace(e.backtrace)
-        raise err
+        raise ParamsArgumentError.new(message, e)
       end
     end
     @params = params

data/lib/toolx/core/operation/response_wrapper.rb

@@ -1,6 +1,9 @@
 require 'dry-struct'
+require_relative '../errors/nested_standard_error'
 
 module Toolx::Core::Operation::ResponseWrapper
+  ResponseArgumentError = Class.new(::Toolx::Core::Errors::NestedStandardError)
+
   def perform(*args, **params)
     response = if args.present? || params.present?
       super
@@ -12,12 +15,12 @@ module Toolx::Core::Operation::ResponseWrapper
       begin
         response = self.class.const_get(:Response).new(response.to_h.deep_symbolize_keys)
       rescue Dry::Struct::Error => e
-        err = ArgumentError.new <<~MSG
-          #{e.message}
-          Provided: #{response.inspect}\n
+        message = <<~MSG
+          Expected #{self.class.name} keyword args: #{self.class.const_get(:Response, false)}
+          Got: #{params.inspect}
+          Message: #{e.message}
         MSG
-        err.set_backtrace(e.backtrace)
-        raise err
+        raise ResponseArgumentError.new(message, e)
       end
     end
 

data/lib/toolx/core/operation/simplified_result.rb

@@ -1,3 +1,5 @@
+require_relative 'params_wrapper'
+
 module Toolx::Core::Operation::SimplifiedResult
   def simplified_result(attr_name)
     # This module allows defining a simplified accessor for the result of an Operation.
@@ -19,10 +21,29 @@ module Toolx::Core::Operation::SimplifiedResult
     #
     # This is useful for operations that return a single value
     # and should provide a concise and readable API.
-    define_singleton_method(:[]) do |args = {}|
+    define_singleton_method(:[]) do |*args_array, **kwargs|
       # new(**args).perform.public_send(attr_name)
-      begin
-        new(**args).perform.public_send(attr_name)
+     begin
+        if args_array.empty?
+          # Regular keyword arguments: Code[source: 'PL']
+          new(**kwargs).perform.public_send(attr_name)
+        else
+          # Handle single argument like Code[:OK]
+          arg = args_array.first
+
+          if arg.is_a?(Hash)
+            # Hash argument: Code[{source: 'PL'}]
+            new(**arg).perform.public_send(attr_name)
+          else
+            # Non-hash argument like Symbol: Code[:OK]
+            # Try to convert to {source: :OK} format
+            if const_defined?(:Params, false) && (first_param = const_get(:Params, false).schema.keys.first)
+              new(**{first_param => arg}).perform.public_send(attr_name)
+            else
+              raise TypeError, "Cannot convert #{arg.class} to parameters hash"
+            end
+          end
+        end
       rescue TypeError, ArgumentError => e
         required = if const_defined?(:Params, false)
           const_get(:Params, false).schema.keys.join(', ')
@@ -30,12 +51,29 @@ module Toolx::Core::Operation::SimplifiedResult
           'Operation params are wrongly assigned or not defined'
         end
 
-        raise ArgumentError, <<~MSG
+        message = <<~MSG
           Expected #{self.name} keyword args: #{required}
-          Got: #{args.inspect}
-          #{e.message}
+          Got: #{(args_array.first || kwargs).inspect}
+          Message: #{e.message}
         MSG
+
+        raise Toolx::Core::Operation::ParamsWrapper::ParamsArgumentError.new(message, e)
       end
+      # begin
+      #   new(**args).perform.public_send(attr_name)
+      # rescue TypeError, ArgumentError => e
+      #   required = if const_defined?(:Params, false)
+      #     const_get(:Params, false).schema.keys.join(', ')
+      #   else
+      #     'Operation params are wrongly assigned or not defined'
+      #   end
+      #
+      #   raise ArgumentError, <<~MSG
+      #     Expected #{self.name} keyword args: #{required}
+      #     Got: #{args.inspect}
+      #     #{e.message}
+      #   MSG
+      # end
     end
 
     class << self

data/lib/toolx/core/operation_base.rb

@@ -1,4 +1,5 @@
 class Toolx::Core::OperationBase
   def initialize(*, **) end
   def perform; end
+  def fail!(ex) = raise ex
 end

data/lib/toolx/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Toolx
-  VERSION = '0.2.3'
+  VERSION = '0.2.5'.freeze
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: toolx
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - Pawel Niemczyk
 bindir: exe
 cert_chain: []
-date: 2025-06-30 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: statesman
@@ -335,7 +335,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Toolx is a set of tools for Ruby on Rails applications that simplifies common
   tasks and enhances development experience.