excess_flow 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb4d99f396cab3a0284b7d82ec64fbd70c2dff2c43f6eac8420291a522641572
-  data.tar.gz: ac6d5775cd62ae23e4b972533dc2837e37ca96cfa02c4e85920a157d4c8b5e5e
+  metadata.gz: ba273741f4b6cb0d38335b7ee7eba8c9283604ce30e2e4463c3dca614ec67f2c
+  data.tar.gz: 44a3a1ef66b0163008e8a62a1c250ac565d7e59e155eab3e18b1f1b4014c8e0b
 SHA512:
-  metadata.gz: ae13311decf56aa76a60e043a39b378cc57189bb58a4999982199607a4e76e0f77d97d384c645cef00b0f91d6a6a2d074af1fdc307cbf7cfaff021f8181ce9c0
-  data.tar.gz: f1822c55125151241c0521e65a46699afaba66e71e2971371ebdab9064422706aff97168e984666665b80384dc452bb6f114475b88c42d0bb4695de00a5d3e06
+  metadata.gz: 4aacbfcf9b81aeb05024920ab3cbd5e1e2aeb70ce60c65b5cbc7fbea918415609f4dd16067955d1e0d7939f3fec39fa2ef2455709b63baf8dc63a205800c9d6f
+  data.tar.gz: 9d357b9e4622e08dc348c478b6980ddb2d238e4ef6e69b2900996361e35d1f0ac3d189bb40c92f6ee5db62577e4d055f679d4fb91a63bd688f0c2c2dc91ca815

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.0.4
+- When setting expiration window rely on TTL and not counts
+  [#3](https://github.com/ConvertKit/excess_flow/pull/3)
+
 ## 1.0.3
 - Bumping up gems in Gemfile.lock
 - Adding test to test window expiration for `FixedWindowStrategy`

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    excess_flow (1.0.3)
+    excess_flow (1.0.4)
       connection_pool
       rake
       redis

data/lib/excess_flow/constants.rb

@@ -23,5 +23,5 @@ module ExcessFlow
   LOCK_PREFIX = 'excess_flow::lock::'
   MUTEX_LOCK_TIME = 1
   MUTEX_SLEEP_TIME = 1 / 100_000
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

data/lib/excess_flow/fixed_window_strategy.rb

@@ -46,8 +46,12 @@ module ExcessFlow
       @current_requests ||= ExcessFlow.redis { |r| r.get(configuration.counter_key) }.to_i
     end
 
+    def current_ttl
+      @current_ttl ||= ExcessFlow.redis { |r| r.ttl(configuration.counter_key) }.to_i
+    end
+
     def start_expiration_window
-      return unless current_requests.zero?
+      return unless current_ttl.negative?
 
       ExcessFlow.redis { |r| r.expire(configuration.counter_key, configuration.ttl) }
     end

data/lib/excess_flow/sliding_window_strategy.rb

@@ -60,12 +60,16 @@ module ExcessFlow
       @current_requests ||= ExcessFlow.redis { |r| r.zcount(configuration.counter_key, '-inf', '+inf') }
     end
 
+    def current_ttl
+      @current_ttl ||= ExcessFlow.redis { |r| r.ttl(configuration.counter_key) }.to_i
+    end
+
     def current_timestamp
       @current_timestamp ||= (Time.now.to_f * 100_000).to_i
     end
 
     def start_expiration_window
-      return if current_requests.zero?
+      return if current_ttl.negative?
 
       ExcessFlow.redis { |r| r.expire(configuration.counter_key, configuration.ttl) }
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: excess_flow
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - ConvertKit, LLC
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-28 00:00:00.000000000 Z
+date: 2020-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool