nypl_sierra_api_client 1.0.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f83a3d06d4010dd2b229b09358e70ff5c4afadbffb92c0d6407b6cf79b41d7dc
-  data.tar.gz: 2dab1288ee02fe238c9517a4bddb7ddcde36dc3a036ed61890c57854186d0dc0
+  metadata.gz: caabcc105e5fa564b09906a50a7c2c83781435ae2997aeb5b1b546c2a5d5196d
+  data.tar.gz: ee28dd954ac82a925c01d4b3c386d7116c45a3a4a9901c19c725f3570c6dd51e
 SHA512:
-  metadata.gz: a349f8a998f13cce0180ecce092f79601c06cc376059fc349add4e98d802532bc8dcf487c0dd2ce574bffa16e70e2c6bce9f4a50e92f392258670a63eb3157af
-  data.tar.gz: 46cb45de0dbb360f12177af4d51102d84e056f7f223d6545a3ff3bc5d1a700f1c5a06115747b00cb6583283a2f28367e95cd8851a25bf90d7205807e9fe09987
+  metadata.gz: 02744457c93e208183dfd10a918ab47bd2be2945b1ab3877ac4af15648da4636e71edde276d73dcc2f9f5e971d72c6cf027c9ac2bad99f58f1ae6d7de9c7946d
+  data.tar.gz: bc02013959688226a4e115deb6ed7dce14c2e4e15b136905d79a5371d9e84450982662cbbbcdf9ee14d8258385cc680be0f2c2b2e83100e93f0e08af1d3a0c52

data/lib/nypl_sierra_api_client.rb

@@ -20,13 +20,32 @@ class SierraApiClient
       }
     }
 
-    @config = config_defaults[:env].map {|k,v| [k, ENV[k]]}.to_h
+    @config = config_defaults[:env].map {|k,v| [k, ENV[v]]}.to_h
       .merge config_defaults[:static]
       .merge config
 
     config_defaults[:env].each do |key, value|
-      raise SierraApiClient.new "Missing config: neither config.#{key} nor ENV.#{value} are set" unless @config[key]
+      raise SierraApiClientError.new "Missing config: neither config.#{key} nor ENV.#{value} are set" unless @config[key]
     end
+
+    @retries = 0
+  end
+
+  def put (path, body, options = {})
+  options = parse_http_options options
+    # Default to POSTing JSON unless explicitly stated otherwise
+    options[:headers]['Content-Type'] = 'application/json' unless options[:headers]['Content-Type']
+
+    do_request 'put', path, options do |request|
+      request.body = body
+      request.body = request.body.to_json unless options[:headers]['Content-Type'] != 'application/json'
+    end
+  end
+
+  def delete (path, options = {})
+  options = parse_http_options options
+
+  do_request 'delete', path, options
   end
 
   def get (path, options = {})
@@ -50,22 +69,19 @@ class SierraApiClient
   private
 
   def do_request (method, path, options = {})
-    # For now, these are the methods we support:
-    raise SierraApiClientError, "Unsupported method: #{method}" unless ['get', 'post'].include? method.downcase
 
-    authenticate! if options[:authenticated]
+  raise SierraApiClientError, "Unsupported method: #{method}" unless ['get', 'post', 'put', 'delete'].include? method.downcase
 
-    uri = URI.parse("#{@config[:base_url]}#{path}")
+    authenticate! if options[:authenticated]
 
-    http = Net::HTTP.new(uri.host, uri.port)
-    http.use_ssl = uri.scheme === 'https'
+    @uri = URI.parse("#{@config[:base_url]}#{path}")
 
     # Build request headers:
     request_headers = {}
     request_headers['Content-Type'] = options[:headers]['Content-Type'] unless options.dig(:headers, 'Content-Type').nil?
 
     # Create HTTP::Get or HTTP::Post
-    request =  Net::HTTP.const_get(method.capitalize).new(uri, request_headers)
+    request =  Net::HTTP.const_get(method.capitalize).new(@uri, request_headers)
 
     # Add bearer token header
     request['Authorization'] = "Bearer #{@access_token}" if options[:authenticated]
@@ -73,31 +89,57 @@ class SierraApiClient
     # Allow caller to modify the request before we send it off:
     yield request if block_given?
 
-    logger.debug "SierraApiClient: #{method} to Sierra api", { uri: uri, body: request.body }
+    logger.debug "SierraApiClient: #{method} to Sierra api", { uri: @uri, body: request.body }
+
+    execute request, options
+  end
+
+  def execute (request, options)
+    http = Net::HTTP.new(@uri.host, @uri.port)
+    http.use_ssl = @uri.scheme === 'https'
 
     begin
-      # Execute request:
       response = http.request(request)
+      logger.debug "SierraApiClient: Got Sierra api response", { code: response.code, body: response.body }
     rescue => e
-      raise SierraApiClientError.new(e), "Failed to #{method} to #{path}: #{e.message}"
+      raise SierraApiClientError.new "Failed to #{request.method} to #{request.path}: #{e.message}"
     end
 
-    logger.debug "SierraApiClient: Got Sierra api response", { code: response.code, body: response.body }
-
-    parse_response response
+    handle_response response, request, options
   end
 
-  def parse_response (response)
+  def handle_response (response, request, options)
     if response.code == "401"
       # Likely an expired access-token; Wipe it for next run
-      # TODO: Implement token refresh
       @access_token = nil
-      raise SierraApiClientTokenError.new("Got a 401: #{response.body}")
+      if @retries < 3
+        if options[:authenticated]
+          logger.debug "SierraApiClient: Refreshing oauth token for 401", { code: 401, body: response.body, retry: @retries }
+
+          return reauthenticate_and_reattempt request, options
+        end
+      else
+        retries_exceeded = true
+      end
+
+      reset_retries
+      message = "Got a 401: #{retries_exceeded ? "Maximum retries exceeded, " : ''}#{response.body}"
+      raise SierraApiClientTokenError.new(message)
     end
 
+    reset_retries if @retries > 0
     SierraApiResponse.new(response)
   end
 
+  def reauthenticate_and_reattempt request, options
+    @retries += 1
+    authenticate!
+    # Reset bearer token header
+    request['Authorization'] = "Bearer #{@access_token}"
+
+    execute request, options
+  end
+
   def parse_http_options (_options)
     options = {
       authenticated: true
@@ -143,4 +185,8 @@ class SierraApiClient
   def logger
     @logger ||= NyplLogFormatter.new(STDOUT, level: @config[:log_level])
   end
+
+  def reset_retries
+    @retries = 0
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nypl_sierra_api_client
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.2.0
 platform: ruby
 authors:
 - nonword