redis_rate_limiter 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9a12dbb2c0de8e121e8b7b3c7294ce9d06338f2
-  data.tar.gz: b080e7d39a8f4878c3c41db51b537189be98ca02
+  metadata.gz: 05bc20f9ac3908cfa3c1b5e459e32b9a19e2bd58
+  data.tar.gz: 1929511d7ef79dcb0831aa153cb4d89fca456682
 SHA512:
-  metadata.gz: 6a28ea510a522378b9517ff7790952720d9e4865711772a94042088ca9a103fa595d4a312ae8e6ae7313e92e4227591c19c52cb6a9a96910183791de7b2de61d
-  data.tar.gz: 0005d0bcca887f45d68ac14f8942c4e90e5b6bf8d35a0e0bfdf01e46c31fc7dd6ff86161ad3c83c37c2d5981c03a5fe1661f7b1d14bfb5ca1ab2aec515dead38
+  metadata.gz: e41ecbc1374c2b4cd22dba9887eecb6a4cc85b8a9a66c4e5a3802b8c96471cd5d00f744c82bbae7c39ce0cb3a0617b8fad64bcf3f28c8c36da1dee13845b0242
+  data.tar.gz: f9a74c5d35be39f298a9f2c71e38eab8104b149c2def08879ae8675a465cc8a2dfaceab9c77ce167dd740adf18fa4e4567e5d4b715eac5756d27b7d5e77e4538

data/lib/redis_rate_limiter.rb

@@ -31,11 +31,11 @@ class RedisRateLimiter
   # @param [String] subject A name to uniquely identify subject
   # @param [time] time UNIX timestamp of event
   def add subject, time = Time.now.to_f
-    subject = "#{@key}:#{subject}"
+    subject_key = "#{@key}:#{subject}"
     @redis.multi do
-      @redis.lpush(subject, time)
-      @redis.ltrim(subject, 0, @limit - 1)
-      @redis.expire(subject, @interval)
+      @redis.lpush(subject_key, time)
+      @redis.ltrim(subject_key, 0, @limit - 1)
+      @redis.expire(subject_key, @interval)
     end
   end
 
@@ -44,9 +44,25 @@ class RedisRateLimiter
   # @param [String] subject Name which uniquely identifies subject
   # @return [Boolean] Returns true if subject has exceeded count
   def exceeded? subject
-    subject = "#{@key}:#{subject}"
-    return false if @redis.llen(subject) < @limit
-    last = @redis.lindex(subject, -1)
-    Time.now.to_f - last.to_f < @interval
+    subject_key = "#{@key}:#{subject}"
+    return false if @redis.llen(subject_key) < @limit
+    time_since_oldest(subject_key) < @interval
+  end
+
+  # Get time in seconds until subject is not rate limited
+  #
+  # @param [String] subject Name which uniquely identifies subject
+  # @return [Float] Returns time in seconds until subject is not rate limited
+  def retry_in? subject
+    subject_key = "#{@key}:#{subject}"
+    return 0.0 if @redis.llen(subject_key) < @limit
+    elapsed = time_since_oldest(subject_key)
+    elapsed > @interval ? 0.0 : @interval - elapsed
+  end
+
+  private
+
+  def time_since_oldest subject_key
+    Time.now.to_f - @redis.lindex(subject_key, -1).to_f
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis_rate_limiter
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Sean Xie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-30 00:00:00.000000000 Z
+date: 2015-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis