rdux 0.4.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad9475cbd38a59110640b53626f3bf33d605c34d6cef0dd857caf2e5c49d741d
-  data.tar.gz: d22d50839f3b66f0d028ebe3281c015b2d72d31264aff073aa0002f5ed2c59b2
+  metadata.gz: e8bafc3ffdb3e56b33a2c6144590f851600eda0abfe67766f2ccb917c4580158
+  data.tar.gz: 7cf3def8a9248fead40f01c72fa5f06a5b69c6aa460d0fabf361860301dfa146
 SHA512:
-  metadata.gz: a46d816e59e211e14da6662e7e575e268da5f6f00b1c2b12cf41d682f3366f266b2ee8321059e800dfd7f5636270751590820ca371a9cbe30a5a041bf1f7e848
-  data.tar.gz: 3f42d29015f3b25b7d1da6135a0e8d43c00ec6dd04812462da24331d23684a27d0a486af45a2abd452d0562d7f6479bda9bc81f2eeada32eb96cc496a75a6f8f
+  metadata.gz: b63dea34a594cf2ef6ab632ae872353cf0c041c40a9c7b3aec4fdedcd00fdc7a65d068c2cb9c21d30f6662b47a8dfbd2b95a20e73a5527846331286843dea066
+  data.tar.gz: 0d9d8ba53c8bec8f31e3f45747257c114a72ea0382838eca0d0203e27998789216a6584031dda8fb340f8a0be7c931760d3a9d03e06b4bbf5d690f8ccbf2a6d4

data/app/models/rdux/action.rb

@@ -4,24 +4,26 @@ module Rdux
   class Action < ApplicationRecord
     include Actionable
 
+    attr_accessor :up_payload_unsanitized
+
     belongs_to :rdux_failed_action, optional: true, class_name: 'Rdux::FailedAction'
     belongs_to :rdux_action, optional: true, class_name: 'Rdux::Action'
     has_many :rdux_actions, class_name: 'Rdux::Action', foreign_key: 'rdux_action_id'
 
-    serialize :down_payload, JSON if ActiveRecord::Base.connection.adapter_name != 'PostgreSQL'
+    serialize :down_payload, coder: JSON if ActiveRecord::Base.connection.adapter_name != 'PostgreSQL'
 
     scope :up, -> { where(down_at: nil) }
     scope :down, -> { where.not(down_at: nil) }
 
     def call(opts = {})
-      perform_action(:call, up_payload, opts)
+      perform_action(:call, up_payload_unsanitized || up_payload, opts)
     end
 
     def up(opts = {})
-      return false if up_payload_sanitized
+      return false if up_payload_sanitized && up_payload_unsanitized.nil?
       return false unless down_at.nil?
 
-      perform_action(:up, up_payload, opts)
+      perform_action(:up, up_payload_unsanitized || up_payload, opts)
     end
 
     def down
@@ -42,8 +44,8 @@ module Rdux
     def can_down?
       q = self.class.where('created_at > ?', created_at)
               .where(down_at: nil)
-              .where('id != ?', rdux_action_id.to_i)
-      q = q.where(stream_hash: stream_hash) unless stream_hash.nil?
+              .where('rdux_action_id IS NULL OR rdux_action_id != ?', id)
+      q = q.where(stream_hash:) unless stream_hash.nil?
       !q.count.positive?
     end
 
@@ -57,13 +59,13 @@ module Rdux
     end
 
     def perform_action(meth, payload, opts)
-      responder = action_performer(meth)
-      return if responder.nil?
+      performer = action_performer(meth)
+      return if performer.nil?
 
       if opts.any?
-        responder.public_send(meth, payload, opts)
+        performer.public_send(meth, payload, opts)
       else
-        responder.public_send(meth, payload)
+        performer.public_send(meth, payload)
       end
     end
 

data/app/models/rdux/actionable.rb

@@ -6,9 +6,9 @@ module Rdux
 
     included do
       if ActiveRecord::Base.connection.adapter_name != 'PostgreSQL'
-        serialize :up_payload, JSON
-        serialize :up_result, JSON
-        serialize :meta, JSON
+        serialize :up_payload, coder: JSON
+        serialize :up_result, coder: JSON
+        serialize :meta, coder: JSON
       end
 
       validates :name, presence: true

data/lib/rdux/result.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
 module Rdux
-  Result = Struct.new(:ok, :down_payload, :resp, :action, :up_result, :nested, :save) do
+  Result = Struct.new(:ok, :down_payload, :resp, :up_result, :save, :after_save, :nested, :action) do
     def payload
       resp || down_payload
     end
+    alias_method :val, :payload
 
     def save_failed?
       ok == false && save

data/lib/rdux/version.rb

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

data/lib/rdux.rb

@@ -9,58 +9,50 @@ module Rdux
   class << self
     def dispatch(action_name, payload, opts = {}, meta: nil)
       (opts[:ars] || {}).each { |k, v| payload["#{k}_id"] = v.id }
-      action = Action.new(name: action_name, up_payload: payload, meta: meta)
-      call_call_meth_on_action(action, opts)
+      action = Action.create!(name: action_name, up_payload: payload, meta:)
+      sanitize(action)
+      call_call_or_up_on_action(action, opts)
     end
 
     alias perform dispatch
 
     private
 
-    def call_call_meth_on_action(action, opts)
+    def call_call_or_up_on_action(action, opts)
       res = action.call(opts)
-      return call_up_meth_on_action(action, opts) if res.nil?
-
-      unless res.down_payload.nil?
-        res.resp = res.down_payload.deep_stringify_keys
+      if res
+        res.resp ||= res.down_payload
         res.down_payload = nil
+      else
+        res = action.up(opts)
       end
       assign_and_persist(res, action)
-    end
-
-    def call_up_meth_on_action(action, opts)
-      res = action.up(opts)
-      res.down_payload&.deep_stringify_keys!
-      action.down_payload = res.down_payload
-      assign_and_persist(res, action)
+      res.after_save.call(res.action) if res.after_save && res.action
+      res
     end
 
     def assign_and_persist(res, action)
+      action.down_payload = res.down_payload&.deep_stringify_keys!
       if res.ok
         assign_and_persist_for_ok(res, action)
       elsif res.save_failed?
         assign_and_persist_for_failed(res, action)
+      else
+        action.destroy
       end
-      res.action ||= action
-      res
-    end
-
-    def assign_and_persist_common(res, action)
-      sanitize(action)
-      action.up_result = res.up_result
     end
 
     def assign_and_persist_for_ok(res, action)
-      assign_and_persist_common(res, action)
+      action.up_result = res.up_result
+      res.action = action.tap(&:save!)
       res.nested&.each { |nested_res| action.rdux_actions << nested_res.action }
-      action.save!
     end
 
     def assign_and_persist_for_failed(res, action)
-      assign_and_persist_common(res, action)
-      action.up_result ||= res.resp
+      action.up_result = res.up_result
       res.action = action.to_failed_action.tap(&:save!)
-      assign_nested_responses_to_failed_action(res.action, res.nested) unless res.nested.nil?
+      action.destroy
+      assign_nested_responses_to_failed_action(res.action, res.nested) if res.nested
     end
 
     def assign_nested_responses_to_failed_action(failed_action, nested)
@@ -76,6 +68,7 @@ module Rdux
     def sanitize(action)
       up_payload_sanitized = Sanitize.call(action.up_payload)
       action.up_payload_sanitized = action.up_payload != up_payload_sanitized
+      action.up_payload_unsanitized = action.up_payload if action.up_payload_sanitized
       action.up_payload = up_payload_sanitized
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdux
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Zbigniew Humeniuk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-10 00:00:00.000000000 Z
+date: 2024-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -36,56 +36,56 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.5.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.5.4
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.55.1
+        version: 1.59.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.55.1
+        version: 1.59.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.20.2
+        version: 2.23.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.20.2
+        version: 2.23.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.3
+        version: 1.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.3
+        version: 1.7.0
 description: |
   Write apps that are easy to test.
   Rdux gives you a possibility to centralize your app's state modification logic (DB changes).
@@ -124,7 +124,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.1.4
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="