tasque 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 770e7ef2d608f90f74cb2c7a6bb5fa07d668069b9b056881021a9361630b9683
-  data.tar.gz: 1d0c6672ffc4c19081dec0ca63e6c1b2b6ca2090007c1608391516592f51002a
+  metadata.gz: b70e30c7ee126d2f6198b70ee8357a32d09f26689732921bc68a4a83eb7aec8f
+  data.tar.gz: 31cfcf34f77c7bce166f22d9b49e34baa604dbe168ec22c7e577f045f5da8e8e
 SHA512:
-  metadata.gz: 22813e39498f31c39bead85e93f89efcdd7eadbd50b2a87e97921cbc5fb7a6d25b688e379d642c26ed15ecc8d86fcb5b90b0e27b230c778bbfc8118fcfdaad50
-  data.tar.gz: 44ba384c338529141639c61dcbc4c7960bbf1ca139e61f01a2ca5361742aef764edf2f9dc3574579a5d14a428c60ce8699658f2f9773ec2b49258515235b7622
+  metadata.gz: 3cd5328d0d63119f7f5877cc886162962c8a6e087e72749c0d2ed4b5f8fc6998a7a0706755126feb0cb84bf9a3fb6e2f549d0942e25edc27ef42f5a32386cd38
+  data.tar.gz: 2e564a2607dadfde24e6b532251a41505cf30484b0a89ba94cba482a9deeb067f53b82c92b830ae4819aa407c81aeb009a056048b6bf47490f04189001879a4c

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

@@ -11,7 +11,7 @@ module Tasque
     serialize :params, JSON
     serialize :result, JSON
     
-    scope :with_task, ->(task) { where(task: task).order priority: :desc }
+    scope :with_task, ->(task) { where(task: task).order priority: :desc, created_at: :asc }
     scope :minimum_priority, ->(priority) { priority.nil? ? nil : where('priority >= ?', priority) }
     scope :to_process, -> { where status: %w(new reprocessed) }
     scope :with_error, -> { where status: 'error' }
@@ -98,7 +98,7 @@ module Tasque
       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.5"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tasque
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Yuri Gomozov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-24 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