grape-throttle 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26bb29ef618e5d2a0e5b79d9f97638f3bd1479fe
-  data.tar.gz: 24f038ed99d7b3438dcd215935c7f6fc0d302d00
+  metadata.gz: a48ae0d355926dc09eb0e43731cf314a8aba10da
+  data.tar.gz: dbfa8774da7394b93e90306cc7b7dc0fc3f88dd1
 SHA512:
-  metadata.gz: 47e65d82f8dcf15a130f686bf75ed44d5e592dd36b9edc0b8093193632fecaee29e9d7697bfa9de5abe2c303d13a0a2b06d69184021e621aeffac29834f2368a
-  data.tar.gz: 12b6eaaeec3a8e7f38f0180effb1d9b93534704acdfbdf94b4f341ab2cc1f00fb0e87f3634430c7cbde78e14318ecfddd0c1ce2de47c06eebb97efd54a94b7cb
+  metadata.gz: c8c98f8c8270a9b4ef1c5b07686183081063d3a3aab2152803b72e53d0c4e5aa1771ad2bbda257eec72b50da8c712ce900ad198cc3880a71e30aadf28b304d2a
+  data.tar.gz: ea2c3665786c6f8b1d21bf65de5de6c527be26bb581591d6b8c17c294c622ddd06f6c66a9174ccef66c65f88d1cdbd2b1450c2af93fcfadec843a9c927898abc

data/lib/grape/middleware/throttle_middleware.rb

@@ -1,6 +1,7 @@
 module Grape
   module Middleware
     class ThrottleMiddleware < Grape::Middleware::Base
+      COUNTER_START = 0
       def before
         endpoint = env['api.endpoint']
         logger   = options[:logger] || Logger.new(STDOUT)
@@ -35,8 +36,10 @@ module Grape
             endpoint.error!("too many requests, please try again later", 403)
           else
             redis.multi do
+              # Set the value of the key to COUNTER_START if the key does not already exist and
+              # set the expiry only on creation to avoid clobbering it later
+              redis.set(rate_key, COUNTER_START, { :nx => true, :ex => period.to_i } )
               redis.incr(rate_key)
-              redis.expire(rate_key, period.to_i)
             end
           end
 

data/spec/simple_api_spec.rb

@@ -23,6 +23,11 @@ describe "ThrottleHelper" do
       get('/wrong-configuration') do
         "step on it"
       end
+
+      throttle period: 2.seconds, limit: 3
+      get('/really-short-throttle') do
+        "step on it"
+      end
     end
   end
 
@@ -68,6 +73,17 @@ describe "ThrottleHelper" do
 
   end
 
+  describe "requests just below the period" do
+    it "do not get throttled by the rate limit" do
+      4.times do
+        get "/really-short-throttle"
+        sleep 1
+      end
+
+      expect(last_response.status).to eq(200)
+    end
+  end
+
   describe 'Redis down' do
     before do
       expect_any_instance_of(Redis).to receive(:ping){ raise Exception }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-throttle
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Alejandro Wainzinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-29 00:00:00.000000000 Z
+date: 2015-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-test
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: grape
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +84,16 @@ dependencies:
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 description: A middleware for Grape to add endpoint-specific throttling.
 email:
 - alejandro.wainzinger@gmail.com