tasque 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f71c3e78628de1004901a309503b7050b8bd8c092ab9fef9ce6dfa2b8e63604a
-  data.tar.gz: 94ceaaae0659164b2e0ebb8a4f7187388bbad6852d69e0689ae3b586deb557f7
+  metadata.gz: 195d58497012018a87a662d83b8ba48e6bdbd87a353221b2e18ad0727b4a410f
+  data.tar.gz: b84b4b12087e49444e6e6f4423bd16cd2ed772d8e1e056b9d0a732a609751114
 SHA512:
-  metadata.gz: 6c8cdd3968483fd86a63e1df7d7268c9b563cb5ffe903ef5e78e633875b60f1fd953b05ae72abf9d5baea3e9f6ea172f5bee5d00e2b75297f369200da4f30f88
-  data.tar.gz: a8c28e81c505235853a238e0f16aaec30bb5bf1dda849da1c829bef6d7d32cb3e1b035de728820bc6b6e7073997a63d28ab4e78c5b05a2575d93fcc7b00c4391
+  metadata.gz: 9c8e7b68fbc85dbfd1fa172307a1fec24c23d4fe4a505a30a1e24a280da00830bdf8bab5ce2985fe79b5257a77129c456079a0d78b740e8f6581ea11686d6acc
+  data.tar.gz: d95f5e11bcb7b481faa0f6d36327e931b43e34ff362a0484a21dcd8f1b8f8d7c215eb7d631383e583c007179dbab2085e5ca872fc5b3880eada87ccf9c7dc2f9

data/lib/tasque.rb

@@ -3,6 +3,7 @@ require "active_record"
 require "tasque/configuration"
 require "tasque/task"
 require "tasque/task_error"
+require "tasque/task_cancel"
 require "tasque/processor"
 require "tasque/version"
 

data/lib/tasque/processor.rb

@@ -17,17 +17,21 @@ module Tasque
         task.process
         begin
           task.result = block.call task
+          task.complete
+        rescue Tasque::TaskCancel => e
+          task.cancel
         rescue Tasque::TaskError => e
           task.error = {
             task_error: e.task_error
           }
+          task.failure
         rescue Exception => e
           task.error = {
             exception: e.message,
             backtrace: e.backtrace
           }
+          task.failure
         end
-        task.error? ? task.failure : task.complete
         @current_task = nil
       end
       @timers.every(check_interval) do

data/lib/tasque/task.rb

@@ -98,7 +98,7 @@ module Tasque
       end
       
       event :cancel do
-        transition any - [:processing] => :canceled
+        transition any => :canceled
       end
       
       

data/lib/tasque/version.rb

@@ -1,3 +1,3 @@
 module Tasque
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tasque
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Yuri Gomozov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-09 00:00:00.000000000 Z
+date: 2020-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -167,8 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: ActiveRecord based task queue