sidejobs 5.1.0 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 576d715438f5bf28ed6f478ba5d81a47bf737907
-  data.tar.gz: dccae5be6356b8aac334dc6a77a4f46fd418d4e1
+  metadata.gz: '0911dac77f937d3227914732dd6120de78360b0a'
+  data.tar.gz: 4f65f14fd0c5bc20d02953f165afb4548c47d187
 SHA512:
-  metadata.gz: 6c1be39cf38b2c6bc18eaadcc211ae732e3e8c1c4c710c551ca8514d7ae6162a9868bda36a49875d06bcd0a3d5a8bfb12c46faa9a677d34a9c103cab589390ed
-  data.tar.gz: 715e43fbf5241459c37801b5a4d43a8c1b4ac1f235da2451d512eb78482a573dcb0f51f62c2547bc62805565cf588feebf815aa9040d76c389a1196cd7ba9fd6
+  metadata.gz: ba869b6c3c50497e2e6e1901dce7447383c578680a029107eb59e7d1c3b078016c04ea13aeb1d30712c8ae82b167efc50117705b11accab5b8929f3b63a14e98
+  data.tar.gz: 4345486f1017beea0c53f1323ea5106bfb09295379072c1f42c9b9c64707d84335690af91c9676f82b896650cc9909505421c3338627e809d49e1c4b6669f2db

data/lib/generators/sidejobs/install/templates/migration.rb

@@ -1,21 +1,21 @@
-class CreateSidejobs < ActiveRecord::Migration
+class CreateSidejobs < ActiveRecord::Migration[5.1]
   def change
     create_table :sidejobs do |t|
       t.jsonb :data
       t.string :queue
-      t.string :status, default: 'pending'
+      t.string :state, default: 'pending'
       t.integer :priority, default: 0
       t.integer :attempts, default: 0
       t.text :error
-      t.datetime :failed_at
-      t.datetime :completed_at
       t.datetime :processed_at
       t.datetime :scheduled_at
 
       t.timestamps null: false
     end
 
-    add_index :sidejobs, %i(status scheduled_at attempts)
+    add_index :sidejobs, :state
+    add_index :sidejobs, :scheduled_at
+    add_index :sidejobs, :attempts
     add_index :sidejobs, :priority
   end
 end

data/lib/sidejobs/job.rb

@@ -1,20 +1,19 @@
 module Sidejobs
   class Job < ActiveRecord::Base
 
-    STATUS = %w(pending processing failing complete)
+    STATES = %w(pending processing failing complete)
 
-    STATUS.each do |name|
-      scope name, -> { where(status: name) }
+    STATES.each do |name|
+      scope name, -> { where(state: name) }
       define_method "#{name}?" do
-        status == name
+        state == name
       end
     end
 
-    validates_presence_of :queue, :data, :status
-    validates_presence_of :error, :failed_at, if: :failing?
-    validates_presence_of :completed_at, if: :complete?
+    validates_presence_of :queue, :data, :state
+    validates_presence_of :error, if: :failing?
     validates_presence_of :processed_at, if: :processing?
-    validates_inclusion_of :status, within: STATUS
+    validates_inclusion_of :state, within: STATES
     validates_numericality_of :priority, :attempts, only_integer: true
 
     def self.table_name

data/lib/sidejobs/processor.rb

@@ -4,12 +4,12 @@ module Sidejobs
 
     def process
       Sidejobs.queue.fetch.each do |job|
-        job.update status: 'processing', processed_at: Time.now, attempts: job.attempts+1
+        job.update state: 'processing', processed_at: Time.zone.now, attempts: job.attempts+1
         begin
           ActiveJob::Base.execute job.data
-          job.update status: 'complete', completed_at: Time.now
+          job.update state: 'complete'
         rescue => exception
-          job.update status: 'failing', failed_at: Time.now, error: exception.message
+          job.update state: 'failing', error: exception.message
         end
       end
     end

data/lib/sidejobs/queue.rb

@@ -11,7 +11,7 @@ module Sidejobs
     end
 
     def fetch
-      Job.where(status: %w(pending failing)).where(
+      Job.where(state: %w(pending failing)).where(
         'attempts < ?',
         Sidejobs.configuration.max_attempts
       ).where(

data/lib/sidejobs/version.rb

@@ -1,5 +1,5 @@
 module Sidejobs
 
-  VERSION = '5.1.0'
+  VERSION = '5.1.1'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidejobs
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.1.1
 platform: ruby
 authors:
 - mmontossi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-09 00:00:00.000000000 Z
+date: 2017-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails