bridge_api 0.1.53 → 0.1.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a747c2ace7fb00d9374078f2ea7f15a8024adcadc3fa3b0b1b61b2d9cc431446
-  data.tar.gz: 232e795f2ac605de1bcb2b22dbae65e1355e6f35f9895e3544e392d344f9b968
+  metadata.gz: 2d39d608d1b30d380fb6fdb79ad8284d5c2e2e1fd132623b89717cf94a9f9071
+  data.tar.gz: a8a72c682e3868563aa290f61b1dabb3295e34aff8ef6d9c61cff9f927a32bba
 SHA512:
-  metadata.gz: d3bfd2c5c66bd5e3f20ddd2bc221ac4b69c3f14d53d5c4553d6a130795bb23971bf4c162d23b9a4ae7b43f8bee9ca8547973fa2cd4fe6dacc31ab0cd37172390
-  data.tar.gz: e11c84963f136ce9613b5bdaa445810aa8aa0eff47e6c5c5037b8ab5536fe2cfc94d6e77b4df7fd8fdaca3c67869caf19bf79f6492186e7f757f1d3d86bc823b
+  metadata.gz: 8b93008180e1bdb8af16f4fbc88f4fa642cbe20e655fcac04dc34ea0c5ba20b1f38ef3b5c32e098224f48da463a7e7288fc7726c57232fc6e5c666d741c505b4
+  data.tar.gz: 10af8a2e42a4ca6db28abdeba4258bf6559a4b6f4ffc3907a0fe3d0f8820015a82b92a2001e08ae25cc3af2bd0653f4de58526f0301db6f0320db96d65a11d0a

data/lib/bridge_api.rb

@@ -4,7 +4,8 @@ require 'bridge_api/client'
 module BridgeAPI
   class << self
     require 'logging'
-    attr_writer :enforce_rate_limits, :rate_limit_min, :rate_limits, :max_sleep_seconds, :min_sleep_seconds, :logger
+    attr_writer :enforce_rate_limits, :rate_limit_min, :rate_limits, :max_sleep_seconds, :min_sleep_seconds,
+                :logger, :master_rate_limit, :master_mutex, :rate_limit_threshold
 
     def configure
       yield self if block_given?
@@ -26,6 +27,18 @@ module BridgeAPI
       @max_sleep_seconds ||= 60
     end
 
+    def master_rate_limit
+      @master_rate_limit ||= false
+    end
+
+    def master_mutex
+      @master_mutex ||= Mutex.new
+    end
+
+    def rate_limit_threshold
+      @rate_limit_threshold ||= 10
+    end
+
     def logger
       return @logger if defined? @logger
       @logger = Logging.logger(STDOUT)

data/lib/bridge_api/client.rb

@@ -60,42 +60,49 @@ module BridgeAPI
     end
 
     def enforce_rate_limits
-      return unless BridgeAPI.enforce_rate_limits && current_limit.present?
-      return unless current_limit < BridgeAPI::rate_limit_min
-
-      BridgeAPI.logger.debug("Current LIMIT: #{current_limit}")
-      tts = ((BridgeAPI.rate_limit_min - current_limit) / 5).ceil
+      return unless BridgeAPI.enforce_rate_limits && limit_remaining.present?
+      return unless limit_remaining < BridgeAPI.rate_limit_threshold
+      tts = ((BridgeAPI.rate_limit_min - limit_remaining) / 5).ceil
       tts = BridgeAPI.min_sleep_seconds if tts < BridgeAPI.min_sleep_seconds
       tts = BridgeAPI.max_sleep_seconds if tts > BridgeAPI.max_sleep_seconds
       message = "Bridge API rate limit minimum #{BridgeAPI.rate_limit_min} reached for key: '#{config[:api_key]}'. "\
         "Sleeping for #{tts} second(s) to catch up ~zzZZ~. "\
-        "Limit Remaining: #{current_limit}"
+        "Limit Remaining: #{limit_remaining}"
       BridgeAPI.logger.debug(message)
       sleep(tts)
     end
 
+    def using_master_rate_limit?
+      config[:master_rate_limit].present? || BridgeAPI.master_rate_limit.present?
+    end
+
     def apply_rate_limits(response)
       limit = response.headers['x-rate-limit-remaining']
       return if limit.nil?
-      self.current_limit = limit.to_i
+      BridgeAPI.logger.debug("BRIDGE RATE LIMIT REMAINING: #{limit}")
+      self.limit_remaining = limit.to_i
     end
 
-    def current_limit
-      if config[:master_rate_limit]
-        limit = PaulWalker::RateLimit.get(config[:api_key], config[:api_key])
-        if limit.nil?
-          PaulWalker::RateLimit.add(config[:api_key], config[:api_key], 0, BridgeAPI::rate_limit_min)
-          limit = {current: 0}.with_indifferent_access
+    def limit_remaining
+      if using_master_rate_limit?
+        BridgeAPI.master_mutex.synchronize do
+          limit = PaulWalker::RateLimit.get(config[:api_key], config[:api_key])
+          if limit.nil?
+            PaulWalker::RateLimit.add(config[:api_key], config[:api_key], 0, BridgeAPI::rate_limit_min)
+            limit = {current: 0}.with_indifferent_access
+          end
+          limit['current']
         end
-        limit['current']
       else
         BridgeAPI.rate_limits[config[:api_key]]
       end
     end
 
-    def current_limit=(value)
-      if config[:master_rate_limit]
-        PaulWalker::RateLimit.add(config[:api_key], config[:api_key], value, BridgeAPI::rate_limit_min)
+    def limit_remaining=(value)
+      if using_master_rate_limit?
+        BridgeAPI.master_mutex.synchronize do
+          PaulWalker::RateLimit.add(config[:api_key], config[:api_key], value, BridgeAPI::rate_limit_min)
+        end
       else
         BridgeAPI.rate_limits[config[:api_key]] = value
       end

data/lib/bridge_api/version.rb

@@ -1,3 +1,3 @@
 module BridgeAPI
-  VERSION = '0.1.53'.freeze unless defined?(BridgeAPI::VERSION)
+  VERSION = '0.1.54'.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.53
+  version: 0.1.54
 platform: ruby
 authors:
 - Jay Shaffer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-22 00:00:00.000000000 Z
+date: 2019-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler