chronofage 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b27efc982e3485c46cc2f8d31cddbe877d32310e
-  data.tar.gz: 63e3cc54c6812ea563d1e5939d3d419a5d41e8d5
+  metadata.gz: 18c92206f64f9d01f3f00def00f4683b4bef6ed5
+  data.tar.gz: 25c04b48128788c746dce2e654cc516e4a707c97
 SHA512:
-  metadata.gz: 071a13893a83ac871e1764e49cf1b91913e426d0815ceb6bbc4f2a7d765310ce07c0e8758e5843ee22bd5b588203f9d787482054b915d81c3256f5c1bda1b02a
-  data.tar.gz: f46f2a9e3e3ee79fea90d96bf8ae37495daa045e07203894eb4a982856e33b5e98bae6b0bdc31caa71404eadeacde584912b52a95b3d87940e258a4ceb782807
+  metadata.gz: eca7229c60618d760bc27391439003d93bc85be1928afef60dd3f42e373198f1a192094bb0f2bc820df0d0aaca1c21fcc36921906c90e2451d831589fcdc0a18
+  data.tar.gz: 3436a72eacc3d26171dc976a80f290496ae9951a4651c40588865af1d8072ebb2904821da2b6726370ab70129863b06c185387cb8885bc09b3fc98c3f0ed0283

data/db/migrate/2_add_default_priority.rb

@@ -0,0 +1,5 @@
+class AddDefaultPriority < ActiveRecord::Migration[5.0]
+  def change
+    change_column_default :chronofage_jobs, :priority, 0
+  end
+end

data/lib/active_job/queue_adapters/chronofage_adapter.rb

@@ -4,10 +4,10 @@ module ActiveJob
       def enqueue(job)
         Chronofage::Job.create!({
           job_class: job.class,
-          arguments: ActiveJob::Arguments.serialize(job.arguments).to_json,
+          arguments: job.serialize.to_json,
           job_id: job.job_id,
           queue_name: job.queue_name,
-          priority: job.priority
+          priority: job.priority || 0
         })
       end
 

data/lib/chronofage/job.rb

@@ -9,20 +9,20 @@ module Chronofage
       ready.where(queue_name: queue_name).order(priority: :asc).first
     end
 
-    def execute!
-      start!
-      job_class.constantize.perform_now(*deserialized_arguments)
-      done!
+    def perform
+      started!
+      ActiveJob::Base.execute(job_data)
+      completed!
     rescue
       failed!
       raise
     end
 
-    def start!
+    def started!
       update!(started_at: Time.now, host: Chronofage::Job.host)
     end
 
-    def done!
+    def completed!
       update!(completed_at: Time.now)
     end
 
@@ -30,12 +30,28 @@ module Chronofage
       update!(failed_at: Time.now)
     end
 
+    def ready?
+      state == :ready
+    end
+
+    def started?
+      state == :started
+    end
+
+    def failed?
+      state == :failed
+    end
+
+    def completed?
+      state == :completed
+    end
+
     def retry!
-      job_class.constantize.perform_later(*deserialized_arguments)
+      job_class.constantize.perform_later(*(ActiveJob::Arguments.deserialize(job_data["arguments"])))
     end
 
-    def deserialized_arguments
-      ActiveJob::Arguments.deserialize(JSON.parse(arguments))
+    def job_data
+      JSON.parse(arguments)
     end
 
     def concurrents
@@ -48,7 +64,7 @@ module Chronofage
       elsif started_at.present? && failed_at.present?
         :failed
       elsif started_at.present?
-        :running
+        :started
       else
         :ready
       end

data/lib/chronofage/version.rb

@@ -1,3 +1,3 @@
 module Chronofage
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end

data/lib/tasks/chronofage.rake

@@ -3,7 +3,7 @@ namespace :chronofage_engine do
     task :execute, [:queue_name, :concurrency] => :environment do |t, args|
       job = Chronofage::Job.next(args.queue_name)
       if job.present? && job.concurrents.count < args.concurrency.to_i
-        job.execute!
+        job.perform
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chronofage
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Victor Goya
@@ -25,6 +25,7 @@ files:
 - Rakefile
 - chronofage.gemspec
 - db/migrate/1_create_job_table.rb
+- db/migrate/2_add_default_priority.rb
 - lib/active_job/queue_adapters/chronofage_adapter.rb
 - lib/chronofage.rb
 - lib/chronofage/engine.rb