pause 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bda062b9f3c87e7079efe48798f512afc22cfad8
-  data.tar.gz: afcdfb3a35303d0a6dede0964e1d30c275553e50
+  metadata.gz: 6c71d4ddaa7df30afce53ce0c5f9cb355326d8f8
+  data.tar.gz: 6ab9fbd9854b7d970bffc0e6436ca788f7303ac5
 SHA512:
-  metadata.gz: 8d195486f30a502ef7fee7c77bbd0471f3eeea1622d207d81d4719126e94d4c5d3c8016176c9ff2a40f51f8ba947fda712b629eba702cce8b5819bec6430364f
-  data.tar.gz: c8af42cebe5703e60a2d484984f7ba1294d58ecdb9621911ebb02aca9ec66f2657cd0f3372f50c7d7cc8609e3ee92be91df778c2dcdde150760f80abec32833f
+  metadata.gz: 6960d06f4e402f5f45c8f4c731db11783bce91aa0ba1e3910a41b5ef2a5c75d5365645b32d7a712c0607dfc41c943db489db9ef89f5932a8ceebefd1addaefc3
+  data.tar.gz: 7a6b55e41e5cab30e2d586a190ca7cb12c7a4de691aba0c5698693418d427c9793b33d92d3d70125fdd71d5b6b9dbc92dc7a1bdd517f74e6178386d600983556

data/lib/pause/redis/adapter.rb

@@ -54,9 +54,14 @@ module Pause
 
       # For a scope, delete the entire sorted set that holds the block list.
       # Also delete the original tracking information, so we don't immediately re-block the id
+      #
+      # @return count [Integer] the number of items deleted
       def delete_rate_limited_keys(scope)
+        return 0 unless rate_limited_keys(scope).any?
         delete_tracking_keys(scope, rate_limited_keys(scope))
-        redis.del rate_limited_list(scope)
+        redis.zremrangebyscore(rate_limited_list(scope), '-inf', '+inf').tap do |_count|
+          redis.del rate_limited_list(scope)
+        end
       end
 
       def delete_rate_limited_key(scope, id)

data/lib/pause/version.rb

@@ -1,3 +1,3 @@
 module Pause
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/spec/pause/redis/adapter_spec.rb

@@ -137,17 +137,31 @@ describe Pause::Redis::Adapter do
   end
 
   describe '#delete_rate_limited_keys' do
-    it 'calls redis del with all keys' do
-      adapter.rate_limit!('boom', '1', 10)
-      adapter.rate_limit!('boom', '2', 10)
+    context 'with blocked items' do
+      before do
+        adapter.rate_limit!('boom', '1', 10)
+        adapter.rate_limit!('boom', '2', 10)
 
-      expect(adapter.rate_limited?('boom', '1')).to be true
-      expect(adapter.rate_limited?('boom', '2')).to be true
+        expect(adapter.rate_limited?('boom', '1')).to be true
+        expect(adapter.rate_limited?('boom', '2')).to be true
+      end
 
-      adapter.delete_rate_limited_keys('boom')
+      it 'calls redis del with all keys' do
+        adapter.delete_rate_limited_keys('boom')
 
-      expect(adapter.rate_limited?('boom', '1')).to be false
-      expect(adapter.rate_limited?('boom', '2')).to be false
+        expect(adapter.rate_limited?('boom', '1')).to be false
+        expect(adapter.rate_limited?('boom', '2')).to be false
+      end
+
+      it 'returns the number of unblocked items' do
+        expect(adapter.delete_rate_limited_keys('boom')).to eq(2)
+      end
+    end
+
+    context 'with no blocked items' do
+      it 'returns 0' do
+        expect(adapter.delete_rate_limited_keys('boom')).to eq(0)
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pause
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Atasay Gokkaya