rdux 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8afda82ad3e063c5a07eb7c3e8b2a9f86019bb35ccdaa8fc875a9aebcd463a29
-  data.tar.gz: 2d72f680e8cb5014fb55b003b09ea11cbf23107e54c8e83e2e0b5e7bff44b860
+  metadata.gz: d324cf717b31be876266cde5674bca57929719914bfe4b93761b031c555e18de
+  data.tar.gz: 1b2d57b63cbed3caa591e5e182633d3d70f58e16e6c5dbf2d304e6b51deba6b2
 SHA512:
-  metadata.gz: 982c68f70df4e2c579e88029551a969f54470c0fa328ce5d1cbf89007001ac93fc6f78aec1a2e0096081c852174265c2e3412714d8466b7eb6ee9073273e3d3a
-  data.tar.gz: 3e63ef96279b424c87f34a23292c70b3cc95d390b63d7f92d83ad1faf95df34b9f18ada2f969a18bf79bb6846da543f5d6b437322453844ea63fbbe21ba13129
+  metadata.gz: f324e2366c6bcdfed6d8e2ae7e786d60eead983e7a842d4ee5ad843342224bb46a3d5500ee996b8145e0bd2a0f39a8892ddb804cc6bc94f4e5c3c79e64568988
+  data.tar.gz: e824ef36d9d639af4e4b8ef729c2eeb4c72b27070dbd0a3f0a5edb7c2198e5e00c2c07c1fbb1d3a6fd86dea3c9a1ce04d576423772ee65816a24befa120251da

data/README.md

@@ -17,7 +17,7 @@ Rdux is a lightweight, minimalistic Rails plugin designed to introduce event sou
 
 * **Audit Logging** 👉 Rdux stores sanitized input data, the name of module or class (action performer) responsible for processing them, processing results, and additional metadata in the database.
 * **Model Representation** 👉 Before action is executed it gets stored in the database through the `Rdux::Action` model. This model can be nested, allowing for complex action structures.
-* **Exception Handling and Recovery** 👉 Rdux automatically creates a `Rdux::Action` record when an exception occurs during action execution. It retains the `payload` and allows you to capture additional data using `opts[:result]`, ensuring all necessary information is available for retrying the action.
+* **Exception Handling and Recovery** 👉 Rdux automatically creates a `Rdux::Action` record when an exception occurs during action execution. It retains the `payload` and allows you to capture additional data using `opts[:action].result`, ensuring all necessary information is available for retrying the action.
 * **Metadata** 👉 Metadata can include the ID of the authenticated resource responsible for performing a given action, as well as resource IDs from external systems related to the action. This creates a clear audit trail of who executed each action and on whose behalf.
 
 Rdux is designed to integrate seamlessly with your existing Rails application, offering a straightforward and powerful solution for managing and auditing key actions.
@@ -244,8 +244,7 @@ end
 Rdux captures exceptions raised during the execution of an action and sets the `Rdux::Action#ok` attribute to `false`.
 The `payload` is retained, but having only the input data is often not enough to retry an action.
 It is crucial to capture data obtained during the action’s execution, up until the exception occurred.
-This can be done by using `opts[:result]` to store all necessary data incrementally.
-The assigned data will then be available as the `Rdux::Action#result` attribute.
+This can be done by using `opts[:action].result` attribute to store all necessary data incrementally.
 
 Example:
 
@@ -257,7 +256,7 @@ class CreditCard
         create_res = create(payload.slice('user_id', 'credit_card'), opts.slice(:user))
         return create_res unless create_res.ok
 
-        opts[:result] = { credit_card_create_action_id: create_res.action.id }
+        opts[:action].result = { credit_card_create_action_id: create_res.action.id }
         charge_id = PaymentGateway.charge(create_res.val[:credit_card].token, payload['amount'])[:id]
         if charge_id.nil?
           Rdux::Result[ok: false, val: { errors: { base: 'Invalid credit card' } }, save: true,

data/lib/rdux/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rdux
-  VERSION = '1.0.0'
+  VERSION = '2.0.0'
 end

data/lib/rdux.rb

@@ -19,14 +19,13 @@ module Rdux
 
     def process(action, opts = {})
       res = action.call(opts)
-      res.result ||= opts[:result]
       return res if destroy_action(res, action)
 
       assign_to_action(res, action)
       persist(res, action)
       res
     rescue StandardError => e
-      handle_exception(e, action, opts[:result])
+      handle_exception(e, action)
     end
 
     alias perform dispatch
@@ -41,7 +40,10 @@ module Rdux
 
     def assign_to_action(res, action)
       action.ok = res.ok
-      action.result = res.result
+      return unless res.result
+
+      action.result ||= {}
+      action.result.merge!(res.result)
     end
 
     def persist(res, action)
@@ -49,9 +51,9 @@ module Rdux
       res.nested&.each { |nested_res| action.rdux_actions << nested_res.action }
     end
 
-    def handle_exception(exc, action, result)
+    def handle_exception(exc, action)
       action.ok = false
-      action.result ||= result || {}
+      action.result ||= {}
       action.result.merge!({ 'Exception' => {
                              class: exc.class.name,
                              message: exc.message

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdux
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Zbigniew Humeniuk