status_workflow 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb9130d6f16327b6b45eede2597c13cde33c20dc
-  data.tar.gz: '08197cc5822f7b153e01c691d0f21166a1942414'
+  metadata.gz: e1429ec0dd19bb00d60a21a13b222e2152d0e61a
+  data.tar.gz: 3a418f92be0f9d4ef97722ec7ae420ef0d3ba4e6
 SHA512:
-  metadata.gz: 3c5f5b2008ed00ddb9c6f0ace025e0f6ae2753101fae3be9d88d52712551595b3720f7724de94470e13a16bf74e64d6310382c10f15ce9c9cec879f35cf3ec14
-  data.tar.gz: bef5b253cc517f759915498e7c43ea6d65f75e4e7b99935304fe83d6b60a89c44521f8afb1482bea0fd7c7c4c1ac09eedc234be9a9ce384bc5d36fdc723d8c08
+  metadata.gz: 7ba51b05b15489ca77342bb35ad4e179c6fe0a00f5aaccc0c62d25e7b20a43e5eb803b8ff8cc4c6b14dd3f8d3a8952d89acd34cd58a5dc8cba1220fc2e2d382a
+  data.tar.gz: 734ce3e74ea19d0dcc96606f6bf513b8ac9e8ac034665d28e374c8a1af8f4eff660822e6cdab218a4cfd10b2c8c1fca6c31d69368f5f46a4c8f60fcac7a84cb1

data/CHANGELOG

@@ -1,3 +1,10 @@
+3.0.2 / 2018-11-05
+
+Enhancements
+
+  * Prefix error status with previous status
+  * Return the result of the block from status_transition!
+
 3.0.1 / 2018-10-24
 
 Enhancements

data/lib/status_workflow.rb

@@ -23,6 +23,7 @@ module StatusWorkflow
   LOCK_CHECK_RATE = 0.2
 
   def status_transition!(intermediate_to_status, final_to_status, prefix = nil)
+    result = nil # what the block yields, return to the user
     intermediate_to_status = intermediate_to_status&.to_s
     final_to_status = final_to_status&.to_s
     prefix_ = prefix ? "#{prefix}_" : nil
@@ -58,11 +59,12 @@ module StatusWorkflow
               sleep LOCK_EXPIRY/2.0
             end
           end
-          yield
+          result = yield
         rescue
           # If the block errors, set status to error and record the backtrace
           error = (["#{$!.class} #{$!.message}"] + $!.backtrace).join("\n")
-          update_columns status_column => 'error', status_changed_at_column => Time.now, error_column => error
+          status = read_attribute status_column
+          update_columns status_column => "#{status}_error", status_changed_at_column => Time.now, error_column => error
           raise
         end
       end
@@ -77,7 +79,7 @@ module StatusWorkflow
       StatusWorkflow.redis.del lock_key
       heartbeat.kill if heartbeat
     end
-    true
+    result
   end
 
   module ClassMethods

data/lib/status_workflow/version.rb

@@ -1,3 +1,3 @@
 module StatusWorkflow
-  VERSION = '3.0.1'
+  VERSION = '3.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: status_workflow
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Seamus Abshere
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-24 00:00:00.000000000 Z
+date: 2018-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis