bridge_api 0.1.46 → 0.1.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b44a0b256fd219e4500817cdbd13fa4845d8de5b2bfbb9932da73ce1d0ad2e5
-  data.tar.gz: 230aeb36234a6217a1b0c287db7f893de9a522e02d5ca326fa3a99e48ede163b
+  metadata.gz: 33d53dbe69e83c140ece152e38d4b640a952dbe71157d3349d2ec992c00a3cdf
+  data.tar.gz: ce0087b8b507566f1620be38adac6e9dcdc48ac4bf24319616771b381cf0b02d
 SHA512:
-  metadata.gz: eac5a3221b794a9bc416195e0b1d917380945d59134db19789b80206746030df6bf8e8987ec8b69a50c7310bd8336610e0ca465deed5db81cf65c725f872c142
-  data.tar.gz: 1d82b404080ae51fdcf22e1ef6eddd05d9c1bd21cde4fe0cd3b93997061514729178106cba5df30f117b8a89da7e251b7f26d1eb22d7b8f15937e894e0e2e43e
+  metadata.gz: abf0c52442afe33ed5708c7c70a09e04277c5838244cbf3c5696842f86cdb54716d1740d38c6b4d7cd53cb069531075ab9a79fd03a7ac7088b7c7aa31a05fa24
+  data.tar.gz: 2f1a010419bad863287b118a899484c689b901099a891b1ac40b57a55ec010585b81a6b4f1a5d7aaa6237d2ebc3342662555454daed43b960f71124121fc7979

data/Gemfile.lock

@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    bridge_api (0.1.46)
+    bridge_api (0.1.47)
       faraday (~> 0.9.0)
       faraday_middleware (>= 0.12.2)
       footrest (>= 0.5.1)
       logging (>= 2.2.2)
+      paul_walker (>= 0.1.1)
 
 GEM
   remote: https://rubygems.org/
@@ -19,7 +20,7 @@ GEM
       public_suffix (>= 2.0.2, < 4.0)
     byebug (8.2.5)
     coderay (1.1.2)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.1)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
@@ -43,6 +44,8 @@ GEM
     minitest (5.11.3)
     multi_json (1.13.1)
     multipart-post (2.0.0)
+    paul_walker (0.1.1)
+      redis (>= 4.0)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -51,6 +54,7 @@ GEM
     rack-protection (1.5.5)
       rack
     rake (0.9.6)
+    redis (4.0.3)
     rspec (2.99.0)
       rspec-core (~> 2.99.0)
       rspec-expectations (~> 2.99.0)

data/bridge_api.gemspec

@@ -31,4 +31,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'faraday_middleware', '>= 0.12.2'
   gem.add_dependency 'footrest', '>= 0.5.1'
   gem.add_dependency 'logging', '>= 2.2.2'
+  gem.add_dependency 'paul_walker', '>= 0.1.1'
 end

data/lib/bridge_api/client.rb

@@ -6,6 +6,7 @@ require 'footrest/pagination'
 require 'footrest/follow_redirects'
 require 'footrest/parse_json'
 require 'base64'
+require 'paul_walker'
 
 module BridgeAPI
   class Client < Footrest::Client
@@ -57,6 +58,7 @@ module BridgeAPI
     def enforce_rate_limits
       return unless BridgeAPI.enforce_rate_limits && !current_limit.nil?
       return unless current_limit < BridgeAPI::rate_limit_min
+      BridgeAPI.logger.debug("Current LIMIT: #{current_limit}")
       tts = ((BridgeAPI.rate_limit_min - current_limit) / 5).ceil
       tts = BridgeAPI.min_sleep_seconds if tts < BridgeAPI.min_sleep_seconds
       tts = BridgeAPI.max_sleep_seconds if tts > BridgeAPI.max_sleep_seconds
@@ -74,11 +76,20 @@ module BridgeAPI
     end
 
     def current_limit
-      BridgeAPI.rate_limits[config[:api_key]]
+      if config[:master_rate_limit]
+        limit = PaulWalker::RateLimit.get(config[:api_key], config[:api_key])
+        limit['current']
+      else
+        BridgeAPI.rate_limits[config[:api_key]]
+      end
     end
 
     def current_limit=(value)
-      BridgeAPI.rate_limits[config[:api_key]] = value
+      if config[:master_rate_limit]
+        PaulWalker::RateLimit.add(config[:api_key], config[:api_key], value, BridgeAPI::rate_limit_min)
+      else
+        BridgeAPI.rate_limits[config[:api_key]] = value
+      end
     end
 
     def set_connection(config)

data/lib/bridge_api/version.rb

@@ -1,3 +1,3 @@
 module BridgeAPI
-  VERSION = '0.1.46'.freeze unless defined?(BridgeAPI::VERSION)
+  VERSION = '0.1.47'.freeze unless defined?(BridgeAPI::VERSION)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridge_api
 version: !ruby/object:Gem::Version
-  version: 0.1.46
+  version: 0.1.47
 platform: ruby
 authors:
 - Jay Shaffer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-23 00:00:00.000000000 Z
+date: 2018-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -190,6 +190,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.2
+- !ruby/object:Gem::Dependency
+  name: paul_walker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 description: Ruby gem for interacting with the bridge API
 email:
 - jshaffer@instructure.com