tasque 0.0.6 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f71c3e78628de1004901a309503b7050b8bd8c092ab9fef9ce6dfa2b8e63604a
-  data.tar.gz: 94ceaaae0659164b2e0ebb8a4f7187388bbad6852d69e0689ae3b586deb557f7
+  metadata.gz: 3623a9472c224a0ede6dd977f6a9d676f65ccd4f6ab961ef275048a9313b78f5
+  data.tar.gz: be4b5a7a8fe9fb387d5f07d12158290cd895838460cee7fa91e33d3bb21841ff
 SHA512:
-  metadata.gz: 6c8cdd3968483fd86a63e1df7d7268c9b563cb5ffe903ef5e78e633875b60f1fd953b05ae72abf9d5baea3e9f6ea172f5bee5d00e2b75297f369200da4f30f88
-  data.tar.gz: a8c28e81c505235853a238e0f16aaec30bb5bf1dda849da1c829bef6d7d32cb3e1b035de728820bc6b6e7073997a63d28ab4e78c5b05a2575d93fcc7b00c4391
+  metadata.gz: ec9753f522a63f78331d0716770668ce925208fa40a692606f1690f0dad236debba82b72cbcf96def777100d985e748c5086771a1cd6f2315a14156a7f2aa2d2
+  data.tar.gz: 371f4a88cdf4b26aa144ec01dd9159c6686ded749556952e715bfcde68818bb4476afe12d193ab3da538ac4527463620738c1c0847030d54f8963c53069640a9

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.result = {
             task_error: e.task_error
           }
+          task.failure
         rescue Exception => e
-          task.error = {
+          task.result = {
             exception: e.message,
             backtrace: e.backtrace
           }
+          task.failure
         end
-        task.error? ? task.failure : task.complete
         @current_task = nil
       end
       @timers.every(check_interval) do
@@ -60,7 +64,7 @@ module Tasque
           heartbeat_timers.every(Tasque.config.heartbeat_interval) do
             message = {
               worker: Tasque.config.worker,
-              busy: !@current_job.nil?
+              busy: !@current_task.nil?
             }.merge(Tasque.config.heartbeat_payload)
             Insque.broadcast :heartbeat, message
           end

data/lib/tasque/task.rb

@@ -94,11 +94,11 @@ module Tasque
       end
       
       event :reprocess do
-        transition [:processing, :complete, :error] => :reprocessed
+        transition [:processing, :complete, :error, :canceled] => :reprocessed
       end
       
       event :cancel do
-        transition any - [:processing] => :canceled
+        transition any => :canceled
       end
       
       

data/lib/tasque/task_cancel.rb

@@ -0,0 +1,10 @@
+module Tasque
+  class TaskCancel < Exception
+    attr_reader :task
+  
+    def initialize(task)
+      @task = task
+    end
+  end
+end
+

data/lib/tasque/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tasque
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.1
 platform: ruby
 authors:
 - Yuri Gomozov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-09 00:00:00.000000000 Z
+date: 2020-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -144,6 +144,7 @@ files:
 - lib/tasque/configuration.rb
 - lib/tasque/processor.rb
 - lib/tasque/task.rb
+- lib/tasque/task_cancel.rb
 - lib/tasque/task_error.rb
 - lib/tasque/version.rb
 - spec/spec_helper.rb
@@ -167,8 +168,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