faraday-rate_limiter 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1081c04a778655e5ad856245885e7fbc406d0418
-  data.tar.gz: 47259209f221507438b2a8b330e56128eb6d4d87
+  metadata.gz: 29be4e16b6bbfc73da1e297934382ae2a1aa9c7f
+  data.tar.gz: bfde830f34f2eaac789461ae4e2ce942c95d3b01
 SHA512:
-  metadata.gz: e3402d1e5d0dcf66ec85355f8d181235530fc06ab7d7364c805ec357e74dbba6138dcedbc5767e82c8e5dd92d67996cdab5587fde28565d5a93f2953273e9e3a
-  data.tar.gz: a4e08c2b52ffeb4dfc272f6528b84eeef51b8e5a1e416877b42d9fb08395700a9e7251e6abf274bf4b03cc11eac3ab24a17bb2437d62907ed08b1a36a50f584a
+  metadata.gz: fc59cdd063d6a2cad6c85063da1fa4f7d13f1c735c0bcbe40be3d041a48de6ce20342ae7cf4b06a0ee57ad3b9e414ae6b5d2a0c8def72790abbc734e910c5efb
+  data.tar.gz: 8d277892aee46d5e1d9482c05cd4bc77514b9fb342b9fa8b14cad4d00c6df36e51df6135d86fc821e613a9ccf4cf1af0f402aa2f373e9e2b863d02becd4af63c

data/faraday-rate_limiter.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'faraday-rate_limiter'
-  spec.version       = '0.0.2'
+  spec.version       = '0.0.3'
   spec.authors       = ['Cameron Martin']
   spec.email         = ['cameronmartin123@gmail.com']
   spec.description   = %q{Limits the rate of faraday requests}
@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
 
   spec.add_runtime_dependency 'faraday'
 end

data/lib/faraday/rate_limiter.rb

@@ -3,16 +3,19 @@ module Faraday
     def initialize(app, options={})
       super(app)
       @interval = options.fetch(:interval, 1)
-      @last_request_time = Time.now
+      @last_request_time = nil
     end
 
     def call(env)
 
-      time_since_last_request = Time.now - @last_request_time
 
-      if time_since_last_request < @interval
-        sleep(@interval-time_since_last_request)
+      if @last_request_time
+        time_since_last_request = Time.now - @last_request_time
+        if time_since_last_request < @interval
+          sleep(@interval-time_since_last_request)
+        end
       end
+
       @last_request_time = Time.now
 
       @app.call(env)
@@ -20,6 +23,4 @@ module Faraday
   end
 end
 
-if Faraday::Request.respond_to? :register_middleware
-  Faraday::Request.register_middleware :rate_limiter => Faraday::RateLimiter
-end
+Faraday::Request.register_middleware :rate_limiter => Faraday::RateLimiter

data/spec/integration/rate_limiter_spec.rb

@@ -0,0 +1,33 @@
+require 'rspec'
+
+require 'faraday'
+require 'faraday-rate_limiter'
+
+describe Faraday::RateLimiter do
+
+  let(:interval) { 5 }
+  let(:conn) do
+    Faraday.new do |conn|
+      conn.request :rate_limiter, interval: interval
+      conn.adapter :test do |stub|
+        stub.get('/index') {[ 200, {}, '' ]}
+      end
+    end
+  end
+
+  it 'should return the first result without delay' do
+    t1 = Time.now
+    conn.get('/index')
+    t2 = Time.now
+    expect((t2 - t1).abs < interval).to be_true
+  end
+
+  it 'should wait between requests' do
+    t1 = Time.now
+    conn.get('/index')
+    conn.get('/index')
+    t2 = Time.now
+    expect((t2 - t1).abs > interval).to be_true
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faraday-rate_limiter
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Cameron Martin
@@ -38,6 +38,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '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'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -67,6 +81,7 @@ files:
 - faraday-rate_limiter.gemspec
 - lib/faraday-rate_limiter.rb
 - lib/faraday/rate_limiter.rb
+- spec/integration/rate_limiter_spec.rb
 homepage: ''
 licenses:
 - MIT
@@ -91,4 +106,5 @@ rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Limits the rate of faraday requests
-test_files: []
+test_files:
+- spec/integration/rate_limiter_spec.rb