folio_client 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e45342fc554ea5de7c33e31a2bc41fd1b550cf1d60a52edd47b18f2c861846e
-  data.tar.gz: 13b0ddc4db0c2f73c31b2db26c48c9295ffa836e1e5e491b3308382d61021e72
+  metadata.gz: db6b3bd02eac883e93ca7a24725f1c3d4f1ef48b34a3aa6e9326070e1903f600
+  data.tar.gz: e2592286592f8fe064b326373dc3f8ca3123a7fa775fedcb23f00da97dc58638
 SHA512:
-  metadata.gz: 5087d3b4a53111f8d442756e4ef4d7d5213c4232650fb46216c48aa877ea12c4bf5a2686ac90cbc575be3c1b7b271079357a00dd25a96f6cd7fc32a2738741f8
-  data.tar.gz: 1094cccbea7e0d3cfc5f0b602c78b1b1b85aa2374cd1f264dcdf569c3b7bd907153f5f9342ddc5ccc7a3a45e68e5462060f5c4452cbc1c2c5a87fd6f4bd903d8
+  metadata.gz: 7ee03f5f2ae933bab57d6a3c6b2be09d7933b98f51ea66c07ffb09e821c4a5c9a08564125c01cd0858a4347465f8e588314b25bc26296851e61e593f8e1c42bd
+  data.tar.gz: '0170689c2a3d9bd2547b976cd43b7258cc3dd6c51a5a8caba9ba62774d3425e62f624024c155d3b728a7dea8df30bce23ee7f111f628c5c1649c8327891e1cc9'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    folio_client (0.6.0)
+    folio_client (0.6.1)
       activesupport (>= 4.2, < 8)
       faraday
       zeitwerk

data/lib/folio_client/token_wrapper.rb

@@ -4,7 +4,7 @@ class FolioClient
   # Wraps API operations to request new access token if expired
   class TokenWrapper
     def self.refresh(config, connection)
-      yield
+      yield.tap { |response| UnexpectedResponse.call(response) unless response.success? }
     rescue UnauthorizedError
       config.token = Authenticator.token(config.login_params, connection)
       yield

data/lib/folio_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class FolioClient
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/lib/folio_client.rb

@@ -58,7 +58,9 @@ class FolioClient
   # @param path [String] the path to the Folio API request
   # @param request [Hash] params to get to the API
   def get(path, params = {})
-    response = connection.get(path, params, {"x-okapi-token": config.token})
+    response = TokenWrapper.refresh(config, connection) do
+      connection.get(path, params, {"x-okapi-token": config.token})
+    end
 
     UnexpectedResponse.call(response) unless response.success?
 
@@ -69,7 +71,9 @@ class FolioClient
   # @param path [String] the path to the Folio API request
   # @param request [json] request body to post to the API
   def post(path, request = nil)
-    response = connection.post(path, request, {"x-okapi-token": config.token})
+    response = TokenWrapper.refresh(config, connection) do
+      connection.post(path, request, {"x-okapi-token": config.token})
+    end
 
     UnexpectedResponse.call(response) unless response.success?
 
@@ -85,25 +89,18 @@ class FolioClient
   end
 
   # Public methods available on the FolioClient below
-  # Wrap methods in `TokenWrapper` to ensure a new token is fetched automatically if expired
   def fetch_hrid(...)
-    TokenWrapper.refresh(config, connection) do
-      inventory = Inventory.new(self)
-      inventory.fetch_hrid(...)
-    end
+    inventory = Inventory.new(self)
+    inventory.fetch_hrid(...)
   end
 
   def fetch_marc_hash(...)
-    TokenWrapper.refresh(config, connection) do
-      source_storage = SourceStorage.new(self)
-      source_storage.fetch_marc_hash(...)
-    end
+    source_storage = SourceStorage.new(self)
+    source_storage.fetch_marc_hash(...)
   end
 
   def has_instance_status?(...)
-    TokenWrapper.refresh(config, connection) do
-      inventory = Inventory.new(self)
-      inventory.has_instance_status?(...)
-    end
+    inventory = Inventory.new(self)
+    inventory.has_instance_status?(...)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: folio_client
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Peter Mangiafico
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-28 00:00:00.000000000 Z
+date: 2023-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.5
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Interface for interacting with the Folio ILS API.