activejob-trackable 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bee026ef1510c64a4ed85b498ef6ae7e3de81d7baf779ea396a79b21d15eaeac
-  data.tar.gz: 9c449c533fa96c66fc3ab0b9f0960b2bc41425f0af6a457348fa97fdf415ee20
+  metadata.gz: fdcd73bc6f61e04156fb73a4f58fe5a6449dd34520af00ddd1bcb40d81a42c03
+  data.tar.gz: efbc64309d3dd2952041d91392b403d7e1319b30ac9ba9794f395698859ce38e
 SHA512:
-  metadata.gz: 8364aa9547dd31acdd5cd192da9095052fbe68aa9e8b40d67eb76b43f66155acdc5b4edd67c00b5828ed3cf3a8aab07b4ee6b42e7c3aac2ef4fea85005bc59e0
-  data.tar.gz: ef43d1e46a28aebf3cb6c1902f0f015b2e9547d9733450cc77ac5a2b84fc7d62fb751be0bbecf51951bf6456849f0de403cf98f6cd50f17f98991f44fb6e0002
+  metadata.gz: 59aa7cdc87e52587eef23ad085d65fca2ca6a8e0f198caf7c5dafa91da727d01229216739c48bcfe80f6b1e63e03222c2e86aff51c0d3485b14d6211f9c14ab0
+  data.tar.gz: ae4b36ce3e45687b136df9ae0adde506eaa65588f23c9e90b19828931453843124b9532d1aa4142915ef1d29a1242e220adf707cfa60ff4e296ef0b66567e11b

data/lib/activejob/trackable/core.rb

@@ -119,22 +119,27 @@ module ActiveJob
         def throttle
           return yield unless throttled?
 
-          expires_in = trackable_options[:throttled] + (scheduled_at - Time.current.to_f)
-
-          debounced_throttle(expires_in) { yield } || Rails.cache.fetch(key(*arguments), expires_in: expires_in) do
+          debounced_throttle { yield } || Rails.cache.fetch(key(*arguments), expires_in: expires_in) do
             yield
 
             true # put true into cache instead of serializing the job
           end
         end
 
-        def debounced_throttle(expires_in)
+        def debounced_throttle
           return unless debounced? && tracker.persisted?
 
           Rails.cache.write key(*arguments), true, expires_in: expires_in
 
           yield
         end
+
+        def expires_in
+          case trackable_options[:throttled]
+          when :daily then (Time.zone.at(scheduled_at).at_end_of_day - Time.current.to_f)
+          else trackable_options[:throttled] + (scheduled_at - Time.current.to_f)
+          end
+        end
     end
   end
 end

data/lib/activejob/trackable/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveJob
   module Trackable
-    VERSION = '0.1.2'
+    VERSION = '0.1.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activejob-trackable
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Ignatius Reza
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-07 00:00:00.000000000 Z
+date: 2019-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails