grape-throttle 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ed50ef26f42b2a23a70ca4980f489a0aa84054d
-  data.tar.gz: 9637edba76b7b8962e6c94d0d45cc97e3fb9820d
+  metadata.gz: 26bb29ef618e5d2a0e5b79d9f97638f3bd1479fe
+  data.tar.gz: 24f038ed99d7b3438dcd215935c7f6fc0d302d00
 SHA512:
-  metadata.gz: 53d9d218043ac41857ba6cbde85eca9069a557ef4374b57dc3882f08447d12f68ddcf6c5626a464de02eeb4d27d023136b532e32d669501e95c4e48e8517e1b7
-  data.tar.gz: 636e71131d1aca85d3ade3eb523654127aec25a7b6a8cfd26823e640bd7e64122c88c3756dfbfb5cbbb24ff7180b0872b303e3d3dac8811f70a293189fe2da8f
+  metadata.gz: 47e65d82f8dcf15a130f686bf75ed44d5e592dd36b9edc0b8093193632fecaee29e9d7697bfa9de5abe2c303d13a0a2b06d69184021e621aeffac29834f2368a
+  data.tar.gz: 12b6eaaeec3a8e7f38f0180effb1d9b93534704acdfbdf94b4f341ab2cc1f00fb0e87f3634430c7cbde78e14318ecfddd0c1ce2de47c06eebb97efd54a94b7cb

data/lib/grape/middleware/throttle_middleware.rb

@@ -3,6 +3,7 @@ module Grape
     class ThrottleMiddleware < Grape::Middleware::Base
       def before
         endpoint = env['api.endpoint']
+        logger   = options[:logger] || Logger.new(STDOUT)
         return unless throttle_options = endpoint.route_setting(:throttle)
 
         if limit = throttle_options[:hourly]
@@ -27,14 +28,20 @@ module Grape
         rate_key = "#{r.route_method}:#{r.route_path}:#{user_value}"
 
         redis = options[:cache]
-        current = redis.get(rate_key).to_i
-        if !current.nil? && current >= limit
-          endpoint.error!("too many requests, please try again later", 403)
-        else
-          redis.multi do
-            redis.incr(rate_key)
-            redis.expire(rate_key, period.to_i)
+        begin
+          redis.ping
+          current = redis.get(rate_key).to_i
+          if !current.nil? && current >= limit
+            endpoint.error!("too many requests, please try again later", 403)
+          else
+            redis.multi do
+              redis.incr(rate_key)
+              redis.expire(rate_key, period.to_i)
+            end
           end
+
+        rescue Exception => e
+          logger.warn(e.message)
         end
 
       end

data/lib/grape-throttle.rb

@@ -1,5 +1,6 @@
 require 'grape'
 require 'grape/extensions/throttle_extension'
+require 'logger'
 
 module Grape
   module Middleware

data/spec/simple_api_spec.rb

@@ -67,4 +67,17 @@ describe "ThrottleHelper" do
     end
 
   end
+
+  describe 'Redis down' do
+    before do
+      expect_any_instance_of(Redis).to receive(:ping){ raise Exception }
+      allow($stdout).to receive(:write)
+    end
+
+    it 'should work when redis is down' do
+      get "/throttle"
+      expect(last_response.status).to eq(200)
+    end
+
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-throttle
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Alejandro Wainzinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-26 00:00:00.000000000 Z
+date: 2015-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-test