funktor 0.4.1 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b6528117a7c1bae745c1d00b14a47e557b604b8347e805bc4d376a1f62baab7
-  data.tar.gz: f351a007712e41b8fc1962cddf5a42f08707e9db76ab651962fe4c7e3631dfa5
+  metadata.gz: 1b3b433385515fb0c83b00d224c60fbafec19e0e13ea3b977f54e47aa272195c
+  data.tar.gz: a487206b8c0a770a0b1be992589e1833510d5f3dd9816d0a3fd4ab91e7d798ab
 SHA512:
-  metadata.gz: 8c7a65dac8b17841022f3f3d9b37931f36797fb0bde9c9bcfac8c809cfd2a6c78e301395e4fc8bc34f2f80d7b8b152ab521b34cddb011c6d58c74a48d2c8fa33
-  data.tar.gz: abcdd24ca17c14e8f30c5ea3966c3dc818e4b3e7af5b162049c787aec72d38b634469bd027dddf8a8f99291082fe371c6679c71711dae6c9b90ea3f4aa0d7470
+  metadata.gz: f3a24838a4d2f01fc165b9cc7837a1478051a94c90c24a9faae05bf181d6b26a10c0d1919441863a26f99dc9bc5b08e89c33f9c4b95bd386fcea5cd55e7881ac
+  data.tar.gz: aba635dc283b1957f96d24e004fe80acaa2d0eba24ac7b3bcab1e654ba19224698c85a5481b49903a2f52606fa60dcafff0e41eed737ce4e53c98ddc83b1a92c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    funktor (0.4.0)
+    funktor (0.4.5)
       activesupport
       aws-sdk-sqs (~> 1.37)
       thor

data/lib/active_job/queue_adapters/funktor_adapter.rb

@@ -16,17 +16,22 @@ module ActiveJob
           "worker"  => JobWrapper.to_s,
           "wrapped" => job.class,
           "queue"   => job.class.work_queue,
+          "delay"   => 0,
           "worker_params"    => [ job.serialize ]
         })
       end
 
       def enqueue_at(job, timestamp) # :nodoc:
+        delay = (Time.at(timestamp).utc - Time.now.utc).round
+        if delay < 0
+          delay = 0
+        end
         job.provider_job_id = Funktor.job_pusher.push({
           "worker"  => JobWrapper.to_s,
           "wrapped" => job.class,
           "queue"   => job.class.work_queue,
-          "worker_params"    => [ job.serialize ],
-          "at"      => timestamp
+          "delay"   => delay,
+          "worker_params"    => [ job.serialize ]
         })
       end
 
@@ -34,7 +39,9 @@ module ActiveJob
         include Funktor::Worker
 
         def perform(job_data)
-          Base.execute job_data.first
+          puts "job_data = #{job_data.class} #{job_data}"
+          puts job_data
+          Base.execute *job_data
         end
       end
     end

data/lib/funktor/job.rb

@@ -38,7 +38,7 @@ module Funktor
       # TODO - In Funktor Pro we need to override this method (or do something else) so that
       # we can schedule jobs farther in the future than 15 minutes. We do this here in case a
       # retry sequence goes too long.
-      jdelay = job_data["delay"]
+      jdelay = job_data["delay"] || 0
       return jdelay < 900 ? jdelay : 900
     end
 

data/lib/funktor/version.rb

@@ -1,3 +1,3 @@
 module Funktor
-  VERSION = "0.4.1"
+  VERSION = "0.4.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: funktor
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.5
 platform: ruby
 authors:
 - Jeremy Green