rdux 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d08bba313e7358c9ab679919bffa752086205e61c3884285da3cca786b1c63e
-  data.tar.gz: 6aa632159bdc20f99fb82686374bc0cf72359a08219485168d5be3fe2e4441bc
+  metadata.gz: 06fb78e021c9f1647140a5f4cb71922f66f1ae7ba6afff88b90e7b9c7652c496
+  data.tar.gz: 2982c9a2492d22c4ad7f5d05eb33fe7f9dc5af4e31fdefb79e759901ceaf147a
 SHA512:
-  metadata.gz: 6420dd96aa5f4c5f51e8bd4ef1d5b689892a7693405b5f27045bbaa5af57a8c09237a9213eb30a85907d7fd7bd4af926c85494843ff32d0330f36dc39c8e375e
-  data.tar.gz: 873fe11556fff66df5290cb3f9aaa9414c39d28299b2f8a1a207a5351853de70e5801fd8d654d9022d1864a243eab4b12f2727be6d866ce7731877d96727a712
+  metadata.gz: e1743dbffc779a50010de16d3eccf6038ddc6ffa5646bc75fc3cabc8e3931f239f9609e8a1523f92df1b83340eb0d131b06818b0b80f774f207f6182ffe81d5b
+  data.tar.gz: 11ffa6637ccf91b868ba80800e60d0ddf7e718f0e441b29a09fbb6cb383bc37da77ebb35605aea1e935c610354386656a595889a863041a655a3c25ca32a821e

data/README.md

@@ -150,11 +150,7 @@ Definition:
 
 ```ruby
 module Rdux
-  Result = Struct.new(:ok, :val, :result, :save, :nested, :action) do
-    def save_failed?
-      ok == false && save ? true : false
-    end
-  end
+  Result = Struct.new(:ok, :val, :result, :save, :nested, :action)
 end
 ```
 

data/Rakefile

@@ -6,16 +6,6 @@ rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
-require 'rdoc/task'
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Rdux'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.md')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
 require 'bundler/gem_tasks'
 
 require 'rake/testtask'
@@ -26,6 +16,4 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = false
 end
 
-Dir.glob('lib/tasks/**/*.rake').each { |r| import r }
-
 task default: :test

data/app/models/rdux/action.rb

@@ -16,6 +16,7 @@ module Rdux
     scope :ok, ->(val = true) { where(ok: val) }
     scope :failed, -> { where(ok: false) }
 
+    # has_attribute? keeps Rdux working when the rdux_process_id migration has not been run
     def process_defined?
       has_attribute?(:rdux_process_id) && rdux_process_id
     end
@@ -24,8 +25,10 @@ module Rdux
       return false if performed?
       return false if only_sanitized_payload?
 
-      opts.merge!(action: self)
-      perform_action(opts)
+      performer = name.to_s.constantize
+      return performer.call(safe_payload) if performer.method(:call).arity == 1
+
+      performer.call(safe_payload, opts.merge(action: self))
     end
 
     private
@@ -33,16 +36,5 @@ module Rdux
     def performed?
       !ok.nil?
     end
-
-    def perform_action(opts)
-      performer = name.to_s.constantize
-      return if performer.nil?
-
-      if performer.method(:call).arity.abs == 2
-        performer.call(safe_payload, opts)
-      else
-        performer.call(safe_payload)
-      end
-    end
   end
 end

data/lib/rdux/dispatching.rb

@@ -13,6 +13,7 @@ module Rdux
       action = Action.new(name:, payload:, meta:)
       action.process = process if process
       Sanitize.call(action)
+      action.save!
       action
     end
 
@@ -61,14 +62,13 @@ module Rdux
     end
 
     def handle_exception(exc, action)
-      raise(action.destroy && exc) if ENV['RDUX_DEV']
+      if ENV['RDUX_DEV']
+        action.destroy
+        raise exc
+      end
 
       action.ok = false
-      action.result ||= {}
-      action.result.merge!({ 'Exception' => {
-                             class: exc.class.name,
-                             message: exc.message
-                           } })
+      action.result = (action.result || {}).merge('Exception' => { class: exc.class.name, message: exc.message })
       action.save!
       raise exc
     end

data/lib/rdux/processing.rb

@@ -5,6 +5,7 @@ module Rdux
     def start(performer, payload)
       process = Process.new(name: performer, payload:)
       Sanitize.call(process)
+      process.save!
       res = process.resume(Rdux::Result[ok: true, val: :start])
       process.update!(ok: res.ok) unless res.ok.nil?
       Result[ok: res.ok, val: { process: }]

data/lib/rdux/result.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
 module Rdux
-  Result = Struct.new(:ok, :val, :result, :save, :nested, :action) do
-    def save_failed?
-      ok == false && save ? true : false
-    end
-  end
+  Result = Struct.new(:ok, :val, :result, :save, :nested, :action)
 end

data/lib/rdux/sanitize.rb

@@ -8,7 +8,6 @@ module Rdux
       aro.payload_sanitized = aro.payload != payload_sanitized
       aro.payload_unsanitized = aro.payload if aro.payload_sanitized
       aro.payload = payload_sanitized
-      aro.save! if aro.changed?
     end
   end
 end

data/lib/rdux/version.rb

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

metadata

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