grape-attack 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57fc46d111b5ae7aea4b21aae9ed2a93e48ab843
-  data.tar.gz: b0b1dcbf53255bba00ecb4520231ae81303920a7
+  metadata.gz: ea399c91939b6f788d31358112d63f737e089948
+  data.tar.gz: fb445757cbb24ac4ffab5c268f0ffb4402ef4fc1
 SHA512:
-  metadata.gz: 15379ea693fa354a8558b6723ff14586ec1990c5e028528918fbad082c90b16e30954b4d4941e72b3f28dfa64a4af9804e42d93b4cd40dfbad4c282c447fa8d7
-  data.tar.gz: 4923d3d2571ac652981e6cccdea912849222bd47c2dbf2afef25bf08a9452e7ca1ea57ef5b04a8bd1c319c285fea725176714a7fd907aada1a80eda45d0c40e2
+  metadata.gz: fa0787a890e5a3a0da29abf0a9edca02bf5ec8d570222e2069817bc1845077745001721b1c8702e4a8e747b7e63ad686f5efd67030fc2ff7528116d810c70387
+  data.tar.gz: 9606cd3d82d81babfeb544e7905fc60f767029b0437fce2a2879d5a841f5454f309f0ca984d3cd000d5aad02cb267e097d65281ddff5b72e4f30b13415eeefeb

data/grape-attack.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "grape", ">= 0.10"
-  spec.add_dependency "redis-namespace"
+  spec.add_dependency "grape", "~> 0.16"
+  spec.add_dependency "redis-namespace", "~> 1.5"
   spec.add_dependency "activemodel", ">= 4.0"
   spec.add_dependency "activesupport", ">= 4.0"
 

data/lib/grape/attack.rb

@@ -1,4 +1,6 @@
 require 'active_support/core_ext/numeric/time.rb'
+require 'grape'
+
 require 'grape/attack/version'
 require 'grape/attack/adapters/redis'
 require 'grape/attack/adapters/memory'

data/lib/grape/attack/limiter.rb

@@ -43,8 +43,6 @@ module Grape
         counter.update
       end
 
-      # Fix when https://github.com/ruby-grape/grape/issues/1069
-      # For now we use route_setting to store :remaining value.
       def set_rate_limit_headers
         request.context.route_setting(:throttle)[:remaining] = [0, max_requests_allowed - (counter.value + 1)].max
       end

data/lib/grape/attack/options.rb

@@ -4,16 +4,38 @@ module Grape
   module Attack
     class Options
       include ActiveModel::Model
+      include ActiveModel::Validations
 
       attr_accessor :max, :per, :identifier, :remaining
 
-      validates :max, presence: true
-      validates :per, presence: true
+      class ProcOrNumberValidator < ActiveModel::EachValidator
+        def validate_each(record, attribute, value)
+          return true if value.is_a?(Numeric)
+          return true if value.is_a?(Proc) && value.call.is_a?(Numeric)
+
+          record.errors.add attribute, "must be either a proc resolving in a numeric or a numeric"
+        end
+      end
+
+      validates :max, proc_or_number: true
+      validates :per, proc_or_number: true
 
       def identifier
         @identifier || Proc.new {}
       end
 
+      def max
+        return @max if @max.is_a?(Numeric)
+        return @max.call if @max.is_a?(Proc)
+        super
+      end
+
+      def per
+        return @per if @per.is_a?(Numeric)
+        return @per.call if @per.is_a?(Proc)
+        super
+      end
+
     end
   end
 end

data/lib/grape/attack/request.rb

@@ -14,15 +14,15 @@ module Grape
       end
 
       def method
-        request.route_method
+        request.request_method
       end
 
       def path
-        request.route_path
+        request.path
       end
 
       def params
-        request.route_params
+        request.params
       end
 
       def method_missing(method_name, *args, &block)

data/lib/grape/attack/throttle.rb

@@ -1,4 +1,3 @@
-require 'grape'
 require 'grape/attack/limiter'
 
 module Grape
@@ -9,17 +8,16 @@ module Grape
         ::Grape::Attack::Limiter.new(env).call!
       end
 
-      # Fix when https://github.com/ruby-grape/grape/issues/1069
-      # For now we use route_setting to store :remaining value.
       def after
         request = ::Grape::Attack::Request.new(env)
 
         return if ::Grape::Attack.config.disable.call
         return unless request.throttle?
 
-        @app_response['X-RateLimit-Limit']     = request.context.route_setting(:throttle)[:max].to_s
-        @app_response['X-RateLimit-Remaining'] = request.context.route_setting(:throttle)[:remaining].to_s
-        @app_response['X-RateLimit-Reset']     = request.context.route_setting(:throttle)[:per].from_now.to_i.to_s
+        header('X-RateLimit-Limit', request.throttle_options.max.to_s)
+        header('X-RateLimit-Reset', request.throttle_options.per.to_s)
+        header('X-RateLimit-Remaining', request.throttle_options.remaining.to_s)
+
         @app_response
       end
 

data/lib/grape/attack/version.rb

@@ -1,5 +1,5 @@
 module Grape
   module Attack
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: grape-attack
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Pierre-Louis Gottfrois
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-27 00:00:00.000000000 Z
+date: 2016-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: redis-namespace
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A middleware for Grape to add endpoint-specific throttling.
@@ -115,9 +115,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -149,17 +149,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A middleware for Grape to add endpoint-specific throttling.