esi 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cca478fd5427ecdcc25baebef64a0a6fd4f0f74
-  data.tar.gz: b61b8a1527217628dd0644b49668f31e0011ee79
+  metadata.gz: c4b5a93efca48b194d39cbe3a444e3c485cfff72
+  data.tar.gz: 1cec263496592b14acc81084ff041095cf8056a4
 SHA512:
-  metadata.gz: 8e33ddf6dae4e6c65876e528cf4f7e4fe6b3fc5df725ba0660d4d9e50f8cdab47d45dc25c0d958281f4d75391d3029ada2ff2fb509aed49255dccc998af07e54
-  data.tar.gz: 45a8329ca80fa71af75a9406f6fddd66d27847f8a6fd0021740285ceca63feb8db09ed90f018c7c50057af8db36e7cb93c1a89278ea4d53998fdd2fa8798fed8
+  metadata.gz: 1633b582d5bb89a30a6572b5717d5cd1290da97a6f122b256d987e98a253f1fcde9ae01a8f6d90db98c4061a4ad38706e57685829d9ea37010d7bbb8ded8d0d9
+  data.tar.gz: 59f485fb251825769b14c18f670b12516bda9a31634edaff11ad4da0d67f8fedaffefe94c1eb8c46dca137eac1168408c6e7210190327c46b2bec96605cd62d4

data/esi.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.files         = %w(LICENSE.txt README.md esi.gemspec) + Dir['lib/**/*.rb']
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "oauth2", "~> 1.2"
+  spec.add_dependency "oauth2", "~> 1.4"
   spec.add_dependency "addressable", "~> 2.3"
   spec.add_dependency "recursive-open-struct", "~> 1"
   spec.add_dependency "activesupport"

data/lib/esi.rb

@@ -67,6 +67,7 @@ module Esi
     log_level: :info,
     log_target: STDOUT,
     response_log_path: nil,
+    timeout: 15,
     client_id: nil,
     client_secret: nil,
     scopes: SCOPES
@@ -105,11 +106,12 @@ module Esi
   end
 
   class ApiError < OAuth2::Error
-    attr_reader :key, :message, :type
+    attr_reader :key, :message, :type, :original_exception
 
-    def initialize(response)
+    def initialize(response, original_exception=nil)
       super(response.original_response)
 
+      @original_exception = original_exception
       @code = response.original_response.status
       @key = response.data[:key]
       @message = response.data[:message].presence || response.data[:error]
@@ -117,6 +119,15 @@ module Esi
     end
   end
 
+  class ApiRequestError < StandardError
+    attr_reader :original_exception
+
+    def initialize(original_exception)
+      @original_exception = original_exception
+      super(original_exception.message)
+    end
+  end
+
   class ApiUnknownError < ApiError; end
   class ApiInvalidAppClientKeysError < ApiError; end
   class ApiNotFoundError < ApiError; end

data/lib/esi/client.rb

@@ -71,14 +71,25 @@ module Esi
 
     def request(call, url=nil, &block)
       response = nil
+      last_ex = nil
+
       url ||= call.url
       debug "Starting request: #{url}"
 
       ActiveSupport::Notifications.instrument('esi.client.request') do
         1.upto(MAX_ATTEMPTS) do |try|
+          last_ex = nil
+
           begin
             response = oauth.request(call.method, url)
+          rescue Net::ReadTimeout => e
+            last_ex = e
+            logger.error "ReadTimeout received"
+            sleep 2
+            next
           rescue OAuth2::Error => e
+            last_ex = e
+
             case e.response.status
             when 502 # Temporary server error
               logger.error "TemporaryServerError, sleeping for 15 seconds"
@@ -111,6 +122,11 @@ module Esi
       end
 
       debug "Request finished"
+      if last_ex
+        logger.error "Request failed with #{last_ex.class}"
+        raise ApiRequestError.new(last_ex)
+      end
+
       ActiveSupport::Notifications.instrument('esi.client.response.initialize') do
         response = Response.new(response)
       end

data/lib/esi/o_auth.rb

@@ -21,7 +21,11 @@ module Esi
         @client ||= OAuth2::Client.new(
           Esi.config.client_id, Esi.config.client_secret,
           { site: Esi.config.oauth_host }
-        )
+        ) do |conn|
+          conn.adapter :net_http do |http|
+            http.read_timeout = Esi.config.timeout
+          end
+        end
       end
     end
 

data/lib/esi/version.rb

@@ -1,3 +1,3 @@
 module Esi
-  VERSION = "0.1.5"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: esi
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Danny Hiemstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-16 00:00:00.000000000 Z
+date: 2017-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement