Lazy load entities when requested instead of initializing everything on load

lib/bootic_client.rb

@@ -1,9 +1,9 @@
 require 'logger'
-require "bootic_client/version"
-require "bootic_client/entity"
-require "bootic_client/relation"
-require "bootic_client/client"
-require "bootic_client/configuration"
+require_relative './bootic_client/version'
+require_relative './bootic_client/entity'
+require_relative './bootic_client/relation'
+require_relative './bootic_client/client'
+require_relative './bootic_client/configuration'
 
 module BooticClient
   class << self
@@ -13,6 +13,7 @@ def strategies
 
     def client(strategy_name, client_opts = {}, &on_new_token)
       return @stubber if @stubber
+
       opts = client_opts.dup
       opts[:logging] = configuration.logging
       opts[:logger] = configuration.logger if configuration.logging

lib/bootic_client/client.rb

@@ -81,9 +81,16 @@ def self.load(string)
 
     private
 
+    DEFAULT_TIMEOUT = 20.freeze # seconds
+
     def conn(&block)
-      @conn ||= Faraday.new do |f|
-        cache_options = {serializer: SafeCacheSerializer, shared_cache: false, store: options[:cache_store]}
+      request_opts = {
+        timeout: (options[:timeout] || DEFAULT_TIMEOUT).to_i, # both read/open timeout
+        open_timeout: (options[:open_timeout] || DEFAULT_TIMEOUT).to_i # only open timeout
+      }
+
+      @conn ||= Faraday.new(request: request_opts) do |f|
+        cache_options = { serializer: SafeCacheSerializer, shared_cache: false, store: options[:cache_store] }
         cache_options[:logger] = options[:logger] if options[:logging]
 
         f.use :http_cache, **cache_options
@@ -102,6 +109,8 @@ def request_headers
     end
 
     def validated_request!(verb, href, &block)
+      retries ||= 0
+
       resp = conn.send(verb) do |req|
         req.url href
         req.headers.update request_headers
@@ -110,6 +119,14 @@ def validated_request!(verb, href, &block)
 
       raise_if_invalid! resp
       resp
+
+    rescue Faraday::ConnectionFailed, Faraday::TimeoutError => e
+      if (retries += 1) < 3 # max retries
+        puts "Got #{e.class} error, attempt #{retries}, retrying..."
+        retry
+      else
+        raise
+      end
     end
 
     def raise_if_invalid!(resp)