redis_rate_limit 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bb561742b30caf0fde6c6483febf005b1977d81
-  data.tar.gz: 0616bfb579d95deaf434aa1f845d4a6de5e729c4
+  metadata.gz: 99dd2f2459d45abe8d5f153986568e91507910f1
+  data.tar.gz: db64ac75e2dddc771d8420e0f2cc613868c0533a
 SHA512:
-  metadata.gz: e7706879fcdc0731ba444d8420a9b19d157cf87eda6b3521b558ea09b7314bb72d42fc051a19e90636ca47d94809067f00e5b98d6e4c649e829d8df1b2a02675
-  data.tar.gz: f0865113f790f8f519e62c70749af4e7526b6c062e7b139f8a358d18bb6ac27e97f54c81fc1cd152d3150a9025c9413b6318952ee72dbca0e5ecca4c8fc7e1ce
+  metadata.gz: 55aeec8da24f5d09385c653271d6d9f78fb3a35e7fdc72be48c8693010b4fac8eb30782f324527890518ebf018d8d879e23fa5e9d7e235df4047c398db49cdae
+  data.tar.gz: 20b1d2fd90fac6ea078df01b9269844a00b3ce363861bcb5f5220c14ef50e4aacee1527aebe7aecd1e624bd47fea1dc8e437d1289ec9fe23005cc408b800ec6b

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/redis_rate_limit-*.gem

data/lib/redis_rate_limit/period.rb

@@ -23,19 +23,25 @@ module RedisRateLimit
     def get_access(client)
       current_time = Time.now
       range = current_time.strftime(@format)
-      current_counter = counter(client)
       reset = current_time.to_i + @interval - (current_time.to_i % @interval)
-      unless current_counter < @limit
-        return {
-          "pass" => false,
-          "RateLimit" => {"X-RateLimit-Limit" => @limit, "X-RateLimit-Remaining" => 0, "X-RateLimit-Reset" => reset}
-        }
+      key_client = key(client)
+      counter = @redis.hincrby(key_client, range, 1)
+
+      if counter < @limit
+        pass = true
+        remaining = @limit - counter
+      else
+        pass = false
+        remaining = 0
       end
-      counter = @redis.hincrby(key(client), range, 1)
-      remaining = @limit - counter
+
       return {
-        "pass" => true,
-        "RateLimit" => {"X-RateLimit-Limit" => @limit, "X-RateLimit-Remaining" => remaining, "X-RateLimit-Reset" => reset}
+        "pass" => pass,
+        "RateLimit" => {
+          "X-RateLimit-Limit" => @limit,
+          "X-RateLimit-Remaining" => remaining,
+          "X-RateLimit-Counter" => counter,
+          "X-RateLimit-Reset" => reset}
       }
     end
 

data/lib/redis_rate_limit/version.rb

@@ -1,3 +1,3 @@
 module RedisRateLimit
-  VERSION = "1.0.0"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis_rate_limit
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - neceha-bgl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-06 00:00:00.000000000 Z
+date: 2017-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis