ruby_rolling_rate_limiter 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 707ecff1e33f4f609cc8399cdebab57ad206daca
-  data.tar.gz: 89273199718232705e954c41decdaa1923e10a98
+  metadata.gz: 1d6a06dabda7291a27e30b3348cbbf5aa564189f
+  data.tar.gz: 67583bb1e73272f81949894311db42db2ca93919
 SHA512:
-  metadata.gz: 41bd11d653038fb3008c62e15289a031b3390ea797d8f38bfa1c1a602420ae5ca7c38459bc117e600b35eb2db9bc20b328ff71f82c4c91ae7d00b5bd59491a58
-  data.tar.gz: f683ecb68d5c63da9aa0eae3b3d1fd648f89d4ea7517f82ab39edf3cd0eb6c15ab3eacd56ecfbe50e9614ff6bce6274c3189e071b0927499f6ff3abe17a5ce6d
+  metadata.gz: 901303ce2533f0cf5be066bc36ba0e00b79814786eec572cd6ec99c2352e9407c3b69d1325e8a08797170f3ad4100f202a25826cf3f8a19081a9e48eeeeff510
+  data.tar.gz: 13e6cbe854abbfd36eea606ef9f2325206937615a41a502212c4301ff3b53116f329bf1fdeaf5856c2f721d73487338d35163dccf4353f2715bbe803c7e04af8

data/lib/ruby_rolling_rate_limiter/version.rb

@@ -1,3 +1,3 @@
 class RubyRollingRateLimiter
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/ruby_rolling_rate_limiter.rb

@@ -48,21 +48,20 @@ class RubyRollingRateLimiter
       if max_retry_counter <= 100
         @lock_manager.lock("#{key}-lock", 10000) do |locked|
           if locked
-            @redis_connection.multi
+            # Because the resource is locked via redlock, I'm going to remove the multi on this.
             @redis_connection.zremrangebyscore(key, 0, clear_before.to_s)
-            @redis_connection.zrange(key, 0, -1)
-            cur = @redis_connection.exec
-
-            if (cur[1].count <= @max_calls_per_interval) && ((cur[1].count+call_size) <= @max_calls_per_interval) && ((@min_distance_between_calls_in_seconds * 1000 * 1000) && (now - cur[1].last.to_i) > (@min_distance_between_calls_in_seconds * 1000 * 1000))
-              @redis_connection.multi
-              @redis_connection.zrange(key, 0, -1)
-              call_size.times do 
+            current_range = @redis_connection.zrange(key, 0, -1)
+            if (current_range.count <= @max_calls_per_interval) && ((current_range.count+call_size) <= @max_calls_per_interval) && ((@min_distance_between_calls_in_seconds * 1000 * 1000) && (now - current_range.last.to_i) > (@min_distance_between_calls_in_seconds * 1000 * 1000))
+              results = @redis_connection.zrange(key, 0, -1)
+              call_size.times do
                 @redis_connection.zadd(key, now.to_s, now.to_s)
+                # This will allow us to make spacing between the weights.
+                now = DateTime.now.strftime('%s%6N').to_i # Time since EPOC in microseconds.
               end
               @redis_connection.expire(key, @interval_in_seconds)
-              results = @redis_connection.exec
+
             else
-              results = [cur[1]]
+              results = current_range
             end
           else
             raise Errors::LockWaiting, "Could not aquire lock"
@@ -78,7 +77,7 @@ class RubyRollingRateLimiter
     end
 
     if results
-      call_set = results[0]
+      call_set = results
       too_many_in_interval = call_set.count >= @max_calls_per_interval
       time_since_last_request = (@min_distance_between_calls_in_seconds * 1000 * 1000) && (now - call_set.last.to_i)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_rolling_rate_limiter
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Karl Kloppenborg
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-14 00:00:00.000000000 Z
+date: 2016-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler